try again

Author: masahi

scripts/build-llvm-project.sh

@@ -22,17 +22,13 @@ if [ -z "$CMAKE_ARGS" ]; then
               -DCMAKE_CXX_COMPILER=clang++
               -DLLVM_ENABLE_LLD=ON
               -DLLVM_OPTIMIZED_TABLEGEN=ON
-<<<<<<< HEAD
               -DMLIR_ENABLE_BINDINGS_PYTHON=OFF
-=======
               -DLLVM_ENABLE_ZSTD=OFF
->>>>>>> d3a8a5aeb ([BACKEND] fix inconsistent use of DLLVM_ENABLE_ZSTD (#6726))
               -DLLVM_TARGETS_TO_BUILD="$LLVM_TARGETS"
               -DCMAKE_EXPORT_COMPILE_COMMANDS=1
               -DLLVM_ENABLE_PROJECTS="$LLVM_PROJECTS"
               -DCMAKE_INSTALL_PREFIX="$LLVM_INSTALL_PATH"
               -B"$LLVM_BUILD_PATH" "$LLVM_PROJECT_PATH/llvm"
-	      -DMLIR_ENABLE_BINDINGS_PYTHON=OFF
         )
     else
         CMAKE_ARGS=("$@")

test/Conversion/tritongpu_to_llvm.mlir

@@ -1,11 +1,7 @@
-<<<<<<< HEAD
-// RUN: triton-opt %s -split-input-file --allocate-shared-memory-nv --convert-triton-gpu-to-llvm -reconcile-unrealized-casts 2>/dev/null | FileCheck %s --dump-input-context 20
-=======
 // RUN: triton-opt %s -split-input-file \
-// RUN:   --allocate-shared-memory-nv --convert-triton-gpu-to-llvm \
+// RUN:   --allocate-shared-memory-nv --convert-triton-gpu-to-llvm -reconcile-unrealized-casts \
 // RUN:   --reconcile-unrealized-casts 2>/dev/null \
 // RUN:   | FileCheck %s --dump-input-context 20
->>>>>>> 0bf92bfbf ([BACKEND] Update LLVM version to https://github.com/llvm/llvm-project/commit/b8649098a7fcf598406d8d8b7d68891d1444e9c8 (#8263))
 
 module attributes {"ttg.num-ctas" = 1 : i32, "ttg.num-warps" = 4 : i32} {
   // CHECK: llvm.func @test_empty_kernel(%arg0: i32, %arg1: !llvm.ptr<1>, %arg2: !llvm.ptr<1>, %arg3: !llvm.ptr<1>)