diff options
author | Moritz Pflanzer <moritz.pflanzer@arm.com> | 2017-07-28 15:04:06 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | adfccb872f0970f95ee594e1fc0dd6c40554abe7 (patch) | |
tree | 918d7cd104cdeea405161ecaff7dc1d0f3f0544d /tests/validation | |
parent | 0eafa687818c11713e7e8e7bfcb976f60b4b8f54 (diff) | |
download | ComputeLibrary-adfccb872f0970f95ee594e1fc0dd6c40554abe7.tar.gz |
COMPMID-415: Move BitwiseNot to new validation
Change-Id: I3388eae0c55dd56f0777736128d93a7e2fa6ba9d
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/82052
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/NEON/BitwiseNot.cpp | 141 | ||||
-rw-r--r-- | tests/validation/Reference.cpp | 15 | ||||
-rw-r--r-- | tests/validation/Reference.h | 7 | ||||
-rw-r--r-- | tests/validation/ReferenceCPP.cpp | 9 | ||||
-rw-r--r-- | tests/validation/ReferenceCPP.h | 6 | ||||
-rw-r--r-- | tests/validation/TensorOperations.h | 10 |
6 files changed, 0 insertions, 188 deletions
diff --git a/tests/validation/NEON/BitwiseNot.cpp b/tests/validation/NEON/BitwiseNot.cpp deleted file mode 100644 index a5a4e350a9..0000000000 --- a/tests/validation/NEON/BitwiseNot.cpp +++ /dev/null @@ -1,141 +0,0 @@ -/* - * 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 "AssetsLibrary.h" -#include "Globals.h" -#include "NEON/Accessor.h" -#include "PaddingCalculator.h" -#include "TypePrinter.h" -#include "Utils.h" -#include "validation/Datasets.h" -#include "validation/Reference.h" -#include "validation/Validation.h" - -#include "arm_compute/core/Helpers.h" -#include "arm_compute/core/Types.h" -#include "arm_compute/runtime/NEON/functions/NEBitwiseNot.h" -#include "arm_compute/runtime/Tensor.h" -#include "arm_compute/runtime/TensorAllocator.h" - -#include "boost_wrapper.h" - -#include <random> -#include <string> - -using namespace arm_compute; -using namespace arm_compute::test; -using namespace arm_compute::test::validation; - -namespace -{ -/** Compute Neon bitwise not function. - * - * @param[in] shape Shape of the input and output tensors. - * - * @return Computed output tensor. - */ -Tensor compute_bitwise_not(const TensorShape &shape) -{ - // Create tensors - Tensor src = create_tensor<Tensor>(shape, DataType::U8); - Tensor dst = create_tensor<Tensor>(shape, DataType::U8); - - // Create not configure function - NEBitwiseNot bnot; - bnot.configure(&src, &dst); - - // Allocate tensors - src.allocator()->allocate(); - dst.allocator()->allocate(); - - BOOST_TEST(!src.info()->is_resizable()); - BOOST_TEST(!dst.info()->is_resizable()); - - // Fill tensors - library->fill_tensor_uniform(Accessor(src), 0); - - // Compute function - bnot.run(); - - return dst; -} -} // namespace - -#ifndef DOXYGEN_SKIP_THIS -BOOST_AUTO_TEST_SUITE(NEON) -BOOST_AUTO_TEST_SUITE(BitwiseNot) - -BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::label("nightly")) -BOOST_DATA_TEST_CASE(Configuration, SmallShapes() + LargeShapes(), shape) -{ - // Create tensors - Tensor src = create_tensor<Tensor>(shape, DataType::U8); - Tensor dst = create_tensor<Tensor>(shape, DataType::U8); - - BOOST_TEST(src.info()->is_resizable()); - BOOST_TEST(dst.info()->is_resizable()); - - // Create not configure function - NEBitwiseNot bnot; - bnot.configure(&src, &dst); - - // Validate valid region - const ValidRegion valid_region = shape_to_valid_region(shape); - validate(src.info()->valid_region(), valid_region); - validate(dst.info()->valid_region(), valid_region); - - // Validate padding - const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding(); - validate(src.info()->padding(), padding); - validate(dst.info()->padding(), padding); -} - -BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit")) -BOOST_DATA_TEST_CASE(RunSmall, SmallShapes(), shape) -{ - // Compute function - Tensor dst = compute_bitwise_not(shape); - - // Compute reference - RawTensor ref_dst = Reference::compute_reference_bitwise_not(shape); - - // Validate output - validate(Accessor(dst), ref_dst); -} - -BOOST_TEST_DECORATOR(*boost::unit_test::label("nightly")) -BOOST_DATA_TEST_CASE(RunLarge, LargeShapes(), shape) -{ - // Compute function - Tensor dst = compute_bitwise_not(shape); - - // Compute reference - RawTensor ref_dst = Reference::compute_reference_bitwise_not(shape); - - // Validate output - validate(Accessor(dst), ref_dst); -} - -BOOST_AUTO_TEST_SUITE_END() -BOOST_AUTO_TEST_SUITE_END() -#endif /* DOXYGEN_SKIP_THIS */ diff --git a/tests/validation/Reference.cpp b/tests/validation/Reference.cpp index 0fd30358b0..16b4cb9217 100644 --- a/tests/validation/Reference.cpp +++ b/tests/validation/Reference.cpp @@ -239,21 +239,6 @@ RawTensor Reference::compute_reference_arithmetic_subtraction(const TensorShape return ref_dst; } -RawTensor Reference::compute_reference_bitwise_not(const TensorShape &shape) -{ - // Create reference - RawTensor ref_src(shape, DataType::U8); - RawTensor ref_dst(shape, DataType::U8); - - // Fill reference - library->fill_tensor_uniform(ref_src, 0); - - // Compute reference - ReferenceCPP::bitwise_not(ref_src, ref_dst); - - return ref_dst; -} - RawTensor Reference::compute_reference_box3x3(const TensorShape &shape, BorderMode border_mode, uint8_t constant_border_value) { // Create reference diff --git a/tests/validation/Reference.h b/tests/validation/Reference.h index c13feca325..93e12fff26 100644 --- a/tests/validation/Reference.h +++ b/tests/validation/Reference.h @@ -161,13 +161,6 @@ public: * @return Computed raw tensor. */ static RawTensor compute_reference_arithmetic_subtraction(const TensorShape &shape, DataType dt_in0, DataType dt_in1, DataType dt_out, ConvertPolicy convert_policy, int fixed_point_position = 0); - /** Compute reference bitwise not. - * - * @param[in] shape Shape of the input and output tensors. - * - * @return Computed raw tensor. - */ - static RawTensor compute_reference_bitwise_not(const TensorShape &shape); /** Compute reference box3x3 filter. * * @param[in] shape Shape of the input and output tensors. diff --git a/tests/validation/ReferenceCPP.cpp b/tests/validation/ReferenceCPP.cpp index 5b7f473d6c..3bf70a0a19 100644 --- a/tests/validation/ReferenceCPP.cpp +++ b/tests/validation/ReferenceCPP.cpp @@ -173,15 +173,6 @@ void ReferenceCPP::arithmetic_subtraction(const RawTensor &src1, const RawTensor boost::apply_visitor(arithmetic_subtraction_visitor(convert_policy), s1, s2, d); } -// Bitwise not -void ReferenceCPP::bitwise_not(const RawTensor &src, RawTensor &dst) -{ - ARM_COMPUTE_ERROR_ON(src.data_type() != DataType::U8 || dst.data_type() != DataType::U8); - const Tensor<uint8_t> s(src.shape(), src.data_type(), src.fixed_point_position(), reinterpret_cast<const uint8_t *>(src.data())); - Tensor<uint8_t> d(dst.shape(), dst.data_type(), dst.fixed_point_position(), reinterpret_cast<uint8_t *>(dst.data())); - tensor_operations::bitwise_not(s, d); -} - // Box3x3 filter void ReferenceCPP::box3x3(const RawTensor &src, RawTensor &dst, BorderMode border_mode, uint8_t constant_border_value) { diff --git a/tests/validation/ReferenceCPP.h b/tests/validation/ReferenceCPP.h index 94a3519926..ce424bed03 100644 --- a/tests/validation/ReferenceCPP.h +++ b/tests/validation/ReferenceCPP.h @@ -150,12 +150,6 @@ public: * @param[in] convert_policy Overflow policy. */ static void arithmetic_subtraction(const RawTensor &src1, const RawTensor &src2, RawTensor &dst, ConvertPolicy convert_policy); - /** Function to compute the bitwise not of a tensor. - * - * @param[in] src Input tensor. - * @param[out] dst Result tensor. - */ - static void bitwise_not(const RawTensor &src, RawTensor &dst); /** Function to compute box3x3 filtered result tensor. * * @param[in] src Input tensor. diff --git a/tests/validation/TensorOperations.h b/tests/validation/TensorOperations.h index 208116baa4..c4884be7ca 100644 --- a/tests/validation/TensorOperations.h +++ b/tests/validation/TensorOperations.h @@ -630,16 +630,6 @@ void arithmetic_subtraction(const Tensor<T1> &in1, const Tensor<T2> &in2, Tensor } } -// Bitwise not -template <typename T, typename = typename std::enable_if<std::is_integral<T>::value>::type> -void bitwise_not(const Tensor<T> &in, Tensor<T> &out) -{ - for(int i = 0; i < in.num_elements(); ++i) - { - out[i] = ~in[i]; - } -} - // Box3x3 filter template <typename T, typename = typename std::enable_if<std::is_integral<T>::value>::type> void box3x3(const Tensor<T> &in, Tensor<T> &out, BorderMode border_mode, T constant_border_value) |