Merge remote-tracking branch 'origin/develop' into jakpiase/ggemm_multid_two_stage

test/permute_scale/test_permute_scale.cpp

@@ -52,40 +52,40 @@ TYPED_TEST_SUITE(TestPermute, KernelTypes);
 TYPED_TEST(TestPermute, Test1D)
 {
     constexpr ck::index_t NumDims = 1;
-    this->template Run<NumDims>({8}, {1}, {2});
-    this->template Run<NumDims>({8}, {2}, {1});
+    this->template Run<NumDims>({16}, {1}, {1});
+    this->template Run<NumDims>({16}, {1}, {2});
     this->template Run<NumDims>({1}, {1}, {1});
 }
 
 TYPED_TEST(TestPermute, Test2D)
 {
     constexpr ck::index_t NumDims = 2;
-    this->template Run<NumDims>({8, 4}, {4, 1}, {1, 8});
-    this->template Run<NumDims>({8, 4}, {1, 8}, {4, 1});
+    this->template Run<NumDims>({8, 16}, {16, 1}, {1, 8});
+    this->template Run<NumDims>({8, 16}, {1, 8}, {16, 1});
     this->template Run<NumDims>({1, 1}, {1, 1}, {1, 1});
 }
 
 TYPED_TEST(TestPermute, Test3D)
 {
     constexpr ck::index_t NumDims = 3;
-    this->template Run<NumDims>({2, 4, 4}, {16, 4, 1}, {1, 2, 8});
-    this->template Run<NumDims>({2, 4, 4}, {1, 2, 8}, {16, 4, 1});
+    this->template Run<NumDims>({8, 2, 8}, {16, 8, 1}, {1, 8, 16});
+    this->template Run<NumDims>({8, 2, 8}, {1, 8, 16}, {16, 8, 1});
     this->template Run<NumDims>({1, 1, 1}, {1, 1, 1}, {1, 1, 1});
 }
 
 TYPED_TEST(TestPermute, Test4D)
 {
     constexpr ck::index_t NumDims = 4;
-    this->template Run<NumDims>({2, 4, 4, 4}, {64, 16, 4, 1}, {1, 2, 8, 32});
-    this->template Run<NumDims>({2, 4, 4, 4}, {1, 2, 8, 32}, {64, 16, 4, 1});
+    this->template Run<NumDims>({8, 2, 3, 8}, {48, 24, 8, 1}, {1, 8, 16, 48});
+    this->template Run<NumDims>({8, 2, 3, 8}, {1, 8, 16, 48}, {48, 24, 8, 1});
     this->template Run<NumDims>({1, 1, 1, 1}, {1, 1, 1, 1}, {1, 1, 1, 1});
 }
 
 TYPED_TEST(TestPermute, Test5D)
 {
     constexpr ck::index_t NumDims = 5;
-    this->template Run<NumDims>({2, 4, 4, 4, 4}, {256, 64, 16, 4, 1}, {1, 2, 8, 32, 128});
-    this->template Run<NumDims>({2, 4, 4, 4, 4}, {1, 2, 8, 32, 128}, {256, 64, 16, 4, 1});
+    this->template Run<NumDims>({8, 2, 3, 4, 8}, {192, 96, 32, 8, 1}, {1, 8, 16, 48, 192});
+    this->template Run<NumDims>({8, 2, 3, 4, 8}, {1, 8, 16, 48, 192}, {192, 96, 32, 8, 1});
     this->template Run<NumDims>({1, 1, 1, 1, 1}, {1, 1, 1, 1, 1}, {1, 1, 1, 1, 1});
 }
 
@@ -93,8 +93,8 @@ TYPED_TEST(TestPermute, Test6D)
 {
     constexpr ck::index_t NumDims = 6;
     this->template Run<NumDims>(
-        {2, 4, 4, 4, 4, 4}, {1024, 256, 64, 16, 4, 1}, {1, 2, 8, 32, 128, 512});
+        {8, 2, 3, 4, 5, 8}, {960, 480, 160, 40, 8, 1}, {1, 8, 16, 48, 192, 960});
     this->template Run<NumDims>(
-        {2, 4, 4, 4, 4, 4}, {1, 2, 8, 32, 128, 512}, {1024, 256, 64, 16, 4, 1});
+        {8, 2, 3, 4, 5, 8}, {1, 8, 16, 48, 192, 960}, {960, 480, 160, 40, 8, 1});
     this->template Run<NumDims>({1, 1, 1, 1, 1, 1}, {1, 1, 1, 1, 1, 1}, {1, 1, 1, 1, 1, 1});
 }