Skip to content

Commit f484cb8

Browse files
authored
[BACKEND] Update LLVM hash (#5040)
Fixes #4769
1 parent 9f93976 commit f484cb8

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

cmake/llvm-hash.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b5cc222d7429fe6f18c787f633d5262fac2e676f
1+
b74e588e1f460eb48ceb1a30cf8ac870b7537dcc

lib/Conversion/TritonToTritonGPU/TritonGPUConversion.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,19 @@ TritonGPUTypeConverter::TritonGPUTypeConverter(MLIRContext *context,
5656
// This will create newArg, and map(origArg, newArg)
5757
addArgumentMaterialization([&](OpBuilder &builder,
5858
RankedTensorType tensorType, ValueRange inputs,
59-
Location loc) -> std::optional<Value> {
59+
Location loc) -> Value {
6060
llvm_unreachable("Argument rematerialization should not happen in Triton "
6161
"-> TritonGPU conversion");
62-
return std::nullopt;
62+
return {};
6363
});
6464

6565
// If the origValue still has live user(s), use this to
6666
// convert origValue to newValue
6767
addSourceMaterialization([&](OpBuilder &builder, RankedTensorType tensorType,
68-
ValueRange inputs,
69-
Location loc) -> std::optional<Value> {
68+
ValueRange inputs, Location loc) -> Value {
7069
llvm_unreachable("Source rematerialization should not happen in Triton -> "
7170
"TritonGPU Conversion");
72-
return std::nullopt;
71+
return {};
7372
});
7473

7574
// This will be called when (desiredType != newOperandType)
@@ -79,7 +78,7 @@ TritonGPUTypeConverter::TritonGPUTypeConverter(MLIRContext *context,
7978
ValueRange inputs, Location loc) {
8079
auto cast =
8180
builder.create<triton::gpu::ConvertLayoutOp>(loc, tensorType, inputs);
82-
return std::optional<Value>(cast.getResult());
81+
return cast.getResult();
8382
});
8483
}
8584

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module attributes {"triton_gpu.num-ctas" = 1 : i32, "triton_gpu.num-warps" = 4 :
4242
%1 = arith.muli %0, %c1024_i32 : i32
4343
%sub = arith.subi %1, %c128_i32 : i32
4444
%cmp = arith.cmpi sgt, %sub, %c0_i32 : i32
45-
"llvm.intr.assume"(%cmp) : (i1) -> ()
45+
llvm.intr.assume %cmp : i1
4646
%2 = tt.splat %sub : i32 -> tensor<1024xi32, #blocked>
4747
%3 = tt.make_range {end = 1024 : i32, start = 0 : i32} : tensor<1024xi32, #blocked>
4848
// CHECK: %[[offset:.*]] = arith.addi

0 commit comments

Comments
 (0)