From 58bce688746f15e6365714e214dda45cc7706a41 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 13 Nov 2020 11:38:58 +0000 Subject: COMPMID-3962: Add Logical And, Or, Not support on NEON Signed-off-by: Georgios Pinitas Change-Id: Iabcd94d1ed6fe8bb27ce93924c35e25f48f39cf1 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4438 Reviewed-by: James Conroy Reviewed-by: Sang-Hoon Park Reviewed-by: Michalis Spyrou Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- tests/validation/NEON/Logical.cpp | 91 +++++++++++++++ tests/validation/fixtures/LogicalFixture.h | 181 +++++++++++++++++++++++++++++ tests/validation/reference/Logical.cpp | 136 ++++++++++++++++++++++ tests/validation/reference/Logical.h | 54 +++++++++ 4 files changed, 462 insertions(+) create mode 100644 tests/validation/NEON/Logical.cpp create mode 100644 tests/validation/fixtures/LogicalFixture.h create mode 100644 tests/validation/reference/Logical.cpp create mode 100644 tests/validation/reference/Logical.h (limited to 'tests') diff --git a/tests/validation/NEON/Logical.cpp b/tests/validation/NEON/Logical.cpp new file mode 100644 index 0000000000..f721e3cbc5 --- /dev/null +++ b/tests/validation/NEON/Logical.cpp @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2020 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/core/Types.h" +#include "arm_compute/runtime/NEON/functions/NELogical.h" +#include "arm_compute/runtime/Tensor.h" +#include "tests/NEON/Accessor.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Macros.h" +#include "tests/validation/Validation.h" +#include "tests/validation/fixtures/LogicalFixture.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +TEST_SUITE(NEON) + +TEST_SUITE(LogicalAnd) +template +using NELogicalAndFixture = LogicalBinaryOperationValidationFixture; + +FIXTURE_DATA_TEST_CASE(RunSmall, NELogicalAndFixture, framework::DatasetMode::ALL, zip(datasets::SmallShapes(), datasets::SmallShapes())) +{ + // Validate output + validate(Accessor(_target), _reference); +} + +FIXTURE_DATA_TEST_CASE(RunSmallBroadcast, NELogicalAndFixture, framework::DatasetMode::ALL, datasets::SmallShapesBroadcast()) +{ + // Validate output + validate(Accessor(_target), _reference); +} +TEST_SUITE_END() // LogicalAnd + +TEST_SUITE(LogicalOr) +template +using NELogicalOrFixture = LogicalBinaryOperationValidationFixture; + +FIXTURE_DATA_TEST_CASE(RunSmall, NELogicalOrFixture, framework::DatasetMode::ALL, zip(datasets::SmallShapes(), datasets::SmallShapes())) +{ + // Validate output + validate(Accessor(_target), _reference); +} + +FIXTURE_DATA_TEST_CASE(RunSmallBroadcast, NELogicalOrFixture, framework::DatasetMode::ALL, datasets::SmallShapesBroadcast()) +{ + // Validate output + validate(Accessor(_target), _reference); +} +TEST_SUITE_END() // LogicalOr + +TEST_SUITE(LogicalNot) + +template +using NELogicalNotFixture = LogicalNotValidationFixture; + +FIXTURE_DATA_TEST_CASE(RunSmall, NELogicalNotFixture, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), framework::dataset::make("DataType", + DataType::U8))) +{ + // Validate output + validate(Accessor(_target), _reference); +} +TEST_SUITE_END() // LogicalNot +TEST_SUITE_END() // NEON +} // namespace validation +} // namespace test +} // namespace arm_compute \ No newline at end of file diff --git a/tests/validation/fixtures/LogicalFixture.h b/tests/validation/fixtures/LogicalFixture.h new file mode 100644 index 0000000000..a4817cf785 --- /dev/null +++ b/tests/validation/fixtures/LogicalFixture.h @@ -0,0 +1,181 @@ +/* + * Copyright (c) 2020 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_LOGICAL_FIXTURE +#define ARM_COMPUTE_TEST_LOGICAL_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" +#include "tests/validation/reference/Logical.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +template +class LogicalOperationValidationFixtureBase : public framework::Fixture +{ +protected: + template + void fill(U &&tensor, int i) + { + constexpr uint8_t zero = 0; + constexpr uint8_t one = 0x1; + constexpr uint8_t mixed = 0xAA; + constexpr uint8_t mixed_bitwise_not = ~(0xAA); + + library->fill_static_values(tensor, i == 0 ? + std::vector { zero, one, zero, one, mixed, zero, mixed } : + std::vector { zero, zero, one, one, zero, mixed, mixed_bitwise_not }); + } + + void allocate_tensor(std::initializer_list tensors) + { + for(auto t : tensors) + { + ARM_COMPUTE_EXPECT(t->info()->is_resizable(), framework::LogLevel::ERRORS); + t->allocator()->allocate(); + ARM_COMPUTE_EXPECT(!t->info()->is_resizable(), framework::LogLevel::ERRORS); + } + } + + TensorType _target{}; + SimpleTensor _reference{}; +}; + +template +class LogicalBinaryOperationValidationFixture : public LogicalOperationValidationFixtureBase +{ + using Parent = LogicalOperationValidationFixtureBase; + +public: + template + void setup(TensorShape shape0, TensorShape shape1) + { + Parent::_target = compute_target(shape0, shape1); + Parent::_reference = compute_reference(shape0, shape1); + } + +private: + TensorType compute_target(const TensorShape &shape0, const TensorShape &shape1) + { + TensorType src0 = create_tensor(shape0, _data_type); + TensorType src1 = create_tensor(shape1, _data_type); + TensorType dst = create_tensor(TensorShape::broadcast_shape(shape0, shape1), _data_type); + + FunctionType logical_binary_op; + + logical_binary_op.configure(&src0, &src1, &dst); + + Parent::allocate_tensor({ &src0, &src1, &dst }); + + Parent::fill(AccessorType(src0), 0); + Parent::fill(AccessorType(src1), 1); + + logical_binary_op.run(); + + return dst; + } + + SimpleTensor compute_reference(const TensorShape &shape0, const TensorShape &shape1) + { + // Create reference + SimpleTensor src0{ shape0, _data_type }; + SimpleTensor src1{ shape1, _data_type }; + + // Fill reference + Parent::fill(src0, 0); + Parent::fill(src1, 1); + + switch(Op) + { + case reference::LogicalBinaryOperation::OR: + return reference::logical_or(src0, src1); + case reference::LogicalBinaryOperation::AND: + return reference::logical_and(src0, src1); + case reference::LogicalBinaryOperation::UNKNOWN: + /* fall-through */ + default: + ARM_COMPUTE_ASSERT_FAIL("unknown logical binary operator is given"); + } + + return SimpleTensor {}; + } + + static constexpr auto _data_type{ DataType::U8 }; +}; + +template +class LogicalNotValidationFixture : public LogicalOperationValidationFixtureBase +{ + using Parent = LogicalOperationValidationFixtureBase; + +public: + template + void setup(TensorShape shape, DataType data_type) + { + Parent::_target = compute_target(shape, data_type); + Parent::_reference = compute_reference(shape, data_type); + } + +private: + TensorType compute_target(const TensorShape &shape, DataType data_type) + { + TensorType src = create_tensor(shape, data_type); + TensorType dst = create_tensor(shape, data_type); + + FunctionType logical_not; + + logical_not.configure(&src, &dst); + + Parent::allocate_tensor({ &src, &dst }); + + Parent::fill(AccessorType(src), 0); + + logical_not.run(); + + return dst; + } + + SimpleTensor compute_reference(const TensorShape &shape, DataType data_type) + { + // Create reference + SimpleTensor src{ shape, data_type }; + + // Fill reference + Parent::fill(src, 0); + + return reference::logical_not(src); + } +}; +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_LOGICAL_FIXTURE */ \ No newline at end of file diff --git a/tests/validation/reference/Logical.cpp b/tests/validation/reference/Logical.cpp new file mode 100644 index 0000000000..394525c392 --- /dev/null +++ b/tests/validation/reference/Logical.cpp @@ -0,0 +1,136 @@ +/* + * Copyright (c) 2020 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 "tests/validation/reference/Logical.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template +T logical_op(LogicalBinaryOperation op, T src1, T src2) +{ + switch(op) + { + case LogicalBinaryOperation::AND: + return src1 && src2; + case LogicalBinaryOperation::OR: + return src1 || src2; + case LogicalBinaryOperation::UNKNOWN: + default: + ARM_COMPUTE_ERROR_ON_MSG(true, "unknown logical binary operation is given"); + } + return false; +} + +template +struct BroadcastUnroll +{ + template + static void unroll(LogicalBinaryOperation op, + const SimpleTensor &src1, const SimpleTensor &src2, SimpleTensor &dst, + Coordinates &id_src1, Coordinates &id_src2, Coordinates &id_dst) + { + const bool src1_is_broadcast = (src1.shape()[dim - 1] != dst.shape()[dim - 1]); + const bool src2_is_broadcast = (src2.shape()[dim - 1] != dst.shape()[dim - 1]); + + id_src1.set(dim - 1, 0); + id_src2.set(dim - 1, 0); + id_dst.set(dim - 1, 0); +#if defined(_OPENMP) + #pragma omp parallel for +#endif /* _OPENMP */ + for(size_t i = 0; i < dst.shape()[dim - 1]; ++i) + { + BroadcastUnroll < dim - 1 >::unroll(op, src1, src2, dst, id_src1, id_src2, id_dst); + + id_src1[dim - 1] += !src1_is_broadcast; + id_src2[dim - 1] += !src2_is_broadcast; + ++id_dst[dim - 1]; + } + } +}; + +template <> +struct BroadcastUnroll<0> +{ + template + static void unroll(LogicalBinaryOperation op, const SimpleTensor &src1, const SimpleTensor &src2, SimpleTensor &dst, + Coordinates &id_src1, Coordinates &id_src2, Coordinates &id_dst) + { + dst[coord2index(dst.shape(), id_dst)] = logical_op(op, src1[coord2index(src1.shape(), id_src1)], src2[coord2index(src2.shape(), id_src2)]); + } +}; + +template +SimpleTensor logical_or(const SimpleTensor &src1, const SimpleTensor &src2) +{ + Coordinates id_src1{}; + Coordinates id_src2{}; + Coordinates id_dst{}; + SimpleTensor dst{ TensorShape::broadcast_shape(src1.shape(), src2.shape()), src1.data_type() }; + + BroadcastUnroll::unroll(LogicalBinaryOperation::OR, src1, src2, dst, id_src1, id_src2, id_dst); + + return dst; +} + +template +SimpleTensor logical_and(const SimpleTensor &src1, const SimpleTensor &src2) +{ + Coordinates id_src1{}; + Coordinates id_src2{}; + Coordinates id_dst{}; + SimpleTensor dst{ TensorShape::broadcast_shape(src1.shape(), src2.shape()), src1.data_type() }; + + BroadcastUnroll::unroll(LogicalBinaryOperation::AND, src1, src2, dst, id_src1, id_src2, id_dst); + + return dst; +} + +template +SimpleTensor logical_not(const SimpleTensor &src) +{ + SimpleTensor dst(src.shape(), src.data_type()); +#if defined(_OPENMP) + #pragma omp parallel for +#endif /* _OPENMP */ + for(int i = 0; i < src.num_elements(); ++i) + { + dst[i] = !src[i]; + } + + return dst; +} + +template SimpleTensor logical_or(const SimpleTensor &src1, const SimpleTensor &src2); +template SimpleTensor logical_and(const SimpleTensor &src1, const SimpleTensor &src2); +template SimpleTensor logical_not(const SimpleTensor &src1); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute \ No newline at end of file diff --git a/tests/validation/reference/Logical.h b/tests/validation/reference/Logical.h new file mode 100644 index 0000000000..fb906b70b6 --- /dev/null +++ b/tests/validation/reference/Logical.h @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2020 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_LOGICAL_H +#define ARM_COMPUTE_TEST_LOGICAL_H + +#include "tests/SimpleTensor.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +enum class LogicalBinaryOperation +{ + UNKNOWN = 0, + AND = 1, + OR = 2 +}; + +template +SimpleTensor logical_or(const SimpleTensor &src1, const SimpleTensor &src2); +template +SimpleTensor logical_and(const SimpleTensor &src1, const SimpleTensor &src2); +template +SimpleTensor logical_not(const SimpleTensor &src1); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_LOGICAL_H */ \ No newline at end of file -- cgit v1.2.1