Skip to content

Commit 8abb0cd

Browse files
krzysz00weidel-p
authored andcommitted
Reapply "Re-enable lds_barrier on RDNA4" (iree-org#22278) (iree-org#22326)
This reverts commit cdce159. This re-applies iree-org#21922. This reverts iree-org#22278. The changes in iree-org#22198 appear to have solved the problem. ci-extra:test_torch Signed-off-by: Philipp <[email protected]>
1 parent b2441ce commit 8abb0cd

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,8 @@ struct ReplaceGPUBarrierWithLDSBarrier
6969
}
7070
};
7171

72-
static void populateConvertGPUToAMDGPUPatterns(RewritePatternSet &patterns,
73-
const amdgpu::Chipset &chipset) {
74-
// TODO(kdrewnia): This if statement is an emergency fix for an incorrect
75-
// lowering of amdgpu.lds_barrier.
76-
if (chipset.majorVersion != 12) {
77-
patterns.add<ReplaceGPUBarrierWithLDSBarrier>(patterns.getContext());
78-
}
72+
static void populateConvertGPUToAMDGPUPatterns(RewritePatternSet &patterns) {
73+
patterns.add<ReplaceGPUBarrierWithLDSBarrier>(patterns.getContext());
7974
}
8075

8176
/// Hacky pattern to swap `s_setprio` operations with `amdgpu.mfma` ops.
@@ -255,7 +250,7 @@ struct ConvertToROCDLPass final
255250
/*chipset=*/*maybeChipset);
256251
arith::populateCeilFloorDivExpandOpsPatterns(patterns);
257252
populateSwapSetPrioWithMFMAPatterns(patterns);
258-
populateConvertGPUToAMDGPUPatterns(patterns, *maybeChipset);
253+
populateConvertGPUToAMDGPUPatterns(patterns);
259254
populateConvertSharedMemoryAllocOps(patterns);
260255
populateDropSharedMemoryDeallocOpPatterns(patterns);
261256
vector::populateVectorToVectorCanonicalizationPatterns(patterns);

0 commit comments

Comments
 (0)