Integrate llvm-project@7c69491 (#19008)

Retains the revert for llvm-project@1004865

Author: qedawkins

compiler/plugins/target/LLVMCPU/LLVMIRPasses.cpp

@@ -56,7 +56,7 @@ LogicalResult runLLVMIRPasses(const LLVMTarget &target,
   case SanitizerKind::kAddress: {
     passBuilder.registerOptimizerLastEPCallback(
         [](llvm::ModulePassManager &modulePassManager,
-           llvm::OptimizationLevel Level) {
+           llvm::OptimizationLevel Level, llvm::ThinOrFullLTOPhase) {
           llvm::AddressSanitizerOptions opts;
           // Can use Never or Always, just not the default Runtime, which
           // introduces a reference to
@@ -73,7 +73,7 @@ LogicalResult runLLVMIRPasses(const LLVMTarget &target,
   case SanitizerKind::kThread: {
     passBuilder.registerOptimizerLastEPCallback(
         [](llvm::ModulePassManager &modulePassManager,
-           llvm::OptimizationLevel Level) {
+           llvm::OptimizationLevel Level, llvm::ThinOrFullLTOPhase) {
           modulePassManager.addPass(llvm::ModuleThreadSanitizerPass());
           modulePassManager.addPass(llvm::createModuleToFunctionPassAdaptor(
               llvm::ThreadSanitizerPass()));

compiler/plugins/target/ROCM/test/opt_pass_plugin/GPUHello.cpp

@@ -67,10 +67,11 @@ bool GpuHello::runOnModule(llvm::Module &module) {
 
 llvm::PassPluginLibraryInfo getPassPluginInfo() {
   const auto callback = [](llvm::PassBuilder &pb) {
-    pb.registerOptimizerLastEPCallback([&](llvm::ModulePassManager &mpm, auto) {
-      mpm.addPass(GpuHello());
-      return true;
-    });
+    pb.registerOptimizerLastEPCallback(
+        [&](llvm::ModulePassManager &mpm, auto, auto) {
+          mpm.addPass(GpuHello());
+          return true;
+        });
   };
   return {LLVM_PLUGIN_API_VERSION, "gpu-hello", LLVM_VERSION_STRING, callback};
 };

compiler/src/iree/compiler/Dialect/Stream/IR/StreamOpFolders.cpp

@@ -105,7 +105,7 @@ static APInt computeRequiredPatternBits(APInt pattern) {
       return APInt(16, b0 | (b1 << 8));
     } else if (b0 == b4 && b1 == b5 && b2 == b6 && b3 == b7) {
       // 0xAABBCCDDAABBCCDD : i64 => 0xAABBCCDD : i32
-      return APInt(32, b0 | (b1 << 8) | (b2 << 16) | (b3 << 32));
+      return APInt(32, b0 | (b1 << 8) | (b2 << 16) | (b3 << 24));
     }
     return pattern;
   }

compiler/src/iree/compiler/Dialect/Stream/IR/test/tensor_folding.mlir

@@ -145,7 +145,7 @@ util.func private @NarrowSplatPatternI64ToI16() -> !stream.resource<*> {
 util.func private @NarrowSplatPatternI64ToI32() -> !stream.resource<*> {
   %c100 = arith.constant 100 : index
   %pattern = arith.constant 0xAABBCCDDAABBCCDD : i64
-  // CHECK: stream.tensor.splat %c12307677_i32
+  // CHECK: stream.tensor.splat %c-1430532899_i32
   %0 = stream.tensor.splat %pattern : i64 -> tensor<2x2xf32> in !stream.resource<*>{%c100}
   util.return %0 : !stream.resource<*>
 }