diff options
author | Pablo Tello <pablo.tello@arm.com> | 2018-03-23 11:40:05 +0000 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:49:16 +0000 |
commit | fc004494c9cde94fe7b5d67199faf2596e223cf3 (patch) | |
tree | a9b365a9ff7e5aedeb6341cba676b1e8022f42e6 /tests/validation | |
parent | c357c47be8a3f210f9eee9a05cc13f1051b036d3 (diff) | |
download | ComputeLibrary-fc004494c9cde94fe7b5d67199faf2596e223cf3.tar.gz |
COMPMID-959: Removed Interleave blocked kernel.
Change-Id: I775eecbc39da583aae2eb4e033c5930dfc402899
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/125684
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'tests/validation')
-rw-r--r-- | tests/validation/NEON/GEMMLowp.cpp | 27 | ||||
-rw-r--r-- | tests/validation/fixtures/GEMMInterleaveBlockedFixture.h | 114 |
2 files changed, 0 insertions, 141 deletions
diff --git a/tests/validation/NEON/GEMMLowp.cpp b/tests/validation/NEON/GEMMLowp.cpp index 471ec3faaf..ed24d618f5 100644 --- a/tests/validation/NEON/GEMMLowp.cpp +++ b/tests/validation/NEON/GEMMLowp.cpp @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "arm_compute/core/NEON/kernels/NEGEMMInterleaveBlockedKernel.h" #include "arm_compute/core/Types.h" #include "arm_compute/runtime/NEON/functions/NEGEMMLowpAssemblyMatrixMultiplyCore.h" #include "arm_compute/runtime/NEON/functions/NEGEMMLowpMatrixMultiplyCore.h" @@ -38,7 +37,6 @@ #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" #include "tests/validation/Validation.h" -#include "tests/validation/fixtures/GEMMInterleaveBlockedFixture.h" #include "tests/validation/fixtures/GEMMLowpAssemblyFixture.h" #include "tests/validation/fixtures/GEMMLowpFixture.h" @@ -50,8 +48,6 @@ namespace validation { namespace { -const auto data_int_blk = framework::dataset::make("M", 8, 12) * framework::dataset::make("N", 8, 12) * framework::dataset::make("by", 8, 13) * framework::dataset::make("block", 4, 9); -const auto data_int_blk_tr = framework::dataset::make("M", 8, 17) * framework::dataset::make("N", 8, 14) * framework::dataset::make("by", 12) * framework::dataset::make("block", 4); const auto data_matrix_multiply = framework::dataset::make("M", 12, 20) * framework::dataset::make("N", 12, 20) * framework::dataset::make("K", 16); } // namespace @@ -79,29 +75,6 @@ TEST_SUITE_END() TEST_SUITE_END() TEST_SUITE(GEMMLowp) - -TEST_SUITE(INTERLEAVE_BLOCKED) - -using NEInterleaveBlocked = NESynthetizeFunction<NEGEMMInterleaveBlockedKernel>; -using NEGEMMInterleaveBlockedFixture = GEMMInterleaveBlockedValidationFixture<Tensor, Accessor, NEInterleaveBlocked>; -FIXTURE_DATA_TEST_CASE(RunSmall, NEGEMMInterleaveBlockedFixture, framework::DatasetMode::PRECOMMIT, data_int_blk) -{ - // Validate output - validate(Accessor(_target), _reference); -} -TEST_SUITE_END() - -TEST_SUITE(INTERLEAVE_BLOCKED_TRANSPOSED) -using NEInterleaveBlockedTransposed = NESynthetizeFunction<NEGEMMInterleaveBlockedKernel>; -using NEGEMMInterleaveBlockedTransposedFixture = GEMMInterleaveBlockedValidationFixture<Tensor, Accessor, NEInterleaveBlockedTransposed, true>; -FIXTURE_DATA_TEST_CASE(RunSmall, NEGEMMInterleaveBlockedTransposedFixture, framework::DatasetMode::PRECOMMIT, data_int_blk_tr) -{ - // Validate output - validate(Accessor(_target), _reference); -} - -TEST_SUITE_END() - TEST_SUITE(MatrixMultiplyCore) using NEGEMMLowpMatrixMultiplyCoreFixture = GEMMLowpMatrixMultiplyCoreValidationFixture<Tensor, Accessor, NEGEMMLowpMatrixMultiplyCore>; diff --git a/tests/validation/fixtures/GEMMInterleaveBlockedFixture.h b/tests/validation/fixtures/GEMMInterleaveBlockedFixture.h deleted file mode 100644 index 488324dcc8..0000000000 --- a/tests/validation/fixtures/GEMMInterleaveBlockedFixture.h +++ /dev/null @@ -1,114 +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. - */ -#ifndef ARM_COMPUTE_TEST_GEMM_INTERLEAVE_BLOCKED_FIXTURE -#define ARM_COMPUTE_TEST_GEMM_INTERLEAVE_BLOCKED_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/Helpers.h" -#include "tests/validation/reference/GEMMInterleaveBlocked.h" - -#include <random> - -namespace arm_compute -{ -namespace test -{ -namespace validation -{ -template <typename TensorType, typename AccessorType, typename FunctionType, bool Transposed = false> -class GEMMInterleaveBlockedValidationFixture : public framework::Fixture -{ -public: - template <typename...> - void setup(size_t x, size_t y, int int_by, int block) - { - const float interleave_by_f32 = int_by; - const TensorShape shape_a(x, y); - const TensorShape shape_b(static_cast<size_t>(x * interleave_by_f32), static_cast<size_t>(std::ceil(y / interleave_by_f32))); - _target = compute_target(shape_a, shape_b, int_by, block); - _reference = compute_reference(shape_a, shape_b, int_by, block); - } - -protected: - template <typename U> - void fill(U &&tensor, int i) - { - ARM_COMPUTE_ERROR_ON(tensor.data_type() != DataType::U8); - std::uniform_int_distribution<> distribution(0, 255); - library->fill(tensor, distribution, i); - } - - TensorType compute_target(const TensorShape &shape_a, const TensorShape &shape_b, int int_by, int block) - { - // Create tensors - TensorType a = create_tensor<TensorType>(shape_a, DataType::U8, 1); - TensorType b = create_tensor<TensorType>(shape_b, DataType::U8, 1); - - // Create and configure function - FunctionType f; - f.configure(&a, &b, int_by, block, Transposed); - - ARM_COMPUTE_EXPECT(a.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(b.info()->is_resizable(), framework::LogLevel::ERRORS); - - // Allocate tensors - a.allocator()->allocate(); - b.allocator()->allocate(); - - ARM_COMPUTE_EXPECT(!a.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(!b.info()->is_resizable(), framework::LogLevel::ERRORS); - - // Fill tensors - fill(AccessorType(a), 0); - - // Compute GEMM function - f.run(); - return b; - } - - SimpleTensor<uint8_t> compute_reference(const TensorShape &shape_a, const TensorShape &shape_b, int int_by, int block) - { - // Create reference - SimpleTensor<uint8_t> a{ shape_a, DataType::U8, 1 }; - SimpleTensor<uint8_t> b{ shape_b, DataType::U8, 1 }; - - // Fill reference - fill(a, 0); - return reference::gemm_interleave_blocked<uint8_t>(a, b, int_by, block, Transposed); - } - - TensorType _target{}; - SimpleTensor<uint8_t> _reference{}; -}; - -} // namespace validation -} // namespace test -} // namespace arm_compute -#endif /* ARM_COMPUTE_TEST_GEMM_INTERLEAVE_BLOCKED_FIXTURE */ |