Skip to content

Commit 99ae675

Browse files
authored
[NFC][OpenMP] Move the default declare mapper name suffix to OMPConstants.h (#141964)
This patch moves the default declare mapper name suffix ".omp.default.mapper" to the OMPConstants.h file to be used everywhere for lowering.
1 parent 73d6a48 commit 99ae675

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

flang/lib/Lower/OpenMP/ClauseProcessor.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,8 @@ void ClauseProcessor::processMapObjects(
11561156
typeSpec = &object.sym()->GetType()->derivedTypeSpec();
11571157

11581158
if (typeSpec) {
1159-
mapperIdName = typeSpec->name().ToString() + ".omp.default.mapper";
1159+
mapperIdName =
1160+
typeSpec->name().ToString() + llvm::omp::OmpDefaultMapperName;
11601161
if (auto *sym = converter.getCurrentScope().FindSymbol(mapperIdName))
11611162
mapperIdName = converter.mangleName(mapperIdName, sym->owner());
11621163
}

flang/lib/Lower/OpenMP/OpenMP.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2424,7 +2424,7 @@ genTargetOp(lower::AbstractConverter &converter, lower::SymMap &symTable,
24242424
if (sym.GetType()->category() == semantics::DeclTypeSpec::TypeDerived) {
24252425
auto &typeSpec = sym.GetType()->derivedTypeSpec();
24262426
std::string mapperIdName =
2427-
typeSpec.name().ToString() + ".omp.default.mapper";
2427+
typeSpec.name().ToString() + llvm::omp::OmpDefaultMapperName;
24282428
if (auto *sym = converter.getCurrentScope().FindSymbol(mapperIdName))
24292429
mapperIdName = converter.mangleName(mapperIdName, sym->owner());
24302430
if (converter.getModuleOp().lookupSymbol(mapperIdName))

flang/lib/Parser/openmp-parsers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1402,7 +1402,7 @@ static OmpMapperSpecifier ConstructOmpMapperSpecifier(
14021402
// This matches the syntax: <type-spec> :: <variable-name>
14031403
if (DerivedTypeSpec * derived{std::get_if<DerivedTypeSpec>(&typeSpec.u)}) {
14041404
return OmpMapperSpecifier{
1405-
std::get<Name>(derived->t).ToString() + ".omp.default.mapper",
1405+
std::get<Name>(derived->t).ToString() + llvm::omp::OmpDefaultMapperName,
14061406
std::move(typeSpec), std::move(varName)};
14071407
}
14081408
return OmpMapperSpecifier{std::string("omp.default.mapper"),

llvm/include/llvm/Frontend/OpenMP/OMPConstants.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,9 @@ enum class OMPScheduleType {
190190
LLVM_MARK_AS_BITMASK_ENUM(/* LargestValue */ ModifierMask)
191191
};
192192

193+
// Default OpenMP mapper name suffix.
194+
inline constexpr const char *OmpDefaultMapperName = ".omp.default.mapper";
195+
193196
/// Values for bit flags used to specify the mapping type for
194197
/// offloading.
195198
enum class OpenMPOffloadMappingFlags : uint64_t {

0 commit comments

Comments
 (0)