Skip to content

Commit ff77e98

Browse files
authored
[BACKEND] Bump to llvm/llvm-project@1188b1ff7b95 (#5884)
Pulls in * llvm/llvm-project#126132 * llvm/llvm-project#126727 * llvm/llvm-project#126732 for fixing wait states of gfx950 mfma ops.
1 parent 0524662 commit ff77e98

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

cmake/llvm-hash.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ffe3129e9bdc146ee4d91e849173d1c64b1ae974
1+
1188b1ff7b956cb65d8ddda5f1e56c432f1a57c7

include/triton/Dialect/Triton/IR/TritonOps.td

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,10 @@ def CallOp : TT_Op<"call", [CallOpInterface, /*MemRefsNormalizable, */DeclareOpI
10551055
```
10561056
}];
10571057

1058-
let arguments = (ins FlatSymbolRefAttr:$callee, Variadic<AnyType>:$operands);
1058+
let arguments = (ins FlatSymbolRefAttr:$callee,
1059+
Variadic<AnyType>:$operands,
1060+
OptionalAttr<DictArrayAttr>:$arg_attrs,
1061+
OptionalAttr<DictArrayAttr>:$res_attrs);
10591062
let results = (outs Variadic<AnyType>);
10601063

10611064
let builders = [

lib/Dialect/Triton/IR/Ops.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ void FuncOp::build(OpBuilder &builder, OperationState &state, StringRef name,
922922
if (argAttrs.empty())
923923
return;
924924
assert(type.getNumInputs() == argAttrs.size());
925-
function_interface_impl::addArgAndResultAttrs(
925+
call_interface_impl::addArgAndResultAttrs(
926926
builder, state, argAttrs, /*resultAttrs=*/std::nullopt,
927927
getArgAttrsAttrName(state.name), getResAttrsAttrName(state.name));
928928
}

test/Conversion/amd/async_ops_to_llvm.mlir

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,16 @@ module attributes {"ttg.num-ctas" = 1 : i32, "ttg.num-warps" = 4 : i32, ttg.shar
8383
%arg1: i32 {tt.divisibility = 16 : i32},
8484
%arg2: !ttg.memdesc<32x64xf16, #shared, #smem, mutable>) {
8585
// The waitcnt stores all counters in one i32 bits 15:14 and 3:0 store the vmcnt we have to wait on
86-
// CHECK: rocdl.waitcnt -49168
86+
// CHECK: rocdl.s.waitcnt -49168
8787
// CHECK: rocdl.barrier
8888
ttg.async_wait {num = 0 : i32}
89-
// CHECK: rocdl.waitcnt -49167
89+
// CHECK: rocdl.s.waitcnt -49167
9090
// CHECK: rocdl.barrier
9191
ttg.async_wait {num = 1 : i32}
92-
// CHECK: rocdl.waitcnt -2
92+
// CHECK: rocdl.s.waitcnt -2
9393
// CHECK: rocdl.barrier
9494
ttg.async_wait {num = 62 : i32}
95-
// CHECK: rocdl.waitcnt -1
95+
// CHECK: rocdl.s.waitcnt -1
9696
// CHECK: rocdl.barrier
9797
ttg.async_wait {num = 63 : i32}
9898
tt.return

third_party/amd/lib/TritonAMDGPUToLLVM/LoadStoreOpToLLVM.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1682,7 +1682,7 @@ struct AsyncWaitOpConversion : public ConvertOpToLLVMPattern<AsyncWaitOp> {
16821682
unsigned otherCnts = ~0xC00F; // C00F has bits 15:14 and 3:0 set
16831683
unsigned waitValue = lowBits | highBits | otherCnts;
16841684

1685-
rewriter.create<ROCDL::WaitcntOp>(loc, waitValue);
1685+
rewriter.create<ROCDL::SWaitcntOp>(loc, waitValue);
16861686

16871687
// Drop the result AsyncToken
16881688
rewriter.replaceOp(op, b.i32_val(0));

0 commit comments

Comments
 (0)