[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.
triton-lang · Aug 5, 2024 · c61bfd2 · c61bfd2
1 parent 9e79619
commit c61bfd2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -1 +1 @@
-99bb9a719cec9513e72ad275c1c0302b76b6c408
+ce80c80dca45c7b4636a3e143973e2c6cbdb2884
diff --git 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
@@ -195,7 +195,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<llvm::MCAsmParser> parser(
             createMCAsmParser(srcMgr, ctx, *mcStreamer, *mai));
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		99bb9a719cec9513e72ad275c1c0302b76b6c408
		ce80c80dca45c7b4636a3e143973e2c6cbdb2884