[flang-commits] [flang] [flang][NFC] Remove hardcoded attr name for fir.global op (PR #81347)
Valentin Clement バレンタイン クレメン via flang-commits
flang-commits at lists.llvm.org
Fri Feb 9 20:31:28 PST 2024
https://github.com/clementval created https://github.com/llvm/llvm-project/pull/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.
>From 2c0cfa882f35f6fb99aabe1f35e1f69fecc6fb6a Mon Sep 17 00:00:00 2001
From: Valentin Clement <clementval at gmail.com>
Date: Fri, 9 Feb 2024 12:04:16 -0800
Subject: [PATCH] [flang][NFC] Remove hardcoded attr name for fir.global op
---
.../include/flang/Optimizer/Dialect/FIROps.td | 11 --------
.../lib/Optimizer/Analysis/AliasAnalysis.cpp | 6 +++--
flang/lib/Optimizer/Dialect/FIROps.cpp | 27 +++++++++++--------
.../Optimizer/Transforms/ArrayValueCopy.cpp | 9 +++++--
4 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/flang/include/flang/Optimizer/Dialect/FIROps.td b/flang/include/flang/Optimizer/Dialect/FIROps.td
index d505fedd6e6415..1694848e073019 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