[flang-commits] [flang] b8535b5 - [flang] Set attribute at the correct position

[Valentin Clement via flang-commits]

Author: Valentin Clement
Date: 2022-08-18T20:21:41+02:00
New Revision: b8535b5908ecde5a10f1e0e592bc9e6ed5b02a56

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

LOG: [flang] Set attribute at the correct position

The TargetRewrite pass can change the number of argument of a function.
An extra llvm.nest attribute is added and was not set at the correct position
if an extra argument was inserted before.

Reviewed By: PeteSteinfeld

Differential Revision: https://reviews.llvm.org/D132113

Added: 
    flang/test/Fir/target-rewrite-arg-position.fir

Modified: 
    flang/lib/Optimizer/CodeGen/TargetRewrite.cpp

Removed: 
    


################################################################################
diff  --git a/flang/lib/Optimizer/CodeGen/TargetRewrite.cpp b/flang/lib/Optimizer/CodeGen/TargetRewrite.cpp
index 30df227478912..d87701dc51df2 100644
--- a/flang/lib/Optimizer/CodeGen/TargetRewrite.cpp
+++ b/flang/lib/Optimizer/CodeGen/TargetRewrite.cpp
@@ -475,6 +475,7 @@ class TargetRewrite : public fir::TargetRewriteBase<TargetRewrite> {
       return;
     llvm::SmallVector<mlir::Type> newResTys;
     llvm::SmallVector<mlir::Type> newInTys;
+    llvm::SmallVector<std::pair<unsigned, mlir::NamedAttribute>> extraAttrs;
     llvm::SmallVector<FixupTy> fixups;
 
     // Convert return value(s)
@@ -552,9 +553,12 @@ class TargetRewrite : public fir::TargetRewriteBase<TargetRewrite> {
             }
           })
           .Default([&](mlir::Type ty) { newInTys.push_back(ty); });
+
       if (func.getArgAttrOfType<mlir::UnitAttr>(index,
                                                 fir::getHostAssocAttrName())) {
-        func.setArgAttr(index, "llvm.nest", rewriter->getUnitAttr());
+        extraAttrs.push_back(
+            {newInTys.size() - 1,
+             rewriter->getNamedAttr("llvm.nest", rewriter->getUnitAttr())});
       }
     }
 
@@ -716,6 +720,10 @@ class TargetRewrite : public fir::TargetRewriteBase<TargetRewrite> {
     LLVM_DEBUG(llvm::dbgs() << "new func: " << newFuncTy << '\n');
     func.setType(newFuncTy);
 
+    for (std::pair<unsigned, mlir::NamedAttribute> extraAttr : extraAttrs)
+      func.setArgAttr(extraAttr.first, extraAttr.second.getName(),
+                      extraAttr.second.getValue());
+
     for (auto &fixup : fixups)
       if (fixup.finalizer)
         (*fixup.finalizer)(func);

diff  --git a/flang/test/Fir/target-rewrite-arg-position.fir b/flang/test/Fir/target-rewrite-arg-position.fir
new file mode 100644
index 0000000000000..1b01e73173ddf
--- /dev/null
+++ b/flang/test/Fir/target-rewrite-arg-position.fir
@@ -0,0 +1,17 @@
+// RUN: fir-opt --target-rewrite="target=x86_64-unknown-linux-gnu" %s | FileCheck %s
+
+func.func @_QFPf(%arg0: !fir.ref<tuple<!fir.ref<i32>>> {fir.host_assoc}) -> !fir.complex<16> {
+  %0 = fir.alloca !fir.complex<16> {bindc_name = "f", uniq_name = "_QFfEf"}
+  %c2_i32 = arith.constant 2 : i32
+  %1 = fir.convert %c2_i32 : (i32) -> f128
+  %cst = arith.constant 0.000000e+00 : f128
+  %2 = fir.undefined !fir.complex<16>
+  %3 = fir.insert_value %2, %1, [0 : index] : (!fir.complex<16>, f128) -> !fir.complex<16>
+  %4 = fir.insert_value %3, %cst, [1 : index] : (!fir.complex<16>, f128) -> !fir.complex<16>
+  fir.store %4 to %0 : !fir.ref<!fir.complex<16>>
+  %5 = fir.load %0 : !fir.ref<!fir.complex<16>>
+  return %5 : !fir.complex<16>
+}
+
+// CHECK-LABEL: func.func @_QFPf
+// CHECK-SAME:    %{{.*}}: !fir.ref<tuple<!fir.real<16>, !fir.real<16>>> {fir.host_assoc, llvm.align = 16 : i32, llvm.sret}, %arg1: !fir.ref<tuple<!fir.ref<i32>>> {llvm.nest}) {