diff options
author | Gunes Bayir <gunes.bayir@arm.com> | 2023-07-11 14:57:36 +0100 |
---|---|---|
committer | Gunes Bayir <gunes.bayir@arm.com> | 2023-07-12 10:09:19 +0000 |
commit | ab0b75054ca3ddd62cff34518f331aa8474daa5a (patch) | |
tree | bf23ec6a1baee5b7359af1b91fb4b3a462760e2f /compute_kernel_writer/validation | |
parent | 653b96c9a72b2b6d4d82d6ee67b51be66351c617 (diff) | |
download | ComputeLibrary-ab0b75054ca3ddd62cff34518f331aa8474daa5a.tar.gz |
Add tile declaration capability in KernelWriter
Resolves: COMPMID-5816
Signed-off-by: Gunes Bayir <gunes.bayir@arm.com>
Change-Id: Ibd885707a842550a058252f9d01e072129896055
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9901
Tested-by: Arm Jenkins <bsgcomp@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/validation')
-rw-r--r-- | compute_kernel_writer/validation/Validation.cpp | 9 | ||||
-rw-r--r-- | compute_kernel_writer/validation/tests/CLKernelWriterCommentTest.h (renamed from compute_kernel_writer/validation/tests/CLKernelWriterTest.h) | 0 | ||||
-rw-r--r-- | compute_kernel_writer/validation/tests/CLKernelWriterDeclareTileTest.h | 99 |
3 files changed, 107 insertions, 1 deletions
diff --git a/compute_kernel_writer/validation/Validation.cpp b/compute_kernel_writer/validation/Validation.cpp index c0bdaaa0dc..e4884fa4aa 100644 --- a/compute_kernel_writer/validation/Validation.cpp +++ b/compute_kernel_writer/validation/Validation.cpp @@ -22,11 +22,12 @@ * SOFTWARE. */ +#include "tests/CLKernelWriterCommentTest.h" +#include "tests/CLKernelWriterDeclareTileTest.h" #include "tests/CLConstantTileTest.hpp" #include "tests/CLTileTest.hpp" #include "tests/TensorBitMaskTest.hpp" #include "tests/UtilsTest.hpp" -#include "tests/CLKernelWriterTest.h" #include <memory> #include <vector> @@ -60,7 +61,10 @@ int32_t main() const auto test12 = std::make_unique<CLConstantTileAccessScalarVariableBroadcastYTest>(); const auto test13 = std::make_unique<CLConstantTileAccessVectorVariablesTest>(); const auto test14 = std::make_unique<CLConstantTileAccessSubVectorVariablesTest>(); +#ifdef COMPUTE_KERNEL_WRITER_DEBUG_ENABLED const auto test15 = std::make_unique<CLKernelWriterCommentTest>(); +#endif /* COMPUTE_KERNEL_WRITER_DEBUG_ENABLED */ + const auto test16 = std::make_unique<CLKernelWriterDeclareTileTest>(); tests.push_back(test3.get()); tests.push_back(test4.get()); @@ -74,7 +78,10 @@ int32_t main() tests.push_back(test12.get()); tests.push_back(test13.get()); tests.push_back(test14.get()); +#ifdef COMPUTE_KERNEL_WRITER_DEBUG_ENABLED tests.push_back(test15.get()); +#endif /* COMPUTE_KERNEL_WRITER_DEBUG_ENABLED */ + tests.push_back(test16.get()); #endif /* COMPUTE_KERNEL_WRITER_OPENCL_ENABLED */ bool all_test_passed = true; diff --git a/compute_kernel_writer/validation/tests/CLKernelWriterTest.h b/compute_kernel_writer/validation/tests/CLKernelWriterCommentTest.h index ff09ea8073..ff09ea8073 100644 --- a/compute_kernel_writer/validation/tests/CLKernelWriterTest.h +++ b/compute_kernel_writer/validation/tests/CLKernelWriterCommentTest.h diff --git a/compute_kernel_writer/validation/tests/CLKernelWriterDeclareTileTest.h b/compute_kernel_writer/validation/tests/CLKernelWriterDeclareTileTest.h new file mode 100644 index 0000000000..5e00084aaa --- /dev/null +++ b/compute_kernel_writer/validation/tests/CLKernelWriterDeclareTileTest.h @@ -0,0 +1,99 @@ +/* + * 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. + */ + +#ifndef CKW_VALIDATION_TESTS_CLKERNELWRITER_H +#define CKW_VALIDATION_TESTS_CLKERNELWRITER_H + +#include "ckw/TileInfo.h" +#include "ckw/types/DataType.h" +#include "src/cl/CLKernelWriter.h" +#include "validation/tests/common/KernelWriterInterceptor.h" +#include "validation/tests/common/Common.h" + +#include <vector> + +namespace ckw +{ + +using CLKernelWriterDeclareTileConfig = std::tuple<DataType, int32_t, int32_t, std::string>; + +class CLKernelWriterDeclareTileTest : public ITest +{ +public: + CLKernelWriterDeclareTileTest() + { + _configs = { + {DataType::Fp32, 4, 4, "float4 G0__a_tile"}, + {DataType::Uint8, 4, 1, "uchar G0__a_tile"}, + {DataType::Int8, 4, 2, "char2 G0__a_tile"}, + {DataType::Bool, 9, 3, "bool3 G0__a_tile"}, + {DataType::Fp16, 4, 16, "half16 G0__a_tile"}, + {DataType::Uint32, 1, 8, "uint8 G0__a_tile"}, + {DataType::Uint16, 2, 3, "ushort3 G0__a_tile"}, + }; + } + + bool run() override + { + bool all_tests_passed = true; + int32_t test_idx = 0; + + for(auto _config: _configs) + { + KernelWriterInterceptor<CLKernelWriter> writer; + writer.start_capture_code(); + + const DataType data_type = std::get<0>(_config); + const int32_t height = std::get<1>(_config); + const int32_t width = std::get<2>(_config); + const std::string prefix = std::get<3>(_config); + + // expected output + std::string expected_code = ""; + for(int32_t row = 0; row < height; ++row) + { + expected_code += prefix + std::to_string(row) + ";\n"; + } + + TileInfo tile_info(data_type, height, width); + writer.declare_tile("a_tile", tile_info); + + VALIDATE_TEST(writer.check_added_code(expected_code), all_tests_passed, test_idx++); + } + + return all_tests_passed; + } + + std::string name() override + { + return "CLKernelWriterDeclareTileTest"; + } + +private: + std::vector<CLKernelWriterDeclareTileConfig> _configs {}; +}; + +} // namespace ckw + +#endif /* CKW_VALIDATION_TESTS_CLKERNELWRITER_H */ |