Skip to content

Commit 10e4b32

Browse files
committed
[BACKEND] Update LLVM version to llvm/llvm-project@f178e51
- amd gfx940 and gfx941 were removed. - createConvertSCFToCFPass was renamed to createSCFToControlFlowPass. - scf.for folder was introduced to remove duplicate variables.
1 parent cb1bd62 commit 10e4b32

File tree

7 files changed

+105
-107
lines changed

7 files changed

+105
-107
lines changed

cmake/llvm-hash.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
627387722469a358a80d77488509fb23d890d402
1+
f178e51747b47a181cd6be8dc4ad8943ea5728b3

python/src/passes.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void init_triton_passes_ttgpuir(py::module &&m) {
8080

8181
void init_triton_passes_convert(py::module &&m) {
8282
using namespace mlir;
83-
ADD_PASS_WRAPPER_0("add_scf_to_cf", createConvertSCFToCFPass);
83+
ADD_PASS_WRAPPER_0("add_scf_to_cf", createSCFToControlFlowPass);
8484
ADD_PASS_WRAPPER_0("add_cf_to_llvmir", createConvertControlFlowToLLVMPass);
8585
ADD_PASS_WRAPPER_0("add_index_to_llvmir", createConvertIndexToLLVMPass);
8686
ADD_PASS_WRAPPER_0("add_arith_to_llvmir", createArithToLLVMConversionPass);

test/TritonGPU/amd/accelerate-amd-matmul-mfma.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: triton-opt %s -split-input-file --tritonamdgpu-accelerate-matmul='arch-generation-name=gfx940 matrix-instruction-size=0' | FileCheck %s --check-prefixes MFMA0,CHECK
2-
// RUN: triton-opt %s -split-input-file --tritonamdgpu-accelerate-matmul='arch-generation-name=gfx940 matrix-instruction-size=16' | FileCheck %s --check-prefixes MFMA16,CHECK
1+
// RUN: triton-opt %s -split-input-file --tritonamdgpu-accelerate-matmul='arch-generation-name=gfx942 matrix-instruction-size=0' | FileCheck %s --check-prefixes MFMA0,CHECK
2+
// RUN: triton-opt %s -split-input-file --tritonamdgpu-accelerate-matmul='arch-generation-name=gfx942 matrix-instruction-size=16' | FileCheck %s --check-prefixes MFMA16,CHECK
33

44
#blocked = #ttg.blocked<{sizePerThread = [4, 4], threadsPerWarp = [8, 8], warpsPerCTA = [2, 4], order = [1, 0]}>
55
// CHECK-LABEL: mfma_dot_fp8e5m2

test/TritonGPU/amd/amd-convert-buffer-ops.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: triton-opt %s -split-input-file --tritonamdgpu-convert-buffer-ops='arch-generation-name=gfx940'| FileCheck %s
1+
// RUN: triton-opt %s -split-input-file --tritonamdgpu-convert-buffer-ops='arch-generation-name=gfx942'| FileCheck %s
22

33
#blocked0 = #ttg.blocked<{sizePerThread = [8], threadsPerWarp = [32], warpsPerCTA = [1], order = [0], CTAsPerCGA = [1], CTASplitNum = [1], CTAOrder = [0]}>
44
module attributes {"ttg.num-ctas" = 1 : i32, "ttg.num-warps" = 1 : i32} {

test/TritonGPU/combine.mlir

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2379,12 +2379,12 @@ module attributes {"ttg.num-ctas" = 1 : i32, "ttg.num-warps" = 1 : i32, "ttg.thr
23792379
%c0_i32 = arith.constant 0 : i32
23802380
%c32_i32 = arith.constant 32 : i32
23812381
%c4096_i32 = arith.constant 4096 : i32
2382-
// CHECK: %[[F:.+]]:4 = scf.for
2382+
// CHECK: %[[F:.+]]:3 = scf.for
23832383
// CHECK: %[[R:.+]] = arith.addf
23842384
// CHECK: arith.addf
2385-
// CHECK: scf.yield %{{.+}}, %{{.+}}, %{{.+}}, %[[R]]
2385+
// CHECK: scf.yield %{{.+}}, %{{.+}}, %[[R]]
23862386
// CHECK: }
2387-
// CHECK: tt.return %[[F]]#3, %[[F]]#1, %[[F]]#2
2387+
// CHECK: tt.return %[[F]]#2, %[[F]]#1, %[[F]]#0
23882388
%1:3 = scf.for %arg0 = %c0_i32 to %c4096_i32 step %c32_i32 iter_args(%arg1 = %cst, %arg3 = %cst_0, %arg4 = %cst) -> (tensor<32xf32, #blocked1>, tensor<32xf32, #blocked>, tensor<32xf32, #blocked1>) : i32 {
23892389
%4 = arith.addf %arg1, %cst : tensor<32xf32, #blocked1>
23902390
%5 = ttg.convert_layout %4 : tensor<32xf32, #blocked1> -> tensor<32xf32, #blocked>

test/TritonGPU/samples/simulated-grouped-gemm.mlir

Lines changed: 97 additions & 97 deletions
Large diffs are not rendered by default.

third_party/amd/lib/TritonAMDGPUToLLVM/TargetUtils.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ ISAFamily deduceISAFamily(llvm::StringRef arch) {
1414
case llvm::AMDGPU::GK_GFX950:
1515
return ISAFamily::CDNA4;
1616
case llvm::AMDGPU::GK_GFX942:
17-
case llvm::AMDGPU::GK_GFX941:
18-
case llvm::AMDGPU::GK_GFX940:
1917
return ISAFamily::CDNA3;
2018
case llvm::AMDGPU::GK_GFX90A:
2119
return ISAFamily::CDNA2;

0 commit comments

Comments
 (0)