amend

rosenrodt · rosenrodt · commit ae82799f31a8 · 2022-05-13T13:26:43.000+08:00
diff --git a/include/ck/tensor_operation/gpu/device/device_conv2d_bwd_data_xdl_nhwc_kyxc_nhwk.hpp b/include/ck/tensor_operation/gpu/device/device_conv2d_bwd_data_xdl_nhwc_kyxc_nhwk.hpp
@@ -486,14 +486,16 @@ struct DeviceConv2dBwdDataXdl_Input_N_Hi_Wi_C_Weight_K_Y_X_C_Output_N_Ho_Wo_K
                     b_grid_desc_k0_n_k1_container_.push_back(descs[I1]);
                     c_grid_desc_m_n_container_.push_back(descs[I2]);
 
-                    block_2_ctile_map_container_.push_back(
-                        GridwiseGemm::MakeDefaultBlock2CTileMap(descs[I2], M01, N01));
+                    auto block_2_ctile_map =
+                        GridwiseGemm::MakeDefaultBlock2CTileMap(descs[I2], M01, N01);
 
                     if(GridwiseGemm::CheckValidity(
-                           descs[I0], descs[I1], descs[I2], block_2_ctile_map_container_.back()))
+                           descs[I0], descs[I1], descs[I2], block_2_ctile_map))
                     {
                         c_grid_desc_m0_n0_m1_n1_m2_m3_m4_n2_container_.push_back(
                             GridwiseGemm::MakeCGridDescriptor_M0_N0_M1_N1_M2_M3_M4_N2(descs[I2]));
+
+                        block_2_ctile_map_container_.push_back(block_2_ctile_map);
                     }
                 }
             }
diff --git a/include/ck/tensor_operation/gpu/device/device_convnd_bwd_data_xdl_ndhwc_kzyxc_ndhwk.hpp b/include/ck/tensor_operation/gpu/device/device_convnd_bwd_data_xdl_ndhwc_kzyxc_ndhwk.hpp
@@ -1073,14 +1073,15 @@ struct DeviceConvndBwdDataXdl_Input_N_Di_Hi_Wi_C_Weight_K_Z_Y_X_C_Output_N_Do_Ho
                 b_grid_desc_k0_n_k1_container_.push_back(descs[I1]);
                 c_grid_desc_m_n_container_.push_back(descs[I2]);
 
-                block_2_ctile_map_container_.push_back(
-                    GridwiseGemm::MakeDefaultBlock2CTileMap(descs[I2], M01_, N01_));
+                auto block_2_ctile_map =
+                    GridwiseGemm::MakeDefaultBlock2CTileMap(descs[I2], M01_, N01_);
 
-                if(GridwiseGemm::CheckValidity(
-                       descs[I0], descs[I1], descs[I2], block_2_ctile_map_container_.back()))
+                if(GridwiseGemm::CheckValidity(descs[I0], descs[I1], descs[I2], block_2_ctile_map))
                 {
                     c_grid_desc_m0_n0_m1_n1_m2_m3_m4_n2_container_.push_back(
                         GridwiseGemm::MakeCGridDescriptor_M0_N0_M1_N1_M2_M3_M4_N2(descs[I2]));
+
+                    block_2_ctile_map_container_.push_back(block_2_ctile_map);
                 }
             }
         }
@@ -1130,14 +1131,16 @@ struct DeviceConvndBwdDataXdl_Input_N_Di_Hi_Wi_C_Weight_K_Z_Y_X_C_Output_N_Do_Ho
                     b_grid_desc_k0_n_k1_container_.push_back(descs[I1]);
                     c_grid_desc_m_n_container_.push_back(descs[I2]);
 
-                    block_2_ctile_map_container_.push_back(
-                        GridwiseGemm::MakeDefaultBlock2CTileMap(descs[I2], M01_, N01_));
+                    auto block_2_ctile_map =
+                        GridwiseGemm::MakeDefaultBlock2CTileMap(descs[I2], M01_, N01_);
 
                     if(GridwiseGemm::CheckValidity(
-                           descs[I0], descs[I1], descs[I2], block_2_ctile_map_container_.back()))
+                           descs[I0], descs[I1], descs[I2], block_2_ctile_map))
                     {
                         c_grid_desc_m0_n0_m1_n1_m2_m3_m4_n2_container_.push_back(
                             GridwiseGemm::MakeCGridDescriptor_M0_N0_M1_N1_M2_M3_M4_N2(descs[I2]));
+
+                        block_2_ctile_map_container_.push_back(block_2_ctile_map);
                     }
                 }
             }
@@ -1196,17 +1199,17 @@ struct DeviceConvndBwdDataXdl_Input_N_Di_Hi_Wi_C_Weight_K_Z_Y_X_C_Output_N_Do_Ho
                         b_grid_desc_k0_n_k1_container_.push_back(descs[I1]);
                         c_grid_desc_m_n_container_.push_back(descs[I2]);
 
-                        block_2_ctile_map_container_.push_back(
-                            GridwiseGemm::MakeDefaultBlock2CTileMap(descs[I2], M01_, N01_));
+                        auto block_2_ctile_map =
+                            GridwiseGemm::MakeDefaultBlock2CTileMap(descs[I2], M01_, N01_);
 
-                        if(GridwiseGemm::CheckValidity(descs[I0],
-                                                       descs[I1],
-                                                       descs[I2],
-                                                       block_2_ctile_map_container_.back()))
+                        if(GridwiseGemm::CheckValidity(
+                               descs[I0], descs[I1], descs[I2], block_2_ctile_map))
                         {
                             c_grid_desc_m0_n0_m1_n1_m2_m3_m4_n2_container_.push_back(
                                 GridwiseGemm::MakeCGridDescriptor_M0_N0_M1_N1_M2_M3_M4_N2(
                                     descs[I2]));
+
+                            block_2_ctile_map_container_.push_back(block_2_ctile_map);
                         }
                     }
                 }
diff --git a/include/ck/tensor_operation/gpu/grid/gridwise_gemm_xdlops_v2r4.hpp b/include/ck/tensor_operation/gpu/grid/gridwise_gemm_xdlops_v2r4.hpp
@@ -300,6 +300,14 @@ struct GridwiseGemm_bk0mk1_bk0nk1_mn_xdlops_v2r4
         const auto block_work_idx =
             c_block_cluster_adaptor.CalculateBottomIndex(make_multi_index(get_block_1d_id()));
 
+        // if(!block_2_ctile_map.ValidCTileIndex(
+        //        make_tuple(block_work_idx[I1], block_work_idx[I2]),
+        //        make_tuple(c_grid_desc_m0_n0_m1_n1_m2_m3_m4_n2.GetLength(I0),
+        //                   c_grid_desc_m0_n0_m1_n1_m2_m3_m4_n2.GetLength(I1))))
+        // {
+        //     return;
+        // }
+
         const index_t k_batch_id = block_work_idx[I0];
 
         // HACK: this force m/n_block_data_idx_on_grid into SGPR
diff --git a/include/ck/tensor_operation/gpu/grid/gridwise_gemm_xdlops_v2r4r2.hpp b/include/ck/tensor_operation/gpu/grid/gridwise_gemm_xdlops_v2r4r2.hpp
@@ -290,7 +290,7 @@ struct GridwiseGemm_bk0mk1_bk0nk1_mn_xdlops_v2r4r2
             c_block_cluster_adaptor.CalculateBottomIndex(make_multi_index(get_block_1d_id()));
 
         if(!c_block_cluster_adaptor.ValidCTileIndex(
-               block_work_idx,
+               make_tuple(block_work_idx[I1], block_work_idx[I2]),
                make_tuple(c_grid_desc_mblock_mperblock_nblock_nperblock.GetLength(I0),
                           c_grid_desc_mblock_mperblock_nblock_nperblock.GetLength(I2))))
         {

Original file line number	Diff line number	Diff line change
`@@ -486,14 +486,16 @@ struct DeviceConv2dBwdDataXdl_Input_N_Hi_Wi_C_Weight_K_Y_X_C_Output_N_Ho_Wo_K`
`486`	`486`	`b_grid_desc_k0_n_k1_container_.push_back(descs[I1]);`
`487`	`487`	`c_grid_desc_m_n_container_.push_back(descs[I2]);`
`488`	`488`
`489`		`- block_2_ctile_map_container_.push_back(`
`490`		`- GridwiseGemm::MakeDefaultBlock2CTileMap(descs[I2], M01, N01));`
	`489`	`+ auto block_2_ctile_map =`
	`490`	`+ GridwiseGemm::MakeDefaultBlock2CTileMap(descs[I2], M01, N01);`
`491`	`491`
`492`	`492`	`if(GridwiseGemm::CheckValidity(`
`493`		`- descs[I0], descs[I1], descs[I2], block_2_ctile_map_container_.back()))`
	`493`	`+ descs[I0], descs[I1], descs[I2], block_2_ctile_map))`
`494`	`494`	`{`
`495`	`495`	`c_grid_desc_m0_n0_m1_n1_m2_m3_m4_n2_container_.push_back(`
`496`	`496`	`GridwiseGemm::MakeCGridDescriptor_M0_N0_M1_N1_M2_M3_M4_N2(descs[I2]));`
	`497`	`+`
	`498`	`+ block_2_ctile_map_container_.push_back(block_2_ctile_map);`
`497`	`499`	`}`
`498`	`500`	`}`
`499`	`501`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1073,14 +1073,15 @@ struct DeviceConvndBwdDataXdl_Input_N_Di_Hi_Wi_C_Weight_K_Z_Y_X_C_Output_N_Do_Ho`
`1073`	`1073`	`b_grid_desc_k0_n_k1_container_.push_back(descs[I1]);`
`1074`	`1074`	`c_grid_desc_m_n_container_.push_back(descs[I2]);`
`1075`	`1075`
`1076`		`- block_2_ctile_map_container_.push_back(`
`1077`		`- GridwiseGemm::MakeDefaultBlock2CTileMap(descs[I2], M01_, N01_));`
	`1076`	`+ auto block_2_ctile_map =`
	`1077`	`+ GridwiseGemm::MakeDefaultBlock2CTileMap(descs[I2], M01_, N01_);`
`1078`	`1078`
`1079`		`- if(GridwiseGemm::CheckValidity(`
`1080`		`- descs[I0], descs[I1], descs[I2], block_2_ctile_map_container_.back()))`
	`1079`	`+ if(GridwiseGemm::CheckValidity(descs[I0], descs[I1], descs[I2], block_2_ctile_map))`
`1081`	`1080`	`{`
`1082`	`1081`	`c_grid_desc_m0_n0_m1_n1_m2_m3_m4_n2_container_.push_back(`
`1083`	`1082`	`GridwiseGemm::MakeCGridDescriptor_M0_N0_M1_N1_M2_M3_M4_N2(descs[I2]));`
	`1083`	`+`
	`1084`	`+ block_2_ctile_map_container_.push_back(block_2_ctile_map);`
`1084`	`1085`	`}`
`1085`	`1086`	`}`
`1086`	`1087`	`}`
`@@ -1130,14 +1131,16 @@ struct DeviceConvndBwdDataXdl_Input_N_Di_Hi_Wi_C_Weight_K_Z_Y_X_C_Output_N_Do_Ho`
`1130`	`1131`	`b_grid_desc_k0_n_k1_container_.push_back(descs[I1]);`
`1131`	`1132`	`c_grid_desc_m_n_container_.push_back(descs[I2]);`
`1132`	`1133`
`1133`		`- block_2_ctile_map_container_.push_back(`
`1134`		`- GridwiseGemm::MakeDefaultBlock2CTileMap(descs[I2], M01_, N01_));`
	`1134`	`+ auto block_2_ctile_map =`
	`1135`	`+ GridwiseGemm::MakeDefaultBlock2CTileMap(descs[I2], M01_, N01_);`
`1135`	`1136`
`1136`	`1137`	`if(GridwiseGemm::CheckValidity(`
`1137`		`- descs[I0], descs[I1], descs[I2], block_2_ctile_map_container_.back()))`
	`1138`	`+ descs[I0], descs[I1], descs[I2], block_2_ctile_map))`
`1138`	`1139`	`{`
`1139`	`1140`	`c_grid_desc_m0_n0_m1_n1_m2_m3_m4_n2_container_.push_back(`
`1140`	`1141`	`GridwiseGemm::MakeCGridDescriptor_M0_N0_M1_N1_M2_M3_M4_N2(descs[I2]));`
	`1142`	`+`
	`1143`	`+ block_2_ctile_map_container_.push_back(block_2_ctile_map);`
`1141`	`1144`	`}`
`1142`	`1145`	`}`
`1143`	`1146`	`}`
`@@ -1196,17 +1199,17 @@ struct DeviceConvndBwdDataXdl_Input_N_Di_Hi_Wi_C_Weight_K_Z_Y_X_C_Output_N_Do_Ho`
`1196`	`1199`	`b_grid_desc_k0_n_k1_container_.push_back(descs[I1]);`
`1197`	`1200`	`c_grid_desc_m_n_container_.push_back(descs[I2]);`
`1198`	`1201`
`1199`		`- block_2_ctile_map_container_.push_back(`
`1200`		`- GridwiseGemm::MakeDefaultBlock2CTileMap(descs[I2], M01_, N01_));`
	`1202`	`+ auto block_2_ctile_map =`
	`1203`	`+ GridwiseGemm::MakeDefaultBlock2CTileMap(descs[I2], M01_, N01_);`
`1201`	`1204`
`1202`		`- if(GridwiseGemm::CheckValidity(descs[I0],`
`1203`		`- descs[I1],`
`1204`		`- descs[I2],`
`1205`		`- block_2_ctile_map_container_.back()))`
	`1205`	`+ if(GridwiseGemm::CheckValidity(`
	`1206`	`+ descs[I0], descs[I1], descs[I2], block_2_ctile_map))`
`1206`	`1207`	`{`
`1207`	`1208`	`c_grid_desc_m0_n0_m1_n1_m2_m3_m4_n2_container_.push_back(`
`1208`	`1209`	`GridwiseGemm::MakeCGridDescriptor_M0_N0_M1_N1_M2_M3_M4_N2(`
`1209`	`1210`	`descs[I2]));`
	`1211`	`+`
	`1212`	`+ block_2_ctile_map_container_.push_back(block_2_ctile_map);`
`1210`	`1213`	`}`
`1211`	`1214`	`}`
`1212`	`1215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ struct GridwiseGemm_bk0mk1_bk0nk1_mn_xdlops_v2r4r2`
`290`	`290`	`c_block_cluster_adaptor.CalculateBottomIndex(make_multi_index(get_block_1d_id()));`
`291`	`291`
`292`	`292`	`if(!c_block_cluster_adaptor.ValidCTileIndex(`
`293`		`- block_work_idx,`
	`293`	`+ make_tuple(block_work_idx[I1], block_work_idx[I2]),`
`294`	`294`	`make_tuple(c_grid_desc_mblock_mperblock_nblock_nperblock.GetLength(I0),`
`295`	`295`	`c_grid_desc_mblock_mperblock_nblock_nperblock.GetLength(I2))))`
`296`	`296`	`{`