Revert "[flang][openmp] Adds Parser and Semantic Support for Interop Construct, and Init and Use Clauses." #132005
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…Construc…" This reverts commit ee8a759.
llvmbot
added
flang
|
@llvm/pr-subscribers-flang-openmp @llvm/pr-subscribers-flang-parser Author: Kiran Chandramohan (kiranchandramohan) ChangesReverts llvm/llvm-project#120584 Reverting due to CI failure https://lab.llvm.org/buildbot/#/builders/157/builds/22946 Patch is 32.32 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/132005.diff 14 Files Affected:
diff --git a/flang/examples/FeatureList/FeatureList.cpp b/flang/examples/FeatureList/FeatureList.cpp
index e34f103a1df04..a1a908820e39c 100644
--- a/flang/examples/FeatureList/FeatureList.cpp
+++ b/flang/examples/FeatureList/FeatureList.cpp
@@ -522,13 +522,6 @@ struct NodeVisitor {
READ_FEATURE(OmpScheduleClause)
READ_FEATURE(OmpScheduleClause::Kind)
READ_FEATURE(OmpScheduleClause::Modifier)
- READ_FEATURE(OmpInteropRuntimeIdentifier)
- READ_FEATURE(OmpInteropPreference)
- READ_FEATURE(OmpInteropType)
- READ_FEATURE(OmpInteropType::Value)
- READ_FEATURE(OmpInitClause)
- READ_FEATURE(OmpInitClause::Modifier)
- READ_FEATURE(OmpUseClause)
READ_FEATURE(OmpDeviceModifier)
READ_FEATURE(OmpDeviceClause)
READ_FEATURE(OmpDeviceClause::Modifier)
@@ -549,7 +542,6 @@ struct NodeVisitor {
READ_FEATURE(OpenACCConstruct)
READ_FEATURE(OpenACCDeclarativeConstruct)
READ_FEATURE(OpenACCLoopConstruct)
- READ_FEATURE(OpenMPInteropConstruct)
READ_FEATURE(OpenACCRoutineConstruct)
READ_FEATURE(OpenACCStandaloneDeclarativeConstruct)
READ_FEATURE(OpenACCStandaloneConstruct)
diff --git a/flang/include/flang/Parser/dump-parse-tree.h b/flang/include/flang/Parser/dump-parse-tree.h
index 8f6fd868feaf0..25fcc843f3732 100644
--- a/flang/include/flang/Parser/dump-parse-tree.h
+++ b/flang/include/flang/Parser/dump-parse-tree.h
@@ -656,13 +656,6 @@ class ParseTreeDumper {
NODE_ENUM(OmpDeviceModifier, Value)
NODE(parser, OmpDeviceTypeClause)
NODE_ENUM(OmpDeviceTypeClause, DeviceTypeDescription)
- NODE(parser, OmpInteropRuntimeIdentifier)
- NODE(parser, OmpInteropPreference)
- NODE(parser, OmpInteropType)
- NODE_ENUM(OmpInteropType, Value)
- NODE(parser, OmpInitClause)
- NODE(OmpInitClause, Modifier)
- NODE(parser, OmpUseClause)
NODE(parser, OmpUpdateClause)
NODE(parser, OmpChunkModifier)
NODE_ENUM(OmpChunkModifier, Value)
@@ -682,7 +675,6 @@ class ParseTreeDumper {
NODE(parser, OpenACCDeclarativeConstruct)
NODE(parser, OpenACCEndConstruct)
NODE(parser, OpenACCLoopConstruct)
- NODE(parser, OpenMPInteropConstruct)
NODE(parser, OpenACCRoutineConstruct)
NODE(parser, OpenACCStandaloneDeclarativeConstruct)
NODE(parser, OpenACCStandaloneConstruct)
diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h
index 371d7653b3b34..1b1d4125464e3 100644
--- a/flang/include/flang/Parser/parse-tree.h
+++ b/flang/include/flang/Parser/parse-tree.h
@@ -3824,33 +3824,6 @@ struct OmpExpectation {
WRAPPER_CLASS_BOILERPLATE(OmpExpectation, Value);
};
-// REF: [5.1:217-220], [5.2:293-294]
-//
-// OmpInteropRuntimeIdentifier -> // since 5.2
-// CharLiteralConstant || ScalarIntConstantExpr
-struct OmpInteropRuntimeIdentifier {
- UNION_CLASS_BOILERPLATE(OmpInteropRuntimeIdentifier);
- std::variant<CharLiteralConstant, ScalarIntConstantExpr> u;
-};
-
-// REF: [5.1:217-220], [5.2:293-294]
-//
-// OmpInteropPreference -> // since 5.2
-// ([OmpRuntimeIdentifier, ...])
-struct OmpInteropPreference {
- WRAPPER_CLASS_BOILERPLATE(
- OmpInteropPreference, std::list<OmpInteropRuntimeIdentifier>);
-};
-
-// REF: [5.1:217-220], [5.2:293-294]
-//
-// InteropType -> target || targetsync // since 5.2
-// There can be at most only two interop-type.
-struct OmpInteropType {
- ENUM_CLASS(Value, Target, TargetSync)
- WRAPPER_CLASS_BOILERPLATE(OmpInteropType, Value);
-};
-
// Ref: [5.0:47-49], [5.1:49-51], [5.2:67-69]
//
// iterator-modifier ->
@@ -4508,25 +4481,6 @@ struct OmpWhenClause {
t;
};
-// REF: [5.1:217-220], [5.2:293-294]
-//
-// init-clause -> INIT ([interop-modifier,] [interop-type,]
-// interop-type: interop-var)
-// interop-modifier: prefer_type(preference-list)
-// interop-type: target, targetsync
-// interop-var: Ompobject
-// There can be at most only two interop-type.
-struct OmpInitClause {
- TUPLE_CLASS_BOILERPLATE(OmpInitClause);
- MODIFIER_BOILERPLATE(OmpInteropPreference, OmpInteropType);
- std::tuple<MODIFIERS(), OmpObject> t;
-};
-
-// REF: [5.1:217-220], [5.2:294]
-//
-// 14.1.3 use-clause -> USE (interop-var)
-WRAPPER_CLASS(OmpUseClause, OmpObject);
-
// OpenMP Clauses
struct OmpClause {
UNION_CLASS_BOILERPLATE(OmpClause);
@@ -4985,15 +4939,6 @@ struct OmpSimpleStandaloneDirective {
CharBlock source;
};
-// Ref: [5.1:217-220], [5.2:291-292]
-//
-// interop -> INTEROP clause[ [ [,] clause]...]
-struct OpenMPInteropConstruct {
- TUPLE_CLASS_BOILERPLATE(OpenMPInteropConstruct);
- CharBlock source;
- std::tuple<Verbatim, OmpClauseList> t;
-};
-
struct OpenMPSimpleStandaloneConstruct {
TUPLE_CLASS_BOILERPLATE(OpenMPSimpleStandaloneConstruct);
CharBlock source;
@@ -5005,7 +4950,7 @@ struct OpenMPStandaloneConstruct {
CharBlock source;
std::variant<OpenMPSimpleStandaloneConstruct, OpenMPFlushConstruct,
OpenMPCancelConstruct, OpenMPCancellationPointConstruct,
- OpenMPDepobjConstruct, OmpMetadirectiveDirective, OpenMPInteropConstruct>
+ OpenMPDepobjConstruct, OmpMetadirectiveDirective>
u;
};
diff --git a/flang/include/flang/Semantics/openmp-modifiers.h b/flang/include/flang/Semantics/openmp-modifiers.h
index 4fbd80f989e72..7cdbf65adebe1 100644
--- a/flang/include/flang/Semantics/openmp-modifiers.h
+++ b/flang/include/flang/Semantics/openmp-modifiers.h
@@ -77,8 +77,6 @@ DECLARE_DESCRIPTOR(parser::OmpDependenceType);
DECLARE_DESCRIPTOR(parser::OmpDeviceModifier);
DECLARE_DESCRIPTOR(parser::OmpDirectiveNameModifier);
DECLARE_DESCRIPTOR(parser::OmpExpectation);
-DECLARE_DESCRIPTOR(parser::OmpInteropPreference);
-DECLARE_DESCRIPTOR(parser::OmpInteropType);
DECLARE_DESCRIPTOR(parser::OmpIterator);
DECLARE_DESCRIPTOR(parser::OmpLastprivateModifier);
DECLARE_DESCRIPTOR(parser::OmpLinearModifier);
diff --git a/flang/lib/Lower/OpenMP/OpenMP.cpp b/flang/lib/Lower/OpenMP/OpenMP.cpp
index d7ae19b2794a0..ac688a69d7fb6 100644
--- a/flang/lib/Lower/OpenMP/OpenMP.cpp
+++ b/flang/lib/Lower/OpenMP/OpenMP.cpp
@@ -425,9 +425,6 @@ extractOmpDirective(const parser::OpenMPConstruct &ompConstruct) {
},
[](const parser::OpenMPDepobjConstruct &c) {
return llvm::omp::OMPD_depobj;
- },
- [](const parser::OpenMPInteropConstruct &c) {
- return llvm::omp::OMPD_interop;
}},
c.u);
},
@@ -3378,13 +3375,6 @@ static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
TODO(converter.getCurrentLocation(), "OpenMPDepobjConstruct");
}
-static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
- semantics::SemanticsContext &semaCtx,
- lower::pft::Evaluation &eval,
- const parser::OpenMPInteropConstruct &interopConstruct) {
- TODO(converter.getCurrentLocation(), "OpenMPInteropConstruct");
-}
-
static void
genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
semantics::SemanticsContext &semaCtx, lower::pft::Evaluation &eval,
diff --git a/flang/lib/Parser/openmp-parsers.cpp b/flang/lib/Parser/openmp-parsers.cpp
index 1aa3527c754fc..8c5c7063553ed 100644
--- a/flang/lib/Parser/openmp-parsers.cpp
+++ b/flang/lib/Parser/openmp-parsers.cpp
@@ -394,17 +394,6 @@ TYPE_PARSER(construct<OmpDeviceModifier>(
TYPE_PARSER(construct<OmpExpectation>( //
"PRESENT" >> pure(OmpExpectation::Value::Present)))
-TYPE_PARSER(construct<OmpInteropRuntimeIdentifier>(
- construct<OmpInteropRuntimeIdentifier>(charLiteralConstant) ||
- construct<OmpInteropRuntimeIdentifier>(scalarIntConstantExpr)))
-
-TYPE_PARSER(construct<OmpInteropPreference>(verbatim("PREFER_TYPE"_tok) >>
- parenthesized(nonemptyList(Parser<OmpInteropRuntimeIdentifier>{}))))
-
-TYPE_PARSER(construct<OmpInteropType>(
- "TARGETSYNC" >> pure(OmpInteropType::Value::TargetSync) ||
- "TARGET" >> pure(OmpInteropType::Value::Target)))
-
TYPE_PARSER(construct<OmpIteratorSpecifier>(
// Using Parser<TypeDeclarationStmt> or Parser<EntityDecl> has the problem
// that they will attempt to treat what follows the '=' as initialization.
@@ -532,11 +521,6 @@ TYPE_PARSER(sourced(
TYPE_PARSER(sourced(construct<OmpIfClause::Modifier>(OmpDirectiveNameParser{})))
-TYPE_PARSER(sourced(
- construct<OmpInitClause::Modifier>(
- construct<OmpInitClause::Modifier>(Parser<OmpInteropPreference>{})) ||
- construct<OmpInitClause::Modifier>(Parser<OmpInteropType>{})))
-
TYPE_PARSER(sourced(construct<OmpInReductionClause::Modifier>(
Parser<OmpReductionIdentifier>{})))
@@ -773,11 +757,6 @@ TYPE_PARSER(
// OpenMPv5.2 12.5.2 detach-clause -> DETACH (event-handle)
TYPE_PARSER(construct<OmpDetachClause>(Parser<OmpObject>{}))
-// init clause
-TYPE_PARSER(construct<OmpInitClause>(
- maybe(nonemptyList(Parser<OmpInitClause::Modifier>{}) / ":"),
- Parser<OmpObject>{}))
-
// 2.8.1 ALIGNED (list: alignment)
TYPE_PARSER(construct<OmpAlignedClause>(Parser<OmpObjectList>{},
maybe(":" >> nonemptyList(Parser<OmpAlignedClause::Modifier>{}))))
@@ -917,8 +896,6 @@ TYPE_PARSER( //
"IF" >> construct<OmpClause>(construct<OmpClause::If>(
parenthesized(Parser<OmpIfClause>{}))) ||
"INBRANCH" >> construct<OmpClause>(construct<OmpClause::Inbranch>()) ||
- "INIT" >> construct<OmpClause>(construct<OmpClause::Init>(
- parenthesized(Parser<OmpInitClause>{}))) ||
"INCLUSIVE" >> construct<OmpClause>(construct<OmpClause::Inclusive>(
parenthesized(Parser<OmpObjectList>{}))) ||
"INITIALIZER" >> construct<OmpClause>(construct<OmpClause::Initializer>(
@@ -1008,8 +985,6 @@ TYPE_PARSER( //
parenthesized(scalarIntExpr))) ||
"TO" >> construct<OmpClause>(construct<OmpClause::To>(
parenthesized(Parser<OmpToClause>{}))) ||
- "USE" >> construct<OmpClause>(construct<OmpClause::Use>(
- parenthesized(Parser<OmpObject>{}))) ||
"USE_DEVICE_PTR" >> construct<OmpClause>(construct<OmpClause::UseDevicePtr>(
parenthesized(Parser<OmpObjectList>{}))) ||
"USE_DEVICE_ADDR" >>
@@ -1237,10 +1212,6 @@ TYPE_PARSER(sourced(construct<OmpSimpleStandaloneDirective>(first(
TYPE_PARSER(sourced(construct<OpenMPSimpleStandaloneConstruct>(
Parser<OmpSimpleStandaloneDirective>{}, Parser<OmpClauseList>{})))
-// OMP 5.2 14.1 Interop construct
-TYPE_PARSER(sourced(construct<OpenMPInteropConstruct>(
- verbatim("INTEROP"_tok), sourced(Parser<OmpClauseList>{}))))
-
// Standalone Constructs
TYPE_PARSER(
sourced(construct<OpenMPStandaloneConstruct>(
@@ -1252,9 +1223,7 @@ TYPE_PARSER(
construct<OpenMPStandaloneConstruct>(Parser<OpenMPCancelConstruct>{}) ||
construct<OpenMPStandaloneConstruct>(
Parser<OmpMetadirectiveDirective>{}) ||
- construct<OpenMPStandaloneConstruct>(Parser<OpenMPDepobjConstruct>{}) ||
- construct<OpenMPStandaloneConstruct>(
- Parser<OpenMPInteropConstruct>{})) /
+ construct<OpenMPStandaloneConstruct>(Parser<OpenMPDepobjConstruct>{})) /
endOfLine)
// Directives enclosing structured-block
diff --git a/flang/lib/Parser/unparse.cpp b/flang/lib/Parser/unparse.cpp
index 37a17d3b88085..c5de5d1d08dd5 100644
--- a/flang/lib/Parser/unparse.cpp
+++ b/flang/lib/Parser/unparse.cpp
@@ -2179,30 +2179,6 @@ class UnparseVisitor {
Walk(std::get<std::optional<std::list<Modifier>>>(x.t), ": ");
Walk(std::get<OmpObjectList>(x.t));
}
- void Unparse(const OmpInteropPreference &x) { Walk(x.v, ","); }
- void Unparse(const OmpInitClause &x) {
- using Modifier = OmpInitClause::Modifier;
- auto &modifiers{std::get<std::optional<std::list<Modifier>>>(x.t)};
- bool isTypeStart{true};
- for (const Modifier &m : *modifiers) {
- if (auto *interopPreferenceMod{
- std::get_if<parser::OmpInteropPreference>(&m.u)}) {
- Put("PREFER_TYPE(");
- Walk(*interopPreferenceMod);
- Put("),");
- } else if (auto *interopTypeMod{
- std::get_if<parser::OmpInteropType>(&m.u)}) {
- if (isTypeStart) {
- isTypeStart = false;
- } else {
- Put(",");
- }
- Walk(*interopTypeMod);
- }
- }
- Put(": ");
- Walk(std::get<OmpObject>(x.t));
- }
void Unparse(const OmpMapClause &x) {
using Modifier = OmpMapClause::Modifier;
Walk(std::get<std::optional<std::list<Modifier>>>(x.t), ": ");
@@ -2764,15 +2740,6 @@ class UnparseVisitor {
Put("\n");
EndOpenMP();
}
-
- void Unparse(const OpenMPInteropConstruct &x) {
- BeginOpenMP();
- Word("!$OMP INTEROP");
- Walk(std::get<OmpClauseList>(x.t));
- Put("\n");
- EndOpenMP();
- }
-
void Unparse(const OpenMPDeclarativeAssumes &x) {
BeginOpenMP();
Word("!$OMP ASSUMES ");
@@ -3070,7 +3037,6 @@ class UnparseVisitor {
OmpDeviceTypeClause, DeviceTypeDescription) // OMP device_type
WALK_NESTED_ENUM(OmpReductionModifier, Value) // OMP reduction-modifier
WALK_NESTED_ENUM(OmpExpectation, Value) // OMP motion-expectation
- WALK_NESTED_ENUM(OmpInteropType, Value) // OMP InteropType
WALK_NESTED_ENUM(OmpOrderClause, Ordering) // OMP ordering
WALK_NESTED_ENUM(OmpOrderModifier, Value) // OMP order-modifier
WALK_NESTED_ENUM(OmpPrescriptiveness, Value) // OMP prescriptiveness
diff --git a/flang/lib/Semantics/check-omp-structure.cpp b/flang/lib/Semantics/check-omp-structure.cpp
index 6c9a1cc4da3f6..17ac6cfb8220f 100644
--- a/flang/lib/Semantics/check-omp-structure.cpp
+++ b/flang/lib/Semantics/check-omp-structure.cpp
@@ -5665,88 +5665,6 @@ void OmpStructureChecker::Leave(const parser::DoConstruct &x) {
Base::Leave(x);
}
-void OmpStructureChecker::Enter(const parser::OpenMPInteropConstruct &x) {
- bool isDependClauseOccured{false};
- int targetCount{0}, targetSyncCount{0};
- const auto &dir{std::get<parser::Verbatim>(x.t)};
- std::set<const Symbol *> objectSymbolList;
- PushContextAndClauseSets(dir.source, llvm::omp::Directive::OMPD_interop);
- const auto &clauseList{std::get<parser::OmpClauseList>(x.t)};
- for (const auto &clause : clauseList.v) {
- common::visit(
- common::visitors{
- [&](const parser::OmpClause::Init &initClause) {
- if (OmpVerifyModifiers(initClause.v, llvm::omp::OMPC_init,
- GetContext().directiveSource, context_)) {
-
- auto &modifiers{OmpGetModifiers(initClause.v)};
- auto &&interopTypeModifier{
- OmpGetRepeatableModifier<parser::OmpInteropType>(
- modifiers)};
- for (const auto &it : interopTypeModifier) {
- if (it->v == parser::OmpInteropType::Value::TargetSync) {
- ++targetSyncCount;
- } else {
- ++targetCount;
- }
- }
- }
- const auto &interopVar{parser::Unwrap<parser::OmpObject>(
- std::get<parser::OmpObject>(initClause.v.t))};
- const auto *name{parser::Unwrap<parser::Name>(interopVar)};
- const auto *objectSymbol{name->symbol};
- if (llvm::is_contained(objectSymbolList, objectSymbol)) {
- context_.Say(GetContext().directiveSource,
- "Each interop-var may be specified for at most one action-clause of each INTEROP construct."_err_en_US);
- } else {
- objectSymbolList.insert(objectSymbol);
- }
- },
- [&](const parser::OmpClause::Depend &dependClause) {
- isDependClauseOccured = true;
- },
- [&](const parser::OmpClause::Destroy &destroyClause) {
- const auto &interopVar{
- parser::Unwrap<parser::OmpObject>(destroyClause.v)};
- const auto *name{parser::Unwrap<parser::Name>(interopVar)};
- const auto *objectSymbol{name->symbol};
- if (llvm::is_contained(objectSymbolList, objectSymbol)) {
- context_.Say(GetContext().directiveSource,
- "Each interop-var may be specified for at most one action-clause of each INTEROP construct."_err_en_US);
- } else {
- objectSymbolList.insert(objectSymbol);
- }
- },
- [&](const parser::OmpClause::Use &useClause) {
- const auto &interopVar{
- parser::Unwrap<parser::OmpObject>(useClause.v)};
- const auto *name{parser::Unwrap<parser::Name>(interopVar)};
- const auto *objectSymbol{name->symbol};
- if (llvm::is_contained(objectSymbolList, objectSymbol)) {
- context_.Say(GetContext().directiveSource,
- "Each interop-var may be specified for at most one action-clause of each INTEROP construct."_err_en_US);
- } else {
- objectSymbolList.insert(objectSymbol);
- }
- },
- [&](const auto &) {},
- },
- clause.u);
- }
- if (targetCount > 1 || targetSyncCount > 1) {
- context_.Say(GetContext().directiveSource,
- "Each interop-type may be specified at most once."_err_en_US);
- }
- if (isDependClauseOccured && !targetSyncCount) {
- context_.Say(GetContext().directiveSource,
- "A DEPEND clause can only appear on the directive if the interop-type includes TARGETSYNC"_err_en_US);
- }
-}
-
-void OmpStructureChecker::Leave(const parser::OpenMPInteropConstruct &) {
- dirContext_.pop_back();
-}
-
void OmpStructureChecker::CheckAllowedRequiresClause(llvmOmpClause clause) {
CheckAllowedClause(clause);
diff --git a/flang/lib/Semantics/check-omp-structure.h b/flang/lib/Semantics/check-omp-structure.h
index e3fb0bdb2c790..4d4adeeaec636 100644
--- a/flang/lib/Semantics/check-omp-structure.h
+++ b/flang/lib/Semantics/check-omp-structure.h
@@ -73,8 +73,6 @@ class OmpStructureChecker
void Enter(const parser::OpenMPConstruct &);
void Leave(const parser::OpenMPConstruct &);
- void Enter(const parser::OpenMPInteropConstruct &);
- void Leave(const parser::OpenMPInteropConstruct &);
void Enter(const parser::OpenMPDeclarativeConstruct &);
void Leave(const parser::OpenMPDeclarativeConstruct &);
diff --git a/flang/lib/Semantics/openmp-modifiers.cpp b/flang/lib/Semantics/openmp-modifiers.cpp
index c84e832ee52a1..73ad7751ee517 100644
--- a/flang/lib/Semantics/openmp-modifiers.cpp
+++ b/flang/lib/Semantics/openmp-modifiers.cpp
@@ -240,38 +240,6 @@ const OmpModifierDescriptor &OmpGetDescriptor<parser::OmpExpectation>() {
return desc;
}
-template <>
-const OmpModifierDescriptor &OmpGetDescriptor<parser::OmpInteropPreference>() {
- static const OmpModifierDescriptor desc{
- /*name=*/"interop-preference",
- /*props=*/
- {
- {52, {OmpProperty::Unique}},
- },
- /*clauses=*/
- {
- {52, {Clause::OMPC_init}},
- },
- };
- return desc;
-}
-
-template <>
-const OmpModifierDescriptor &OmpGetDescriptor<parser::OmpInteropType>() {
- static const OmpModifierDescriptor desc{
- /*name=*/"interop-type",
- /*props=*/
- {
- {52, {OmpProperty::Required}},
- },
- /*clauses=*/
- {
- {52, {Clause::OMPC_init}},
- },
- };
- return desc;
-}
-
template <>
const OmpModifierDescriptor &OmpGetDescriptor<parser::OmpIterator>() {
static const OmpModifierDescriptor desc{
diff --git a/flang/test/Lower/OpenMP/Todo/inteorp-construct.f90 b/flang/test/Lower/OpenMP/Todo/inteorp-construct.f90
deleted file mode 100644
index f7920c09464ed..0000000000000
--- a/flang/test/Lower/OpenMP/Todo/inteorp-construct.f90
+++ /dev/null
@@ -1,9 +0,0 @@
-! REQUIRES: openmp_runtime
-! RUN: %not_todo_cmd %flang_fc1 -emit-fir -fopenmp -fopenmp-version=52 -o - %s 2>&1 | FileCheck %s
-
-! CHECK: not yet implemented: OpenMPInteropConstruct
-program interop_test
- use omp_lib
- integer(omp_interop_kind) :: obj
- !$omp interop init(targetsync,target: obj)
-end program interop_test
diff --git a/flang/test/Parser/OpenMP/interop-construct.f90 b/flang/test/Parser/OpenMP/interop-construct.f90
deleted file mode 100644
index a1781d559b46d..0000000000000
--- a/flang/test/Parser/OpenMP/interop-construct.f90
+++ /dev/n...
[truncated]
|
|
@llvm/pr-subscribers-flang-semantics Author: Kiran Chandramohan (kiranchandramohan) ChangesReverts llvm/llvm-project#120584 Reverting due to CI failure https://lab.llvm.org/buildbot/#/builders/157/builds/22946 Patch is 32.32 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/132005.diff 14 Files Affected:
diff --git a/flang/examples/FeatureList/FeatureList.cpp b/flang/examples/FeatureList/FeatureList.cpp
index e34f103a1df04..a1a908820e39c 100644
--- a/flang/examples/FeatureList/FeatureList.cpp
+++ b/flang/examples/FeatureList/FeatureList.cpp
@@ -522,13 +522,6 @@ struct NodeVisitor {
READ_FEATURE(OmpScheduleClause)
READ_FEATURE(OmpScheduleClause::Kind)
READ_FEATURE(OmpScheduleClause::Modifier)
- READ_FEATURE(OmpInteropRuntimeIdentifier)
- READ_FEATURE(OmpInteropPreference)
- READ_FEATURE(OmpInteropType)
- READ_FEATURE(OmpInteropType::Value)
- READ_FEATURE(OmpInitClause)
- READ_FEATURE(OmpInitClause::Modifier)
- READ_FEATURE(OmpUseClause)
READ_FEATURE(OmpDeviceModifier)
READ_FEATURE(OmpDeviceClause)
READ_FEATURE(OmpDeviceClause::Modifier)
@@ -549,7 +542,6 @@ struct NodeVisitor {
READ_FEATURE(OpenACCConstruct)
READ_FEATURE(OpenACCDeclarativeConstruct)
READ_FEATURE(OpenACCLoopConstruct)
- READ_FEATURE(OpenMPInteropConstruct)
READ_FEATURE(OpenACCRoutineConstruct)
READ_FEATURE(OpenACCStandaloneDeclarativeConstruct)
READ_FEATURE(OpenACCStandaloneConstruct)
diff --git a/flang/include/flang/Parser/dump-parse-tree.h b/flang/include/flang/Parser/dump-parse-tree.h
index 8f6fd868feaf0..25fcc843f3732 100644
--- a/flang/include/flang/Parser/dump-parse-tree.h
+++ b/flang/include/flang/Parser/dump-parse-tree.h
@@ -656,13 +656,6 @@ class ParseTreeDumper {
NODE_ENUM(OmpDeviceModifier, Value)
NODE(parser, OmpDeviceTypeClause)
NODE_ENUM(OmpDeviceTypeClause, DeviceTypeDescription)
- NODE(parser, OmpInteropRuntimeIdentifier)
- NODE(parser, OmpInteropPreference)
- NODE(parser, OmpInteropType)
- NODE_ENUM(OmpInteropType, Value)
- NODE(parser, OmpInitClause)
- NODE(OmpInitClause, Modifier)
- NODE(parser, OmpUseClause)
NODE(parser, OmpUpdateClause)
NODE(parser, OmpChunkModifier)
NODE_ENUM(OmpChunkModifier, Value)
@@ -682,7 +675,6 @@ class ParseTreeDumper {
NODE(parser, OpenACCDeclarativeConstruct)
NODE(parser, OpenACCEndConstruct)
NODE(parser, OpenACCLoopConstruct)
- NODE(parser, OpenMPInteropConstruct)
NODE(parser, OpenACCRoutineConstruct)
NODE(parser, OpenACCStandaloneDeclarativeConstruct)
NODE(parser, OpenACCStandaloneConstruct)
diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h
index 371d7653b3b34..1b1d4125464e3 100644
--- a/flang/include/flang/Parser/parse-tree.h
+++ b/flang/include/flang/Parser/parse-tree.h
@@ -3824,33 +3824,6 @@ struct OmpExpectation {
WRAPPER_CLASS_BOILERPLATE(OmpExpectation, Value);
};
-// REF: [5.1:217-220], [5.2:293-294]
-//
-// OmpInteropRuntimeIdentifier -> // since 5.2
-// CharLiteralConstant || ScalarIntConstantExpr
-struct OmpInteropRuntimeIdentifier {
- UNION_CLASS_BOILERPLATE(OmpInteropRuntimeIdentifier);
- std::variant<CharLiteralConstant, ScalarIntConstantExpr> u;
-};
-
-// REF: [5.1:217-220], [5.2:293-294]
-//
-// OmpInteropPreference -> // since 5.2
-// ([OmpRuntimeIdentifier, ...])
-struct OmpInteropPreference {
- WRAPPER_CLASS_BOILERPLATE(
- OmpInteropPreference, std::list<OmpInteropRuntimeIdentifier>);
-};
-
-// REF: [5.1:217-220], [5.2:293-294]
-//
-// InteropType -> target || targetsync // since 5.2
-// There can be at most only two interop-type.
-struct OmpInteropType {
- ENUM_CLASS(Value, Target, TargetSync)
- WRAPPER_CLASS_BOILERPLATE(OmpInteropType, Value);
-};
-
// Ref: [5.0:47-49], [5.1:49-51], [5.2:67-69]
//
// iterator-modifier ->
@@ -4508,25 +4481,6 @@ struct OmpWhenClause {
t;
};
-// REF: [5.1:217-220], [5.2:293-294]
-//
-// init-clause -> INIT ([interop-modifier,] [interop-type,]
-// interop-type: interop-var)
-// interop-modifier: prefer_type(preference-list)
-// interop-type: target, targetsync
-// interop-var: Ompobject
-// There can be at most only two interop-type.
-struct OmpInitClause {
- TUPLE_CLASS_BOILERPLATE(OmpInitClause);
- MODIFIER_BOILERPLATE(OmpInteropPreference, OmpInteropType);
- std::tuple<MODIFIERS(), OmpObject> t;
-};
-
-// REF: [5.1:217-220], [5.2:294]
-//
-// 14.1.3 use-clause -> USE (interop-var)
-WRAPPER_CLASS(OmpUseClause, OmpObject);
-
// OpenMP Clauses
struct OmpClause {
UNION_CLASS_BOILERPLATE(OmpClause);
@@ -4985,15 +4939,6 @@ struct OmpSimpleStandaloneDirective {
CharBlock source;
};
-// Ref: [5.1:217-220], [5.2:291-292]
-//
-// interop -> INTEROP clause[ [ [,] clause]...]
-struct OpenMPInteropConstruct {
- TUPLE_CLASS_BOILERPLATE(OpenMPInteropConstruct);
- CharBlock source;
- std::tuple<Verbatim, OmpClauseList> t;
-};
-
struct OpenMPSimpleStandaloneConstruct {
TUPLE_CLASS_BOILERPLATE(OpenMPSimpleStandaloneConstruct);
CharBlock source;
@@ -5005,7 +4950,7 @@ struct OpenMPStandaloneConstruct {
CharBlock source;
std::variant<OpenMPSimpleStandaloneConstruct, OpenMPFlushConstruct,
OpenMPCancelConstruct, OpenMPCancellationPointConstruct,
- OpenMPDepobjConstruct, OmpMetadirectiveDirective, OpenMPInteropConstruct>
+ OpenMPDepobjConstruct, OmpMetadirectiveDirective>
u;
};
diff --git a/flang/include/flang/Semantics/openmp-modifiers.h b/flang/include/flang/Semantics/openmp-modifiers.h
index 4fbd80f989e72..7cdbf65adebe1 100644
--- a/flang/include/flang/Semantics/openmp-modifiers.h
+++ b/flang/include/flang/Semantics/openmp-modifiers.h
@@ -77,8 +77,6 @@ DECLARE_DESCRIPTOR(parser::OmpDependenceType);
DECLARE_DESCRIPTOR(parser::OmpDeviceModifier);
DECLARE_DESCRIPTOR(parser::OmpDirectiveNameModifier);
DECLARE_DESCRIPTOR(parser::OmpExpectation);
-DECLARE_DESCRIPTOR(parser::OmpInteropPreference);
-DECLARE_DESCRIPTOR(parser::OmpInteropType);
DECLARE_DESCRIPTOR(parser::OmpIterator);
DECLARE_DESCRIPTOR(parser::OmpLastprivateModifier);
DECLARE_DESCRIPTOR(parser::OmpLinearModifier);
diff --git a/flang/lib/Lower/OpenMP/OpenMP.cpp b/flang/lib/Lower/OpenMP/OpenMP.cpp
index d7ae19b2794a0..ac688a69d7fb6 100644
--- a/flang/lib/Lower/OpenMP/OpenMP.cpp
+++ b/flang/lib/Lower/OpenMP/OpenMP.cpp
@@ -425,9 +425,6 @@ extractOmpDirective(const parser::OpenMPConstruct &ompConstruct) {
},
[](const parser::OpenMPDepobjConstruct &c) {
return llvm::omp::OMPD_depobj;
- },
- [](const parser::OpenMPInteropConstruct &c) {
- return llvm::omp::OMPD_interop;
}},
c.u);
},
@@ -3378,13 +3375,6 @@ static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
TODO(converter.getCurrentLocation(), "OpenMPDepobjConstruct");
}
-static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
- semantics::SemanticsContext &semaCtx,
- lower::pft::Evaluation &eval,
- const parser::OpenMPInteropConstruct &interopConstruct) {
- TODO(converter.getCurrentLocation(), "OpenMPInteropConstruct");
-}
-
static void
genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
semantics::SemanticsContext &semaCtx, lower::pft::Evaluation &eval,
diff --git a/flang/lib/Parser/openmp-parsers.cpp b/flang/lib/Parser/openmp-parsers.cpp
index 1aa3527c754fc..8c5c7063553ed 100644
--- a/flang/lib/Parser/openmp-parsers.cpp
+++ b/flang/lib/Parser/openmp-parsers.cpp
@@ -394,17 +394,6 @@ TYPE_PARSER(construct<OmpDeviceModifier>(
TYPE_PARSER(construct<OmpExpectation>( //
"PRESENT" >> pure(OmpExpectation::Value::Present)))
-TYPE_PARSER(construct<OmpInteropRuntimeIdentifier>(
- construct<OmpInteropRuntimeIdentifier>(charLiteralConstant) ||
- construct<OmpInteropRuntimeIdentifier>(scalarIntConstantExpr)))
-
-TYPE_PARSER(construct<OmpInteropPreference>(verbatim("PREFER_TYPE"_tok) >>
- parenthesized(nonemptyList(Parser<OmpInteropRuntimeIdentifier>{}))))
-
-TYPE_PARSER(construct<OmpInteropType>(
- "TARGETSYNC" >> pure(OmpInteropType::Value::TargetSync) ||
- "TARGET" >> pure(OmpInteropType::Value::Target)))
-
TYPE_PARSER(construct<OmpIteratorSpecifier>(
// Using Parser<TypeDeclarationStmt> or Parser<EntityDecl> has the problem
// that they will attempt to treat what follows the '=' as initialization.
@@ -532,11 +521,6 @@ TYPE_PARSER(sourced(
TYPE_PARSER(sourced(construct<OmpIfClause::Modifier>(OmpDirectiveNameParser{})))
-TYPE_PARSER(sourced(
- construct<OmpInitClause::Modifier>(
- construct<OmpInitClause::Modifier>(Parser<OmpInteropPreference>{})) ||
- construct<OmpInitClause::Modifier>(Parser<OmpInteropType>{})))
-
TYPE_PARSER(sourced(construct<OmpInReductionClause::Modifier>(
Parser<OmpReductionIdentifier>{})))
@@ -773,11 +757,6 @@ TYPE_PARSER(
// OpenMPv5.2 12.5.2 detach-clause -> DETACH (event-handle)
TYPE_PARSER(construct<OmpDetachClause>(Parser<OmpObject>{}))
-// init clause
-TYPE_PARSER(construct<OmpInitClause>(
- maybe(nonemptyList(Parser<OmpInitClause::Modifier>{}) / ":"),
- Parser<OmpObject>{}))
-
// 2.8.1 ALIGNED (list: alignment)
TYPE_PARSER(construct<OmpAlignedClause>(Parser<OmpObjectList>{},
maybe(":" >> nonemptyList(Parser<OmpAlignedClause::Modifier>{}))))
@@ -917,8 +896,6 @@ TYPE_PARSER( //
"IF" >> construct<OmpClause>(construct<OmpClause::If>(
parenthesized(Parser<OmpIfClause>{}))) ||
"INBRANCH" >> construct<OmpClause>(construct<OmpClause::Inbranch>()) ||
- "INIT" >> construct<OmpClause>(construct<OmpClause::Init>(
- parenthesized(Parser<OmpInitClause>{}))) ||
"INCLUSIVE" >> construct<OmpClause>(construct<OmpClause::Inclusive>(
parenthesized(Parser<OmpObjectList>{}))) ||
"INITIALIZER" >> construct<OmpClause>(construct<OmpClause::Initializer>(
@@ -1008,8 +985,6 @@ TYPE_PARSER( //
parenthesized(scalarIntExpr))) ||
"TO" >> construct<OmpClause>(construct<OmpClause::To>(
parenthesized(Parser<OmpToClause>{}))) ||
- "USE" >> construct<OmpClause>(construct<OmpClause::Use>(
- parenthesized(Parser<OmpObject>{}))) ||
"USE_DEVICE_PTR" >> construct<OmpClause>(construct<OmpClause::UseDevicePtr>(
parenthesized(Parser<OmpObjectList>{}))) ||
"USE_DEVICE_ADDR" >>
@@ -1237,10 +1212,6 @@ TYPE_PARSER(sourced(construct<OmpSimpleStandaloneDirective>(first(
TYPE_PARSER(sourced(construct<OpenMPSimpleStandaloneConstruct>(
Parser<OmpSimpleStandaloneDirective>{}, Parser<OmpClauseList>{})))
-// OMP 5.2 14.1 Interop construct
-TYPE_PARSER(sourced(construct<OpenMPInteropConstruct>(
- verbatim("INTEROP"_tok), sourced(Parser<OmpClauseList>{}))))
-
// Standalone Constructs
TYPE_PARSER(
sourced(construct<OpenMPStandaloneConstruct>(
@@ -1252,9 +1223,7 @@ TYPE_PARSER(
construct<OpenMPStandaloneConstruct>(Parser<OpenMPCancelConstruct>{}) ||
construct<OpenMPStandaloneConstruct>(
Parser<OmpMetadirectiveDirective>{}) ||
- construct<OpenMPStandaloneConstruct>(Parser<OpenMPDepobjConstruct>{}) ||
- construct<OpenMPStandaloneConstruct>(
- Parser<OpenMPInteropConstruct>{})) /
+ construct<OpenMPStandaloneConstruct>(Parser<OpenMPDepobjConstruct>{})) /
endOfLine)
// Directives enclosing structured-block
diff --git a/flang/lib/Parser/unparse.cpp b/flang/lib/Parser/unparse.cpp
index 37a17d3b88085..c5de5d1d08dd5 100644
--- a/flang/lib/Parser/unparse.cpp
+++ b/flang/lib/Parser/unparse.cpp
@@ -2179,30 +2179,6 @@ class UnparseVisitor {
Walk(std::get<std::optional<std::list<Modifier>>>(x.t), ": ");
Walk(std::get<OmpObjectList>(x.t));
}
- void Unparse(const OmpInteropPreference &x) { Walk(x.v, ","); }
- void Unparse(const OmpInitClause &x) {
- using Modifier = OmpInitClause::Modifier;
- auto &modifiers{std::get<std::optional<std::list<Modifier>>>(x.t)};
- bool isTypeStart{true};
- for (const Modifier &m : *modifiers) {
- if (auto *interopPreferenceMod{
- std::get_if<parser::OmpInteropPreference>(&m.u)}) {
- Put("PREFER_TYPE(");
- Walk(*interopPreferenceMod);
- Put("),");
- } else if (auto *interopTypeMod{
- std::get_if<parser::OmpInteropType>(&m.u)}) {
- if (isTypeStart) {
- isTypeStart = false;
- } else {
- Put(",");
- }
- Walk(*interopTypeMod);
- }
- }
- Put(": ");
- Walk(std::get<OmpObject>(x.t));
- }
void Unparse(const OmpMapClause &x) {
using Modifier = OmpMapClause::Modifier;
Walk(std::get<std::optional<std::list<Modifier>>>(x.t), ": ");
@@ -2764,15 +2740,6 @@ class UnparseVisitor {
Put("\n");
EndOpenMP();
}
-
- void Unparse(const OpenMPInteropConstruct &x) {
- BeginOpenMP();
- Word("!$OMP INTEROP");
- Walk(std::get<OmpClauseList>(x.t));
- Put("\n");
- EndOpenMP();
- }
-
void Unparse(const OpenMPDeclarativeAssumes &x) {
BeginOpenMP();
Word("!$OMP ASSUMES ");
@@ -3070,7 +3037,6 @@ class UnparseVisitor {
OmpDeviceTypeClause, DeviceTypeDescription) // OMP device_type
WALK_NESTED_ENUM(OmpReductionModifier, Value) // OMP reduction-modifier
WALK_NESTED_ENUM(OmpExpectation, Value) // OMP motion-expectation
- WALK_NESTED_ENUM(OmpInteropType, Value) // OMP InteropType
WALK_NESTED_ENUM(OmpOrderClause, Ordering) // OMP ordering
WALK_NESTED_ENUM(OmpOrderModifier, Value) // OMP order-modifier
WALK_NESTED_ENUM(OmpPrescriptiveness, Value) // OMP prescriptiveness
diff --git a/flang/lib/Semantics/check-omp-structure.cpp b/flang/lib/Semantics/check-omp-structure.cpp
index 6c9a1cc4da3f6..17ac6cfb8220f 100644
--- a/flang/lib/Semantics/check-omp-structure.cpp
+++ b/flang/lib/Semantics/check-omp-structure.cpp
@@ -5665,88 +5665,6 @@ void OmpStructureChecker::Leave(const parser::DoConstruct &x) {
Base::Leave(x);
}
-void OmpStructureChecker::Enter(const parser::OpenMPInteropConstruct &x) {
- bool isDependClauseOccured{false};
- int targetCount{0}, targetSyncCount{0};
- const auto &dir{std::get<parser::Verbatim>(x.t)};
- std::set<const Symbol *> objectSymbolList;
- PushContextAndClauseSets(dir.source, llvm::omp::Directive::OMPD_interop);
- const auto &clauseList{std::get<parser::OmpClauseList>(x.t)};
- for (const auto &clause : clauseList.v) {
- common::visit(
- common::visitors{
- [&](const parser::OmpClause::Init &initClause) {
- if (OmpVerifyModifiers(initClause.v, llvm::omp::OMPC_init,
- GetContext().directiveSource, context_)) {
-
- auto &modifiers{OmpGetModifiers(initClause.v)};
- auto &&interopTypeModifier{
- OmpGetRepeatableModifier<parser::OmpInteropType>(
- modifiers)};
- for (const auto &it : interopTypeModifier) {
- if (it->v == parser::OmpInteropType::Value::TargetSync) {
- ++targetSyncCount;
- } else {
- ++targetCount;
- }
- }
- }
- const auto &interopVar{parser::Unwrap<parser::OmpObject>(
- std::get<parser::OmpObject>(initClause.v.t))};
- const auto *name{parser::Unwrap<parser::Name>(interopVar)};
- const auto *objectSymbol{name->symbol};
- if (llvm::is_contained(objectSymbolList, objectSymbol)) {
- context_.Say(GetContext().directiveSource,
- "Each interop-var may be specified for at most one action-clause of each INTEROP construct."_err_en_US);
- } else {
- objectSymbolList.insert(objectSymbol);
- }
- },
- [&](const parser::OmpClause::Depend &dependClause) {
- isDependClauseOccured = true;
- },
- [&](const parser::OmpClause::Destroy &destroyClause) {
- const auto &interopVar{
- parser::Unwrap<parser::OmpObject>(destroyClause.v)};
- const auto *name{parser::Unwrap<parser::Name>(interopVar)};
- const auto *objectSymbol{name->symbol};
- if (llvm::is_contained(objectSymbolList, objectSymbol)) {
- context_.Say(GetContext().directiveSource,
- "Each interop-var may be specified for at most one action-clause of each INTEROP construct."_err_en_US);
- } else {
- objectSymbolList.insert(objectSymbol);
- }
- },
- [&](const parser::OmpClause::Use &useClause) {
- const auto &interopVar{
- parser::Unwrap<parser::OmpObject>(useClause.v)};
- const auto *name{parser::Unwrap<parser::Name>(interopVar)};
- const auto *objectSymbol{name->symbol};
- if (llvm::is_contained(objectSymbolList, objectSymbol)) {
- context_.Say(GetContext().directiveSource,
- "Each interop-var may be specified for at most one action-clause of each INTEROP construct."_err_en_US);
- } else {
- objectSymbolList.insert(objectSymbol);
- }
- },
- [&](const auto &) {},
- },
- clause.u);
- }
- if (targetCount > 1 || targetSyncCount > 1) {
- context_.Say(GetContext().directiveSource,
- "Each interop-type may be specified at most once."_err_en_US);
- }
- if (isDependClauseOccured && !targetSyncCount) {
- context_.Say(GetContext().directiveSource,
- "A DEPEND clause can only appear on the directive if the interop-type includes TARGETSYNC"_err_en_US);
- }
-}
-
-void OmpStructureChecker::Leave(const parser::OpenMPInteropConstruct &) {
- dirContext_.pop_back();
-}
-
void OmpStructureChecker::CheckAllowedRequiresClause(llvmOmpClause clause) {
CheckAllowedClause(clause);
diff --git a/flang/lib/Semantics/check-omp-structure.h b/flang/lib/Semantics/check-omp-structure.h
index e3fb0bdb2c790..4d4adeeaec636 100644
--- a/flang/lib/Semantics/check-omp-structure.h
+++ b/flang/lib/Semantics/check-omp-structure.h
@@ -73,8 +73,6 @@ class OmpStructureChecker
void Enter(const parser::OpenMPConstruct &);
void Leave(const parser::OpenMPConstruct &);
- void Enter(const parser::OpenMPInteropConstruct &);
- void Leave(const parser::OpenMPInteropConstruct &);
void Enter(const parser::OpenMPDeclarativeConstruct &);
void Leave(const parser::OpenMPDeclarativeConstruct &);
diff --git a/flang/lib/Semantics/openmp-modifiers.cpp b/flang/lib/Semantics/openmp-modifiers.cpp
index c84e832ee52a1..73ad7751ee517 100644
--- a/flang/lib/Semantics/openmp-modifiers.cpp
+++ b/flang/lib/Semantics/openmp-modifiers.cpp
@@ -240,38 +240,6 @@ const OmpModifierDescriptor &OmpGetDescriptor<parser::OmpExpectation>() {
return desc;
}
-template <>
-const OmpModifierDescriptor &OmpGetDescriptor<parser::OmpInteropPreference>() {
- static const OmpModifierDescriptor desc{
- /*name=*/"interop-preference",
- /*props=*/
- {
- {52, {OmpProperty::Unique}},
- },
- /*clauses=*/
- {
- {52, {Clause::OMPC_init}},
- },
- };
- return desc;
-}
-
-template <>
-const OmpModifierDescriptor &OmpGetDescriptor<parser::OmpInteropType>() {
- static const OmpModifierDescriptor desc{
- /*name=*/"interop-type",
- /*props=*/
- {
- {52, {OmpProperty::Required}},
- },
- /*clauses=*/
- {
- {52, {Clause::OMPC_init}},
- },
- };
- return desc;
-}
-
template <>
const OmpModifierDescriptor &OmpGetDescriptor<parser::OmpIterator>() {
static const OmpModifierDescriptor desc{
diff --git a/flang/test/Lower/OpenMP/Todo/inteorp-construct.f90 b/flang/test/Lower/OpenMP/Todo/inteorp-construct.f90
deleted file mode 100644
index f7920c09464ed..0000000000000
--- a/flang/test/Lower/OpenMP/Todo/inteorp-construct.f90
+++ /dev/null
@@ -1,9 +0,0 @@
-! REQUIRES: openmp_runtime
-! RUN: %not_todo_cmd %flang_fc1 -emit-fir -fopenmp -fopenmp-version=52 -o - %s 2>&1 | FileCheck %s
-
-! CHECK: not yet implemented: OpenMPInteropConstruct
-program interop_test
- use omp_lib
- integer(omp_interop_kind) :: obj
- !$omp interop init(targetsync,target: obj)
-end program interop_test
diff --git a/flang/test/Parser/OpenMP/interop-construct.f90 b/flang/test/Parser/OpenMP/interop-construct.f90
deleted file mode 100644
index a1781d559b46d..0000000000000
--- a/flang/test/Parser/OpenMP/interop-construct.f90
+++ /dev/n...
[truncated]
|
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Mar 28, 2025
…upport for Interop Construct, and Init and Use Clauses."" (#132343) Reverts llvm/llvm-project#132005
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts #120584
Reverting due to CI failure https://lab.llvm.org/buildbot/#/builders/157/builds/22946