Merge pull request #32 from ROCmSoftwarePlatform/develop

Merge develop into master

host/host_tensor/include/gemm_common.hpp

+#ifndef GEMM_COMMON_HPP
+#define GEMM_COMMON_HPP
+
+enum GemmMatrixLayout
+{
+    MK_KN_MN, // 0
+    MK_NK_MN, // 1
+    KM_KN_MN, // 2
+    KM_NK_MN, // 3
+};
+
+#endif

host/solver/include/conv_tunable_fwd_v4r4_xdlops_nchw_kcyx_nkhw.hpp

@@ -9,8 +9,8 @@ struct tunable_dyn_conv_fwd_v4r4_xdlops_nchw_kcyx_nkhw
     int NPerBlock;
     int KPerBlock;
 
-    int MPerWave;
-    int NPerWave;
+    int MPerXDL;
+    int NPerXDL;
     int K1;
 
     int MRepeat;
@@ -45,8 +45,8 @@ static tunable_dyn_conv_fwd_v4r4_xdlops_nchw_kcyx_nkhw
         128,                      // MPerBlock,
         128,                      // NPerBlock,
         4,                        // KPerBlock,
-        32,                       // MPerWave,
-        32,                       // NPerWave,
+        32,                       // MPerXDL,
+        32,                       // NPerXDL,
         4,                        // K1,
         2,                        // MRepeat,
         2,                        // NRepeat,