[CK] Add tuned CK a8w8 blockscale GEMM configs for Gemma-4-31B FP8-block

aiter/configs/model_configs/a8w8_blockscale_tuned_gemm_gemma4_31b.csv

@@ -0,0 +1,86 @@
+gfx,cu_num,M,N,K,libtype,kernelId,splitK,us,kernelName,tflops,bw,errRatio
+gfx942,304,1,5376,8192,ck,7,2,17.3223,a8w8_blockscale_1x128x128_256x16x128x256_16x16_16x16_1x2_16x16x1_16x16x1_1x16x1x16_8_1x2_intrawave_v1,5.08,2543.49,0.0
+gfx942,304,1,5376,16384,ck,6,3,33.8482,a8w8_blockscale_1x128x128_256x16x64x128_8x16_16x16_1x1_16x16x1_8x32x1_1x16x1x16_4_1x1_intrawave_v1,5.2,2603.02,0.0032
+gfx942,304,1,5376,21504,ck,7,2,36.1368,a8w8_blockscale_1x128x128_256x16x128x256_16x16_16x16_1x2_16x16x1_16x16x1_1x16x1x16_8_1x2_intrawave_v1,6.4,3200.0,0.0
+gfx942,304,8,5376,8192,ck,8,3,20.1063,a8w8_blockscale_1x128x128_256x16x64x256_16x16_16x16_1x1_16x16x1_16x16x1_1x16x1x16_4_1x1_intrawave_v1,35.05,2197.91,0.0015
+gfx942,304,8,5376,16384,ck,8,3,35.3439,a8w8_blockscale_1x128x128_256x16x64x256_16x16_16x16_1x1_16x16x1_16x16x1_1x16x1x16_4_1x1_intrawave_v1,39.87,2498.24,0.0021
+gfx942,304,8,5376,21504,ck,7,2,36.4136,a8w8_blockscale_1x128x128_256x16x128x256_16x16_16x16_1x2_16x16x1_16x16x1_1x16x1x16_8_1x2_intrawave_v1,50.8,3181.88,0.0
+gfx942,304,16,5376,8192,ck,8,3,20.5426,a8w8_blockscale_1x128x128_256x16x64x256_16x16_16x16_1x1_16x16x1_16x16x1_1x16x1x16_4_1x1_intrawave_v1,68.6,2158.6,0.0012
+gfx942,304,16,5376,16384,ck,8,3,35.1982,a8w8_blockscale_1x128x128_256x16x64x256_16x16_16x16_1x1_16x16x1_16x16x1_1x16x1x16_4_1x1_intrawave_v1,80.08,2514.75,0.0027
+gfx942,304,16,5376,21504,ck,7,2,37.3828,a8w8_blockscale_1x128x128_256x16x128x256_16x16_16x16_1x2_16x16x1_16x16x1_1x16x1x16_8_1x2_intrawave_v1,98.96,3106.28,0.0
+gfx942,304,32,5376,8192,ck,8,3,22.7202,a8w8_blockscale_1x128x128_256x16x64x256_16x16_16x16_1x1_16x16x1_16x16x1_1x16x1x16_4_1x1_intrawave_v1,124.06,1965.05,0.0008
+gfx942,304,32,5376,16384,ck,8,3,40.5617,a8w8_blockscale_1x128x128_256x16x64x256_16x16_16x16_1x1_16x16x1_16x16x1_1x16x1x16_4_1x1_intrawave_v1,138.98,2192.92,0.003
+gfx942,304,32,5376,21504,ck,12,2,46.4932,a8w8_blockscale_1x128x128_256x32x128x256_16x16_32x32_1x1_16x16x1_16x16x1_1x32x1x8_8_1x1_intrawave_v1,159.14,2508.7,0.0
+gfx942,304,64,5376,8192,ck,18,1,31.5773,a8w8_blockscale_1x128x128_256x64x64x256_16x16_32x32_1x1_16x16x1_16x16x1_1x32x1x8_8_1x1_intrawave_v1,178.52,1433.07,0.0
+gfx942,304,64,5376,16384,ck,18,1,51.5438,a8w8_blockscale_1x128x128_256x64x64x256_16x16_32x32_1x1_16x16x1_16x16x1_1x32x1x8_8_1x1_intrawave_v1,218.73,1742.54,0.0
+gfx942,304,64,5376,21504,ck,18,1,60.4414,a8w8_blockscale_1x128x128_256x64x64x256_16x16_32x32_1x1_16x16x1_16x16x1_1x32x1x8_8_1x1_intrawave_v1,244.82,1946.84,0.0
+gfx942,304,128,5376,8192,ck,18,0,37.8994,a8w8_blockscale_1x128x128_256x64x64x256_16x16_32x32_1x1_16x16x1_16x16x1_1x32x1x8_8_1x1_intrawave_v1,297.48,1226.01,0.0
+gfx942,304,128,5376,16384,ck,18,0,73.0127,a8w8_blockscale_1x128x128_256x64x64x256_16x16_32x32_1x1_16x16x1_16x16x1_1x32x1x8_8_1x1_intrawave_v1,308.83,1253.94,0.0
+gfx942,304,128,5376,21504,ck,18,2,91.2003,a8w8_blockscale_1x128x128_256x64x64x256_16x16_32x32_1x1_16x16x1_16x16x1_1x32x1x8_8_1x1_intrawave_v1,324.51,1312.87,0.0
+gfx942,304,256,5376,8192,ck,18,0,67.6999,a8w8_blockscale_1x128x128_256x64x64x256_16x16_32x32_1x1_16x16x1_16x16x1_1x32x1x8_8_1x1_intrawave_v1,333.07,722.16,0.0
+gfx942,304,256,5376,16384,ck,18,2,114.8804,a8w8_blockscale_1x128x128_256x64x64x256_16x16_32x32_1x1_16x16x1_16x16x1_1x32x1x8_8_1x1_intrawave_v1,392.56,827.18,0.0001
+gfx942,304,256,5376,21504,ck,0,2,139.3529,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,424.75,888.84,0.0
+gfx942,304,512,5376,8192,ck,3,0,101.6519,a8w8_blockscale_1x128x128_256x64x64x128_16x16_32x32_1x1_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,443.64,528.66,0.0
+gfx942,304,512,5376,16384,ck,2,2,190.3544,a8w8_blockscale_1x128x128_256x64x128x128_16x16_32x32_1x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,473.82,535.71,0.0001
+gfx942,304,512,5376,21504,ck,0,2,209.8811,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,564.03,629.5,0.0
+gfx942,304,1024,5376,8192,ck,0,0,154.7488,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,582.84,409.95,0.0
+gfx942,304,1024,5376,21504,ck,0,2,331.0843,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,715.11,448.94,0.0
+gfx942,304,2048,5376,8192,ck,0,0,250.6688,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,719.63,330.47,0.0
+gfx942,304,2048,5376,16384,ck,0,1,513.8579,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,702.1,279.56,0.0
+gfx942,304,2048,5376,21504,ck,0,1,591.6391,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,800.35,307.06,0.0
+gfx942,304,4096,5376,8192,ck,0,0,408.5272,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,883.12,297.74,0.0
+gfx942,304,4096,5376,16384,ck,0,0,903.5904,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,798.54,220.49,0.0
+gfx942,304,4096,5376,21504,ck,0,0,1095.4945,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,864.49,226.13,0.0
+gfx942,304,8192,5376,8192,ck,0,0,775.9555,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,929.89,256.75,0.0
+gfx942,304,8192,5376,16384,ck,0,0,1785.422,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,808.27,173.84,0.0
+gfx942,304,8192,5376,21504,ck,0,0,2165.2104,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,874.78,175.43,0.0
+gfx942,304,16384,5376,8192,ck,0,0,1589.9829,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,907.63,222.91,0.0
+gfx942,304,16384,5376,16384,ck,0,0,3668.6201,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,786.73,145.2,0.0
+gfx942,304,1,16384,5376,ck,8,0,22.0646,a8w8_blockscale_1x128x128_256x16x64x256_16x16_16x16_1x1_16x16x1_16x16x1_1x16x1x16_4_1x1_intrawave_v1,7.98,3993.66,0.0
+gfx942,304,8,16384,5376,ck,8,0,22.1105,a8w8_blockscale_1x128x128_256x16x64x256_16x16_16x16_1x1_16x16x1_16x16x1_1x16x1x16_4_1x1_intrawave_v1,63.74,3997.45,0.0
+gfx942,304,16,16384,5376,ck,8,0,22.1595,a8w8_blockscale_1x128x128_256x16x64x256_16x16_16x16_1x1_16x16x1_16x16x1_1x16x1x16_4_1x1_intrawave_v1,127.19,4002.38,0.0
+gfx942,304,32,16384,5376,ck,13,0,26.561,a8w8_blockscale_1x128x128_256x32x64x256_16x16_16x16_2x1_16x16x1_16x16x1_1x32x1x8_8_2x1_intrawave_v1,212.23,3362.11,0.0
+gfx942,304,64,16384,5376,ck,18,0,30.2152,a8w8_blockscale_1x128x128_256x64x64x256_16x16_32x32_1x1_16x16x1_16x16x1_1x32x1x8_8_1x1_intrawave_v1,373.13,2995.9,0.0
+gfx942,304,128,16384,5376,ck,2,0,43.347,a8w8_blockscale_1x128x128_256x64x128x128_16x16_32x32_1x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,520.19,2144.62,0.0
+gfx942,304,256,16384,5376,ck,0,0,61.5426,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,732.78,1589.88,0.0
+gfx942,304,512,16384,5376,ck,0,0,105.6286,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,853.88,1018.76,0.0
+gfx942,304,1024,16384,5376,ck,0,0,193.532,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,932.09,656.94,0.0
+gfx942,304,2048,16384,5376,ck,0,0,344.9965,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,1045.74,481.74,0.0
+gfx942,304,4096,16384,5376,ck,0,0,657.1408,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,1098.02,371.79,0.0
+gfx942,304,8192,16384,5376,ck,0,0,1284.0984,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,1123.83,311.94,0.0
+gfx942,304,16384,16384,5376,ck,0,0,2554.9372,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,1129.66,279.08,0.0
+gfx942,304,1,20480,5376,ck,7,0,29.0595,a8w8_blockscale_1x128x128_256x16x128x256_16x16_16x16_1x2_16x16x1_16x16x1_1x16x1x16_8_1x2_intrawave_v1,7.58,3790.39,0.0
+gfx942,304,8,20480,5376,ck,7,0,29.2442,a8w8_blockscale_1x128x128_256x16x128x256_16x16_16x16_1x2_16x16x1_16x16x1_1x16x1x16_8_1x2_intrawave_v1,60.24,3777.54,0.0
+gfx942,304,16,20480,5376,ck,7,0,29.4663,a8w8_blockscale_1x128x128_256x16x128x256_16x16_16x16_1x2_16x16x1_16x16x1_1x16x1x16_8_1x2_intrawave_v1,119.57,3761.65,0.0
+gfx942,304,32,20480,5376,ck,12,0,32.3817,a8w8_blockscale_1x128x128_256x32x128x256_16x16_32x32_1x1_16x16x1_16x16x1_1x32x1x8_8_1x1_intrawave_v1,217.61,3445.87,0.0
+gfx942,304,64,20480,5376,ck,2,0,44.0064,a8w8_blockscale_1x128x128_256x64x128x128_16x16_32x32_1x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,320.25,2569.31,0.0
+gfx942,304,128,20480,5376,ck,0,0,60.352,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,467.02,1922.58,0.0
+gfx942,304,256,20480,5376,ck,0,0,93.6787,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,601.75,1301.92,0.0
+gfx942,304,512,20480,5376,ck,0,0,143.0196,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,788.3,935.71,0.0
+gfx942,304,1024,20480,5376,ck,0,0,241.8342,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,932.4,651.47,0.0
+gfx942,304,2048,20480,5376,ck,0,0,427.7956,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,1054.18,479.19,0.0
+gfx942,304,4096,20480,5376,ck,0,0,814.0222,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,1108.01,368.41,0.0
+gfx942,304,8192,20480,5376,ck,0,0,1618.4031,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,1114.61,302.57,0.0
+gfx942,304,16384,20480,5376,ck,0,0,3221.0203,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,1120.07,269.87,0.0
+gfx942,304,1,43008,5376,ck,6,0,58.9866,a8w8_blockscale_1x128x128_256x16x64x128_8x16_16x16_1x1_16x16x1_8x32x1_1x16x1x16_4_1x1_intrawave_v1,7.84,3921.27,0.0
+gfx942,304,8,43008,5376,ck,4,0,59.9466,a8w8_blockscale_1x128x128_256x16x256x128_8x16_16x16_1x4_16x16x1_8x32x1_1x16x1x16_8_1x2_intrawave_v1,61.71,3869.15,0.0
+gfx942,304,16,43008,5376,ck,4,0,61.1715,a8w8_blockscale_1x128x128_256x16x256x128_8x16_16x16_1x4_16x16x1_8x32x1_1x16x1x16_8_1x2_intrawave_v1,120.95,3803.62,0.0
+gfx942,304,32,43008,5376,ck,9,0,67.005,a8w8_blockscale_1x128x128_256x32x256x128_16x16_32x32_1x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v1,220.84,3494.3,0.0
+gfx942,304,64,43008,5376,ck,14,0,77.2218,a8w8_blockscale_1x128x128_256x64x256x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v1,383.25,3069.86,0.0
+gfx942,304,128,43008,5376,ck,2,0,110.4695,a8w8_blockscale_1x128x128_256x64x128x128_16x16_32x32_1x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,535.8,2198.88,0.0
+gfx942,304,256,43008,5376,ck,0,0,150.6563,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,785.76,1689.99,0.0
+gfx942,304,512,43008,5376,ck,0,0,250.3472,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,945.73,1110.47,0.0
+gfx942,304,1024,43008,5376,ck,0,0,442.8695,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,1069.21,733.39,0.0
+gfx942,304,2048,43008,5376,ck,0,0,863.5023,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,1096.74,484.52,0.0
+gfx942,304,4096,43008,5376,ck,0,0,1696.6489,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,1116.37,356.91,0.0
+gfx942,304,8192,43008,5376,ck,0,0,3404.8779,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,1112.57,287.79,0.0
+gfx942,304,1,262144,5376,ck,7,0,326.9743,a8w8_blockscale_1x128x128_256x16x128x256_16x16_16x16_1x2_16x16x1_16x16x1_1x16x1x16_8_1x2_intrawave_v1,8.62,4311.7,0.0
+gfx942,304,8,262144,5376,ck,7,0,332.1267,a8w8_blockscale_1x128x128_256x16x128x256_16x16_16x16_1x2_16x16x1_16x16x1_1x16x1x16_8_1x2_intrawave_v1,67.89,4255.98,0.0
+gfx942,304,16,262144,5376,ck,7,0,337.0875,a8w8_blockscale_1x128x128_256x16x128x256_16x16_16x16_1x2_16x16x1_16x16x1_1x16x1x16_8_1x2_intrawave_v1,133.78,4205.91,0.0
+gfx942,304,32,262144,5376,ck,12,0,356.0155,a8w8_blockscale_1x128x128_256x32x128x256_16x16_32x32_1x1_16x16x1_16x16x1_1x32x1x8_8_1x1_intrawave_v1,253.34,4006.1,0.0
+gfx942,304,64,262144,5376,ck,2,0,379.7972,a8w8_blockscale_1x128x128_256x64x128x128_16x16_32x32_1x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,474.96,3799.88,0.0
+gfx942,304,128,262144,5376,ck,0,0,505.8846,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,713.16,2919.8,0.0
+gfx942,304,256,262144,5376,ck,0,0,776.4718,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,929.27,1989.62,0.0
+gfx942,304,512,262144,5376,ck,0,0,1404.69,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,1027.35,1196.33,0.0
+gfx942,304,1024,262144,5376,ck,0,0,2689.7166,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,1073.06,725.6,0.0
+gfx942,304,2048,262144,5376,ck,0,0,5233.9715,a8w8_blockscale_1x128x128_256x128x128x128_16x16_32x32_2x2_8x32x1_8x32x1_1x32x1x8_8_1x1_intrawave_v3,1102.88,476.51,0.0

csrc/ck_gemm_a8w8_blockscale/gemm_a8w8_blockscale_cktile_instance.py

@@ -138,10 +138,21 @@ def expand_blockpercu(base_dict, max_bpc=BLOCK_PER_CU_MAX, field_name="BlockPerC
 
 
 arch = get_gfx()
+_expanded_942 = expand_blockpercu(kernels_list_942)
+_expanded_95x = expand_blockpercu(kernels_list_95x)
 if arch.startswith("gfx95"):
-    candidate_kernels_cktile_dict = expand_blockpercu(kernels_list_95x)
+    candidate_kernels_cktile_dict = _expanded_95x
 else:
-    candidate_kernels_cktile_dict = expand_blockpercu(kernels_list_942)
+    candidate_kernels_cktile_dict = _expanded_942
 
 # Name-based reverse lookup for get_tune_dict()
-candidate_kernels_by_name = {v.name: v for v in candidate_kernels_cktile_dict.values()}
+# Must include kernels from ALL arches, not just the current get_gfx() arch.
+# In a multi-target build (GPU_ARCHS=gfx942;gfx950), get_gfx() returns only the
+# last entry (gfx950), but build_tune_dict processes CSV rows for all build targets.
+# If the name registry only has the current arch's kernels, codegen crashes when it
+# encounters a CSV row referencing a kernel name from a different arch.
+# Note: cannot use {**a, **b} merge — both arches use overlapping integer IDs,
+# which would drop entries. Collect values from both dicts instead.
+candidate_kernels_by_name = {
+    v.name: v for v in list(_expanded_942.values()) + list(_expanded_95x.values())
+}

csrc/cktile_gemm_a8w8_bpreshuffle/gemm_a8w8_bpreshuffle_cktile_common.py

@@ -488,14 +488,23 @@ def append_expanded(base_expanded, extra):
 
 
 arch = get_gfx()
+_expanded_942 = expand_blockpercu(kernels_list_942)
+_expanded_950 = append_expanded(
+    expand_blockpercu(kernels_list_950), kernels_list_950_rowcol_wp_v2
+)
 if arch == "gfx942":
-    kernels_list = expand_blockpercu(kernels_list_942)
+    kernels_list = _expanded_942
     default_kernels_dict = default_kernels_dict_942
 else:
-    kernels_list = append_expanded(
-        expand_blockpercu(kernels_list_950), kernels_list_950_rowcol_wp_v2
-    )
+    kernels_list = _expanded_950
     default_kernels_dict = default_kernels_dict_950
 
 # Name-based reverse lookup for get_tune_dict() — built once at import time
-kernels_by_name = {v.name: v for v in kernels_list.values()}
+# Must include kernels from ALL arches, not just the current get_gfx() arch.
+# In a multi-target build (GPU_ARCHS=gfx942;gfx950), get_gfx() returns only the
+# last entry, but build_tune_dict processes CSV rows for all build targets.
+# Note: cannot use {**a, **b} merge — both arches use overlapping integer IDs,
+# which would drop entries. Collect values from both dicts instead.
+kernels_by_name = {
+    v.name: v for v in list(_expanded_942.values()) + list(_expanded_950.values())
+}