From 797b4f236c32feb2791f935d04858107554e1acb Mon Sep 17 00:00:00 2001 From: Isabella Gottardi Date: Wed, 13 Feb 2019 11:20:57 +0000 Subject: COMPMID-1993: Remove GEMMInterleave4x4 benchmark Change-Id: Iebddb2971af4c47848b15691318b6c12347b7050 Signed-off-by: Isabella Gottardi Reviewed-on: https://review.mlplatform.org/674 Reviewed-by: Michele Di Giorgio Tested-by: Arm Jenkins --- tests/benchmark/CL/GEMMInterleave4x4.cpp | 57 -------------- tests/benchmark/NEON/GEMMInterleave4x4.cpp | 59 --------------- .../benchmark/fixtures/GEMMInterleave4x4Fixture.h | 87 ---------------------- 3 files changed, 203 deletions(-) delete mode 100644 tests/benchmark/CL/GEMMInterleave4x4.cpp delete mode 100644 tests/benchmark/NEON/GEMMInterleave4x4.cpp delete mode 100644 tests/benchmark/fixtures/GEMMInterleave4x4Fixture.h diff --git a/tests/benchmark/CL/GEMMInterleave4x4.cpp b/tests/benchmark/CL/GEMMInterleave4x4.cpp deleted file mode 100644 index b7e24b1cc3..0000000000 --- a/tests/benchmark/CL/GEMMInterleave4x4.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2017-2018 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/core/TensorShape.h" -#include "arm_compute/runtime/CL/CLTensor.h" -#include "arm_compute/runtime/CL/CLTensorAllocator.h" -#include "arm_compute/runtime/CL/functions/CLGEMMInterleave4x4.h" -#include "tests/CL/CLAccessor.h" -#include "tests/benchmark/fixtures/GEMMInterleave4x4Fixture.h" -#include "tests/framework/Macros.h" -#include "tests/framework/datasets/Datasets.h" -#include "utils/TypePrinter.h" - -namespace arm_compute -{ -namespace test -{ -namespace benchmark -{ -namespace -{ -const auto small_data_shapes = framework::dataset::make("M", 8, 12) * framework::dataset::make("N", 8, 12); -const auto big_data_shapes = framework::dataset::make("M", 9999, 10001) * framework::dataset::make("N", 20000, 20003); -const auto data_types = framework::dataset::make("DataType", { DataType::U8, DataType::U16, DataType::U32 }); -} // namespace - -using CLGEMMInterleave4x4Fixture = GEMMInterleave4x4Fixture; - -TEST_SUITE(CL) -REGISTER_FIXTURE_DATA_TEST_CASE(GEMMInterleave4x4Small, CLGEMMInterleave4x4Fixture, framework::DatasetMode::ALL, small_data_shapes *data_types); - -REGISTER_FIXTURE_DATA_TEST_CASE(GEMMInterleave4x4Big, CLGEMMInterleave4x4Fixture, framework::DatasetMode::NIGHTLY, big_data_shapes *data_types); - -TEST_SUITE_END() -} // namespace benchmark -} // namespace test -} // namespace arm_compute diff --git a/tests/benchmark/NEON/GEMMInterleave4x4.cpp b/tests/benchmark/NEON/GEMMInterleave4x4.cpp deleted file mode 100644 index 4f34d0fb80..0000000000 --- a/tests/benchmark/NEON/GEMMInterleave4x4.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2017-2018 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/core/TensorShape.h" -#include "arm_compute/core/Types.h" -#include "arm_compute/runtime/NEON/functions/NEGEMMInterleave4x4.h" -#include "arm_compute/runtime/Tensor.h" -#include "arm_compute/runtime/TensorAllocator.h" -#include "tests/NEON/Accessor.h" -#include "tests/benchmark/fixtures/GEMMInterleave4x4Fixture.h" -#include "tests/framework/Macros.h" -#include "tests/framework/datasets/Datasets.h" -#include "utils/TypePrinter.h" - -namespace arm_compute -{ -namespace test -{ -namespace benchmark -{ -namespace -{ -const auto small_data_shapes = framework::dataset::make("M", 8, 12) * framework::dataset::make("N", 8, 12); -const auto big_data_shapes = framework::dataset::make("M", 9999, 10001) * framework::dataset::make("N", 20000, 20003); -const auto data_types = framework::dataset::make("DataType", { DataType::U8, DataType::U16, DataType::U32 }); -} // namespace - -using NEGEMMInterleave4x4Fixture = GEMMInterleave4x4Fixture; - -TEST_SUITE(NEON) - -REGISTER_FIXTURE_DATA_TEST_CASE(GEMMInterleave4x4Small, NEGEMMInterleave4x4Fixture, framework::DatasetMode::ALL, small_data_shapes *data_types); - -REGISTER_FIXTURE_DATA_TEST_CASE(GEMMInterleave4x4Big, NEGEMMInterleave4x4Fixture, framework::DatasetMode::NIGHTLY, big_data_shapes *data_types); - -TEST_SUITE_END() -} // namespace benchmark -} // namespace test -} // namespace arm_compute diff --git a/tests/benchmark/fixtures/GEMMInterleave4x4Fixture.h b/tests/benchmark/fixtures/GEMMInterleave4x4Fixture.h deleted file mode 100644 index c8e6f4a8db..0000000000 --- a/tests/benchmark/fixtures/GEMMInterleave4x4Fixture.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2017-2018 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_INTERLEAVE4X4_FIXTURE -#define ARM_COMPUTE_TEST_GEMM_INTERLEAVE4X4_FIXTURE - -#include "arm_compute/core/TensorShape.h" -#include "arm_compute/core/Types.h" -#include "tests/Globals.h" -#include "tests/Utils.h" -#include "tests/framework/Fixture.h" - -namespace arm_compute -{ -namespace test -{ -namespace benchmark -{ -/** Fixture that can be used for NEON and CL */ -template -class GEMMInterleave4x4Fixture : public framework::Fixture -{ -public: - template - void setup(size_t x, size_t y, DataType data_type) - { - const TensorShape shape_a(x, y); - const TensorShape shape_b(static_cast(x * 4.f), static_cast(std::ceil(y / 4.f))); - - // Create tensors - a = create_tensor(shape_a, data_type, 1); - b = create_tensor(shape_b, data_type, 1); - - // Create and configure function - gemm.configure(&a, &b); - - // Allocate tensors - a.allocator()->allocate(); - b.allocator()->allocate(); - } - - void run() - { - gemm.run(); - } - - void sync() - { - sync_if_necessary(); - sync_tensor_if_necessary(b); - } - - void teardown() - { - a.allocator()->free(); - b.allocator()->free(); - } - -private: - TensorType a{}; - TensorType b{}; - Function gemm{}; -}; -} // namespace benchmark -} // namespace test -} // namespace arm_compute -#endif /* ARM_COMPUTE_TEST_GEMM_INTERLEAVE4X4_FIXTURE */ -- cgit v1.2.1