Merge pull request #482 from cgmillette/layout_traits_test_ext

Reduce parameter set redundancy for CI build
ROCm · Dec 19, 2024 · 2d628ba · 2d628ba
2 parents c831ff5 + 4e4f004
commit 2d628ba
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 12 deletions.
diff --git a/test/unit/layout_traits_test/test/layout_traits_int_128.cpp b/test/unit/layout_traits_test/test/layout_traits_int_128.cpp
@@ -34,10 +34,22 @@ namespace rocwmma
 
     struct TestParams : public UnitTestParams
     {
-        using Base        = UnitTestParams;
-        using Types       = typename Base::TestAllSizeTypes;
-        using MmaDims     = std::tuple<I<16>, I<32>, I<64>>;
-        using SplitKs     = std::tuple<I<1>, I<2>, I<4>>;
+        using Base    = UnitTestParams;
+        using Types   = typename Base::TestAllSizeTypes;
+        using MmaDims = std::tuple<I<16>,
+                                   I<32>
+#if ROCWMMA_EXTENDED_TESTS
+                                   ,
+                                   I<64>
+#endif // ROCWMMA_EXTENDED_TESTS
+                                   >;
+        using SplitKs = std::tuple<I<1>,
+                                   I<4>
+#if ROCWMMA_EXTENDED_TESTS
+                                   ,
+                                   I<2>
+#endif // ROCWMMA_EXTENDED_TESTS
+                                   >;
         using BlockSizes  = typename Base::TestBlockSizes128;
         using DataLayouts = typename Base::TestLayoutsAll;
 

diff --git a/test/unit/layout_traits_test/test/layout_traits_int_256.cpp b/test/unit/layout_traits_test/test/layout_traits_int_256.cpp
@@ -34,10 +34,22 @@ namespace rocwmma
 
     struct TestParams : public UnitTestParams
     {
-        using Base        = UnitTestParams;
-        using Types       = typename Base::TestAllSizeTypes;
-        using MmaDims     = std::tuple<I<16>, I<32>, I<64>>;
-        using SplitKs     = std::tuple<I<1>, I<2>, I<4>>;
+        using Base    = UnitTestParams;
+        using Types   = typename Base::TestAllSizeTypes;
+        using MmaDims = std::tuple<I<16>,
+                                   I<32>
+#if ROCWMMA_EXTENDED_TESTS
+                                   ,
+                                   I<64>
+#endif // ROCWMMA_EXTENDED_TESTS
+                                   >;
+        using SplitKs = std::tuple<I<1>,
+                                   I<4>
+#if ROCWMMA_EXTENDED_TESTS
+                                   ,
+                                   I<2>
+#endif // ROCWMMA_EXTENDED_TESTS
+                                   >;
         using BlockSizes  = typename Base::TestBlockSizes256;
         using DataLayouts = typename Base::TestLayoutsAll;
 

diff --git a/test/unit/layout_traits_test/test/layout_traits_int_64.cpp b/test/unit/layout_traits_test/test/layout_traits_int_64.cpp
@@ -34,10 +34,22 @@ namespace rocwmma
 
     struct TestParams : public UnitTestParams
     {
-        using Base        = UnitTestParams;
-        using Types       = typename Base::TestAllSizeTypes;
-        using MmaDims     = std::tuple<I<16>, I<32>, I<64>>;
-        using SplitKs     = std::tuple<I<1>, I<2>, I<4>>;
+        using Base    = UnitTestParams;
+        using Types   = typename Base::TestAllSizeTypes;
+        using MmaDims = std::tuple<I<16>,
+                                   I<32>
+#if ROCWMMA_EXTENDED_TESTS
+                                   ,
+                                   I<64>
+#endif // ROCWMMA_EXTENDED_TESTS
+                                   >;
+        using SplitKs = std::tuple<I<1>,
+                                   I<4>
+#if ROCWMMA_EXTENDED_TESTS
+                                   ,
+                                   I<2>
+#endif // ROCWMMA_EXTENDED_TESTS
+                                   >;
         using BlockSizes  = typename Base::TestBlockSizes64;
         using DataLayouts = typename Base::TestLayoutsAll;