diff options
author | John Richardson <john.richardson@arm.com> | 2017-10-13 20:51:42 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | 63e5041e6ea0f7fb57a1cc349f1325785fa800fa (patch) | |
tree | c83d31baf2cb7fb80ad127396fe6e55ad0959273 /tests/validation | |
parent | 2d09993bed545f836cd624577c3ae749de6329b7 (diff) | |
download | ComputeLibrary-63e5041e6ea0f7fb57a1cc349f1325785fa800fa.tar.gz |
COMPMID-576: Port Phase to new validation
Change-Id: Ice08031c997cf8162a4358deb059db857ede2382
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/93585
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'tests/validation')
-rw-r--r-- | tests/validation/CL/Phase.cpp | 114 | ||||
-rw-r--r-- | tests/validation/CPP/Phase.cpp | 91 | ||||
-rw-r--r-- | tests/validation/CPP/Phase.h | 43 | ||||
-rw-r--r-- | tests/validation/NEON/Phase.cpp | 97 | ||||
-rw-r--r-- | tests/validation/fixtures/PhaseFixture.h | 122 |
5 files changed, 467 insertions, 0 deletions
diff --git a/tests/validation/CL/Phase.cpp b/tests/validation/CL/Phase.cpp new file mode 100644 index 0000000000..3cb6f68e1a --- /dev/null +++ b/tests/validation/CL/Phase.cpp @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2017 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/CLPhase.h" +#include "tests/CL/CLAccessor.h" +#include "tests/PaddingCalculator.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "tests/validation/Validation.h" +#include "tests/validation/fixtures/PhaseFixture.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace +{ +constexpr AbsoluteTolerance<uint8_t> tolerance_value(1); +} // namespace + +TEST_SUITE(CL) +TEST_SUITE(Phase) + +DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(concat(datasets::SmallShapes(), datasets::LargeShapes()), framework::dataset::make("DataType", { DataType::S16, DataType::S32 })), + shape, data_type) +{ + // Create tensors + CLTensor src1 = create_tensor<CLTensor>(shape, data_type); + CLTensor src2 = create_tensor<CLTensor>(shape, data_type); + CLTensor dst = create_tensor<CLTensor>(shape, DataType::U8); + + ARM_COMPUTE_EXPECT(src1.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(src2.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Create and configure function + CLPhase phase; + phase.configure(&src1, &src2, &dst); + + // Validate valid region + const ValidRegion valid_region = shape_to_valid_region(shape); + validate(dst.info()->valid_region(), valid_region); + + // Validate padding + const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding(); + validate(src1.info()->padding(), padding); + validate(src2.info()->padding(), padding); + validate(dst.info()->padding(), padding); +} + +template <typename T> +using CLPhaseFixture = PhaseValidationFixture<CLTensor, CLAccessor, CLPhase, T>; + +TEST_SUITE(S16) +FIXTURE_DATA_TEST_CASE(RunSmall, CLPhaseFixture<int16_t>, framework::DatasetMode::PRECOMMIT, combine(combine(datasets::Small2DShapes(), framework::dataset::make("Format", Format::S16)), + framework::dataset::make("PhaseType", { PhaseType::SIGNED, PhaseType::UNSIGNED }))) +{ + // Validate output + validate_wrap(CLAccessor(_target), _reference, tolerance_value, 0); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, CLPhaseFixture<int16_t>, framework::DatasetMode::NIGHTLY, combine(combine(datasets::Large2DShapes(), framework::dataset::make("Format", Format::S16)), + framework::dataset::make("PhaseType", { PhaseType::SIGNED, PhaseType::UNSIGNED }))) +{ + // Validate output + validate_wrap(CLAccessor(_target), _reference, tolerance_value, 0); +} +TEST_SUITE_END() // S16 + +TEST_SUITE(S32) +FIXTURE_DATA_TEST_CASE(RunSmall, CLPhaseFixture<int32_t>, framework::DatasetMode::PRECOMMIT, combine(combine(datasets::Small2DShapes(), framework::dataset::make("Format", Format::S32)), + framework::dataset::make("PhaseType", { PhaseType::SIGNED, PhaseType::UNSIGNED }))) +{ + // Validate output + validate_wrap(CLAccessor(_target), _reference, tolerance_value, 0); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, CLPhaseFixture<int32_t>, framework::DatasetMode::NIGHTLY, combine(combine(datasets::Large2DShapes(), framework::dataset::make("Format", Format::S32)), + framework::dataset::make("PhaseType", { PhaseType::SIGNED, PhaseType::UNSIGNED }))) +{ + // Validate output + validate_wrap(CLAccessor(_target), _reference, tolerance_value, 0); +} +TEST_SUITE_END() // S32 + +TEST_SUITE_END() +TEST_SUITE_END() +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/CPP/Phase.cpp b/tests/validation/CPP/Phase.cpp new file mode 100644 index 0000000000..4311ef091e --- /dev/null +++ b/tests/validation/CPP/Phase.cpp @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2017 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 "Phase.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template <typename T> +SimpleTensor<uint8_t> phase(const SimpleTensor<T> &gx, const SimpleTensor<T> &gy, PhaseType phase_type) +{ + const float pi = std::atan(1) * 4; + const float rad_to_deg = 180.0f / pi; + const float scale_factor = 128.f / 180.f; + const float epsilon = 1e-9f; // used to avoid division by zero + + const float ninety = scale_factor * 90.f; + const float one_eighty = scale_factor * 180.f; + const float two_seventy = scale_factor * 270.f; + + // unsigned: map to [0-255) + // signed: map to [0-180) degrees + const float scale = (phase_type == PhaseType::UNSIGNED) ? rad_to_deg : rad_to_deg * scale_factor; + + SimpleTensor<uint8_t> phase(gx.shape(), DataType::U8); + + for(int i = 0; i < gx.num_elements(); ++i) + { + bool quad_two = std::signbit(gx[i]) && !std::signbit(gy[i]); + bool quad_three = std::signbit(gx[i]) && std::signbit(gy[i]); + bool quad_four = !std::signbit(gx[i]) && std::signbit(gy[i]); + + float x = gy[i] / (gx[i] + epsilon); + double arctan = std::atan(x); + + const bool is_negative = std::signbit(arctan); + + // Radians to degrees conversion with applied scale factor + arctan = arctan * scale; + + if(phase_type == PhaseType::UNSIGNED) + { + arctan = is_negative ? arctan + 180.f : arctan; + } + else + { + arctan = is_negative ? arctan + ninety : arctan; + + // Choose correct quandrant + arctan = quad_two ? ninety + arctan : arctan; + arctan = quad_three ? one_eighty + arctan : arctan; + arctan = quad_four ? two_seventy + arctan : arctan; + } + + phase[i] = saturate_cast<uint8_t>(arctan + 0.5f); + } + + return phase; +} + +template SimpleTensor<uint8_t> phase(const SimpleTensor<int16_t> &gx, const SimpleTensor<int16_t> &gy, PhaseType phase_type); +template SimpleTensor<uint8_t> phase(const SimpleTensor<int32_t> &gx, const SimpleTensor<int32_t> &gy, PhaseType phase_type); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/CPP/Phase.h b/tests/validation/CPP/Phase.h new file mode 100644 index 0000000000..d322d53e02 --- /dev/null +++ b/tests/validation/CPP/Phase.h @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2017 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_PHASE_H__ +#define __ARM_COMPUTE_TEST_PHASE_H__ + +#include "tests/SimpleTensor.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template <typename T> +SimpleTensor<uint8_t> phase(const SimpleTensor<T> &gx, const SimpleTensor<T> &gy, PhaseType phase_type); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* __ARM_COMPUTE_TEST_PHASE_H__ */ diff --git a/tests/validation/NEON/Phase.cpp b/tests/validation/NEON/Phase.cpp new file mode 100644 index 0000000000..8e2ef23ccc --- /dev/null +++ b/tests/validation/NEON/Phase.cpp @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2017 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/NEON/functions/NEPhase.h" +#include "tests/NEON/Accessor.h" +#include "tests/PaddingCalculator.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "tests/validation/Validation.h" +#include "tests/validation/fixtures/PhaseFixture.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace +{ +constexpr AbsoluteTolerance<uint8_t> tolerance_value(1); +} // namespace + +TEST_SUITE(NEON) +TEST_SUITE(Phase) + +DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(concat(datasets::SmallShapes(), datasets::LargeShapes()), framework::dataset::make("DataType", DataType::S16)), shape, data_type) +{ + // Create tensors + Tensor src1 = create_tensor<Tensor>(shape, data_type); + Tensor src2 = create_tensor<Tensor>(shape, data_type); + Tensor dst = create_tensor<Tensor>(shape, DataType::U8); + + ARM_COMPUTE_EXPECT(src1.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(src2.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Create and configure function + NEPhase phase; + phase.configure(&src1, &src2, &dst); + + // Validate valid region + const ValidRegion valid_region = shape_to_valid_region(shape); + validate(dst.info()->valid_region(), valid_region); + + // Validate padding + const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding(); + validate(src1.info()->padding(), padding); + validate(src2.info()->padding(), padding); + validate(dst.info()->padding(), padding); +} + +template <typename T> +using NEPhaseFixture = PhaseValidationFixture<Tensor, Accessor, NEPhase, T>; + +TEST_SUITE(S16) +FIXTURE_DATA_TEST_CASE(RunSmall, NEPhaseFixture<int16_t>, framework::DatasetMode::PRECOMMIT, combine(combine(datasets::Small2DShapes(), framework::dataset::make("Format", Format::S16)), + framework::dataset::make("PhaseType", { PhaseType::UNSIGNED, PhaseType::SIGNED }))) +{ + // Validate output + validate_wrap(Accessor(_target), _reference, tolerance_value, 0); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, NEPhaseFixture<int16_t>, framework::DatasetMode::NIGHTLY, combine(combine(datasets::Large2DShapes(), framework::dataset::make("Format", Format::S16)), + framework::dataset::make("PhaseType", { PhaseType::UNSIGNED, PhaseType::SIGNED }))) +{ + // Validate output + validate_wrap(Accessor(_target), _reference, tolerance_value, 0); +} +TEST_SUITE_END() // S16 + +TEST_SUITE_END() +TEST_SUITE_END() +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/fixtures/PhaseFixture.h b/tests/validation/fixtures/PhaseFixture.h new file mode 100644 index 0000000000..693a61ed1a --- /dev/null +++ b/tests/validation/fixtures/PhaseFixture.h @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2017 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_PHASE_FIXTURE +#define ARM_COMPUTE_TEST_PHASE_FIXTURE + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" +#include "tests/Globals.h" +#include "tests/IAccessor.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Fixture.h" +#include "tests/validation/CPP/Phase.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +template <typename TensorType, typename AccessorType, typename FunctionType, typename T> +class PhaseValidationFixture : public framework::Fixture +{ +public: + template <typename...> + void setup(TensorShape shape, Format format, PhaseType phase_type) + { + _target = compute_target(shape, format, phase_type); + _reference = compute_reference(shape, format, phase_type); + } + +protected: + template <typename U> + void fill(U &&tensor, std::random_device::result_type seed_offset) + { + library->fill_tensor_uniform(tensor, seed_offset); + } + + TensorType compute_target(const TensorShape &shape, Format format, PhaseType phase_type) + { + DataType data_type = data_type_from_format(format); + + // Create tensors + TensorType src1 = create_tensor<TensorType>(shape, data_type); + src1.info()->set_format(format); + + TensorType src2 = create_tensor<TensorType>(shape, data_type); + src2.info()->set_format(format); + + TensorType dst = create_tensor<TensorType>(shape, DataType::U8); + dst.info()->set_format(Format::U8); + + // Create and configure function + FunctionType phase; + + phase.configure(&src1, &src2, &dst, phase_type); + + ARM_COMPUTE_EXPECT(src1.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(src2.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Allocate tensors + src1.allocator()->allocate(); + src2.allocator()->allocate(); + dst.allocator()->allocate(); + + ARM_COMPUTE_EXPECT(!src1.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(!src2.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(!dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Fill tensors + fill(AccessorType(src1), 0); + fill(AccessorType(src2), 1); + + // Compute function + phase.run(); + + return dst; + } + + SimpleTensor<uint8_t> compute_reference(const TensorShape &shape, Format format, PhaseType phase_type) + { + DataType data_type = data_type_from_format(format); + + // Create reference + SimpleTensor<T> src1{ shape, data_type }; + SimpleTensor<T> src2{ shape, data_type }; + + // Fill reference + fill(src1, 0); + fill(src2, 1); + + return reference::phase<T>(src1, src2, phase_type); + } + + TensorType _target{}; + SimpleTensor<uint8_t> _reference{}; +}; +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_PHASE_FIXTURE */ |