experiement

Author: matthias-springer

flang/lib/Optimizer/CodeGen/CodeGen.cpp

@@ -2153,6 +2153,9 @@ struct InsertValueOpConversion
   matchAndRewrite(fir::InsertValueOp insertVal, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
+    llvm::errs() << "InsertValueOpConversion: " << insertVal << "\n";
+    llvm::errs() << " -- operand 0: " << operands[0] << "\n";
+    llvm::errs() << " -- operand 1: " << operands[1] << "\n";
     auto indices = collectIndices(rewriter, insertVal.getCoor());
     toRowMajor(indices, operands[0].getType());
     rewriter.replaceOpWithNewOp<mlir::LLVM::InsertValueOp>(
@@ -3877,8 +3880,8 @@ void fir::populateFIRToLLVMConversionPatterns(
 
   // Patterns that are populated without a type converter do not trigger
   // target materializations for the operands of the root op.
-  patterns.insert<InsertValueOpConversion>(
-      converter, patterns.getContext());
-  patterns.insert<HasValueOpConversion>(
+  //patterns.insert<InsertValueOpConversion>(
+  //    converter, patterns.getContext());
+  patterns.insert<HasValueOpConversion, InsertValueOpConversion>(
      patterns.getContext());
 }

mlir/lib/Transforms/Utils/DialectConversion.cpp

@@ -1318,9 +1318,13 @@ Block *ConversionPatternRewriterImpl::applySignatureConversion(
     // used as a replacement.
     auto replArgs =
         newBlock->getArguments().slice(inputMap->inputNo, inputMap->size);
-    insertNTo1Materialization(
-        OpBuilder::InsertPoint(newBlock, newBlock->begin()), origArg.getLoc(),
-        /*replacements=*/replArgs, /*outputValue=*/origArg, converter);
+    if (replArgs.size() == 1) {
+      mapping.map(origArg, replArgs.front());
+    } else {
+      insertNTo1Materialization(
+          OpBuilder::InsertPoint(newBlock, newBlock->begin()), origArg.getLoc(),
+          /*replacements=*/replArgs, /*outputValue=*/origArg, converter);
+    }
     appendRewrite<ReplaceBlockArgRewrite>(block, origArg, converter);
   }