From 9afc41a50751e1cb1a1002a85f7b156c67567778 Mon Sep 17 00:00:00 2001 From: Kurtis Charnock Date: Mon, 11 Nov 2019 17:24:37 +0000 Subject: COMPMID-2151: Implement Fill for CL Exposes CLMemsetKernel as a function to allow a tensor to be filled with a constant value. Signed-off-by: Kurtis Charnock Change-Id: I1aa75e9e3406ae28399ab817132b1f9faae1f9b6 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/c/VisualCompute/ComputeLibrary/+/211486 Tested-by: bsgcomp Reviewed-by: Georgios Pinitas Comments-Addressed: bsgcomp Reviewed-on: https://review.mlplatform.org/c/2317 Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins Reviewed-by: Michalis Spyrou --- arm_compute/runtime/CL/CLFunctions.h | 1 + arm_compute/runtime/CL/functions/CLFill.h | 47 ++++++++++++ docs/06_functions_list.dox | 1 + src/runtime/CL/functions/CLFill.cpp | 40 ++++++++++ tests/validation/CL/Fill.cpp | 123 ++++++++++++++++++++++++++++++ tests/validation/fixtures/FillFixture.h | 96 +++++++++++++++++++++++ 6 files changed, 308 insertions(+) create mode 100644 arm_compute/runtime/CL/functions/CLFill.h create mode 100644 src/runtime/CL/functions/CLFill.cpp create mode 100644 tests/validation/CL/Fill.cpp create mode 100644 tests/validation/fixtures/FillFixture.h diff --git a/arm_compute/runtime/CL/CLFunctions.h b/arm_compute/runtime/CL/CLFunctions.h index e647819bff..80caf7d23b 100644 --- a/arm_compute/runtime/CL/CLFunctions.h +++ b/arm_compute/runtime/CL/CLFunctions.h @@ -69,6 +69,7 @@ #include "arm_compute/runtime/CL/functions/CLFFT2D.h" #include "arm_compute/runtime/CL/functions/CLFFTConvolutionLayer.h" #include "arm_compute/runtime/CL/functions/CLFastCorners.h" +#include "arm_compute/runtime/CL/functions/CLFill.h" #include "arm_compute/runtime/CL/functions/CLFillBorder.h" #include "arm_compute/runtime/CL/functions/CLFlattenLayer.h" #include "arm_compute/runtime/CL/functions/CLFloor.h" diff --git a/arm_compute/runtime/CL/functions/CLFill.h b/arm_compute/runtime/CL/functions/CLFill.h new file mode 100644 index 0000000000..c4ba257753 --- /dev/null +++ b/arm_compute/runtime/CL/functions/CLFill.h @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2019 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 ARM_COMPUTE_CLFILL_H +#define ARM_COMPUTE_CLFILL_H + +#include "arm_compute/core/PixelValue.h" +#include "arm_compute/core/Types.h" +#include "arm_compute/runtime/CL/ICLSimpleFunction.h" + +namespace arm_compute +{ +class ICLTensor; + +/** Function to run @ref CLMemsetKernel to fill a tensor with a scalar value */ +class CLFill : public ICLSimpleFunction +{ +public: + /** Initialize the function + * + * @param[in,out] tensor Source tensor. Data types supported: U8/S8/QASYMM8/U16/S16/F16/U32/S32/F32 + * @param[in] constant_value Constant value to use to fill tensor. + */ + void configure(ICLTensor *tensor, PixelValue constant_value); +}; +} // namespace arm_compute +#endif /*ARM_COMPUTE_CLFILL_H */ diff --git a/docs/06_functions_list.dox b/docs/06_functions_list.dox index 48016ed375..0f1c00d9cf 100644 --- a/docs/06_functions_list.dox +++ b/docs/06_functions_list.dox @@ -280,6 +280,7 @@ namespace arm_compute - @ref CLElementwiseSquaredDiff - @ref CLErode - @ref CLExpLayer + - @ref CLFill - @ref CLFillBorder - @ref CLFlattenLayer - @ref CLFloor diff --git a/src/runtime/CL/functions/CLFill.cpp b/src/runtime/CL/functions/CLFill.cpp new file mode 100644 index 0000000000..035bb7ce8d --- /dev/null +++ b/src/runtime/CL/functions/CLFill.cpp @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2019 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 "arm_compute/runtime/CL/functions/CLFill.h" + +#include "arm_compute/core/CL/kernels/CLMemsetKernel.h" +#include "arm_compute/core/Types.h" + +#include + +namespace arm_compute +{ + +void CLFill::configure(ICLTensor *tensor, PixelValue constant_value) +{ + auto k = arm_compute::support::cpp14::make_unique(); + k->configure(tensor, constant_value); + _kernel = std::move(k); +} +} // namespace arm_compute diff --git a/tests/validation/CL/Fill.cpp b/tests/validation/CL/Fill.cpp new file mode 100644 index 0000000000..26f9872d71 --- /dev/null +++ b/tests/validation/CL/Fill.cpp @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2019 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 "arm_compute/runtime/CL/functions/CLFill.h" +#include "tests/CL/CLAccessor.h" +#include "tests/Globals.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "tests/framework/datasets/Datasets.h" +#include "tests/validation/Validation.h" +#include "tests/validation/fixtures/FillFixture.h" +#include + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +TEST_SUITE(CL) +TEST_SUITE(Fill) + +template +using CLFillFixture = FillFixture; + +TEST_SUITE(U8) +FIXTURE_DATA_TEST_CASE(RunSmall, CLFillFixture, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // U8 + +TEST_SUITE(S8) +FIXTURE_DATA_TEST_CASE(RunSmall, CLFillFixture, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S8))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // S8 + +TEST_SUITE(QASYMM8) +FIXTURE_DATA_TEST_CASE(RunSmall, CLFillFixture, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::QASYMM8))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // QASYMM8 + +TEST_SUITE(U16) +FIXTURE_DATA_TEST_CASE(RunSmall, CLFillFixture, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U16))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // U16 + +TEST_SUITE(S16) +FIXTURE_DATA_TEST_CASE(RunSmall, CLFillFixture, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // S16 + +TEST_SUITE(F16) +FIXTURE_DATA_TEST_CASE(RunSmall, CLFillFixture, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::F16))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // F16 + +TEST_SUITE(U32) +FIXTURE_DATA_TEST_CASE(RunSmall, CLFillFixture, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U32))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // U32 + +TEST_SUITE(S32) +FIXTURE_DATA_TEST_CASE(RunSmall, CLFillFixture, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S32))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // S32 + +TEST_SUITE(F32) +FIXTURE_DATA_TEST_CASE(RunSmall, CLFillFixture, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::F32))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // F32 + +TEST_SUITE_END() // Fill +TEST_SUITE_END() // CL +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/fixtures/FillFixture.h b/tests/validation/fixtures/FillFixture.h new file mode 100644 index 0000000000..c9817a3e28 --- /dev/null +++ b/tests/validation/fixtures/FillFixture.h @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2019 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 ARM_COMPUTE_TEST_FILL_FIXTURE +#define ARM_COMPUTE_TEST_FILL_FIXTURE + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" +#include "tests/AssetsLibrary.h" +#include "tests/Globals.h" +#include "tests/IAccessor.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Fixture.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +template +class FillFixture : public framework::Fixture +{ +public: + template + void setup(TensorShape input_shape, DataType data_type) + { + _target = compute_target(input_shape, data_type); + _reference = compute_reference(input_shape, data_type); + } + +protected: + TensorType compute_target(const TensorShape &input_shape, DataType data_type) + { + // Create tensors + TensorType input = create_tensor(input_shape, data_type); + + // Allocate tensors + input.allocator()->allocate(); + + // Fill tensor with an initial value + library->fill_tensor_uniform(AccessorType(input), 0); + + // Create and configure function + FunctionType fill; + const T constant_value {1}; + fill.configure(&input, constant_value); + + // Compute function with a distinct, second value + fill.run(); + + return input; + } + + SimpleTensor compute_reference(const TensorShape &input_shape, DataType data_type) + { + // Create reference + SimpleTensor input{ input_shape, data_type }; + + // Fill tensor + const T constant_value {1}; + for(int i = 0; i < input.num_elements(); ++i) + { + input[i] = constant_value; + } + + return input; + } + + TensorType _target{}; + SimpleTensor _reference{}; +}; +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_FILL_FIXTURE */ -- cgit v1.2.1