Merge commit '91822318570f76e8952b9a49934df97e8871492e'

Author: whitneywhtsang

cmake/llvm-hash.txt

@@ -1 +1 @@
-8957e64a20fc7f4277565c6cfe3e555c119783ce
+570885128351868c1308bb22e8ca351d318bc4a1

lib/Conversion/TritonGPUToLLVM/FuncOpToLLVM.cpp

@@ -1,15 +1,9 @@
+#include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h"
 #include "mlir/Dialect/LLVMIR/NVVMDialect.h"
 #include "mlir/IR/BuiltinAttributes.h"
 #include "triton/Conversion/TritonGPUToLLVM/PatternTritonGPUOpToLLVM.h"
 #include "triton/Conversion/TritonGPUToLLVM/Utility.h"
 
-namespace mlir {
-FailureOr<LLVM::LLVMFuncOp>
-convertFuncOpToLLVMFuncOp(FunctionOpInterface funcOp,
-                          ConversionPatternRewriter &rewriter,
-                          const LLVMTypeConverter &converter);
-}
-
 namespace {
 
 using namespace mlir;

third_party/amd/lib/TritonAMDGPUToLLVM/ScalarizePackedFOps.cpp

@@ -1,4 +1,5 @@
 #include "TritonAMDGPUToLLVM/Passes.h"
+#include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/PatternMatch.h"
 #include "llvm/IR/Verifier.h"
@@ -79,7 +80,7 @@ struct ScalarizePackedFOps : FunctionPass {
   ScalarizePackedFOps() : FunctionPass(ID) {}
 
   bool runOnFunction(Function &F) override {
-    IRBuilder builder(F.getContext());
+    IRBuilder<> builder(F.getContext());
     bool changed = false;
     SmallVector<Instruction *> instsToErase;
     for (BasicBlock &BB : F) {