[Mlir-commits] [mlir] 6bdf2cb - [mlir][NFC] Remove redundant insertion point changes (#161837)

[llvmlistbot at llvm.org]

Author: Markus Böck
Date: 2025-10-03T15:05:59+02:00
New Revision: 6bdf2cb2024e3a1f9596189f567b13665a19d1b1

URL: https://github.com/llvm/llvm-project/commit/6bdf2cb2024e3a1f9596189f567b13665a19d1b1
DIFF: https://github.com/llvm/llvm-project/commit/6bdf2cb2024e3a1f9596189f567b13665a19d1b1.diff

LOG: [mlir][NFC] Remove redundant insertion point changes (#161837)

These insertion points were added in
https://github.com/llvm/llvm-project/pull/146551 and
https://github.com/llvm/llvm-project/pull/146908 to support the one-shot
dialect conversion driver which performs changes to the IR immediately
and would otherwise invalidate previous insertion points.

Since then, the insertion point has been made resilient against op
erasure (https://github.com/llvm/llvm-project/pull/146955) making the
changes now redundant.

Added: 
    

Modified: 
    mlir/lib/Conversion/SPIRVToLLVM/ConvertLaunchFuncToLLVMCalls.cpp
    mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamed.cpp

Removed: 
    


################################################################################
diff  --git a/mlir/lib/Conversion/SPIRVToLLVM/ConvertLaunchFuncToLLVMCalls.cpp b/mlir/lib/Conversion/SPIRVToLLVM/ConvertLaunchFuncToLLVMCalls.cpp
index 035f197b1eac2..399ccf3925f3a 100644
--- a/mlir/lib/Conversion/SPIRVToLLVM/ConvertLaunchFuncToLLVMCalls.cpp
+++ b/mlir/lib/Conversion/SPIRVToLLVM/ConvertLaunchFuncToLLVMCalls.cpp
@@ -267,9 +267,8 @@ class GPULaunchLowering : public ConvertOpToLLVMPattern<gpu::LaunchFuncOp> {
       copyInfo.push_back(info);
     }
     // Create a call to the kernel and copy the data back.
-    Operation *callOp = rewriter.replaceOpWithNewOp<LLVM::CallOp>(
-        op, kernelFunc, ArrayRef<Value>());
-    rewriter.setInsertionPointAfter(callOp);
+    rewriter.replaceOpWithNewOp<LLVM::CallOp>(op, kernelFunc,
+                                              ArrayRef<Value>());
     for (CopyInfo info : copyInfo)
       copy(loc, info.src, info.dst, info.size, rewriter);
     return success();

diff  --git a/mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamed.cpp b/mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamed.cpp
index 6f288495516f7..0cb0badacf69d 100644
--- a/mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamed.cpp
+++ b/mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamed.cpp
@@ -802,7 +802,6 @@ class MaxPool2dConverter : public OpConversionPattern<tosa::MaxPool2dOp> {
         ValueRange{paddedInput, fakeWindowDims}, filledEmptyTensor, strideAttr,
         dilationAttr);
 
-    rewriter.setInsertionPointAfter(op);
     NanPropagationMode nanMode = op.getNanMode();
     rewriter.replaceOp(op, resultOp);