From 25d26f4d86042e0ca52ac1bef4039b187f77b5b3 Mon Sep 17 00:00:00 2001 From: Viet-Hoa Do Date: Thu, 20 Jul 2023 17:31:47 +0100 Subject: Change TileOperand to a view of a tile object * TileOperand instead of being the tile object now is only a view of a tile object. - declare_tile now returns a TileOperand object, not a reference to a TileOperand object. - This is to prepare for the posibility that the users need to perform operations on part of a tile (e.g. a scalar value, a vector, a sub-tile). Partially resolves: COMPMID-6391 Signed-off-by: Viet-Hoa Do Change-Id: I35c08b22a384a756d99dcd04cbe66fc57bd548d2 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9958 Reviewed-by: Gunes Bayir Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Benchmark: Arm Jenkins --- compute_kernel_writer/src/cl/CLKernelWriter.cpp | 22 +++++++++++----------- compute_kernel_writer/src/cl/CLKernelWriter.h | 11 ++++++----- compute_kernel_writer/src/cl/CLTile.h | 13 +++++-------- 3 files changed, 22 insertions(+), 24 deletions(-) (limited to 'compute_kernel_writer/src/cl') diff --git a/compute_kernel_writer/src/cl/CLKernelWriter.cpp b/compute_kernel_writer/src/cl/CLKernelWriter.cpp index 2f8b1c95ce..bc056c67a2 100644 --- a/compute_kernel_writer/src/cl/CLKernelWriter.cpp +++ b/compute_kernel_writer/src/cl/CLKernelWriter.cpp @@ -24,14 +24,15 @@ #include "src/cl/CLKernelWriter.h" #include "ckw/Error.h" -#include "src/cl/CLTile.h" +#include "ckw/TileOperand.h" #include "src/cl/CLHelpers.h" +#include "src/cl/CLTile.h" #include namespace ckw { -CLKernelWriter::CLKernelWriter() = default; +CLKernelWriter::CLKernelWriter() = default; CLKernelWriter::~CLKernelWriter() = default; std::unique_ptr CLKernelWriter::emit_kernel(const std::string &name) @@ -61,12 +62,12 @@ const std::string &CLKernelWriter::body_source_code() const return _body_source_code; } -TileOperand &CLKernelWriter::declare_tile(const std::string &name, const TileInfo &tile_info) +TileOperand CLKernelWriter::declare_tile(const std::string &name, const TileInfo &tile_info) { const std::string fullname = generate_full_name(name); - const int32_t height = tile_info.height(); - const int32_t width = tile_info.width(); + const int32_t height = tile_info.height(); + const int32_t width = tile_info.width(); const DataType data_type = tile_info.data_type(); for(int32_t row = 0; row < height; ++row) @@ -75,13 +76,12 @@ TileOperand &CLKernelWriter::declare_tile(const std::string &name, const TileInf append_code(cl_type, " ", fullname, std::to_string(row), ";\n"); } - return add_operand(fullname, tile_info); -} + auto tile = std::make_unique(name, tile_info); + const auto operand = create_tile_operand(*tile); -TileOperand &CLKernelWriter::add_operand(const std::string &name, const TileInfo &tile_info) -{ - std::unique_ptr operand = std::make_unique(name, tile_info); - return KernelWriter::add_operand(operand); + _tiles.insert(std::move(tile)); + + return operand; } } // namespace ckw diff --git a/compute_kernel_writer/src/cl/CLKernelWriter.h b/compute_kernel_writer/src/cl/CLKernelWriter.h index 5bf7293ae2..c69a0bc07e 100644 --- a/compute_kernel_writer/src/cl/CLKernelWriter.h +++ b/compute_kernel_writer/src/cl/CLKernelWriter.h @@ -26,7 +26,10 @@ #define CKW_SRC_CL_CLKERNELWRITER_H #include "ckw/KernelWriter.h" +#include "src/cl/CLTile.h" +#include +#include #include namespace ckw @@ -62,8 +65,7 @@ public: * * Similar to @ref KernelWriter::declare_tile() */ - TileOperand &declare_tile(const ::std::string &name, const TileInfo &tile_info) override; - + TileOperand declare_tile(const std::string &name, const TileInfo &tile_info) override; protected: /** Append the specified code to the kernel body source code. */ @@ -84,9 +86,6 @@ protected: /** Get the current kernel body source code. */ const std::string &body_source_code() const; - /** Add a tile operand to the kernel and return it */ - TileOperand &add_operand(const std::string &code, const TileInfo &tile_info) override; - private: /** This string contains the kernel body source code, not the full CL source code. * The full source code will only be generated when the user calls @ref KernelWriter::emit_kernel. @@ -95,6 +94,8 @@ private: * Do not attempt to concatenate and alter this string directly. */ std::string _body_source_code{}; + + std::set> _tiles{}; }; } // namespace ckw diff --git a/compute_kernel_writer/src/cl/CLTile.h b/compute_kernel_writer/src/cl/CLTile.h index b9d4bbaf84..f06bb449c0 100644 --- a/compute_kernel_writer/src/cl/CLTile.h +++ b/compute_kernel_writer/src/cl/CLTile.h @@ -24,10 +24,7 @@ #ifndef COMPUTE_KERNEL_WRITER_SRC_CL_CLTILE_H #define COMPUTE_KERNEL_WRITER_SRC_CL_CLTILE_H -#include "src/ITile.h" #include "src/cl/ICLTile.h" -#include "ckw/TileOperand.h" - #include namespace ckw @@ -36,7 +33,7 @@ namespace ckw class TileInfo; /** OpenCL specific tile */ -class CLTile : public ICLTile, public TileOperand +class CLTile : public ICLTile { public: /** Constructor @@ -47,15 +44,15 @@ public: CLTile(const std::string &name, const TileInfo &info); // Inherited method overridden - TileVariable scalar(int32_t row, int32_t col) const override; + TileVariable scalar(int32_t row, int32_t col) const override; - TileVariable vector(int32_t row) const override; + TileVariable vector(int32_t row) const override; - TileVariable vector(int32_t row, int32_t col_start, int32_t width) const override; + TileVariable vector(int32_t row, int32_t col_start, int32_t width) const override; std::vector all() const override; - bool is_assignable() const override; + bool is_assignable() const override; private: std::string create_var_name(int32_t row) const; -- cgit v1.2.1