From 62eada278f4b6b840747cb1641b2e65838e9acaa Mon Sep 17 00:00:00 2001 From: Moritz Pflanzer Date: Fri, 28 Jul 2017 14:02:55 +0100 Subject: COMPMID-415: Move BitwiseAnd to new validation Change-Id: I1f1dff485ac510b6a9e5baf5f00c77beab7f8a5f Reviewed-on: http://mpd-gerrit.cambridge.arm.com/82049 Reviewed-by: Anthony Barbier Tested-by: Kaizen --- tests/validation/CL/BitwiseAnd.cpp | 217 ------------------------------------- 1 file changed, 217 deletions(-) delete mode 100644 tests/validation/CL/BitwiseAnd.cpp (limited to 'tests/validation/CL/BitwiseAnd.cpp') 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 -#include - -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(shape, DataType::U8); - CLTensor src2 = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(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(shape, DataType::U8); - CLTensor src2 = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(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(shape, DataType::U8); - CLTensor src2 = create_tensor(shape, DataType::U8); - CLTensor dst = create_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 - 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 */ -- cgit v1.2.1