Add kernel argument emitting
Resolves: COMPMID-6391
Signed-off-by: Viet-Hoa Do <viet-hoa.do@arm.com>
Change-Id: I0d54d99ffad275400c6da7fe16deb544553060eb
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10004
Reviewed-by: Anitha Raj <Anitha.Raj@arm.com>
Reviewed-by: Gunes Bayir <gunes.bayir@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>
diff --git a/compute_kernel_writer/src/Kernel.cpp b/compute_kernel_writer/src/Kernel.cpp
index 5eea1aa..bfb0f46 100644
--- a/compute_kernel_writer/src/Kernel.cpp
+++ b/compute_kernel_writer/src/Kernel.cpp
@@ -30,8 +30,8 @@
Kernel::~Kernel() = default;
-Kernel::Kernel(TargetLanguage language, const std::string &source_code)
- : _language(language), _source_code(source_code)
+Kernel::Kernel(TargetLanguage language, const std::vector<KernelArgument> &arguments, const std::string &source_code)
+ : _language(language), _arguments(arguments), _source_code(source_code)
{
}
@@ -40,6 +40,11 @@
return _language;
}
+const std::vector<KernelArgument> &Kernel::arguments() const
+{
+ return _arguments;
+}
+
const std::string &Kernel::source_code() const
{
return _source_code;
diff --git a/compute_kernel_writer/src/KernelArgument.cpp b/compute_kernel_writer/src/KernelArgument.cpp
new file mode 100644
index 0000000..a31ca17
--- /dev/null
+++ b/compute_kernel_writer/src/KernelArgument.cpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2023 Arm Limited.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "ckw/KernelArgument.h"
+#include "ckw/Error.h"
+
+namespace ckw
+{
+
+KernelArgument::KernelArgument(int32_t tensor_id, TensorStorageType storage_type)
+ : _type(Type::TensorStorage), _id(tensor_id)
+{
+ _sub_id.tensor_storage_type = storage_type;
+}
+
+KernelArgument::KernelArgument(int32_t tensor_id, TensorComponentType component_type)
+ : _type(Type::TensorComponent), _id(tensor_id)
+{
+ _sub_id.tensor_component_type = component_type;
+}
+
+KernelArgument::Type KernelArgument::type() const
+{
+ return _type;
+}
+
+int32_t KernelArgument::id() const
+{
+ return _id;
+}
+
+TensorStorageType KernelArgument::tensor_storage_type() const
+{
+ CKW_ASSERT(_type == Type::TensorStorage);
+
+ return _sub_id.tensor_storage_type;
+}
+
+TensorComponentType KernelArgument::tensor_component_type() const
+{
+ CKW_ASSERT(_type == Type::TensorComponent);
+
+ return _sub_id.tensor_component_type;
+}
+
+} // namespace ckw
diff --git a/compute_kernel_writer/src/cl/CLKernelWriter.cpp b/compute_kernel_writer/src/cl/CLKernelWriter.cpp
index 9363076..88ada37 100644
--- a/compute_kernel_writer/src/cl/CLKernelWriter.cpp
+++ b/compute_kernel_writer/src/cl/CLKernelWriter.cpp
@@ -26,6 +26,8 @@
#include "ckw/Error.h"
#include "ckw/Kernel.h"
#include "ckw/TileOperand.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"
@@ -39,8 +41,63 @@
std::unique_ptr<Kernel> CLKernelWriter::emit_kernel(const std::string &name)
{
- CKW_UNUSED(name);
- CKW_THROW_MSG("Not implemented!");
+ std::string code;
+
+ code += "__kernel void ";
+ code += name;
+ code += "\n(\n";
+
+ // Create the list of arguments.
+ std::vector<KernelArgument> arguments;
+
+ for(const auto &tensor : _tensors)
+ {
+ const auto tensor_id = tensor->info().id();
+
+ const auto storages = tensor->storages();
+ const auto components = tensor->components();
+
+ for(const auto &storage : storages)
+ {
+ code += cl_get_variable_storagetype_as_string(storage.type);
+ code += " ";
+ code += storage.val;
+ code += ",\n";
+
+ arguments.emplace_back(tensor_id, storage.type);
+ }
+
+ for(const auto &component : components)
+ {
+ const auto &tile = component->tile();
+ const auto &tile_info = tile.info();
+
+ CKW_ASSERT(tile_info.height() == 1);
+ CKW_ASSERT(tile_info.width() == 1);
+
+ code += cl_get_variable_datatype_as_string(tile_info.data_type(), 1);
+ code += " ";
+ code += tile.name();
+ code += ",\n";
+
+ arguments.emplace_back(tensor_id, component->component_type());
+ }
+ }
+
+ if(code.size() >= 2 && code[code.size() - 2] == ',' && code[code.size() - 1] == '\n')
+ {
+ // Remove the last comma in the argument list.
+ code.pop_back();
+ code[code.size() - 1] = '\n';
+ }
+
+ code += ")\n{\n";
+
+ code += _body_source_code;
+
+ code += "}\n";
+
+ return std::make_unique<Kernel>(TargetLanguage::OpenCL, arguments, code);
}
void CLKernelWriter::comment(const std::string &text)