[flang-commits] [flang] [flang][OpenMP] Rename few types to spec names, NFC (PR #171845)
via flang-commits
flang-commits at lists.llvm.org
Thu Dec 11 08:51:22 PST 2025
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-flang-openmp
Author: Krzysztof Parzyszek (kparzysz)
<details>
<summary>Changes</summary>
Change Severity to SevLevel and TargetSync to Targetsync.
---
Full diff: https://github.com/llvm/llvm-project/pull/171845.diff
7 Files Affected:
- (modified) flang/include/flang/Parser/dump-parse-tree.h (+1-1)
- (modified) flang/include/flang/Parser/parse-tree.h (+3-3)
- (modified) flang/lib/Parser/openmp-parsers.cpp (+3-3)
- (modified) flang/lib/Parser/unparse.cpp (+1-1)
- (modified) flang/lib/Semantics/check-omp-structure.cpp (+1-1)
- (modified) flang/test/Parser/OpenMP/error-unparse.f90 (+3-3)
- (modified) flang/test/Parser/OpenMP/interop-construct.f90 (+5-5)
``````````diff
diff --git a/flang/include/flang/Parser/dump-parse-tree.h b/flang/include/flang/Parser/dump-parse-tree.h
index d00db7616f434..252e156d2d459 100644
--- a/flang/include/flang/Parser/dump-parse-tree.h
+++ b/flang/include/flang/Parser/dump-parse-tree.h
@@ -705,7 +705,7 @@ class ParseTreeDumper {
NODE(parser, OmpSelfModifier)
NODE_ENUM(OmpSelfModifier, Value)
NODE(parser, OmpSeverityClause)
- NODE_ENUM(OmpSeverityClause, Severity)
+ NODE_ENUM(OmpSeverityClause, SevLevel)
NODE(parser, OmpStepComplexModifier)
NODE(parser, OmpStepSimpleModifier)
NODE(parser, OmpStylizedDeclaration)
diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h
index 6c7b35ba5c58f..93743709f10d2 100644
--- a/flang/include/flang/Parser/parse-tree.h
+++ b/flang/include/flang/Parser/parse-tree.h
@@ -4072,7 +4072,7 @@ struct OmpPreferType {
// TARGETSYNC
// There can be at most only two interop-type.
struct OmpInteropType {
- ENUM_CLASS(Value, Target, TargetSync)
+ ENUM_CLASS(Value, Target, Targetsync)
WRAPPER_CLASS_BOILERPLATE(OmpInteropType, Value);
};
@@ -4899,8 +4899,8 @@ struct OmpSelfMapsClause {
// severity-clause ->
// SEVERITY(warning|fatal)
struct OmpSeverityClause {
- ENUM_CLASS(Severity, Fatal, Warning);
- WRAPPER_CLASS_BOILERPLATE(OmpSeverityClause, Severity);
+ ENUM_CLASS(SevLevel, Fatal, Warning);
+ WRAPPER_CLASS_BOILERPLATE(OmpSeverityClause, SevLevel);
};
// Ref: [5.0:232-234], [5.1:264-266], [5.2:137]
diff --git a/flang/lib/Parser/openmp-parsers.cpp b/flang/lib/Parser/openmp-parsers.cpp
index e813cb5eef537..24bdef9f88ed4 100644
--- a/flang/lib/Parser/openmp-parsers.cpp
+++ b/flang/lib/Parser/openmp-parsers.cpp
@@ -832,7 +832,7 @@ TYPE_PARSER(construct<OmpFallbackModifier>("FALLBACK"_tok >>
"NULL" >> pure(OmpFallbackModifier::Value::Null))))
TYPE_PARSER(construct<OmpInteropType>(
- "TARGETSYNC" >> pure(OmpInteropType::Value::TargetSync) ||
+ "TARGETSYNC" >> pure(OmpInteropType::Value::Targetsync) ||
"TARGET" >> pure(OmpInteropType::Value::Target)))
TYPE_PARSER(construct<OmpIteratorSpecifier>(
@@ -1386,8 +1386,8 @@ TYPE_PARSER(construct<OmpAtClause>(
"COMPILATION" >> pure(OmpAtClause::ActionTime::Compilation)))
TYPE_PARSER(construct<OmpSeverityClause>(
- "FATAL" >> pure(OmpSeverityClause::Severity::Fatal) ||
- "WARNING" >> pure(OmpSeverityClause::Severity::Warning)))
+ "FATAL" >> pure(OmpSeverityClause::SevLevel::Fatal) ||
+ "WARNING" >> pure(OmpSeverityClause::SevLevel::Warning)))
TYPE_PARSER(construct<OmpMessageClause>(expr))
diff --git a/flang/lib/Parser/unparse.cpp b/flang/lib/Parser/unparse.cpp
index 455a74d528cec..a8d2c0b0df81a 100644
--- a/flang/lib/Parser/unparse.cpp
+++ b/flang/lib/Parser/unparse.cpp
@@ -2850,7 +2850,7 @@ class UnparseVisitor {
WALK_NESTED_ENUM(OmpOrderingModifier, Value) // OMP ordering-modifier
WALK_NESTED_ENUM(OmpTaskDependenceType, Value) // OMP task-dependence-type
WALK_NESTED_ENUM(OmpScheduleClause, Kind) // OMP schedule-kind
- WALK_NESTED_ENUM(OmpSeverityClause, Severity) // OMP severity
+ WALK_NESTED_ENUM(OmpSeverityClause, SevLevel) // OMP severity
WALK_NESTED_ENUM(OmpThreadsetClause, ThreadsetPolicy) // OMP threadset
WALK_NESTED_ENUM(OmpAccessGroup, Value)
WALK_NESTED_ENUM(OmpDeviceModifier, Value) // OMP device modifier
diff --git a/flang/lib/Semantics/check-omp-structure.cpp b/flang/lib/Semantics/check-omp-structure.cpp
index f6f7baaffeef7..e640ca8c1d3d9 100644
--- a/flang/lib/Semantics/check-omp-structure.cpp
+++ b/flang/lib/Semantics/check-omp-structure.cpp
@@ -5458,7 +5458,7 @@ void OmpStructureChecker::Enter(const parser::OpenMPInteropConstruct &x) {
OmpGetRepeatableModifier<parser::OmpInteropType>(
modifiers)};
for (const auto &it : interopTypeModifier) {
- if (it->v == parser::OmpInteropType::Value::TargetSync) {
+ if (it->v == parser::OmpInteropType::Value::Targetsync) {
++targetSyncCount;
} else {
++targetCount;
diff --git a/flang/test/Parser/OpenMP/error-unparse.f90 b/flang/test/Parser/OpenMP/error-unparse.f90
index 2cb4e1a083a6c..60ce52b9b88a1 100644
--- a/flang/test/Parser/OpenMP/error-unparse.f90
+++ b/flang/test/Parser/OpenMP/error-unparse.f90
@@ -5,7 +5,7 @@ program main
!CHECK: !$OMP ERROR AT(COMPILATION) SEVERITY(WARNING) MESSAGE("some message here")
!PARSE-TREE: ExecutionPartConstruct -> ExecutableConstruct -> OpenMPConstruct -> OpenMPUtilityConstruct -> OmpErrorDirective
!PARSE-TREE: OmpClauseList -> OmpClause -> At -> OmpAtClause -> ActionTime = Compilation
- !PARSE-TREE: OmpClause -> Severity -> OmpSeverityClause -> Severity = Warning
+ !PARSE-TREE: OmpClause -> Severity -> OmpSeverityClause -> SevLevel = Warning
!PARSE-TREE: OmpClause -> Message -> OmpMessageClause -> Expr = '"some message here"'
!PARSE-TREE: LiteralConstant -> CharLiteralConstant
!PARSE-TREE: string = 'some message here'
@@ -13,14 +13,14 @@ program main
!CHECK: !$OMP ERROR AT(COMPILATION) SEVERITY(FATAL) MESSAGE("This is an error")
!PARSE-TREE: ExecutionPartConstruct -> ExecutableConstruct -> OpenMPConstruct -> OpenMPUtilityConstruct -> OmpErrorDirective
!PARSE-TREE: OmpClauseList -> OmpClause -> At -> OmpAtClause -> ActionTime = Compilation
- !PARSE-TREE: OmpClause -> Severity -> OmpSeverityClause -> Severity = Fatal
+ !PARSE-TREE: OmpClause -> Severity -> OmpSeverityClause -> SevLevel = Fatal
!PARSE-TREE: OmpClause -> Message -> OmpMessageClause -> Expr = '"This is an error"'
!PARSE-TREE: Designator -> DataRef -> Name = 'message'
!$omp error at(compilation) severity(fatal) message(message)
!CHECK: !$OMP ERROR AT(EXECUTION) SEVERITY(FATAL) MESSAGE("This is an error")
!PARSE-TREE: ExecutionPartConstruct -> ExecutableConstruct -> OpenMPConstruct -> OpenMPUtilityConstruct -> OmpErrorDirective
!PARSE-TREE: OmpClauseList -> OmpClause -> At -> OmpAtClause -> ActionTime = Execution
- !PARSE-TREE: OmpClause -> Severity -> OmpSeverityClause -> Severity = Fatal
+ !PARSE-TREE: OmpClause -> Severity -> OmpSeverityClause -> SevLevel = Fatal
!PARSE-TREE: OmpClause -> Message -> OmpMessageClause -> Expr = '"This is an error"'
!PARSE-TREE: Designator -> DataRef -> Name = 'message'
!$omp error at(EXECUTION) severity(fatal) message(message)
diff --git a/flang/test/Parser/OpenMP/interop-construct.f90 b/flang/test/Parser/OpenMP/interop-construct.f90
index 684d06f241719..a80d06ae4d627 100644
--- a/flang/test/Parser/OpenMP/interop-construct.f90
+++ b/flang/test/Parser/OpenMP/interop-construct.f90
@@ -36,7 +36,7 @@ END SUBROUTINE test_interop_02
!PARSE-TREE: ExecutionPartConstruct -> ExecutableConstruct -> OpenMPConstruct -> OpenMPStandaloneConstruct -> OpenMPInteropConstruct -> OmpDirectiveSpecification
!PARSE-TREE: | OmpDirectiveName -> llvm::omp::Directive = interop
!PARSE-TREE: | OmpClauseList -> OmpClause -> Init -> OmpInitClause
-!PARSE-TREE: | | Modifier -> OmpInteropType -> Value = TargetSync
+!PARSE-TREE: | | Modifier -> OmpInteropType -> Value = Targetsync
!PARSE-TREE: | | OmpObject -> Designator -> DataRef -> Name = 'obj'
!PARSE-TREE: | OmpClause -> Use -> OmpUseClause -> OmpObject -> Designator -> DataRef -> Name = 'obj1'
!PARSE-TREE: | OmpClause -> Destroy -> OmpDestroyClause -> OmpObject -> Designator -> DataRef -> Name = 'obj3'
@@ -60,7 +60,7 @@ END SUBROUTINE test_interop_03
!PARSE-TREE: ExecutionPartConstruct -> ExecutableConstruct -> OpenMPConstruct -> OpenMPStandaloneConstruct -> OpenMPInteropConstruct -> OmpDirectiveSpecification
!PARSE-TREE: | OmpDirectiveName -> llvm::omp::Directive = interop
!PARSE-TREE: | OmpClauseList -> OmpClause -> Init -> OmpInitClause
-!PARSE-TREE: | | Modifier -> OmpInteropType -> Value = TargetSync
+!PARSE-TREE: | | Modifier -> OmpInteropType -> Value = Targetsync
!PARSE-TREE: | | OmpObject -> Designator -> DataRef -> Name = 'obj'
!PARSE-TREE: | OmpClause -> Depend -> OmpDependClause -> TaskDep
!PARSE-TREE: | | Modifier -> OmpTaskDependenceType -> Value = Inout
@@ -90,7 +90,7 @@ END SUBROUTINE test_interop_04
!PARSE-TREE: | OmpClauseList -> OmpClause -> Init -> OmpInitClause
!PARSE-TREE: | | Modifier -> OmpPreferType -> OmpPreferenceSpecification -> Expr -> LiteralConstant -> CharLiteralConstant
!PARSE-TREE: | | | string = 'cuda'
-!PARSE-TREE: | | Modifier -> OmpInteropType -> Value = TargetSync
+!PARSE-TREE: | | Modifier -> OmpInteropType -> Value = Targetsync
!PARSE-TREE: | | Modifier -> OmpInteropType -> Value = Target
!PARSE-TREE: | | OmpObject -> Designator -> DataRef -> Name = 'obj'
!PARSE-TREE: | OmpClause -> Depend -> OmpDependClause -> TaskDep
@@ -118,7 +118,7 @@ END SUBROUTINE test_interop_05
!PARSE-TREE: | OmpDirectiveName -> llvm::omp::Directive = interop
!PARSE-TREE: | OmpClauseList -> OmpClause -> Init -> OmpInitClause
!PARSE-TREE: | | Modifier -> OmpPreferType -> OmpPreferenceSpecification -> Expr -> Designator -> DataRef -> Name = 'omp_ifr_sycl'
-!PARSE-TREE: | | Modifier -> OmpInteropType -> Value = TargetSync
+!PARSE-TREE: | | Modifier -> OmpInteropType -> Value = Targetsync
!PARSE-TREE: | | OmpObject -> Designator -> DataRef -> Name = 'obj'
!PARSE-TREE: | OmpClause -> Device -> OmpDeviceClause
!PARSE-TREE: | | Modifier -> OmpDeviceModifier -> Value = Device_Num
@@ -149,6 +149,6 @@ SUBROUTINE test_interop_06()
!PARSE-TREE: | | | string = 'ext1'
!PARSE-TREE: | | Expr -> LiteralConstant -> CharLiteralConstant
!PARSE-TREE: | | | string = 'ext2'
-!PARSE-TREE: | | Modifier -> OmpInteropType -> Value = TargetSync
+!PARSE-TREE: | | Modifier -> OmpInteropType -> Value = Targetsync
!PARSE-TREE: | | OmpObject -> Designator -> DataRef -> Name = 'obj'
!PARSE-TREE: | Flags = {}
``````````
</details>
https://github.com/llvm/llvm-project/pull/171845
More information about the flang-commits
mailing list