From 70b5c9a5744c2e696ecbad3533fcb86de12799a0 Mon Sep 17 00:00:00 2001 From: Tori Baker Date: Mon, 8 Jul 2024 10:21:13 +0200 Subject: [PATCH 1/5] [BACKEND] Update LLVM version to https://github.com/llvm/llvm-project/commit/de88b2cb16af4bba659d0bb2ddf10bda681ec84d (#4275) --- cmake/llvm-hash.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/llvm-hash.txt b/cmake/llvm-hash.txt index 38467d8883bd..25f43ecd7d54 100644 --- a/cmake/llvm-hash.txt +++ b/cmake/llvm-hash.txt @@ -1 +1 @@ -4713bd4ccc0c0d568f92916e7851d993291742c0 +de88b2cb16af4bba659d0bb2ddf10bda681ec84d From fa827ed3c9b04a185a4bd7858a64b7e11095d026 Mon Sep 17 00:00:00 2001 From: Goran Flegar Date: Mon, 15 Jul 2024 11:29:43 +0200 Subject: [PATCH 2/5] [BACKEND] Update LLVM version to https://github.com/llvm/llvm-project/commit/9ddfe62f5c11e3f65f444209f514029ded2d58b9 (#4323) --- cmake/llvm-hash.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/llvm-hash.txt b/cmake/llvm-hash.txt index 25f43ecd7d54..ad80c9753d70 100644 --- a/cmake/llvm-hash.txt +++ b/cmake/llvm-hash.txt @@ -1 +1 @@ -de88b2cb16af4bba659d0bb2ddf10bda681ec84d +9ddfe62f5c11e3f65f444209f514029ded2d58b9 From 455e93fa0c9281545be7ef6192abf98d4027885b Mon Sep 17 00:00:00 2001 From: Florian Reichl <63750742+reichlfl@users.noreply.github.com> Date: Tue, 23 Jul 2024 11:58:24 +0200 Subject: [PATCH 3/5] [BACKEND] Update LLVM version to https://github.com/llvm/llvm-project/commit/dd7d81ea49bf39e1d69bbb84bd3f31bd95519369 (#4374) Update LLVM version to https://github.com/llvm/llvm-project/commit/dd7d81ea49bf39e1d69bbb84bd3f31bd95519369 --- cmake/llvm-hash.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/llvm-hash.txt b/cmake/llvm-hash.txt index ad80c9753d70..a742a8cd21ba 100644 --- a/cmake/llvm-hash.txt +++ b/cmake/llvm-hash.txt @@ -1 +1 @@ -9ddfe62f5c11e3f65f444209f514029ded2d58b9 +dd7d81ea49bf39e1d69bbb84bd3f31bd95519369 From c6431becde6d5ff65264ac1c85aa3452b8cd096f Mon Sep 17 00:00:00 2001 From: Pablo Zimmermann Date: Mon, 29 Jul 2024 14:07:56 +0200 Subject: [PATCH 4/5] [BACKEND] Update LLVM version to https://github.com/llvm/llvm-project/commit/99bb9a719cec9513e72ad275c1c0302b76b6c408 (#4410) Included the use of the non-deprecated version of createMCObjectStreamer (needed after https://github.com/llvm/llvm-project/commit/f1422a86c4a812a7ccd744082741841e596ccea0). --- cmake/llvm-hash.txt | 2 +- third_party/amd/lib/TritonAMDGPUToLLVM/BuiltinFuncToLLVM.cpp | 2 +- third_party/amd/python/triton_amd.cc | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cmake/llvm-hash.txt b/cmake/llvm-hash.txt index a742a8cd21ba..8d223b744a09 100644 --- a/cmake/llvm-hash.txt +++ b/cmake/llvm-hash.txt @@ -1 +1 @@ -dd7d81ea49bf39e1d69bbb84bd3f31bd95519369 +99bb9a719cec9513e72ad275c1c0302b76b6c408 diff --git a/third_party/amd/lib/TritonAMDGPUToLLVM/BuiltinFuncToLLVM.cpp b/third_party/amd/lib/TritonAMDGPUToLLVM/BuiltinFuncToLLVM.cpp index 99dad006dba3..cddf0898128a 100644 --- a/third_party/amd/lib/TritonAMDGPUToLLVM/BuiltinFuncToLLVM.cpp +++ b/third_party/amd/lib/TritonAMDGPUToLLVM/BuiltinFuncToLLVM.cpp @@ -128,7 +128,7 @@ class CallOpConversion : public mlir::RewritePattern { auto operands = callOp.getOperands(); auto result = callOp.getResult(); - LLVM::LLVMFunctionType calleeType = callOp.getCalleeType().value(); + LLVM::LLVMFunctionType calleeType = callOp.getVarCalleeType().value(); Type returnType = calleeType.getReturnType(); auto loc = callOp.getLoc(); diff --git a/third_party/amd/python/triton_amd.cc b/third_party/amd/python/triton_amd.cc index bee5437555f4..27e22e54655f 100644 --- a/third_party/amd/python/triton_amd.cc +++ b/third_party/amd/python/triton_amd.cc @@ -193,9 +193,7 @@ void init_triton_amd(py::module &&m) { target->createMCAsmBackend(*sti, *mri, mcOptions)); mcStreamer.reset(target->createMCObjectStreamer( triple, ctx, std::move(mab), mab->createObjectWriter(svos), - std::move(ce), *sti, mcOptions.MCRelaxAll, - mcOptions.MCIncrementalLinkerCompatible, - /*DWARFMustBeAtTheEnd=*/false)); + std::move(ce), *sti)); std::unique_ptr parser( createMCAsmParser(srcMgr, ctx, *mcStreamer, *mai)); From 0eb7a01a3a89feca0c77481cd1f1167102ab01f9 Mon Sep 17 00:00:00 2001 From: Pablo Zimmermann Date: Wed, 31 Jul 2024 10:32:59 +0200 Subject: [PATCH 5/5] [Draft] Update LLVM version to debug a building issue This draft PR is trying to find the culprit of the building issue we currently have when we try to update llvm. We are bisecting between 2 versions. --- .github/workflows/llvm-build.yml | 4 ++++ cmake/llvm-hash.txt | 2 +- third_party/amd/lib/TritonAMDGPUToLLVM/BuiltinFuncToLLVM.cpp | 2 +- third_party/amd/python/triton_amd.cc | 4 +++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/llvm-build.yml b/.github/workflows/llvm-build.yml index 9f452ac9c5e1..b5114f2dfbe6 100644 --- a/.github/workflows/llvm-build.yml +++ b/.github/workflows/llvm-build.yml @@ -107,6 +107,7 @@ jobs: -DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD="host;NVPTX;AMDGPU" -DLLVM_ENABLE_TERMINFO=OFF + -DLLVM_ENABLE_ABI_BREAKING_CHECKS=0 llvm-project/llvm ninja -C llvm-project/build check-mlir install @@ -130,6 +131,7 @@ jobs: -DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD="host;NVPTX;AMDGPU" -DLLVM_ENABLE_TERMINFO=OFF + -DLLVM_ENABLE_ABI_BREAKING_CHECKS=0 llvm-project/llvm ninja -C llvm-project/build check-mlir install @@ -175,6 +177,7 @@ jobs: -DCMAKE_LINKER=$LINKER \ -DMLIR_ENABLE_BINDINGS_PYTHON=ON \ -DLLVM_ENABLE_ZSTD=OFF \ + -DLLVM_ENABLE_ABI_BREAKING_CHECKS=0 \ -DLLVM_INSTALL_UTILS=ON \ -DCMAKE_INSTALL_PREFIX="${{ env.llvm_install_dir }}" \ -DLLVM_TARGETS_TO_BUILD="AArch64;NVPTX;AMDGPU" \ @@ -225,6 +228,7 @@ jobs: -DLLVM_TARGETS_TO_BUILD="AArch64;NVPTX;AMDGPU" -DLLVM_USE_HOST_TOOLS=ON -DLLVM_ENABLE_TERMINFO=OFF + -DLLVM_ENABLE_ABI_BREAKING_CHECKS=0 llvm-project/llvm ninja -C llvm-project/build install diff --git a/cmake/llvm-hash.txt b/cmake/llvm-hash.txt index 8d223b744a09..1522498c600e 100644 --- a/cmake/llvm-hash.txt +++ b/cmake/llvm-hash.txt @@ -1 +1 @@ -99bb9a719cec9513e72ad275c1c0302b76b6c408 +ce80c80dca45c7b4636a3e143973e2c6cbdb2884 diff --git a/third_party/amd/lib/TritonAMDGPUToLLVM/BuiltinFuncToLLVM.cpp b/third_party/amd/lib/TritonAMDGPUToLLVM/BuiltinFuncToLLVM.cpp index cddf0898128a..99dad006dba3 100644 --- a/third_party/amd/lib/TritonAMDGPUToLLVM/BuiltinFuncToLLVM.cpp +++ b/third_party/amd/lib/TritonAMDGPUToLLVM/BuiltinFuncToLLVM.cpp @@ -128,7 +128,7 @@ class CallOpConversion : public mlir::RewritePattern { auto operands = callOp.getOperands(); auto result = callOp.getResult(); - LLVM::LLVMFunctionType calleeType = callOp.getVarCalleeType().value(); + LLVM::LLVMFunctionType calleeType = callOp.getCalleeType().value(); Type returnType = calleeType.getReturnType(); auto loc = callOp.getLoc(); diff --git a/third_party/amd/python/triton_amd.cc b/third_party/amd/python/triton_amd.cc index 27e22e54655f..bee5437555f4 100644 --- a/third_party/amd/python/triton_amd.cc +++ b/third_party/amd/python/triton_amd.cc @@ -193,7 +193,9 @@ void init_triton_amd(py::module &&m) { target->createMCAsmBackend(*sti, *mri, mcOptions)); mcStreamer.reset(target->createMCObjectStreamer( triple, ctx, std::move(mab), mab->createObjectWriter(svos), - std::move(ce), *sti)); + std::move(ce), *sti, mcOptions.MCRelaxAll, + mcOptions.MCIncrementalLinkerCompatible, + /*DWARFMustBeAtTheEnd=*/false)); std::unique_ptr parser( createMCAsmParser(srcMgr, ctx, *mcStreamer, *mai));