diff options
Diffstat (limited to 'tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp')
| -rw-r--r-- | tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp b/tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp index 86c8f5a7a8..d0d06a8ddb 100644 --- a/tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp +++ b/tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 ARM Limited. + * Copyright (c) 2019-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "arm_compute/core/CL/kernels/CLGEMMLowpMatrixMultiplyNativeKernel.h" #include "arm_compute/core/Types.h" #include "arm_compute/core/utils/misc/ShapeCalculator.h" +#include "src/gpu/cl/kernels/ClGemmLowpMatrixMultiplyNativeKernel.h" #include "tests/CL/CLAccessor.h" #include "tests/CL/Helper.h" #include "tests/framework/Asserts.h" @@ -41,7 +41,7 @@ namespace validation using namespace arm_compute::misc::shape_calculator; // Create function for CLGEMMMatrixMultiplyNativeKernel -using CLGEMMLowpMatrixMultiplyNative = CLSynthetizeFunction<CLGEMMLowpMatrixMultiplyNativeKernel>; +using CLGEMMLowpMatrixMultiplyNative = CLSynthetizeOperator<opencl::kernels::ClGemmLowpMatrixMultiplyNativeKernel>; // Fixture for CLGEMMLowpMatrixMultiplyNative using CLGEMMLowpMatrixMultiplyNativeFixture = GEMMLowpMatrixMultiplyNativeValidationFixture<CLTensor, CLAccessor, CLGEMMLowpMatrixMultiplyNative>; @@ -53,8 +53,15 @@ namespace { // *INDENT-OFF* // clang-format off -/** M values to test */ -const auto m_values = framework::dataset::make("M", 37); +/** M, N combinations to test + * 1: Special 1x1 case + * 2: Special multples of processor size in both dimensions + * 3: Non multiples of processor size in both dimensions +*/ +const auto m_n_values = zip( + framework::dataset::make("M", {1, 16, 37}), + framework::dataset::make("N", {1, 16, 51}) + ); /** M_W values to test */ const auto m_w_values = framework::dataset::make("M_W", 5); @@ -81,7 +88,7 @@ const auto n0_values_precommit = framework::dataset::make("N0", { 4 }); const auto k0_values_precommit = framework::dataset::make("K0", { 16 }); /** M0 values to test - Nightly */ -const auto m0_values_nightly = framework::dataset::make("M0", 1, 2, 7); +const auto m0_values_nightly = framework::dataset::make("M0", {1, 2, 7}); /** N0 values to test - Nightly */ const auto n0_values_nightly = framework::dataset::make("N0", { 1, 2, 3, 4, 8 }); @@ -93,8 +100,7 @@ const auto k0_values_nightly = framework::dataset::make("K0", { 1, 2, 3, 4, 8, 1 TEST_SUITE(CL) TEST_SUITE(GEMMLowpMatrixMultiplyNative) FIXTURE_DATA_TEST_CASE(RunSmall, CLGEMMLowpMatrixMultiplyNativeFixture, framework::DatasetMode::ALL, - combine(combine(combine(combine(combine(combine(m_values, - n_values), + combine(combine(combine(combine(combine(m_n_values, k_values), b_values), m0_values_precommit), @@ -106,8 +112,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLGEMMLowpMatrixMultiplyNativeFixture, framewor } FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMLowpMatrixMultiplyNativeFixture, framework::DatasetMode::ALL, - combine(combine(combine(combine(combine(combine(m_values, - n_values), + combine(combine(combine(combine(combine(m_n_values, k_values), b_values), m0_values_nightly), |