[NFC] Minor clean ups found during LLVM upgrade (triton-lang#2433)

Pull some of the changes required for LLVM upgrade to make the upgrade simpler.
nicholasjng · Oct 3, 2023 · 020f43d · 020f43d
1 parent cd38642
commit 020f43d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -222,7 +222,6 @@ if(TRITON_BUILD_PYTHON_MODULE)
     MLIRLLVMDialect
     MLIRSupport
     MLIRTargetLLVMIRExport
-    MLIRExecutionEngine
     MLIRMathToLLVM
     MLIRNVVMToLLVMIRTranslation
     MLIRROCDLToLLVMIRTranslation

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
@@ -71,7 +71,6 @@ llvm_update_compile_flags(triton-translate)
          MLIRPass
          MLIRSupport
          MLIRTransforms
-         MLIRExecutionEngine
          MLIRMathToLLVM
          MLIRTransformUtils
          MLIRLLVMToLLVMIRTranslation

diff --git a/lib/Conversion/TritonGPUToLLVM/Utility.cpp b/lib/Conversion/TritonGPUToLLVM/Utility.cpp
@@ -289,13 +289,15 @@ static Value commonShflSync(Location loc, ConversionPatternRewriter &rewriter,
   Type type = val.getType();
   if (type != i32_ty) {
     val = bitcast(val, int_ty(bits));
-    val = zext(i32_ty, val);
+    if (bits < 32)
+      val = zext(i32_ty, val);
   }
   Value mask = i32_val(0xFFFFFFFF);
   Value result = rewriter.create<NVVM::ShflOp>(loc, i32_ty, mask, val, i, clamp,
                                                mode, UnitAttr());
   if (type != i32_ty) {
-    result = trunc(int_ty(bits), result);
+    if (bits < 32)
+      result = trunc(int_ty(bits), result);
     result = bitcast(result, type);
   }
   return result;

diff --git a/lib/Target/LLVMIR/CMakeLists.txt b/lib/Target/LLVMIR/CMakeLists.txt
@@ -14,7 +14,6 @@ add_mlir_translation_library(TritonLLVMIR
         PUBLIC
         MLIRArithToLLVM
         MLIRBuiltinToLLVMIRTranslation
-        MLIRExecutionEngineUtils
         MLIRIndexToLLVM
         MLIRIR
         MLIRLLVMDialect