Skip to content

Commit 49eafdf

Browse files
committed
Revert accidentally updated part.
1 parent e470f0a commit 49eafdf

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

compiler/src/iree/compiler/Codegen/LLVMGPU/KernelConfig.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,12 +1446,12 @@ static LogicalResult setContractConfig(IREE::GPU::TargetAttr target,
14461446
return failure();
14471447
}
14481448

1449-
auto setMatmulConfig = [&entryPoint, &op,
1450-
&target](int64_t tileX, int64_t tileY, int64_t tileK,
1451-
ArrayRef<int64_t> workgroupSize,
1452-
ArrayRef<int32_t> subgroupSizes,
1453-
unsigned softwarePipelineDepth,
1454-
CodeGenPipeline pipeline) {
1449+
auto setMatmulConfig = [&entryPoint, &op](int64_t tileX, int64_t tileY,
1450+
int64_t tileK,
1451+
ArrayRef<int64_t> workgroupSize,
1452+
ArrayRef<int32_t> subgroupSizes,
1453+
unsigned softwarePipelineDepth,
1454+
CodeGenPipeline pipeline) {
14551455
TileSizesListType tileSizes;
14561456
unsigned numParallelLoops = op.getNumParallelLoops();
14571457
unsigned numReductionLoops = op.getNumReductionLoops();
@@ -1509,8 +1509,7 @@ static LogicalResult setContractConfig(IREE::GPU::TargetAttr target,
15091509
SmallVector<NamedAttribute, 1> pipelineAttrs;
15101510
auto pipelineOptions = IREE::GPU::GPUPipelineOptionsAttr::get(
15111511
context, /*prefetch_num_stages=*/0,
1512-
/*no_reduce_shared_memory_bank_conflicts=*/
1513-
IREE::GPU::targetSupportsGlobalLoadDMA(target),
1512+
/*no_reduce_shared_memory_bank_conflicts=*/true,
15141513
/*use_igemm_convolution=*/false,
15151514
/*reorder_workgroups_strategy=*/std::nullopt);
15161515
pipelineAttrs.emplace_back(

compiler/src/iree/compiler/Codegen/LLVMGPU/test/config_matmul.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func.func @matmul_DYN_1_4096(%arg0: !TA, %arg1: !TB, %arg2: !TC, %arg3: !DTC, %a
153153
!DTC = !iree_tensor_ext.dispatch.tensor<readwrite:tensor<32x32xf32>>
154154

155155
// CHECK: #translation = #iree_codegen.translation_info<pipeline = LLVMGPUTileAndFuse
156-
// CHECK-SAME: workgroup_size = [64, 16, 1] subgroup_size = 64, {gpu_pipeline_options = #iree_gpu.pipeline_options<no_reduce_shared_memory_bank_conflicts = false, use_igemm_convolution = false>}>
156+
// CHECK-SAME: workgroup_size = [64, 16, 1] subgroup_size = 64, {gpu_pipeline_options = #iree_gpu.pipeline_options<no_reduce_shared_memory_bank_conflicts = true, use_igemm_convolution = false>}>
157157
func.func @matmul_32_32_DYN(%arg0: !TA, %arg1: !TB, %arg2: !TC, %arg3: !DTC) {
158158
// CHECK: #iree_gpu.lowering_config<{reduction = [0, 0, 1], thread = [1, 8, 0], workgroup = [64, 128, 1]}
159159
%0 = linalg.matmul ins(%arg0, %arg1 : !TA, !TB) outs(%arg2 : !TC) -> !TC
@@ -168,7 +168,7 @@ func.func @matmul_32_32_DYN(%arg0: !TA, %arg1: !TB, %arg2: !TC, %arg3: !DTC) {
168168
!TC = tensor<4096x4096xf32>
169169
!DTC = !iree_tensor_ext.dispatch.tensor<readwrite:tensor<4096x4096xf32>>
170170
// CHECK: #translation = #iree_codegen.translation_info<pipeline = LLVMGPUTileAndFuse
171-
// CHECK-SAME: workgroup_size = [64, 16, 1] subgroup_size = 64, {gpu_pipeline_options = #iree_gpu.pipeline_options<no_reduce_shared_memory_bank_conflicts = false, use_igemm_convolution = false>}>
171+
// CHECK-SAME: workgroup_size = [64, 16, 1] subgroup_size = 64, {gpu_pipeline_options = #iree_gpu.pipeline_options<no_reduce_shared_memory_bank_conflicts = true, use_igemm_convolution = false>}>
172172
func.func @matmul_4096_4096_DYN(%arg0: !TA, %arg1: !TB, %arg2: !TC, %arg3: !DTC) {
173173
// CHECK: #iree_gpu.lowering_config<{reduction = [0, 0, 1], thread = [1, 8, 0], workgroup = [64, 128, 1]}
174174
%0 = linalg.matmul ins(%arg0, %arg1 : !TA, !TB) outs(%arg2 : !TC) -> !TC

compiler/src/iree/compiler/Codegen/LLVMGPU/test/config_matvec.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ func.func @not_vmt() {
438438
return
439439
}
440440

441-
// CHECK-DAG: #[[$TRANSLATION:.+]] = #iree_codegen.translation_info<pipeline = LLVMGPUTileAndFuse workgroup_size = [32, 1, 1] subgroup_size = 64, {gpu_pipeline_options = #iree_gpu.pipeline_options<no_reduce_shared_memory_bank_conflicts = false, use_igemm_convolution = false>}>
441+
// CHECK-DAG: #[[$TRANSLATION:.+]] = #iree_codegen.translation_info<pipeline = LLVMGPUTileAndFuse workgroup_size = [32, 1, 1] subgroup_size = 64, {gpu_pipeline_options = #iree_gpu.pipeline_options<no_reduce_shared_memory_bank_conflicts = true, use_igemm_convolution = false>}>
442442
// CHECK: func.func @not_vmt()
443443
// CHECK-SAME: translation_info = #[[$TRANSLATION]]
444444
// CHECK: linalg.generic

0 commit comments

Comments
 (0)