COMPMID-415: Move BitwiseAnd to new validation

Change-Id: I1f1dff485ac510b6a9e5baf5f00c77beab7f8a5f
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/82049
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>

7 files changed, 0 insertions, 485 deletions

diff --git a/tests/validation/CL/BitwiseAnd.cpp b/tests/validation/CL/BitwiseAnd.cpp
deleted file mode 100644
index 5615e8e5e9..0000000000
--- a/tests/validation/CL/BitwiseAnd.cpp
+++ /dev/null
@@ -1,217 +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 "CL/CLAccessor.h"
-#include "Globals.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/CL/CLSubTensor.h"
-#include "arm_compute/runtime/CL/CLTensor.h"
-#include "arm_compute/runtime/CL/CLTensorAllocator.h"
-#include "arm_compute/runtime/CL/functions/CLBitwiseAnd.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 CL bitwise and function.
- *
- * @param[in] shape Shape of the input and output tensors.
- *
- * @return Computed output tensor.
- */
-CLTensor compute_bitwise_and(const TensorShape &shape)
-{
-    // Create tensors
-    CLTensor src1 = create_tensor<CLTensor>(shape, DataType::U8);
-    CLTensor src2 = create_tensor<CLTensor>(shape, DataType::U8);
-    CLTensor dst  = create_tensor<CLTensor>(shape, DataType::U8);
-
-    // Create and configure function
-    CLBitwiseAnd band;
-    band.configure(&src1, &src2, &dst);
-
-    // Allocate tensors
-    src1.allocator()->allocate();
-    src2.allocator()->allocate();
-    dst.allocator()->allocate();
-
-    BOOST_TEST(!src1.info()->is_resizable());
-    BOOST_TEST(!src2.info()->is_resizable());
-    BOOST_TEST(!dst.info()->is_resizable());
-
-    // Fill tensors
-    library->fill_tensor_uniform(CLAccessor(src1), 0);
-    library->fill_tensor_uniform(CLAccessor(src2), 1);
-
-    // Compute function
-    band.run();
-
-    return dst;
-}
-
-/** Compute OpenCL bitwise and function that splits the input and output in two subtensor.
- *
- * @param[in] shape Shape of the input and output tensors.
- *
- * @return Computed output tensor.
- */
-CLTensor compute_bitwise_and_subtensor(const TensorShape &shape)
-{
-    // Create tensors
-    CLTensor src1 = create_tensor<CLTensor>(shape, DataType::U8);
-    CLTensor src2 = create_tensor<CLTensor>(shape, DataType::U8);
-    CLTensor dst  = create_tensor<CLTensor>(shape, DataType::U8);
-
-    // Create SubTensors
-    int         coord_z   = shape.z() / 2;
-    TensorShape sub_shape = shape;
-    sub_shape.set(2, coord_z);
-
-    CLSubTensor src1_sub1(&src1, sub_shape, Coordinates());
-    CLSubTensor src1_sub2(&src1, sub_shape, Coordinates(0, 0, coord_z));
-    CLSubTensor src2_sub1(&src2, sub_shape, Coordinates());
-    CLSubTensor src2_sub2(&src2, sub_shape, Coordinates(0, 0, coord_z));
-    CLSubTensor dst_sub1(&dst, sub_shape, Coordinates());
-    CLSubTensor dst_sub2(&dst, sub_shape, Coordinates(0, 0, coord_z));
-
-    // Create and configure function
-    CLBitwiseAnd band1, band2;
-    band1.configure(&src1_sub1, &src2_sub1, &dst_sub1);
-    band2.configure(&src1_sub2, &src2_sub2, &dst_sub2);
-
-    // Allocate tensors
-    src1.allocator()->allocate();
-    src2.allocator()->allocate();
-    dst.allocator()->allocate();
-
-    BOOST_TEST(!src1.info()->is_resizable());
-    BOOST_TEST(!src2.info()->is_resizable());
-    BOOST_TEST(!dst.info()->is_resizable());
-
-    // Fill tensors
-    std::uniform_int_distribution<> distribution(0, 255);
-    library->fill(CLAccessor(src1), distribution, 0);
-    library->fill(CLAccessor(src2), distribution, 1);
-
-    // Compute function
-    band1.run();
-    band2.run();
-
-    return dst;
-}
-} // namespace
-
-#ifndef DOXYGEN_SKIP_THIS
-BOOST_AUTO_TEST_SUITE(CL)
-BOOST_AUTO_TEST_SUITE(BitwiseAnd)
-
-BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::label("nightly"))
-BOOST_DATA_TEST_CASE(Configuration, SmallShapes() + LargeShapes(), shape)
-{
-    // Create tensors
-    CLTensor src1 = create_tensor<CLTensor>(shape, DataType::U8);
-    CLTensor src2 = create_tensor<CLTensor>(shape, DataType::U8);
-    CLTensor dst  = create_tensor<CLTensor>(shape, DataType::U8);
-
-    BOOST_TEST(src1.info()->is_resizable());
-    BOOST_TEST(src2.info()->is_resizable());
-    BOOST_TEST(dst.info()->is_resizable());
-
-    // Create and configure function
-    CLBitwiseAnd band;
-    band.configure(&src1, &src2, &dst);
-
-    // Validate valid region
-    const ValidRegion valid_region = shape_to_valid_region(shape);
-    validate(src1.info()->valid_region(), valid_region);
-    validate(src2.info()->valid_region(), valid_region);
-    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);
-}
-
-BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit"))
-BOOST_DATA_TEST_CASE(RunSmall, SmallShapes(), shape)
-{
-    // Compute function
-    CLTensor dst = compute_bitwise_and(shape);
-
-    // Compute reference
-    RawTensor ref_dst = Reference::compute_reference_bitwise_and(shape);
-
-    // Validate output
-    validate(CLAccessor(dst), ref_dst);
-}
-
-BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit"))
-BOOST_AUTO_TEST_CASE(RunSubTensor)
-{
-    // Create shape
-    TensorShape shape(27U, 35U, 8U, 2U);
-
-    // Compute function
-    CLTensor dst = compute_bitwise_and_subtensor(shape);
-
-    // Compute reference
-    RawTensor ref_dst = Reference::compute_reference_bitwise_and(shape);
-
-    // Validate output
-    validate(CLAccessor(dst), ref_dst);
-}
-
-BOOST_TEST_DECORATOR(*boost::unit_test::label("nightly"))
-BOOST_DATA_TEST_CASE(RunLarge, LargeShapes(), shape)
-{
-    // Compute function
-    CLTensor dst = compute_bitwise_and(shape);
-
-    // Compute reference
-    RawTensor ref_dst = Reference::compute_reference_bitwise_and(shape);
-
-    // Validate output
-    validate(CLAccessor(dst), ref_dst);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-BOOST_AUTO_TEST_SUITE_END()
-#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/BitwiseAnd.cpp b/tests/validation/NEON/BitwiseAnd.cpp
deleted file mode 100644
index e701b40949..0000000000
--- a/tests/validation/NEON/BitwiseAnd.cpp
+++ /dev/null
@@ -1,217 +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/NEBitwiseAnd.h"
-#include "arm_compute/runtime/SubTensor.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 and function.
- *
- * @param[in] shape Shape of the input and output tensors.
- *
- * @return Computed output tensor.
- */
-Tensor compute_bitwise_and(const TensorShape &shape)
-{
-    // Create tensors
-    Tensor src1 = create_tensor<Tensor>(shape, DataType::U8);
-    Tensor src2 = create_tensor<Tensor>(shape, DataType::U8);
-    Tensor dst  = create_tensor<Tensor>(shape, DataType::U8);
-
-    // Create and configure function
-    NEBitwiseAnd band;
-    band.configure(&src1, &src2, &dst);
-
-    // Allocate tensors
-    src1.allocator()->allocate();
-    src2.allocator()->allocate();
-    dst.allocator()->allocate();
-
-    BOOST_TEST(!src1.info()->is_resizable());
-    BOOST_TEST(!src2.info()->is_resizable());
-    BOOST_TEST(!dst.info()->is_resizable());
-
-    // Fill tensors
-    library->fill_tensor_uniform(Accessor(src1), 0);
-    library->fill_tensor_uniform(Accessor(src2), 1);
-
-    // Compute function
-    band.run();
-
-    return dst;
-}
-
-/** Compute Neon bitwise and function that splits the input and output in two subtensor.
- *
- * @param[in] shape Shape of the input and output tensors.
- *
- * @return Computed output tensor.
- */
-Tensor compute_bitwise_and_subtensor(const TensorShape &shape)
-{
-    // Create tensors
-    Tensor src1 = create_tensor<Tensor>(shape, DataType::U8);
-    Tensor src2 = create_tensor<Tensor>(shape, DataType::U8);
-    Tensor dst  = create_tensor<Tensor>(shape, DataType::U8);
-
-    // Create SubTensors
-    int         coord_z   = shape.z() / 2;
-    TensorShape sub_shape = shape;
-    sub_shape.set(2, coord_z);
-
-    SubTensor src1_sub1(&src1, sub_shape, Coordinates());
-    SubTensor src1_sub2(&src1, sub_shape, Coordinates(0, 0, coord_z));
-    SubTensor src2_sub1(&src2, sub_shape, Coordinates());
-    SubTensor src2_sub2(&src2, sub_shape, Coordinates(0, 0, coord_z));
-    SubTensor dst_sub1(&dst, sub_shape, Coordinates());
-    SubTensor dst_sub2(&dst, sub_shape, Coordinates(0, 0, coord_z));
-
-    // Create and configure function
-    NEBitwiseAnd band1, band2;
-    band1.configure(&src1_sub1, &src2_sub1, &dst_sub1);
-    band2.configure(&src1_sub2, &src2_sub2, &dst_sub2);
-
-    // Allocate tensors
-    src1.allocator()->allocate();
-    src2.allocator()->allocate();
-    dst.allocator()->allocate();
-
-    BOOST_TEST(!src1.info()->is_resizable());
-    BOOST_TEST(!src2.info()->is_resizable());
-    BOOST_TEST(!dst.info()->is_resizable());
-
-    // Fill tensors
-    std::uniform_int_distribution<> distribution(0, 255);
-    library->fill(Accessor(src1), distribution, 0);
-    library->fill(Accessor(src2), distribution, 1);
-
-    // Compute function
-    band1.run();
-    band2.run();
-
-    return dst;
-}
-} // namespace
-
-#ifndef DOXYGEN_SKIP_THIS
-BOOST_AUTO_TEST_SUITE(NEON)
-BOOST_AUTO_TEST_SUITE(BitwiseAnd)
-
-BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::label("nightly"))
-BOOST_DATA_TEST_CASE(Configuration, SmallShapes() + LargeShapes(), shape)
-{
-    // Create tensors
-    Tensor src1 = create_tensor<Tensor>(shape, DataType::U8);
-    Tensor src2 = create_tensor<Tensor>(shape, DataType::U8);
-    Tensor dst  = create_tensor<Tensor>(shape, DataType::U8);
-
-    BOOST_TEST(src1.info()->is_resizable());
-    BOOST_TEST(src2.info()->is_resizable());
-    BOOST_TEST(dst.info()->is_resizable());
-
-    // Create and configure function
-    NEBitwiseAnd band;
-    band.configure(&src1, &src2, &dst);
-
-    // Validate valid region
-    const ValidRegion valid_region = shape_to_valid_region(shape);
-    validate(src1.info()->valid_region(), valid_region);
-    validate(src2.info()->valid_region(), valid_region);
-    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);
-}
-
-BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit"))
-BOOST_DATA_TEST_CASE(RunSmall, SmallShapes(), shape)
-{
-    // Compute function
-    Tensor dst = compute_bitwise_and(shape);
-
-    // Compute reference
-    RawTensor ref_dst = Reference::compute_reference_bitwise_and(shape);
-
-    // Validate output
-    validate(Accessor(dst), ref_dst);
-}
-
-BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit"))
-BOOST_AUTO_TEST_CASE(RunSubTensor)
-{
-    // Create shape
-    TensorShape shape(27U, 35U, 8U, 2U);
-
-    // Compute function
-    Tensor dst = compute_bitwise_and_subtensor(shape);
-
-    // Compute reference
-    RawTensor ref_dst = Reference::compute_reference_bitwise_and(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_and(shape);
-
-    // Compute reference
-    RawTensor ref_dst = Reference::compute_reference_bitwise_and(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 e5bbdf2f2e..58beee5d62 100644
--- a/tests/validation/Reference.cpp
+++ b/tests/validation/Reference.cpp
@@ -214,23 +214,6 @@ RawTensor Reference::compute_reference_arithmetic_subtraction(const TensorShape
     return ref_dst;
 }
 
-RawTensor Reference::compute_reference_bitwise_and(const TensorShape &shape)
-{
-    // Create reference
-    RawTensor ref_src1(shape, DataType::U8);
-    RawTensor ref_src2(shape, DataType::U8);
-    RawTensor ref_dst(shape, DataType::U8);
-
-    // Fill reference
-    library->fill_tensor_uniform(ref_src1, 0);
-    library->fill_tensor_uniform(ref_src2, 1);
-
-    // Compute reference
-    ReferenceCPP::bitwise_and(ref_src1, ref_src2, ref_dst);
-
-    return ref_dst;
-}
-
 RawTensor Reference::compute_reference_bitwise_or(const TensorShape &shape)
 {
     // Create reference
diff --git a/tests/validation/Reference.h b/tests/validation/Reference.h
index 9bcbdf7418..f367ace1c2 100644
--- a/tests/validation/Reference.h
+++ b/tests/validation/Reference.h
@@ -146,13 +146,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 and.
-     *
-     * @param[in] shape Shape of the input and output tensors.
-     *
-     * @return Computed raw tensor.
-     */
-    static RawTensor compute_reference_bitwise_and(const TensorShape &shape);
     /** Compute reference bitwise or.
      *
      * @param[in] shape Shape of the input and output tensors.
diff --git a/tests/validation/ReferenceCPP.cpp b/tests/validation/ReferenceCPP.cpp
index 0364e75ce3..8366f1fac8 100644
--- a/tests/validation/ReferenceCPP.cpp
+++ b/tests/validation/ReferenceCPP.cpp
@@ -148,16 +148,6 @@ void ReferenceCPP::arithmetic_subtraction(const RawTensor &src1, const RawTensor
     boost::apply_visitor(arithmetic_subtraction_visitor(convert_policy), s1, s2, d);
 }
 
-// Bitwise and
-void ReferenceCPP::bitwise_and(const RawTensor &src1, const RawTensor &src2, RawTensor &dst)
-{
-    ARM_COMPUTE_ERROR_ON(src1.data_type() != DataType::U8 || src2.data_type() != DataType::U8 || dst.data_type() != DataType::U8);
-    const Tensor<uint8_t> s1(src1.shape(), src1.data_type(), src1.fixed_point_position(), reinterpret_cast<const uint8_t *>(src1.data()));
-    const Tensor<uint8_t> s2(src2.shape(), src2.data_type(), src2.fixed_point_position(), reinterpret_cast<const uint8_t *>(src2.data()));
-    Tensor<uint8_t>       d(dst.shape(), dst.data_type(), dst.fixed_point_position(), reinterpret_cast<uint8_t *>(dst.data()));
-    tensor_operations::bitwise_and(s1, s2, d);
-}
-
 // Bitwise or
 void ReferenceCPP::bitwise_or(const RawTensor &src1, const RawTensor &src2, RawTensor &dst)
 {
diff --git a/tests/validation/ReferenceCPP.h b/tests/validation/ReferenceCPP.h
index 7ae45f0dac..64a6eaecdc 100644
--- a/tests/validation/ReferenceCPP.h
+++ b/tests/validation/ReferenceCPP.h
@@ -131,13 +131,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 and between two tensors.
-     *
-     * @param[in]  src1 First tensor.
-     * @param[in]  src2 Second tensor.
-     * @param[out] dst  Result tensor.
-     */
-    static void bitwise_and(const RawTensor &src1, const RawTensor &src2, RawTensor &dst);
     /** Function to compute the bitwise or between two tensors.
      *
      * @param[in]  src1 First tensor.
diff --git a/tests/validation/TensorOperations.h b/tests/validation/TensorOperations.h
index 6e6d1f5115..96d5e2d3c5 100644
--- a/tests/validation/TensorOperations.h
+++ b/tests/validation/TensorOperations.h
@@ -431,16 +431,6 @@ void arithmetic_subtraction(const Tensor<T1> &in1, const Tensor<T2> &in2, Tensor
     }
 }
 
-// Bitwise and
-template <typename T, typename = typename std::enable_if<std::is_integral<T>::value>::type>
-void bitwise_and(const Tensor<T> &in1, const Tensor<T> &in2, Tensor<T> &out)
-{
-    for(int i = 0; i < in1.num_elements(); ++i)
-    {
-        out[i] = in1[i] & in2[i];
-    }
-}
-
 // Bitwise or
 template <typename T, typename = typename std::enable_if<std::is_integral<T>::value>::type>
 void bitwise_or(const Tensor<T> &in1, const Tensor<T> &in2, Tensor<T> &out)