From 7e5b7bfc06c0bd8aecd809817866733c4fdf07fe Mon Sep 17 00:00:00 2001 From: SiCong Li Date: Tue, 17 Nov 2020 09:41:13 +0000 Subject: Review all shapes in datasets to account for padding removal Part 3 * Add the following configurations for stressing padding removal: * size = 1 * size = multiple of processing size * size = non-multiple of processing size Resolves COMPMID-3865 Signed-off-by: SiCong Li Change-Id: I2e0e6d4da129f64ba23cf7b9e0fa1fa1ad93efc3 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4440 Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Georgios Pinitas --- tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp') diff --git a/tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp b/tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp index 4a574d8f1d..1057af95f2 100644 --- a/tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp +++ b/tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp @@ -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); @@ -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), -- cgit v1.2.1