COMPMID-2819 Disable GEMM MatrixMultiply nightly tests

Disable all the nightly MatrixMultiply tests and remove some
large shapes.

Change-Id: Ic7d178ecb4e92fdb0c19ef48727f7ffb2972625a
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/2439
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

9 files changed, 45 insertions, 91 deletions

diff --git a/tests/datasets/ShapeDatasets.h b/tests/datasets/ShapeDatasets.h
index fae2faaaa0..2a2047480f 100644
--- a/tests/datasets/ShapeDatasets.h
+++ b/tests/datasets/ShapeDatasets.h
@@ -330,9 +330,7 @@ public:
     Large1DShapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 1921U },
-                     TensorShape{ 1245U },
-                     TensorShape{ 4160U }
+        TensorShape{ 1245U }
     })
     {
     }
@@ -345,9 +343,7 @@ public:
     Large2DShapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 1920U, 1080U },
-                     TensorShape{ 1245U, 652U },
-                     TensorShape{ 4160U, 3120U }
+        TensorShape{ 1245U, 652U }
     })
     {
     }
@@ -360,9 +356,7 @@ public:
     Large3DShapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 320U, 240U, 3U },
-                     TensorShape{ 383U, 653U, 2U },
-                     TensorShape{ 721U, 123U, 13U }
+        TensorShape{ 320U, 240U, 3U }
     })
     {
     }
@@ -375,9 +369,7 @@ public:
     Large4DShapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 320U, 123U, 3U, 3U },
-                     TensorShape{ 383U, 413U, 2U, 3U },
-                     TensorShape{ 517U, 123U, 13U, 2U }
+        TensorShape{ 320U, 123U, 3U, 3U }
     })
     {
     }
@@ -495,9 +487,7 @@ public:
     Large5x5Shapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 5U, 5U, 32U, 64U },
-                     TensorShape{ 5U, 5U, 51U, 13U },
-                     TensorShape{ 5U, 5U, 53U, 47U },
+        TensorShape{ 5U, 5U, 32U, 64U }
     })
     {
     }
@@ -510,9 +500,7 @@ public:
     Small5x1Shapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 5U, 1U, 7U, 4U },
-                     TensorShape{ 5U, 1U, 4U, 13U },
-                     TensorShape{ 5U, 1U, 3U, 5U },
+        TensorShape{ 5U, 1U, 7U, 4U }
     })
     {
     }
@@ -525,9 +513,7 @@ public:
     Large5x1Shapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 5U, 1U, 32U, 64U },
-                     TensorShape{ 5U, 1U, 51U, 13U },
-                     TensorShape{ 5U, 1U, 53U, 47U },
+        TensorShape{ 5U, 1U, 32U, 64U }
     })
     {
     }
@@ -540,9 +526,7 @@ public:
     Small1x5Shapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 1U, 5U, 7U, 4U },
-                     TensorShape{ 1U, 5U, 4U, 13U },
-                     TensorShape{ 1U, 5U, 3U, 5U },
+        TensorShape{ 1U, 5U, 7U, 4U }
     })
     {
     }
@@ -555,9 +539,7 @@ public:
     Large1x5Shapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 1U, 5U, 32U, 64U },
-                     TensorShape{ 1U, 5U, 51U, 13U },
-                     TensorShape{ 1U, 5U, 53U, 47U },
+        TensorShape{ 1U, 5U, 32U, 64U }
     })
     {
     }
@@ -570,9 +552,7 @@ public:
     Small1x7Shapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 1U, 7U, 7U, 4U },
-                     TensorShape{ 1U, 7U, 4U, 13U },
-                     TensorShape{ 1U, 7U, 3U, 5U },
+        TensorShape{ 1U, 7U, 7U, 4U }
     })
     {
     }
@@ -585,9 +565,7 @@ public:
     Large1x7Shapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 1U, 7U, 32U, 64U },
-                     TensorShape{ 1U, 7U, 51U, 13U },
-                     TensorShape{ 1U, 7U, 53U, 47U },
+        TensorShape{ 1U, 7U, 32U, 64U }
     })
     {
     }
@@ -600,9 +578,7 @@ public:
     Small7x7Shapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 7U, 7U, 7U, 4U },
-                     TensorShape{ 7U, 7U, 4U, 13U },
-                     TensorShape{ 7U, 7U, 3U, 5U },
+        TensorShape{ 7U, 7U, 7U, 4U }
     })
     {
     }
@@ -615,9 +591,7 @@ public:
     Large7x7Shapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 7U, 7U, 32U, 64U },
-                     TensorShape{ 7U, 7U, 51U, 13U },
-                     TensorShape{ 7U, 7U, 53U, 47U },
+        TensorShape{ 7U, 7U, 32U, 64U }
     })
     {
     }
@@ -630,9 +604,7 @@ public:
     Small7x1Shapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 7U, 1U, 7U, 4U },
-                     TensorShape{ 7U, 1U, 4U, 13U },
-                     TensorShape{ 7U, 1U, 3U, 5U },
+        TensorShape{ 7U, 1U, 7U, 4U }
     })
     {
     }
@@ -645,9 +617,7 @@ public:
     Large7x1Shapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 7U, 1U, 32U, 64U },
-                     TensorShape{ 7U, 1U, 51U, 13U },
-                     TensorShape{ 7U, 1U, 53U, 47U },
+        TensorShape{ 7U, 1U, 32U, 64U }
     })
     {
     }
@@ -758,9 +728,7 @@ public:
         TensorShape{ 3U, 3U, 48U, 120U },
                      TensorShape{ 1U, 3U, 24U, 240U },
                      TensorShape{ 3U, 1U, 12U, 480U },
-                     TensorShape{ 5U, 5U, 48U, 120U },
-                     TensorShape{ 1U, 5U, 24U, 240U },
-                     TensorShape{ 5U, 1U, 48U, 480U }
+                     TensorShape{ 5U, 5U, 48U, 120U }
     })
     {
     }
@@ -774,11 +742,7 @@ public:
         : ShapeDataset("Shape",
     {
         TensorShape{ 9U, 9U, 96U, 240U },
-                     TensorShape{ 7U, 9U, 48U, 480U },
-                     TensorShape{ 9U, 7U, 24U, 960U },
-                     TensorShape{ 13U, 13U, 96U, 240U },
-                     TensorShape{ 11U, 13U, 48U, 480U },
-                     TensorShape{ 13U, 11U, 24U, 960U }
+                     TensorShape{ 13U, 13U, 96U, 240U }
     })
     {
     }
@@ -870,9 +834,7 @@ public:
     SoftmaxLayerLargeShapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 1000U, 10U },
-                     TensorShape{ 3989U, 10U },
-                     TensorShape{ 7339U, 11U },
+        TensorShape{ 1000U, 10U }
 
     })
     {
@@ -887,10 +849,7 @@ public:
         : ShapeDataset("Shape",
     {
         TensorShape{ 9U, 9U, 9U, 9U },
-                     TensorShape{ 256U, 10U, 1U, 9U },
-                     TensorShape{ 353U, 8U, 2U },
-                     TensorShape{ 781U, 5U, 2U, 2U },
-                     TensorShape{ 781U, 11U, 1U, 2U },
+                     TensorShape{ 31U, 10U, 1U, 9U },
     })
     {
     }
@@ -905,7 +864,6 @@ public:
     {
         TensorShape{ 640U, 480U },
                      TensorShape{ 800U, 600U },
-                     TensorShape{ 1200U, 800U }
     })
     {
     }
@@ -991,8 +949,7 @@ public:
         : ShapeDataset("Shape",
     {
         TensorShape{ 16U, 27U },
-                     TensorShape{ 533U, 171U },
-                     TensorShape{ 345U, 612U }
+                     TensorShape{ 345U, 171U }
     })
     {
     }
@@ -1006,7 +963,6 @@ public:
         : ShapeDataset("Shape",
     {
         TensorShape{ 16U, 3U, 9U },
-                     TensorShape{ 533U, 19U, 9U },
                      TensorShape{ 345U, 34U, 18U }
     })
     {
@@ -1035,9 +991,7 @@ public:
     Large2DNonMaxSuppressionShapes()
         : ShapeDataset("Shape",
     {
-        TensorShape{ 4U, 207U },
-                     TensorShape{ 4U, 113U },
-                     TensorShape{ 4U, 264U }
+        TensorShape{ 4U, 113U }
     })
     {
     }
diff --git a/tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp b/tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp
index 6243b3f7e3..457d98ff8d 100644
--- a/tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp
+++ b/tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp
@@ -105,7 +105,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLGEMMLowpMatrixMultiplyNativeFixture, framewor
     validate(CLAccessor(_target), _reference);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMLowpMatrixMultiplyNativeFixture, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMLowpMatrixMultiplyNativeFixture, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(m_values,
                                                                 n_values),
                                                                 k_values),
@@ -132,7 +132,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall3D, CLGEMMLowpMatrixMultiplyNative3DFixture, fram
     validate(CLAccessor(_target), _reference);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMLowpMatrixMultiplyNative3DFixture, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMLowpMatrixMultiplyNative3DFixture, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(m_w_values,
                                                                         m_h_values),
                                                                         n_values),
diff --git a/tests/validation/CL/GEMMLowpMatrixMultiplyReshaped.cpp b/tests/validation/CL/GEMMLowpMatrixMultiplyReshaped.cpp
index de229ef7fb..e1f2b0c9a9 100644
--- a/tests/validation/CL/GEMMLowpMatrixMultiplyReshaped.cpp
+++ b/tests/validation/CL/GEMMLowpMatrixMultiplyReshaped.cpp
@@ -137,7 +137,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLGEMMLowpMatrixMultiplyReshapedFixture, framew
     validate(CLAccessor(_target), _reference);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMLowpMatrixMultiplyReshapedFixture, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMLowpMatrixMultiplyReshapedFixture, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_values,
                                                                    n_values),
@@ -174,7 +174,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall3D, CLGEMMLowpMatrixMultiplyReshaped3DFixture, fr
     validate(CLAccessor(_target), _reference);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMLowpMatrixMultiplyReshaped3DFixture, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMLowpMatrixMultiplyReshaped3DFixture, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_w_values,
                                                                    m_h_values),
diff --git a/tests/validation/CL/GEMMLowpMatrixMultiplyReshapedOnlyRHS.cpp b/tests/validation/CL/GEMMLowpMatrixMultiplyReshapedOnlyRHS.cpp
index 106d650109..30c91b7091 100644
--- a/tests/validation/CL/GEMMLowpMatrixMultiplyReshapedOnlyRHS.cpp
+++ b/tests/validation/CL/GEMMLowpMatrixMultiplyReshapedOnlyRHS.cpp
@@ -209,7 +209,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall_2, CLGEMMLowpMatrixMultiplyReshapedOnlyRHSFixtur
     validate(CLAccessor(_target), _reference);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMLowpMatrixMultiplyReshapedOnlyRHSFixture, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMLowpMatrixMultiplyReshapedOnlyRHSFixture, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_values,
                                                                    n_values),
@@ -265,7 +265,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall3D_2, CLGEMMLowpMatrixMultiplyReshapedOnlyRHS3DFi
     validate(CLAccessor(_target), _reference);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMLowpMatrixMultiplyReshapedOnlyRHS3DFixture, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMLowpMatrixMultiplyReshapedOnlyRHS3DFixture, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_w_values,
                                                                    m_h_values),
diff --git a/tests/validation/CL/GEMMMatrixMultiply.cpp b/tests/validation/CL/GEMMMatrixMultiply.cpp
index 0bc8b02825..9115aa8a10 100644
--- a/tests/validation/CL/GEMMMatrixMultiply.cpp
+++ b/tests/validation/CL/GEMMMatrixMultiply.cpp
@@ -202,7 +202,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLGEMMMatrixMultiplyNativeFixture<float>, frame
     validate(CLAccessor(_target), _reference, rel_tolerance_f32, 0.f, abs_tolerance_f32);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyNativeFixture<float>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyNativeFixture<float>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_values_nightly,
                                                                    n_values_nightly),
@@ -239,7 +239,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall3D, CLGEMMMatrixMultiplyNative3DFixture<float>, f
     validate(CLAccessor(_target), _reference, rel_tolerance_f32, 0.f, abs_tolerance_f32);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyNative3DFixture<float>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyNative3DFixture<float>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_w_values_nightly,
                                                                    m_h_values_nightly),
@@ -279,7 +279,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLGEMMMatrixMultiplyNativeFixture<half>, framew
     validate(CLAccessor(_target), _reference, rel_tolerance_f16, tolerance_num_f16);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyNativeFixture<half>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyNativeFixture<half>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_values_nightly,
                                                                    n_values_nightly),
@@ -316,7 +316,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall3D, CLGEMMMatrixMultiplyNative3DFixture<half>, fr
     validate(CLAccessor(_target), _reference, rel_tolerance_f16, tolerance_num_f16);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyNative3DFixture<half>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyNative3DFixture<half>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_w_values_nightly,
                                                                    m_h_values_nightly),
diff --git a/tests/validation/CL/GEMMMatrixMultiplyInterleavedTransposed.cpp b/tests/validation/CL/GEMMMatrixMultiplyInterleavedTransposed.cpp
index c3b461a0d8..d36b2dadac 100644
--- a/tests/validation/CL/GEMMMatrixMultiplyInterleavedTransposed.cpp
+++ b/tests/validation/CL/GEMMMatrixMultiplyInterleavedTransposed.cpp
@@ -248,7 +248,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLGEMMMatrixMultiplyReshapedFixture<float>, fra
     validate(CLAccessor(_target), _reference, rel_tolerance_f32, 0.f, abs_tolerance_f32);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyReshapedFixture<float>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyReshapedFixture<float>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_values_nightly,
                                                                    n_values_nightly),
@@ -289,7 +289,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall3D, CLGEMMMatrixMultiplyReshaped3DFixture<float>,
     validate(CLAccessor(_target), _reference, rel_tolerance_f32, 0.f, abs_tolerance_f32);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyReshaped3DFixture<float>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyReshaped3DFixture<float>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_w_values_nightly,
                                                                    m_h_values_nightly),
@@ -333,7 +333,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLGEMMMatrixMultiplyReshapedFixture<half>, fram
     validate(CLAccessor(_target), _reference, rel_tolerance_f16, tolerance_num_f16);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyReshapedFixture<half>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyReshapedFixture<half>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_values_nightly,
                                                                    n_values_nightly),
@@ -374,7 +374,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall3D, CLGEMMMatrixMultiplyReshaped3DFixture<half>,
     validate(CLAccessor(_target), _reference, rel_tolerance_f16, tolerance_num_f16);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyReshaped3DFixture<half>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyReshaped3DFixture<half>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_w_values_nightly,
                                                                    m_h_values_nightly),
diff --git a/tests/validation/CL/GEMMMatrixMultiplyNative.cpp b/tests/validation/CL/GEMMMatrixMultiplyNative.cpp
index 0dac2e8039..c060a8bc05 100644
--- a/tests/validation/CL/GEMMMatrixMultiplyNative.cpp
+++ b/tests/validation/CL/GEMMMatrixMultiplyNative.cpp
@@ -204,7 +204,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLGEMMMatrixMultiplyNativeFixture<float>, frame
     validate(CLAccessor(_target), _reference, rel_tolerance_f32, 0.f, abs_tolerance_f32);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyNativeFixture<float>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyNativeFixture<float>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_values,
                                                                    n_values),
@@ -242,7 +242,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall3D, CLGEMMMatrixMultiplyNative3DFixture<float>, f
     validate(CLAccessor(_target), _reference, rel_tolerance_f32, 0.f, abs_tolerance_f32);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyNative3DFixture<float>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyNative3DFixture<float>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_w_values,
                                                                    m_h_values),
diff --git a/tests/validation/CL/GEMMMatrixMultiplyReshaped.cpp b/tests/validation/CL/GEMMMatrixMultiplyReshaped.cpp
index b885bfe4af..a333d1ca02 100644
--- a/tests/validation/CL/GEMMMatrixMultiplyReshaped.cpp
+++ b/tests/validation/CL/GEMMMatrixMultiplyReshaped.cpp
@@ -196,7 +196,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLGEMMMatrixMultiplyReshapedFixture<float>, fra
     validate(CLAccessor(_target), _reference, rel_tolerance_f32, 0.f, abs_tolerance_f32);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyReshapedFixture<float>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyReshapedFixture<float>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_values,
                                                                    n_values),
@@ -244,7 +244,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall3D, CLGEMMMatrixMultiplyReshaped3DFixture<float>,
     validate(CLAccessor(_target), _reference, rel_tolerance_f32, 0.f, abs_tolerance_f32);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyReshaped3DFixture<float>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyReshaped3DFixture<float>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_w_values,
                                                                    m_h_values),
@@ -295,7 +295,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLGEMMMatrixMultiplyReshapedFixture<half>, fram
     validate(CLAccessor(_target), _reference, rel_tolerance_f16, 0.f, abs_tolerance_f16);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyReshapedFixture<half>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyReshapedFixture<half>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_values,
                                                                    n_values),
@@ -343,7 +343,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall3D, CLGEMMMatrixMultiplyReshaped3DFixture<half>,
     validate(CLAccessor(_target), _reference, rel_tolerance_f16, 0.f, abs_tolerance_f16);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyReshaped3DFixture<half>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyReshaped3DFixture<half>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_w_values,
                                                                    m_h_values),
@@ -394,7 +394,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLGEMMMatrixMultiplyReshapedMixedPrecisionFixtu
     validate(CLAccessor(_target), _reference, rel_tolerance_f16_mixed_precision, 0.f, abs_tolerance_f16_mixed_precision);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyReshapedMixedPrecisionFixture<half>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyReshapedMixedPrecisionFixture<half>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_values,
                                                                    n_values),
@@ -442,7 +442,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall3D, CLGEMMMatrixMultiplyReshaped3DMixedPrecisionF
     validate(CLAccessor(_target), _reference, rel_tolerance_f16_mixed_precision, 0.f, abs_tolerance_f16_mixed_precision);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyReshaped3DMixedPrecisionFixture<half>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyReshaped3DMixedPrecisionFixture<half>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_w_values,
                                                                    m_h_values),
diff --git a/tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp b/tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp
index 5baab611c6..9fc6fd713d 100644
--- a/tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp
+++ b/tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp
@@ -232,7 +232,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLGEMMMatrixMultiplyReshapedOnlyRHSFixture<floa
     validate(CLAccessor(_target), _reference, rel_tolerance_f32, 0.f, abs_tolerance_f32);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyReshapedOnlyRHSFixture<float>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge, CLGEMMMatrixMultiplyReshapedOnlyRHSFixture<float>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_values,
                                                                    n_values),
@@ -276,7 +276,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall3D, CLGEMMMatrixMultiplyReshapedOnlyRHS3DFixture<
     validate(CLAccessor(_target), _reference, rel_tolerance_f32, 0.f, abs_tolerance_f32);
 }
 
-FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyReshapedOnlyRHS3DFixture<float>, framework::DatasetMode::NIGHTLY,
+FIXTURE_DATA_TEST_CASE(RunLarge3D, CLGEMMMatrixMultiplyReshapedOnlyRHS3DFixture<float>, framework::DatasetMode::DISABLED,
                 combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
                                                                    m_w_values,
                                                                    m_h_values),