-
Notifications
You must be signed in to change notification settings - Fork 3.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Hexagon] Add Hand written HVX conv2d #12204
Merged
+1,477
−0
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
89e6911
[Hexagon] Add Hand written HVX conv2d
quic-sanirudh a663c48
Address review comments
quic-sanirudh fbf570c
Add some more comments and a file rename
quic-sanirudh b40c152
Add gtest unit tests for blockize/deblockize
quic-sanirudh b47ba68
Add gtest unit tests fp16 utils
quic-sanirudh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,198 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
#include <tvm/runtime/c_runtime_api.h> | ||
#include <tvm/runtime/device_api.h> | ||
|
||
#include <cassert> | ||
|
||
#ifndef TVM_RUNTIME_HEXAGON_OPS_CONV2D_H_ | ||
#define TVM_RUNTIME_HEXAGON_OPS_CONV2D_H_ | ||
|
||
namespace tvm { | ||
namespace runtime { | ||
namespace hexagon { | ||
static constexpr auto hexagon_device = DLDevice{static_cast<DLDeviceType>(kDLHexagon), 0}; | ||
|
||
// Standalone DLTensor: the standalone-ness means that this object owns the shape | ||
// (as opposed to a DLTensor). | ||
template <size_t NDIM> | ||
class SDLTensor : public DLTensor { | ||
public: | ||
SDLTensor(void* data_ptr, DLDataType data_type, void* data_space, const int64_t* data_dims) | ||
: SDLTensor(data_ptr, data_type, data_space) { | ||
for (size_t i = 0; i < NDIM; ++i) dims[i] = data_dims[i]; | ||
} | ||
|
||
SDLTensor(void* data_ptr, DLDataType data_type, void* data_space, | ||
std::initializer_list<int64_t> data_dims) | ||
: SDLTensor(data_ptr, data_type, data_space, data_dims.begin()) {} | ||
|
||
void* GetDataSpace() const { return data_space; } | ||
|
||
private: | ||
/** | ||
* @brief Construct SDLTensor | ||
* | ||
* @param data_ptr Either points to the same memory as data_space or an array of pointers to the | ||
* start of each chunk of weight. Since weights can be of varying sizes, this array could contain | ||
* the pointer to each chunk of memory | ||
* @param data_type data type of the elements in Tensor | ||
* @param data_space is meant to store the pointer returned from AllocDataSpace and can be freed | ||
* by passing it to FreeDataSpace | ||
*/ | ||
SDLTensor(void* data_ptr, DLDataType data_type, void* data_space) : data_space(data_space) { | ||
data = data_ptr; | ||
device = hexagon_device; | ||
ndim = NDIM; | ||
dtype = data_type; | ||
shape = dims; | ||
strides = nullptr; | ||
byte_offset = 0; | ||
} | ||
|
||
void* data_space = nullptr; | ||
int64_t dims[NDIM]; | ||
}; | ||
|
||
inline void* to_ptr(uintptr_t v) { return reinterpret_cast<void*>(v); } | ||
|
||
inline uintptr_t to_uint(void* ptr) { return reinterpret_cast<uintptr_t>(ptr); } | ||
|
||
constexpr int xyc_to_sm_16b(int y, int x, int c) { | ||
// Map y,x,c coordinates within a block to the offset (in 16-bit elements) | ||
// from the beginning of the block in spatial-major layout. | ||
// 10-bit spatial mask: yyyxcccccx | ||
assert(y >= 0 && x >= 0 && c >= 0); | ||
return y << 7 | (x & 2) << 5 | c << 1 | (x & 1); | ||
} | ||
|
||
constexpr int hwio_to_sm_16b(int width, int y, int x, int i, int o) { | ||
// Map y,x,i,o coordinates within a chunk (assuming the origin at the | ||
// top-left spatial corner) to the offset (in 16-bit elements) from the | ||
// beginning of the chunk in spatial-major layout. | ||
// Spatial mask: p..piiiioooooi, where p..p are position bits. | ||
assert(width >= 1); | ||
assert(y >= 0 && x >= 0 && i >= 0 && o >= 0); | ||
int p = y * width + (width - 1 - x); | ||
return p << 10 | (i & 0x1e) << 5 | o << 1 | (i & 1); | ||
} | ||
|
||
inline constexpr int round_up(int v, int p2) { return (v + p2 - 1) & -p2; } | ||
|
||
// Returns the block address at the given index | ||
// Assumptions | ||
// - The data type of tensor is fp16 | ||
// - There is only one batch, and hence n==0 | ||
inline uintptr_t nhwc_at(const DLTensor& a, int n, int y, int x, int c) { | ||
if (y < 0 || y >= a.shape[1]) return uintptr_t(0); | ||
auto p = static_cast<uintptr_t*>(a.data); | ||
assert(n == 0); | ||
return p[y * a.shape[2] * a.shape[3] + x * a.shape[3] + c]; | ||
} | ||
|
||
// Returns the address of the chunk stored at given index | ||
// Assumptions | ||
// - The data type of tensor is fp16 | ||
inline uintptr_t hwio_at(const DLTensor& f, int y, int x, int i, int o) { | ||
auto p = static_cast<uintptr_t*>(f.data); | ||
return p[y * f.shape[1] * f.shape[2] * f.shape[3] + x * f.shape[2] * f.shape[3] + i * f.shape[3] + | ||
o]; | ||
} | ||
|
||
/** | ||
* @brief Function to "blockize" the flat input data | ||
* The term "blockize" is used to mention that the data is stored in non-contiguous blocks | ||
* | ||
* The input is mapped into the below mentioned layout (notation similar to index map used for | ||
* transform layout): | ||
* | ||
* lambda n, h, w, c: n, h//8, w//4, c//32, AXIS_SEPARATOR, h%8, (w%4)//2, c%32, w%2 | ||
* | ||
* where AXIS_SEPARATOR represents split up in the physical layout | ||
* | ||
* @param out Pre-allocated output memory pointer | ||
* @param inp_flat Flat input data pointer | ||
* @param height | ||
* @param width | ||
* @param depth | ||
*/ | ||
void blockize_hwc_16b(void* out, void* inp_flat, int height, int width, int depth); | ||
|
||
/** | ||
* @brief Convert back from non-contguous layout to a flat layout | ||
* | ||
* @param out_flat Pre-allocated output memory pointer | ||
* @param inp Blockized input data pointer | ||
* @param height | ||
* @param width | ||
* @param depth | ||
*/ | ||
void deblockize_hwc_16b(void* out_flat, void* inp, int height, int width, int depth); | ||
|
||
/** | ||
* @brief Convert the layout of weights from flat to "chunked". The term chunked is explained below: | ||
* | ||
* Weights are packed into the below mentioned layout (notation similar to index map): | ||
* Since weights cannot be exactly represented into a index map notation, the | ||
* base split up is mentioned below with a few gotchas | ||
* | ||
* lambda h, w, i, o: h//8, w//4, o//32, i//32, h%8, w%4, (i%32)//2, o%32, i%2 | ||
* | ||
* The gotchas are: | ||
* - (w%4) is actually stored in the right to left order, as in 3,2,1,0 instead of 0,1,2,3 | ||
* - The h%8 and (w%4) dimensions are not padded up, leading to chunks of different sizes | ||
* (thereby the name "chunked" instead of packed) | ||
* - The thinnest chunk of width is stored first. For example, if a kernel is 5x5, the first | ||
* chunk along the width has size 1 (representing index 0) and then next one has size 4 | ||
* representing indices (1,2,3,4) | ||
* | ||
* @param out_ptr Base pointer table to be filled with the list of pointers to the first addresses | ||
* of the "chunked" weights | ||
* @param out_ptr_size The number of chunks | ||
* @param out Pointer to pre-allocated output memory | ||
* @param inp Pointer to flat input data | ||
* @param height | ||
* @param width | ||
* @param idepth | ||
* @param odepth | ||
*/ | ||
void chunkify_hwio_16b(void** out_ptr, int out_ptr_size, void* out, void* inp, int height, | ||
int width, int idepth, int odepth); | ||
|
||
SDLTensor<4> prepare_nhwc(tvm::runtime::DeviceAPI* device_api, const DLTensor* nhwc_flat, | ||
bool copy_data); | ||
|
||
int calculate_num_weight_chunks(int64_t* shape_hwio); | ||
|
||
SDLTensor<4> prepare_hwio(tvm::runtime::DeviceAPI* device_api, const DLTensor* hwio_flat, | ||
int num_chunks, void** ptr_table); | ||
|
||
template <size_t N> | ||
void release(tvm::runtime::DeviceAPI* device_api, const SDLTensor<N>& tensor) { | ||
if (auto* data_space = tensor.GetDataSpace()) { | ||
device_api->FreeDataSpace(hexagon_device, data_space); | ||
} | ||
} | ||
|
||
} // namespace hexagon | ||
} // namespace runtime | ||
} // namespace tvm | ||
|
||
#endif // TVM_RUNTIME_HEXAGON_OPS_CONV2D_H_ |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The roles of
data_ptr
anddata_space
are explained in this PR comment, but I don't see that same information in the current code.Could we add put that same information into one or more code comments?
Also, even if that PR comment is right about there being no risk of dangling pointers, that isn't obviously true just from normal-level-of-effort reading of the code. Is there some way we can address that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've added comments explaining them, thanks for the suggestion. As to the idea of dangling pointers, I'll try and address them separately as I'm not sure how generic the usage of these are going to be.