maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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
This commit is contained in:
Valentin Clement 2022-08-18 20:21:21 +02:00
parent b8709a9d03
commit b8535b5908
No known key found for this signature in database
GPG Key ID: 086D54783C928776
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flang/lib/Optimizer/CodeGen/TargetRewrite.cpp
View File

@ -475,6 +475,7 @@ public:
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 @@ public:
}
})
.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 @@ public:
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);

17
flang/test/Fir/target-rewrite-arg-position.fir Normal file
View File

@ -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}) {