From 7e5b7bfc06c0bd8aecd809817866733c4fdf07fe Mon Sep 17 00:00:00 2001
From: SiCong Li <sicong.li@arm.com>
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 <sicong.li@arm.com>
Change-Id: I2e0e6d4da129f64ba23cf7b9e0fa1fa1ad93efc3
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4440
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
---
 tests/validation/CL/GEMMMatrixMultiply.cpp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'tests/validation/CL/GEMMMatrixMultiply.cpp')

diff --git a/tests/validation/CL/GEMMMatrixMultiply.cpp b/tests/validation/CL/GEMMMatrixMultiply.cpp
index 5d2e211d91..fdf7f503ec 100644
--- a/tests/validation/CL/GEMMMatrixMultiply.cpp
+++ b/tests/validation/CL/GEMMMatrixMultiply.cpp
@@ -72,8 +72,16 @@ const auto alpha_values = framework::dataset::make("alpha", {1.0f, -0.75f} );
 /** Beta values to test */
 const auto beta_values = framework::dataset::make("beta", {-0.35f, 0.0f} );
 
-/** M values to test */
-const auto m_values = framework::dataset::make("M", {37, 1});
+/** 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
+ *  4: Special 1x1003 case
+*/
+const auto m_n_values = zip(
+    framework::dataset::make("M", {1, 16, 37, 1}),
+    framework::dataset::make("N", {1, 16, 51, 1003})
+    );
 
 /** N values to test */
 const auto n_values = framework::dataset::make("N", {51, 1003});
@@ -247,9 +255,8 @@ TEST_SUITE(Float)
 TEST_SUITE(FP32)
 
 FIXTURE_DATA_TEST_CASE(RunSmall, CLGEMMMatrixMultiplyNativeFixture<float>, framework::DatasetMode::ALL,
-                combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
-                                                                   m_values,
-                                                                   n_values),
+                combine(combine(combine(combine(combine(combine(combine(combine(combine(
+                                                                   m_n_values,
                                                                    k_values),
                                                                    b_values),
                                                                    alpha_values),
@@ -287,9 +294,8 @@ TEST_SUITE_END() // FP32
 
 TEST_SUITE(FP16)
 FIXTURE_DATA_TEST_CASE(RunSmall, CLGEMMMatrixMultiplyNativeFixture<half>, framework::DatasetMode::ALL,
-                combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
-                                                                   m_values,
-                                                                   n_values),
+                combine(combine(combine(combine(combine(combine(combine(combine(combine(
+                                                                   m_n_values,
                                                                    k_values),
                                                                    b_values),
                                                                    alpha_values),
-- 
cgit v1.2.1