Skip to content

Commit 111b8e2

Browse files
gflegarloislo
authored andcommitted
[BACKEND] Update LLVM version to llvm/llvm-project@7752e0a (triton-lang#6735)
Removed `addArgumentMaterialization` since that method was removed from MLIR in llvm/llvm-project@23e3cbb
1 parent 9e244ee commit 111b8e2

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

lib/Conversion/TritonGPUToLLVM/ConvertLayoutOpToLLVM.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ struct ConvertLayoutOpUsingLinearLayoutsConversion
294294
b.shl(b.lshr(offset, b.i32_val(rshiftVal)), b.i32_val(lshiftVal)),
295295
offset);
296296
}
297-
auto vecAddr = b.gep(sharedPtrTy, elemTy, smemBase, offset,
298-
LLVM::GEPNoWrapFlags::inbounds);
297+
auto vecAddr = b.gep(sharedPtrTy, elemTy, smemBase, offset);
298+
vecAddr.setNoWrapFlags(mlir::LLVM::GEPNoWrapFlags::inbounds);
299299
return vecAddr;
300300
};
301301

third_party/amd/lib/TritonAMDGPUToLLVM/TritonGPUToLLVM.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "triton/Dialect/Triton/IR/Dialect.h"
2626
#include "triton/Dialect/TritonGPU/IR/Dialect.h"
2727
#include "triton/Dialect/TritonNvidiaGPU/IR/Dialect.h"
28+
#include "llvm/TargetParser/TargetParser.h"
2829

2930
#include "third_party/proton/dialect/include/TritonProtonToLLVM/PatternTritonProtonOpToLLVM.h"
3031

@@ -87,6 +88,15 @@ struct ConvertTritonAMDGPUToLLVM
8788
mod.emitError("unsupported target: '") << this->arch.getValue() << "'";
8889
return signalPassFailure();
8990
}
91+
llvm::StringRef chipset =
92+
llvm::AMDGPU::getArchNameAMDGCN(targetInfo.getGPUKind());
93+
llvm::FailureOr<mlir::amdgpu::Chipset> maybeChipset =
94+
mlir::amdgpu::Chipset::parse(chipset);
95+
if (failed(maybeChipset)) {
96+
mlir::emitError(mlir::UnknownLoc::get(&getContext()),
97+
"Invalid chipset name: " + chipset);
98+
return signalPassFailure();
99+
}
90100

91101
mlir::LowerToLLVMOptions option(context);
92102
option.overrideIndexBitwidth(32);

0 commit comments

Comments
 (0)