Skip to content

Commit 7ff4887

Browse files
clementvalclementval
authored
[flang][cuda][NFC] Rename CUDAAttribute to CUDADataAttribute (#81323)
The newly introduced `CUDAAttribute` is meant for CUDA attributes associated with variable. In order to not clash with the future attribute for function/subroutine, rename `CUDAAttribute` to `CUDADataAttribute`.
1 parent c7a0db1 commit 7ff4887

File tree

15 files changed

+48
-46
lines changed

15 files changed

+48
-46
lines changed

‎flang/include/flang/Lower/ConvertVariable.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ translateSymbolAttributes(mlir::MLIRContext *mlirContext,
139139

140140
/// Translate the CUDA Fortran attributes of \p sym into the FIR CUDA attribute
141141
/// representation.
142-
fir::CUDAAttributeAttr
143-
translateSymbolCUDAAttribute(mlir::MLIRContext *mlirContext,
144-
const Fortran::semantics::Symbol &sym);
142+
fir::CUDADataAttributeAttr
143+
translateSymbolCUDADataAttribute(mlir::MLIRContext *mlirContext,
144+
const Fortran::semantics::Symbol &sym);
145145

146146
/// Map a symbol to a given fir::ExtendedValue. This will generate an
147147
/// hlfir.declare when lowering to HLFIR and map the hlfir.declare result to the

‎flang/include/flang/Optimizer/Builder/FIRBuilder.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,13 @@ class FirOpBuilder : public mlir::OpBuilder, public mlir::OpBuilder::Listener {
231231
mlir::StringAttr linkage = {},
232232
mlir::Attribute value = {}, bool isConst = false,
233233
bool isTarget = false,
234-
fir::CUDAAttributeAttr cudaAttr = {});
234+
fir::CUDADataAttributeAttr cudaAttr = {});
235235

236236
fir::GlobalOp createGlobal(mlir::Location loc, mlir::Type type,
237237
llvm::StringRef name, bool isConst, bool isTarget,
238238
std::function<void(FirOpBuilder &)> bodyBuilder,
239239
mlir::StringAttr linkage = {},
240-
fir::CUDAAttributeAttr cudaAttr = {});
240+
fir::CUDADataAttributeAttr cudaAttr = {});
241241

242242
/// Create a global constant (read-only) value.
243243
fir::GlobalOp createGlobalConstant(mlir::Location loc, mlir::Type type,

‎flang/include/flang/Optimizer/Builder/HLFIRTools.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ fir::FortranVariableOpInterface
237237
genDeclare(mlir::Location loc, fir::FirOpBuilder &builder,
238238
const fir::ExtendedValue &exv, llvm::StringRef name,
239239
fir::FortranVariableFlagsAttr flags,
240-
fir::CUDAAttributeAttr cudaAttr = {});
240+
fir::CUDADataAttributeAttr cudaAttr = {});
241241

242242
/// Generate an hlfir.associate to build a variable from an expression value.
243243
/// The type of the variable must be provided so that scalar logicals are

‎flang/include/flang/Optimizer/Dialect/FIRAttr.td

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,17 @@ def CUDAshared : I32EnumAttrCase<"Shared", 4, "shared">;
6666
def CUDAunified : I32EnumAttrCase<"Unified", 5, "unified">;
6767
// Texture is omitted since it is obsolete and rejected by semantic.
6868

69-
def fir_CUDAAttribute : I32EnumAttr<
70-
"CUDAAttribute",
69+
def fir_CUDADataAttribute : I32EnumAttr<
70+
"CUDADataAttribute",
7171
"CUDA Fortran variable attributes",
7272
[CUDAconstant, CUDAdevice, CUDAmanaged, CUDApinned, CUDAshared,
7373
CUDAunified]> {
7474
let genSpecializedAttr = 0;
7575
let cppNamespace = "::fir";
7676
}
7777

78-
def fir_CUDAAttributeAttr : EnumAttr<fir_Dialect, fir_CUDAAttribute, "cuda"> {
78+
def fir_CUDADataAttributeAttr :
79+
EnumAttr<fir_Dialect, fir_CUDADataAttribute, "cuda"> {
7980
let assemblyFormat = [{ ```<` $value `>` }];
8081
}
8182

‎flang/include/flang/Optimizer/Dialect/FIROps.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2738,7 +2738,7 @@ def fir_GlobalOp : fir_Op<"global", [IsolatedFromAbove, Symbol]> {
27382738
OptionalAttr<UnitAttr>:$constant,
27392739
OptionalAttr<UnitAttr>:$target,
27402740
OptionalAttr<StrAttr>:$linkName,
2741-
OptionalAttr<fir_CUDAAttributeAttr>:$cuda_attr
2741+
OptionalAttr<fir_CUDADataAttributeAttr>:$cuda_attr
27422742
);
27432743

27442744
let regions = (region AtMostRegion<1>:$region);
@@ -3029,7 +3029,7 @@ def fir_DeclareOp : fir_Op<"declare", [AttrSizedOperandSegments,
30293029
Variadic<AnyIntegerType>:$typeparams,
30303030
Builtin_StringAttr:$uniq_name,
30313031
OptionalAttr<fir_FortranVariableFlagsAttr>:$fortran_attrs,
3032-
OptionalAttr<fir_CUDAAttributeAttr>:$cuda_attr
3032+
OptionalAttr<fir_CUDADataAttributeAttr>:$cuda_attr
30333033
);
30343034

30353035
let results = (outs AnyRefOrBox);

‎flang/include/flang/Optimizer/HLFIR/HLFIROps.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def hlfir_DeclareOp : hlfir_Op<"declare", [AttrSizedOperandSegments,
8989
Variadic<AnyIntegerType>:$typeparams,
9090
Builtin_StringAttr:$uniq_name,
9191
OptionalAttr<fir_FortranVariableFlagsAttr>:$fortran_attrs,
92-
OptionalAttr<fir_CUDAAttributeAttr>:$cuda_attr
92+
OptionalAttr<fir_CUDADataAttributeAttr>:$cuda_attr
9393
);
9494

9595
let results = (outs AnyFortranVariable, AnyRefOrBoxLike);
@@ -103,7 +103,7 @@ def hlfir_DeclareOp : hlfir_Op<"declare", [AttrSizedOperandSegments,
103103
OpBuilder<(ins "mlir::Value":$memref, "llvm::StringRef":$uniq_name,
104104
CArg<"mlir::Value", "{}">:$shape, CArg<"mlir::ValueRange", "{}">:$typeparams,
105105
CArg<"fir::FortranVariableFlagsAttr", "{}">:$fortran_attrs,
106-
CArg<"fir::CUDAAttributeAttr", "{}">:$cuda_attr)>];
106+
CArg<"fir::CUDADataAttributeAttr", "{}">:$cuda_attr)>];
107107

108108
let extraClassDeclaration = [{
109109
/// Get the variable original base (same as input). It lacks

‎flang/include/flang/Optimizer/Support/Utils.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -273,32 +273,32 @@ inline void genMinMaxlocReductionLoop(
273273
builder.setInsertionPointAfter(ifMaskTrueOp);
274274
}
275275

276-
inline fir::CUDAAttributeAttr
277-
getCUDAAttribute(mlir::MLIRContext *mlirContext,
278-
std::optional<Fortran::common::CUDADataAttr> cudaAttr) {
276+
inline fir::CUDADataAttributeAttr
277+
getCUDADataAttribute(mlir::MLIRContext *mlirContext,
278+
std::optional<Fortran::common::CUDADataAttr> cudaAttr) {
279279
if (cudaAttr) {
280-
fir::CUDAAttribute attr;
280+
fir::CUDADataAttribute attr;
281281
switch (*cudaAttr) {
282282
case Fortran::common::CUDADataAttr::Constant:
283-
attr = fir::CUDAAttribute::Constant;
283+
attr = fir::CUDADataAttribute::Constant;
284284
break;
285285
case Fortran::common::CUDADataAttr::Device:
286-
attr = fir::CUDAAttribute::Device;
286+
attr = fir::CUDADataAttribute::Device;
287287
break;
288288
case Fortran::common::CUDADataAttr::Managed:
289-
attr = fir::CUDAAttribute::Managed;
289+
attr = fir::CUDADataAttribute::Managed;
290290
break;
291291
case Fortran::common::CUDADataAttr::Pinned:
292-
attr = fir::CUDAAttribute::Pinned;
292+
attr = fir::CUDADataAttribute::Pinned;
293293
break;
294294
case Fortran::common::CUDADataAttr::Shared:
295-
attr = fir::CUDAAttribute::Shared;
295+
attr = fir::CUDADataAttribute::Shared;
296296
break;
297297
case Fortran::common::CUDADataAttr::Texture:
298298
// Obsolete attribute
299299
return {};
300300
}
301-
return fir::CUDAAttributeAttr::get(mlirContext, attr);
301+
return fir::CUDADataAttributeAttr::get(mlirContext, attr);
302302
}
303303
return {};
304304
}

‎flang/lib/Lower/CallInterface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,7 @@ class Fortran::lower::CallInterfaceImpl {
972972
if (obj.cudaDataAttr)
973973
attrs.emplace_back(
974974
mlir::StringAttr::get(&mlirContext, fir::getCUDAAttrName()),
975-
fir::getCUDAAttribute(&mlirContext, obj.cudaDataAttr));
975+
fir::getCUDADataAttribute(&mlirContext, obj.cudaDataAttr));
976976

977977
// TODO: intents that require special care (e.g finalization)
978978

‎flang/lib/Lower/ConvertVariable.cpp

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ static fir::GlobalOp defineGlobal(Fortran::lower::AbstractConverter &converter,
139139
const Fortran::lower::pft::Variable &var,
140140
llvm::StringRef globalName,
141141
mlir::StringAttr linkage,
142-
fir::CUDAAttributeAttr cudaAttr = {});
142+
fir::CUDADataAttributeAttr cudaAttr = {});
143143

144144
static mlir::Location genLocation(Fortran::lower::AbstractConverter &converter,
145145
const Fortran::semantics::Symbol &sym) {
@@ -464,7 +464,7 @@ static fir::GlobalOp defineGlobal(Fortran::lower::AbstractConverter &converter,
464464
const Fortran::lower::pft::Variable &var,
465465
llvm::StringRef globalName,
466466
mlir::StringAttr linkage,
467-
fir::CUDAAttributeAttr cudaAttr) {
467+
fir::CUDADataAttributeAttr cudaAttr) {
468468
fir::FirOpBuilder &builder = converter.getFirOpBuilder();
469469
const Fortran::semantics::Symbol &sym = var.getSymbol();
470470
mlir::Location loc = genLocation(converter, sym);
@@ -1583,11 +1583,11 @@ fir::FortranVariableFlagsAttr Fortran::lower::translateSymbolAttributes(
15831583
return fir::FortranVariableFlagsAttr::get(mlirContext, flags);
15841584
}
15851585

1586-
fir::CUDAAttributeAttr Fortran::lower::translateSymbolCUDAAttribute(
1586+
fir::CUDADataAttributeAttr Fortran::lower::translateSymbolCUDADataAttribute(
15871587
mlir::MLIRContext *mlirContext, const Fortran::semantics::Symbol &sym) {
15881588
std::optional<Fortran::common::CUDADataAttr> cudaAttr =
15891589
Fortran::semantics::GetCUDADataAttr(&sym);
1590-
return fir::getCUDAAttribute(mlirContext, cudaAttr);
1590+
return fir::getCUDADataAttribute(mlirContext, cudaAttr);
15911591
}
15921592

15931593
/// Map a symbol to its FIR address and evaluated specification expressions.
@@ -1629,8 +1629,9 @@ static void genDeclareSymbol(Fortran::lower::AbstractConverter &converter,
16291629
auto name = converter.mangleName(sym);
16301630
fir::FortranVariableFlagsAttr attributes =
16311631
Fortran::lower::translateSymbolAttributes(builder.getContext(), sym);
1632-
fir::CUDAAttributeAttr cudaAttr =
1633-
Fortran::lower::translateSymbolCUDAAttribute(builder.getContext(), sym);
1632+
fir::CUDADataAttributeAttr cudaAttr =
1633+
Fortran::lower::translateSymbolCUDADataAttribute(builder.getContext(),
1634+
sym);
16341635

16351636
if (isCrayPointee) {
16361637
mlir::Type baseType =
@@ -1722,9 +1723,9 @@ void Fortran::lower::genDeclareSymbol(
17221723
fir::FortranVariableFlagsAttr attributes =
17231724
Fortran::lower::translateSymbolAttributes(
17241725
builder.getContext(), sym.GetUltimate(), extraFlags);
1725-
fir::CUDAAttributeAttr cudaAttr =
1726-
Fortran::lower::translateSymbolCUDAAttribute(builder.getContext(),
1727-
sym.GetUltimate());
1726+
fir::CUDADataAttributeAttr cudaAttr =
1727+
Fortran::lower::translateSymbolCUDADataAttribute(builder.getContext(),
1728+
sym.GetUltimate());
17281729
auto name = converter.mangleName(sym);
17291730
hlfir::EntityWithAttributes declare =
17301731
hlfir::genDeclare(loc, builder, exv, name, attributes, cudaAttr);
@@ -2222,8 +2223,8 @@ void Fortran::lower::defineModuleVariable(
22222223
// Do nothing. Mapping will be done on user side.
22232224
} else {
22242225
std::string globalName = converter.mangleName(sym);
2225-
fir::CUDAAttributeAttr cudaAttr =
2226-
Fortran::lower::translateSymbolCUDAAttribute(
2226+
fir::CUDADataAttributeAttr cudaAttr =
2227+
Fortran::lower::translateSymbolCUDADataAttribute(
22272228
converter.getFirOpBuilder().getContext(), sym);
22282229
defineGlobal(converter, var, globalName, linkage, cudaAttr);
22292230
}

‎flang/lib/Optimizer/Builder/FIRBuilder.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ mlir::Value fir::FirOpBuilder::createHeapTemporary(
274274
fir::GlobalOp fir::FirOpBuilder::createGlobal(
275275
mlir::Location loc, mlir::Type type, llvm::StringRef name,
276276
mlir::StringAttr linkage, mlir::Attribute value, bool isConst,
277-
bool isTarget, fir::CUDAAttributeAttr cudaAttr) {
277+
bool isTarget, fir::CUDADataAttributeAttr cudaAttr) {
278278
auto module = getModule();
279279
auto insertPt = saveInsertionPoint();
280280
if (auto glob = module.lookupSymbol<fir::GlobalOp>(name))
@@ -296,7 +296,7 @@ fir::GlobalOp fir::FirOpBuilder::createGlobal(
296296
fir::GlobalOp fir::FirOpBuilder::createGlobal(
297297
mlir::Location loc, mlir::Type type, llvm::StringRef name, bool isConst,
298298
bool isTarget, std::function<void(FirOpBuilder &)> bodyBuilder,
299-
mlir::StringAttr linkage, fir::CUDAAttributeAttr cudaAttr) {
299+
mlir::StringAttr linkage, fir::CUDADataAttributeAttr cudaAttr) {
300300
auto module = getModule();
301301
auto insertPt = saveInsertionPoint();
302302
if (auto glob = module.lookupSymbol<fir::GlobalOp>(name))

‎flang/lib/Optimizer/Builder/HLFIRTools.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ fir::FortranVariableOpInterface
199199
hlfir::genDeclare(mlir::Location loc, fir::FirOpBuilder &builder,
200200
const fir::ExtendedValue &exv, llvm::StringRef name,
201201
fir::FortranVariableFlagsAttr flags,
202-
fir::CUDAAttributeAttr cudaAttr) {
202+
fir::CUDADataAttributeAttr cudaAttr) {
203203

204204
mlir::Value base = fir::getBase(exv);
205205
assert(fir::conformsWithPassByRef(base.getType()) &&

‎flang/lib/Optimizer/Dialect/FIRAttr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,5 +298,5 @@ void fir::printFirAttribute(FIROpsDialect *dialect, mlir::Attribute attr,
298298
void FIROpsDialect::registerAttributes() {
299299
addAttributes<ClosedIntervalAttr, ExactTypeAttr, FortranVariableFlagsAttr,
300300
LowerBoundAttr, PointIntervalAttr, RealAttr, SubclassAttr,
301-
UpperBoundAttr, CUDAAttributeAttr>();
301+
UpperBoundAttr, CUDADataAttributeAttr>();
302302
}

‎flang/lib/Optimizer/HLFIR/IR/HLFIROps.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ void hlfir::DeclareOp::build(mlir::OpBuilder &builder,
124124
llvm::StringRef uniq_name, mlir::Value shape,
125125
mlir::ValueRange typeparams,
126126
fir::FortranVariableFlagsAttr fortran_attrs,
127-
fir::CUDAAttributeAttr cuda_attr) {
127+
fir::CUDADataAttributeAttr cuda_attr) {
128128
auto nameAttr = builder.getStringAttr(uniq_name);
129129
mlir::Type inputType = memref.getType();
130130
bool hasExplicitLbs = hasExplicitLowerBounds(shape);

‎flang/lib/Optimizer/HLFIR/Transforms/ConvertToFIR.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,12 +320,12 @@ class DeclareOpConversion : public mlir::OpRewritePattern<hlfir::DeclareOp> {
320320
mlir::Location loc = declareOp->getLoc();
321321
mlir::Value memref = declareOp.getMemref();
322322
fir::FortranVariableFlagsAttr fortranAttrs;
323-
fir::CUDAAttributeAttr cudaAttr;
323+
fir::CUDADataAttributeAttr cudaAttr;
324324
if (auto attrs = declareOp.getFortranAttrs())
325325
fortranAttrs =
326326
fir::FortranVariableFlagsAttr::get(rewriter.getContext(), *attrs);
327327
if (auto attr = declareOp.getCudaAttr())
328-
cudaAttr = fir::CUDAAttributeAttr::get(rewriter.getContext(), *attr);
328+
cudaAttr = fir::CUDADataAttributeAttr::get(rewriter.getContext(), *attr);
329329
auto firDeclareOp = rewriter.create<fir::DeclareOp>(
330330
loc, memref.getType(), memref, declareOp.getShape(),
331331
declareOp.getTypeparams(), declareOp.getUniqName(), fortranAttrs,

‎flang/unittests/Optimizer/FortranVariableTest.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ TEST_F(FortranVariableTest, SimpleScalar) {
5050
auto declare = builder->create<fir::DeclareOp>(loc, addr.getType(), addr,
5151
/*shape=*/mlir::Value{}, /*typeParams=*/std::nullopt, name,
5252
/*fortran_attrs=*/fir::FortranVariableFlagsAttr{},
53-
/*cuda_attr=*/fir::CUDAAttributeAttr{});
53+
/*cuda_attr=*/fir::CUDADataAttributeAttr{});
5454

5555
fir::FortranVariableOpInterface fortranVariable = declare;
5656
EXPECT_FALSE(fortranVariable.isArray());
@@ -76,7 +76,7 @@ TEST_F(FortranVariableTest, CharacterScalar) {
7676
auto declare = builder->create<fir::DeclareOp>(loc, addr.getType(), addr,
7777
/*shape=*/mlir::Value{}, typeParams, name,
7878
/*fortran_attrs=*/fir::FortranVariableFlagsAttr{},
79-
/*cuda_attr=*/fir::CUDAAttributeAttr{});
79+
/*cuda_attr=*/fir::CUDADataAttributeAttr{});
8080

8181
fir::FortranVariableOpInterface fortranVariable = declare;
8282
EXPECT_FALSE(fortranVariable.isArray());
@@ -107,7 +107,7 @@ TEST_F(FortranVariableTest, SimpleArray) {
107107
auto declare = builder->create<fir::DeclareOp>(loc, addr.getType(), addr,
108108
shape, /*typeParams*/ std::nullopt, name,
109109
/*fortran_attrs=*/fir::FortranVariableFlagsAttr{},
110-
/*cuda_attr=*/fir::CUDAAttributeAttr{});
110+
/*cuda_attr=*/fir::CUDADataAttributeAttr{});
111111

112112
fir::FortranVariableOpInterface fortranVariable = declare;
113113
EXPECT_TRUE(fortranVariable.isArray());
@@ -138,7 +138,7 @@ TEST_F(FortranVariableTest, CharacterArray) {
138138
auto declare = builder->create<fir::DeclareOp>(loc, addr.getType(), addr,
139139
shape, typeParams, name,
140140
/*fortran_attrs=*/fir::FortranVariableFlagsAttr{},
141-
/*cuda_attr=*/fir::CUDAAttributeAttr{});
141+
/*cuda_attr=*/fir::CUDADataAttributeAttr{});
142142

143143
fir::FortranVariableOpInterface fortranVariable = declare;
144144
EXPECT_TRUE(fortranVariable.isArray());

0 commit comments

Comments
 (0)