diff options
author | Gunes Bayir <gunes.bayir@arm.com> | 2024-01-17 16:07:03 +0000 |
---|---|---|
committer | Viet-Hoa Do <viet-hoa.do@arm.com> | 2024-02-01 16:00:34 +0000 |
commit | 2b9fa593a0a172bf36a02b5cdb840c6b9b361d7c (patch) | |
tree | a4e2d5ce46443a79a0778e4960462ce3edf106ec /src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwDriver.cpp | |
parent | 7ab7fca87cca8775f82b0e9efec6a40975910c17 (diff) | |
download | ComputeLibrary-2b9fa593a0a172bf36a02b5cdb840c6b9b361d7c.tar.gz |
Use the stable CKW API in the GPU dynamic fusion backend
- Refactor all kernels to work with the CKW stable API
- Add support for sub-tile in the op_load/op_store CKW operator
- Fix mismatch in resize
- Add comments in all kernels written with CKW to help developers
understand the structure of the code
- Add texture image support in depthwise convolution written with CKW
- Add support for different block sizes in depthwise convolution
- Remove the use of the dynamic fusion helper functions.
- Add support for floor in the op_unary() of CKW
Resolves: COMPMID-6708, COMPMID-6743, COMPMID-6530
Signed-off-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Signed-off-by: Gunes Bayir <gunes.bayir@arm.com>
Signed-off-by: Viet-Hoa Do <viet-hoa.do@arm.com>
Signed-off-by: Jakub Sujak <jakub.sujak@arm.com>
Change-Id: I8104ce4d04a3138a1aeb0b84940e1f1c89e76069
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10914
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Jakub Sujak <jakub.sujak@arm.com>
Reviewed-by: Gunes Bayir <gunes.bayir@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwDriver.cpp')
-rw-r--r-- | src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwDriver.cpp | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwDriver.cpp b/src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwDriver.cpp index c927f32bde..a0e5e16aa0 100644 --- a/src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwDriver.cpp +++ b/src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwDriver.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Arm Limited. + * Copyright (c) 2023-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -28,13 +28,17 @@ #include "src/common/utils/Log.h" #include "src/dynamic_fusion/sketch/gpu/ckw_driver/components/utils/type_converter/Common.h" -#include "src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwKernelWriter.h" #include "src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwScopedKernelWriter.h" #include "src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwVariableTable.h" #include "src/dynamic_fusion/sketch/gpu/ckw_driver/IGpuCkwComponentDriver.h" #include "src/dynamic_fusion/sketch/gpu/components/IGpuKernelComponent.h" +#include "compute_kernel_writer/include/ckw/KernelWriter.h" +#include "compute_kernel_writer/include/ckw/types/TargetArchitecture.h" +#include "compute_kernel_writer/include/ckw/types/TargetLanguage.h" + using namespace ckw; + namespace arm_compute { namespace experimental @@ -42,21 +46,22 @@ namespace experimental namespace dynamic_fusion { GpuCkwDriver::GpuCkwDriver(const GpuKernelComponentGroup &components) - : _components{components}, _kernel{GpuTargetLanguage::OpenCL}, _code{} { + _components = components; + // Generate kernel name - std::string name = ""; + std::string kernel_name; for (auto &comp : _components) { auto ckw_driver = comp->ckw_component_driver(); ARM_COMPUTE_ERROR_ON(ckw_driver == nullptr); - name += ckw_driver->get_name(_components) + "__"; + kernel_name += ckw_driver->get_name(_components) + "__"; } // Generate kernel code - _kernel.name(name); - GpuCkwKernelWriter root_writer(_kernel); - GpuCkwScopedKernelWriter writer(&root_writer); + auto root_writer = + KernelWriter::create_instance(ckw::TargetArchitecture::GpuArmMaliValhall, ckw::TargetLanguage::OpenCL); + GpuCkwScopedKernelWriter writer(root_writer.get()); GpuCkwVariableTable vtable{}; for (auto &comp : _components) @@ -65,22 +70,27 @@ GpuCkwDriver::GpuCkwDriver(const GpuKernelComponentGroup &components) ARM_COMPUTE_ERROR_ON(ckw_driver == nullptr); ckw_driver->write_component_code(_components, vtable, writer); } - _code = root_writer.generate_code(); + auto kernel = root_writer->emit_kernel(kernel_name); + + // Set the kernel name, kernel arguments and source code + _kernel_name = kernel_name; + _kernel_args = kernel->arguments(); + _kernel_code = kernel->source_code(); } std::string GpuCkwDriver::get_name() { - return _kernel.name(); + return _kernel_name; } std::string GpuCkwDriver::get_code() { - return _code; + return _kernel_code; } std::string GpuCkwDriver::get_config_id() { - std::string id = ""; + std::string id; for (auto &comp : _components) { auto ckw_driver = comp->ckw_component_driver(); @@ -100,7 +110,7 @@ Window GpuCkwDriver::get_window() const GpuKernelArgumentList GpuCkwDriver::get_kernel_arguments() { GpuKernelArgumentList args{}; - for (const auto &arg : _kernel.arguments()) + for (const auto &arg : _kernel_args) { switch (arg.type()) { |