[flang-commits] [flang] 7d9c38a - [flang][NFC] Remove hardcoded attr name for fir.global op (#81347)
via flang-commits
flang-commits at lists.llvm.org
Mon Feb 12 08:56:34 PST 2024
Author: Valentin Clement (バレンタイン クレメン)
Date: 2024-02-12T08:56:30-08:00
New Revision: 7d9c38a040d778338131fbbcc094aa412dc9306a
URL: https://github.com/llvm/llvm-project/commit/7d9c38a040d778338131fbbcc094aa412dc9306a
DIFF: https://github.com/llvm/llvm-project/commit/7d9c38a040d778338131fbbcc094aa412dc9306a.diff
LOG: [flang][NFC] Remove hardcoded attr name for fir.global op (#81347)
These hardcoded attribute name are a leftover from the upstreaming
period when there was no way to get the attribute name without an
instance of the operation. It is since possible to do without them and
they should be removed to avoid duplication.
This PR cleanup the fir.global op of these hardcoded attribute name and
use their generated getters. Some other PRs will follow to cleanup other
operations.
Added:
Modified:
flang/include/flang/Optimizer/Dialect/FIROps.td
flang/lib/Optimizer/Analysis/AliasAnalysis.cpp
flang/lib/Optimizer/Dialect/FIROps.cpp
flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp
Removed:
################################################################################
diff --git a/flang/include/flang/Optimizer/Dialect/FIROps.td b/flang/include/flang/Optimizer/Dialect/FIROps.td
index 9f198a4c9132ea..d1308df3fb962f 100644
--- a/flang/include/flang/Optimizer/Dialect/FIROps.td
+++ b/flang/include/flang/Optimizer/Dialect/FIROps.td
@@ -2769,17 +2769,6 @@ def fir_GlobalOp : fir_Op<"global", [IsolatedFromAbove, Symbol]> {
];
let extraClassDeclaration = [{
- static constexpr llvm::StringRef getSymbolAttrNameStr() { return "symref"; }
- static constexpr llvm::StringRef getConstantAttrNameStr() {
- return "constant";
- }
- static constexpr llvm::StringRef getLinkageAttrNameStr() {
- return "linkName";
- }
- static constexpr llvm::StringRef getTargetAttrNameStr() {
- return "target";
- }
-
/// The semantic type of the global
mlir::Type resultType();
diff --git a/flang/lib/Optimizer/Analysis/AliasAnalysis.cpp b/flang/lib/Optimizer/Analysis/AliasAnalysis.cpp
index ea2064e32a44df..e144640081cbf3 100644
--- a/flang/lib/Optimizer/Analysis/AliasAnalysis.cpp
+++ b/flang/lib/Optimizer/Analysis/AliasAnalysis.cpp
@@ -333,8 +333,10 @@ AliasAnalysis::Source AliasAnalysis::getSource(mlir::Value v) {
else
type = SourceKind::Global;
- if (fir::valueHasFirAttribute(v,
- fir::GlobalOp::getTargetAttrNameStr()))
+ auto globalOpName = mlir::OperationName(
+ fir::GlobalOp::getOperationName(), defOp->getContext());
+ if (fir::valueHasFirAttribute(
+ v, fir::GlobalOp::getTargetAttrName(globalOpName)))
attributes.set(Attribute::Target);
// TODO: Take followBoxAddr into account when setting the pointer
diff --git a/flang/lib/Optimizer/Dialect/FIROps.cpp b/flang/lib/Optimizer/Dialect/FIROps.cpp
index a5b31daa6440a2..447d56d822a3ee 100644
--- a/flang/lib/Optimizer/Dialect/FIROps.cpp
+++ b/flang/lib/Optimizer/Dialect/FIROps.cpp
@@ -1325,12 +1325,14 @@ mlir::ParseResult fir::GlobalOp::parse(mlir::OpAsmParser &parser,
if (fir::GlobalOp::verifyValidLinkage(linkage))
return mlir::failure();
mlir::StringAttr linkAttr = builder.getStringAttr(linkage);
- result.addAttribute(fir::GlobalOp::getLinkageAttrNameStr(), linkAttr);
+ result.addAttribute(fir::GlobalOp::getLinkNameAttrName(result.name),
+ linkAttr);
}
// Parse the name as a symbol reference attribute.
mlir::SymbolRefAttr nameAttr;
- if (parser.parseAttribute(nameAttr, fir::GlobalOp::getSymbolAttrNameStr(),
+ if (parser.parseAttribute(nameAttr,
+ fir::GlobalOp::getSymrefAttrName(result.name),
result.attributes))
return mlir::failure();
result.addAttribute(mlir::SymbolTable::getSymbolAttrName(),
@@ -1339,7 +1341,8 @@ mlir::ParseResult fir::GlobalOp::parse(mlir::OpAsmParser &parser,
bool simpleInitializer = false;
if (mlir::succeeded(parser.parseOptionalLParen())) {
mlir::Attribute attr;
- if (parser.parseAttribute(attr, "initVal", result.attributes) ||
+ if (parser.parseAttribute(attr, getInitValAttrName(result.name),
+ result.attributes) ||
parser.parseRParen())
return mlir::failure();
simpleInitializer = true;
@@ -1348,13 +1351,15 @@ mlir::ParseResult fir::GlobalOp::parse(mlir::OpAsmParser &parser,
if (parser.parseOptionalAttrDict(result.attributes))
return mlir::failure();
- if (succeeded(parser.parseOptionalKeyword(getConstantAttrNameStr()))) {
+ if (succeeded(
+ parser.parseOptionalKeyword(getConstantAttrName(result.name)))) {
// if "constant" keyword then mark this as a constant, not a variable
- result.addAttribute(getConstantAttrNameStr(), builder.getUnitAttr());
+ result.addAttribute(getConstantAttrName(result.name),
+ builder.getUnitAttr());
}
- if (succeeded(parser.parseOptionalKeyword(getTargetAttrNameStr())))
- result.addAttribute(getTargetAttrNameStr(), builder.getUnitAttr());
+ if (succeeded(parser.parseOptionalKeyword(getTargetAttrName(result.name))))
+ result.addAttribute(getTargetAttrName(result.name), builder.getUnitAttr());
mlir::Type globalType;
if (parser.parseColonType(globalType))
@@ -1389,9 +1394,9 @@ void fir::GlobalOp::print(mlir::OpAsmPrinter &p) {
getTargetAttrName(), getLinkNameAttrName(),
getInitValAttrName()});
if (getOperation()->getAttr(getConstantAttrName()))
- p << " " << getConstantAttrNameStr();
+ p << " " << getConstantAttrName().strref();
if (getOperation()->getAttr(getTargetAttrName()))
- p << " " << getTargetAttrNameStr();
+ p << " " << getTargetAttrName().strref();
p << " : ";
p.printType(getType());
if (hasInitializationBody()) {
@@ -1415,7 +1420,7 @@ void fir::GlobalOp::build(mlir::OpBuilder &builder,
result.addAttribute(getTypeAttrName(result.name), mlir::TypeAttr::get(type));
result.addAttribute(mlir::SymbolTable::getSymbolAttrName(),
builder.getStringAttr(name));
- result.addAttribute(getSymbolAttrNameStr(),
+ result.addAttribute(getSymrefAttrName(result.name),
mlir::SymbolRefAttr::get(builder.getContext(), name));
if (isConstant)
result.addAttribute(getConstantAttrName(result.name),
@@ -1425,7 +1430,7 @@ void fir::GlobalOp::build(mlir::OpBuilder &builder,
if (initialVal)
result.addAttribute(getInitValAttrName(result.name), initialVal);
if (linkage)
- result.addAttribute(getLinkageAttrNameStr(), linkage);
+ result.addAttribute(getLinkNameAttrName(result.name), linkage);
result.attributes.append(attrs.begin(), attrs.end());
}
diff --git a/flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp b/flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp
index 29717353da9638..675314ed9da038 100644
--- a/flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp
+++ b/flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp
@@ -573,6 +573,8 @@ static bool conflictOnLoad(llvm::ArrayRef<mlir::Operation *> reach,
for (auto *op : reach)
if (auto ld = mlir::dyn_cast<ArrayLoadOp>(op)) {
mlir::Type ldTy = ld.getMemref().getType();
+ auto globalOpName = mlir::OperationName(fir::GlobalOp::getOperationName(),
+ ld.getContext());
if (ld.getMemref() == addr) {
if (mutuallyExclusiveSliceRange(ld, st))
continue;
@@ -588,14 +590,17 @@ static bool conflictOnLoad(llvm::ArrayRef<mlir::Operation *> reach,
if (optimize && !hasPointerType(ldTy) &&
!valueMayHaveFirAttributes(
ld.getMemref(),
- {getTargetAttrName(), GlobalOp::getTargetAttrNameStr()}))
+ {getTargetAttrName(),
+ fir::GlobalOp::getTargetAttrName(globalOpName).strref()}))
continue;
return true;
} else if (hasPointerType(ldTy)) {
if (optimize && !storeHasPointerType &&
!valueMayHaveFirAttributes(
- addr, {getTargetAttrName(), GlobalOp::getTargetAttrNameStr()}))
+ addr,
+ {getTargetAttrName(),
+ fir::GlobalOp::getTargetAttrName(globalOpName).strref()}))
continue;
return true;
More information about the flang-commits
mailing list