aboutsummaryrefslogtreecommitdiff
path: root/compute_kernel_writer/src
diff options
context:
space:
mode:
authorGunes Bayir <gunes.bayir@arm.com>2023-08-17 11:04:02 +0100
committerGunes Bayir <gunes.bayir@arm.com>2023-08-18 15:34:49 +0000
commit47a396e3aae96f2dcad44f4e0d6cb6b87b368395 (patch)
tree454123cb8c47a90d7baf57b0f296c2baa18615de /compute_kernel_writer/src
parent580ecd750ed76c72d59a8b8d23566686e6aa9c7b (diff)
downloadComputeLibrary-47a396e3aae96f2dcad44f4e0d6cb6b87b368395.tar.gz
Implement load/store API functions
Add KernelWriter API functions for loading and storing tiles with and without dilations. Resolves: COMPMID-5791, COMPMID-6389 Change-Id: I9b1f5b2f081fa54e7bda488aac69ed8d43d1d35c Signed-off-by: Gunes Bayir <gunes.bayir@arm.com> Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10152 Tested-by: Arm Jenkins <bsgcomp@arm.com> Reviewed-by: Jakub Sujak <jakub.sujak@arm.com> Reviewed-by: Viet-Hoa Do <viet-hoa.do@arm.com> Comments-Addressed: Arm Jenkins <bsgcomp@arm.com> Benchmark: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'compute_kernel_writer/src')
-rw-r--r--compute_kernel_writer/src/cl/CLKernelWriter.cpp126
-rw-r--r--compute_kernel_writer/src/cl/CLKernelWriter.h55
2 files changed, 180 insertions, 1 deletions
diff --git a/compute_kernel_writer/src/cl/CLKernelWriter.cpp b/compute_kernel_writer/src/cl/CLKernelWriter.cpp
index 88ada37d71..b4df5c5f50 100644
--- a/compute_kernel_writer/src/cl/CLKernelWriter.cpp
+++ b/compute_kernel_writer/src/cl/CLKernelWriter.cpp
@@ -25,12 +25,18 @@
#include "src/cl/CLKernelWriter.h"
#include "ckw/Error.h"
#include "ckw/Kernel.h"
+#include "ckw/TensorSampler.h"
#include "ckw/TileOperand.h"
+#include "ckw/types/MemoryOperation.h"
#include "ckw/types/TargetLanguage.h"
#include "src/ITensorComponent.h"
#include "src/cl/CLHelpers.h"
#include "src/cl/CLTensorArgument.h"
#include "src/cl/CLTile.h"
+#include "src/cl/helpers/CLMemoryOpBufferHelper.h"
+#include "src/cl/helpers/CLMemoryOpImage2dHelper.h"
+#include "src/cl/helpers/ICLMemoryOpHelper.h"
+
#include <cstdint>
namespace ckw
@@ -160,4 +166,124 @@ void CLKernelWriter::op_write_raw_code(const std::string &raw_code)
append_code(raw_code);
}
+const CLTile &CLKernelWriter::to_cl_tile(const TileOperand &operand)
+{
+ const auto &tile = get_tile(operand);
+#ifdef COMPUTE_KERNEL_WRITER_ASSERTS_ENABLED
+ // Check if the tile is a CLTile created by this kernel writer.
+ {
+ bool found = false;
+ for(const auto &t : _tiles)
+ {
+ if(&tile == t.get())
+ {
+ found = true;
+ break;
+ }
+ }
+ if(!found)
+ {
+ for(const auto &t : _tensors)
+ {
+ const auto components = t->components();
+ for(const auto component : components)
+ {
+ if(&tile == &component->tile())
+ {
+ found = true;
+ break;
+ }
+ }
+ }
+ }
+ CKW_ASSERT_MSG(found, "The tile is not found!");
+ }
+#endif // COMPUTE_KERNEL_WRITER_ASSERTS_ENABLED
+ return static_cast<const CLTile &>(tile);
+}
+
+void CLKernelWriter::op_load(const TileOperand &tile_op, const TensorOperand &tensor_op, TensorSampler &sampler,
+ const TileOperand &x, const TileOperand &y, const TileOperand &z, const TileOperand &batch)
+{
+ const CLTile dilation_x("1", DataType::Int32);
+ const CLTile dilation_y("1", DataType::Int32);
+
+ op_load_store(MemoryOperation::Load, tile_op, tensor_op, sampler, x, y, z, batch, dilation_x, dilation_y);
+}
+
+void CLKernelWriter::op_load_dilated(const TileOperand &tile_op, const TensorOperand &tensor_op, TensorSampler &sampler,
+ const TileOperand &x, const TileOperand &y, const TileOperand &z, const TileOperand &batch,
+ const TileOperand &dilation_x, const TileOperand &dilation_y)
+{
+ const auto &dil_x_tile = to_cl_tile(dilation_x);
+ const auto &dil_y_tile = to_cl_tile(dilation_y);
+
+ op_load_store(MemoryOperation::Load, tile_op, tensor_op, sampler, x, y, z, batch, dil_x_tile, dil_y_tile);
+}
+
+void CLKernelWriter::op_store(const TensorOperand &tensor_op, const TileOperand &tile_op, TensorSampler &sampler,
+ const TileOperand &x, const TileOperand &y, const TileOperand &z, const TileOperand &batch)
+{
+ const CLTile dilation_x("1", DataType::Int32);
+ const CLTile dilation_y("1", DataType::Int32);
+
+ op_load_store(MemoryOperation::Store, tile_op, tensor_op, sampler, x, y, z, batch, dilation_x, dilation_y);
+}
+
+void CLKernelWriter::op_store_dilated(const TensorOperand &tensor_op, const TileOperand &tile_op, TensorSampler &sampler,
+ const TileOperand &x, const TileOperand &y, const TileOperand &z, const TileOperand &batch,
+ const TileOperand &dilation_x, const TileOperand &dilation_y)
+{
+ const auto &dil_x_tile = to_cl_tile(dilation_x);
+ const auto &dil_y_tile = to_cl_tile(dilation_y);
+
+ op_load_store(MemoryOperation::Store, tile_op, tensor_op, sampler, x, y, z, batch, dil_x_tile, dil_y_tile);
+}
+
+void CLKernelWriter::op_load_store(MemoryOperation op, const TileOperand &tile_op, const TensorOperand &tensor_op, TensorSampler &sampler,
+ const TileOperand &x, const TileOperand &y, const TileOperand &z, const TileOperand &batch,
+ const CLTile &dilation_x, const CLTile &dilation_y)
+{
+ CKW_UNUSED(dilation_x);
+ CKW_ASSERT(dilation_x.scalar(0,0).str == "1"); // Dilation in x dimension is not implemented yet
+
+ ITensor &tensor = get_tensor(tensor_op);
+
+ std::unique_ptr<ICLMemoryOpHelper> helper;
+ switch(sampler.storage())
+ {
+ case TensorStorageType::BufferUint8Ptr:
+ helper = std::make_unique<CLMemoryOpBufferHelper>(this, &tensor, &sampler, op);
+ break;
+ case TensorStorageType::Texture2dReadOnly:
+ case TensorStorageType::Texture2dWriteOnly:
+ helper = std::make_unique<CLMemoryOpImage2dHelper>(this, &tensor, &sampler, op);
+ break;
+ default:
+ CKW_THROW_MSG("Unsupported tensor storage");
+ }
+
+ const auto &tile = to_cl_tile(tile_op);
+ const auto &x_tile = to_cl_tile(x);
+ const auto &y_tile = to_cl_tile(y);
+ const auto &z_tile = to_cl_tile(z);
+ const auto &batch_tile = to_cl_tile(batch);
+
+ helper->initialize(&tile, &x_tile, &z_tile, &batch_tile);
+
+ for(int row = 0; row < tile.info().height(); ++row)
+ {
+ std::string coord_y = y_tile.scalar(0, 0).str + " + " + std::to_string(row);
+
+ if(dilation_y.scalar(0, 0).str != "1")
+ {
+ coord_y += " * " + dilation_y.scalar(0, 0).str;
+ }
+
+ helper->write_row(row, coord_y);
+ }
+
+ helper->finalize();
+}
+
} // namespace ckw
diff --git a/compute_kernel_writer/src/cl/CLKernelWriter.h b/compute_kernel_writer/src/cl/CLKernelWriter.h
index 5df148da7b..a40698d7bb 100644
--- a/compute_kernel_writer/src/cl/CLKernelWriter.h
+++ b/compute_kernel_writer/src/cl/CLKernelWriter.h
@@ -36,6 +36,11 @@ namespace ckw
class CLTile;
class CLTensorArgument;
+class TensorSampler;
+class TileOperand;
+class TensorOperand;
+
+enum class MemoryOperation;
/** OpenCL kernel writer. */
class CLKernelWriter : public KernelWriter
@@ -76,9 +81,43 @@ public:
/** Declare a tile given name and tile information
*
* Similar to @ref KernelWriter::declare_tile()
- */
+ */
TileOperand declare_tile(const std::string &name, const TileInfo &tile_info) override;
+ // =============================================================================================
+ // Memory Operations
+ // =============================================================================================
+
+ /** Load the data from the tensor memory to the tile using the sampling information.
+ *
+ * Similar to @ref KernelWriter::op_load()
+ */
+ void op_load(const TileOperand &tile_op, const TensorOperand &tensor_op, TensorSampler &sampler,
+ const TileOperand &x, const TileOperand &y, const TileOperand &z, const TileOperand &batch) override;
+
+ /** Load the data from the tensor memory to the tile in a dilated way using the sampling information.
+ *
+ * Similar to @ref KernelWriter::op_load_dilated()
+ */
+ void op_load_dilated(const TileOperand &tile_op, const TensorOperand &tensor_op, TensorSampler &sampler,
+ const TileOperand &x, const TileOperand &y, const TileOperand &z, const TileOperand &batch,
+ const TileOperand &dilation_x, const TileOperand &dilation_y) override;
+
+ /** Store the data to the tensor memory from the tile using the sampling information.
+ *
+ * Similar to @ref KernelWriter::op_store()
+ */
+ void op_store(const TensorOperand &tensor_op, const TileOperand &tile_op, TensorSampler &sampler,
+ const TileOperand &x, const TileOperand &y, const TileOperand &z, const TileOperand &batch) override;
+
+ /** Store the data to the tensor memory from the tile in a dilated way using the sampling information.
+ *
+ * Similar to @ref KernelWriter::op_store_dilated()
+ */
+ void op_store_dilated(const TensorOperand &tensor_op, const TileOperand &tile_op, TensorSampler &sampler,
+ const TileOperand &x, const TileOperand &y, const TileOperand &z, const TileOperand &batch,
+ const TileOperand &dilation_x, const TileOperand &dilation_y) override;
+
protected:
/** Append the specified code to the kernel body source code. */
template <typename T, typename... TArgs>
@@ -98,6 +137,20 @@ protected:
/** Get the current kernel body source code. */
const std::string &body_source_code() const;
+// For helper functions
+private:
+ /** Return @ref CLTile object from the @ref TileOperand object.
+ *
+ * This function performs appropriate check before doing type casting.
+ */
+ const CLTile &to_cl_tile(const TileOperand &operand);
+
+ /** Helper function to consolidate all load/store logic in this class */
+ void op_load_store(MemoryOperation op, const TileOperand &tile_op, const TensorOperand &tensor_op, TensorSampler &sampler,
+ const TileOperand &x, const TileOperand &y, const TileOperand &z, const TileOperand &batch,
+ const CLTile &dilation_x, const CLTile &dilation_y);
+
+// For attributes
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.