From cd1f03e765ad0f3ca3b68b1a7c1d0a1539cab439 Mon Sep 17 00:00:00 2001 From: Viet-Hoa Do Date: Tue, 19 Sep 2023 16:41:34 +0100 Subject: Add row vector and scalar access support to tile operand * Add the concept of tile view which refers to a specific rectangular area of the tile object. - The active area is added to TileOperand so that the user can access part of the tile. - Currently only row vector and scalar access are exposed to the user. - All writing operations except load/store op support sub-tile. * Add tests for sub-tile access. Resolves: COMPMID-6557 Signed-off-by: Mohammed Suhail Munshi Signed-off-by: Viet-Hoa Do Change-Id: Ica3f9eaf17f06e080c495d36c572f623b62c2910 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10354 Reviewed-by: Gunes Bayir Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins --- compute_kernel_writer/include/ckw/KernelWriter.h | 8 +++-- compute_kernel_writer/include/ckw/TileOperand.h | 46 +++++++++++++++++++++++- 2 files changed, 50 insertions(+), 4 deletions(-) (limited to 'compute_kernel_writer/include/ckw') diff --git a/compute_kernel_writer/include/ckw/KernelWriter.h b/compute_kernel_writer/include/ckw/KernelWriter.h index 93ae8aecd6..15c99fe652 100644 --- a/compute_kernel_writer/include/ckw/KernelWriter.h +++ b/compute_kernel_writer/include/ckw/KernelWriter.h @@ -34,6 +34,7 @@ #include #include #include +#include namespace ckw { @@ -42,6 +43,7 @@ namespace ckw class Kernel; class TensorInfo; class TensorSampler; +class TileArea; class TileInfo; enum class DataType; @@ -313,7 +315,7 @@ public: * @param[in] batch batch */ virtual void op_load_indirect(const TileOperand &tile_op, const TensorOperand &tensor_op, TensorSampler &sampler, - const TileOperand &x, const TileOperand &y, const TileOperand &z, const TileOperand &batch_op) = 0; + const TileOperand &x, const TileOperand &y, const TileOperand &z, const TileOperand &batch_op) = 0; protected: // ============================================================================================= @@ -355,8 +357,8 @@ protected: /** Create a new tile operand referring to the specified tile object. */ static TileOperand create_tile_operand(ITile &tile); - /** Get the reference to tile object from the tile operand. */ - static ITile &get_tile(const TileOperand &operand); + /** Get the reference to the tile object and the active area from the tile operand. */ + static std::tuple get_tile(const TileOperand &operand); /** Create a new tensor operand from a tensor object. */ static TensorOperand create_tensor_operand(ITensor &tensor); diff --git a/compute_kernel_writer/include/ckw/TileOperand.h b/compute_kernel_writer/include/ckw/TileOperand.h index 873a9825f3..56dc5e7b2b 100644 --- a/compute_kernel_writer/include/ckw/TileOperand.h +++ b/compute_kernel_writer/include/ckw/TileOperand.h @@ -25,6 +25,8 @@ #ifndef CKW_INCLUDE_CKW_TILEOPERAND_H #define CKW_INCLUDE_CKW_TILEOPERAND_H +#include + namespace ckw { @@ -41,13 +43,55 @@ public: friend class KernelWriter; friend class TensorOperand; + /** Get a row vector of the current tile operand. + * + * @param[in] row The index of the row to be accessed in the current tile operand. + * + * @return A new tile operand referring to a row of the current tile operand. + */ + TileOperand row(int32_t row) const; + + /** Get a scalar element of the current tile operand. + * + * @param[in] row The index of the row to be accessed in the current tile operand. + * @param[in] col The index of the column to be accessed in the current tile operand. + * + * @return A new tile operand referring to a scalar element of the current tile operand. + */ + TileOperand scalar(int32_t row, int32_t col) const; + private: // These are hidden from the public API to avoid any misuse. /** Initialize a new instance of @ref TileOperand class for the given tile. */ TileOperand(ITile &tile); - ITile &_tile; + /** Initialize a new instance of @ref TileOperand class that is the sub-tile of the given tile. */ + TileOperand(const TileOperand &operand, int32_t row_start, int32_t row_end, int32_t col_start, int32_t col_end); + + /** Get a sub-tile of the current tile operand. + * + * The range of rows and columns is defined by pairs of start and end indices, inclusive lower and exclusive upper. + * In other words, any row and column indices satisfying the following conditions will be part of the sub-tile: + * + * row_start <= row_index < row_end + * col_start <= col_index < col_end + * + * @param[in] row_start The start index of the row range. + * @param[in] row_end The end index of the row range. + * @param[in] col_start The start index of the column range. + * @param[in] col_end The end index of the column range. + * + * @return A new tile operand refering to the same tile but with the new active area. + */ + TileOperand tile(int32_t row_start, int32_t row_end, int32_t col_start, int32_t col_end) const; + + ITile *_tile; + + int32_t _row_start; + int32_t _row_end; + int32_t _col_start; + int32_t _col_end; }; } // namespace ckw -- cgit v1.2.1