Update LLVM to llvm/llvm-project@b135922 (llvm/llvm-project#85376).

Changes in C++ mostly handle changes done in llvm/llvm-project@4b56345 that combines SCFTilingResult and SCFReductionTilingResult.

This PR also carries the following reverts

- llvm/llvm-project#119671
- llvm/llvm-project#119970

The first one is a from the previous integrate. The last one is a new error being tracked in iree-org#19498.

Signed-off-by: Stanley Winata <stanley.winata@amd.com>

compiler/src/iree/compiler/Codegen/Common/CPU/CPUPrepareUkernels.cpp

@@ -75,7 +75,7 @@ static void tileNonPackedDimsFor3DPackOps(RewriterBase &rewriter,
     FailureOr<scf::SCFTilingResult> tilingResult =
         scf::tileUsingSCF(rewriter, tilingInterfaceOp, options);
     assert(succeeded(tilingResult));
-    rewriter.replaceOp(packOp, tilingResult->replacements);
+    rewriter.replaceOp(packOp, tilingResult->mergeResult.replacements);
   });
 }
 
@@ -110,7 +110,7 @@ static void tileNonPackedDimsFor5DPUnpackOps(RewriterBase &rewriter,
     FailureOr<scf::SCFTilingResult> tilingResult =
         scf::tileUsingSCF(rewriter, tilingInterfaceOp, options);
     assert(succeeded(tilingResult));
-    rewriter.replaceOp(unpackOp, tilingResult->replacements);
+    rewriter.replaceOp(unpackOp, tilingResult->mergeResult.replacements);
   });
 }
 

compiler/src/iree/compiler/Codegen/Common/DecomposePackUnPackOps.cpp

@@ -200,7 +200,7 @@ static LogicalResult commonRunOnOperation(
             unpackTilingOptions);
         if (failed(tilingResult))
           return WalkResult::interrupt();
-        rewriter.replaceOp(op, tilingResult->replacements);
+        rewriter.replaceOp(op, tilingResult->mergeResult.replacements);
         return WalkResult::advance();
       });
       if (status.wasInterrupted()) {

compiler/src/iree/compiler/Codegen/Common/GPU/GPUTensorTile.cpp

@@ -90,7 +90,7 @@ class TileConsumerAndFuseInputProducer final
     }
 
     // Replace the tiled op with replacements.
-    rewriter.replaceOp(op, tilingResult->replacements);
+    rewriter.replaceOp(op, tilingResult->mergeResult.replacements);
     filter.replaceLinalgTransformationFilter(rewriter,
                                              tilingResult->tiledOps.front());
 
@@ -292,7 +292,7 @@ static LogicalResult tileParallelDims(mlir::FunctionOpInterface funcOp,
     if (failed(tilingResult)) {
       return tilingOp->emitOpError("failed to tile to scf.forall");
     }
-    rewriter.replaceOp(tilingOp, tilingResult->replacements);
+    rewriter.replaceOp(tilingOp, tilingResult->mergeResult.replacements);
   }
   return success();
 }

compiler/src/iree/compiler/Codegen/Common/GPU/GPUTileReduction.cpp

@@ -38,7 +38,7 @@ static LogicalResult tileReduction(linalg::LinalgOp op) {
     sizes.push_back(rewriter.getIndexAttr(size));
   }
   rewriter.setInsertionPoint(op);
-  FailureOr<scf::SCFReductionTilingResult> results = scf::tileReductionUsingScf(
+  FailureOr<scf::SCFTilingResult> results = scf::tileReductionUsingScf(
       rewriter, cast<PartialReductionOpInterface>(op.getOperation()), sizes);
   if (failed(results))
     return failure();

compiler/src/iree/compiler/Codegen/LLVMCPU/LLVMCPU2DScalableTo1DScalable.cpp

@@ -161,7 +161,7 @@ dropScalabilityFromUnsupportedOperations(mlir::FunctionOpInterface funcOp,
         setLoweringConfig(newOp, newLoweringConfig);
     }
 
-    rewriter.replaceOp(tilingOp, tilingResult->replacements);
+    rewriter.replaceOp(tilingOp, tilingResult->mergeResult.replacements);
   }
   return success();
 }

compiler/src/iree/compiler/Codegen/LLVMCPU/LLVMCPUSplitReduction.cpp

@@ -132,7 +132,7 @@ LogicalResult splitReductionImpl(Operation *op, int64_t size,
     LLVM_DEBUG(llvm::dbgs() << "failed on step 1 (SCFTiling)\n");
     return failure();
   }
-  rewriter.replaceOp(linalgOp, tileResFirst->replacements);
+  rewriter.replaceOp(linalgOp, tileResFirst->mergeResult.replacements);
 
   // 2) Apply splitReduction on the single vector-length array.
   // splitReduction already replaces the op.
@@ -159,7 +159,8 @@ LogicalResult splitReductionImpl(Operation *op, int64_t size,
     LLVM_DEBUG(llvm::dbgs() << "failed on step 3 (SCFTiling)\n");
     return failure();
   }
-  rewriter.replaceOp(splitRes->splitLinalgOp, tileRes->replacements);
+  rewriter.replaceOp(splitRes->splitLinalgOp,
+                     tileRes->mergeResult.replacements);
   return success();
 }
 

compiler/src/iree/compiler/Codegen/LLVMCPU/LLVMCPUTile.cpp

@@ -101,7 +101,7 @@ void LLVMCPUTilePass::runOnOperation() {
         scf::tileUsingSCF(rewriter, op, options);
     if (failed(tiledResults))
       continue;
-    rewriter.replaceOp(op, tiledResults->replacements);
+    rewriter.replaceOp(op, tiledResults->mergeResult.replacements);
   }
 
   RewritePatternSet patterns =

compiler/src/iree/compiler/Codegen/Transforms/Transforms.cpp

@@ -1256,7 +1256,7 @@ LogicalResult tileLinalgOpsWithFilter(mlir::FunctionOpInterface funcOp,
     for (auto tiledOp : tiledResults->tiledOps) {
       filter.replaceLinalgTransformationFilter(rewriter, tiledOp);
     }
-    rewriter.replaceOp(op, tiledResults->replacements);
+    rewriter.replaceOp(op, tiledResults->mergeResult.replacements);
   }
 
   return success();