diff options
author | Johannes Doerfert <johannes@jdoerfert.de> | 2020-12-15 18:02:22 -0600 |
---|---|---|
committer | Johannes Doerfert <johannes@jdoerfert.de> | 2020-12-15 18:03:10 -0600 |
commit | 1efd7a73acdf1e3f61bbcf82d3c30be41771ce6b (patch) | |
tree | 51e22fc27ceb898a397645343d673e030223936e /llvm | |
parent | b0b5d389635a54c5aeb490b1b067f3a38e038235 (diff) | |
download | llvm-1efd7a73acdf1e3f61bbcf82d3c30be41771ce6b.zip llvm-1efd7a73acdf1e3f61bbcf82d3c30be41771ce6b.tar.gz llvm-1efd7a73acdf1e3f61bbcf82d3c30be41771ce6b.tar.bz2 |
Revert "[OpenMP] Add initial support for `omp [begin/end] assumes`"
There is a build error with gcc-5 [0], investigating now.
[0] https://reviews.llvm.org/D91980#2456526
This reverts commit a5a14cbe7f87e01882ecaa14df5d596cbf38823a.
Diffstat (limited to 'llvm')
-rw-r--r-- | llvm/include/llvm/Frontend/OpenMP/OMP.td | 3 | ||||
-rw-r--r-- | llvm/include/llvm/Frontend/OpenMP/OMPConstants.h | 28 | ||||
-rw-r--r-- | llvm/include/llvm/Frontend/OpenMP/OMPKinds.def | 24 |
3 files changed, 0 insertions, 55 deletions
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMP.td b/llvm/include/llvm/Frontend/OpenMP/OMP.td index 58aa1bf..59198f8 100644 --- a/llvm/include/llvm/Frontend/OpenMP/OMP.td +++ b/llvm/include/llvm/Frontend/OpenMP/OMP.td @@ -1593,9 +1593,6 @@ def OMP_Scan : Directive<"scan"> { VersionedClause<OMPC_Exclusive, 50> ]; } -def OMP_Assumes : Directive<"assumes"> {} -def OMP_BeginAssumes : Directive<"begin assumes"> {} -def OMP_EndAssumes : Directive<"end assumes"> {} def OMP_BeginDeclareVariant : Directive<"begin declare variant"> {} def OMP_EndDeclareVariant : Directive<"end declare variant"> {} def OMP_ParallelWorkshare : Directive<"parallel workshare"> { diff --git a/llvm/include/llvm/Frontend/OpenMP/OMPConstants.h b/llvm/include/llvm/Frontend/OpenMP/OMPConstants.h index 36ce3fc..3ad13ddc 100644 --- a/llvm/include/llvm/Frontend/OpenMP/OMPConstants.h +++ b/llvm/include/llvm/Frontend/OpenMP/OMPConstants.h @@ -16,7 +16,6 @@ #include "llvm/ADT/BitmaskEnum.h" -#include "llvm/ADT/StringRef.h" #include "llvm/Frontend/OpenMP/OMP.h.inc" namespace llvm { @@ -80,33 +79,6 @@ enum class IdentFlag { #define OMP_IDENT_FLAG(Enum, ...) constexpr auto Enum = omp::IdentFlag::Enum; #include "llvm/Frontend/OpenMP/OMPKinds.def" -/// Helper to describe assume clauses. -struct AssumptionClauseMappingInfo { - /// The identifier describing the (beginning of the) clause. - llvm::StringLiteral Identifier; - /// Flag to determine if the identifier is a full name or the start of a name. - bool StartsWith; - /// Flag to determine if a directive lists follows. - bool HasDirectiveList; - /// Flag to determine if an expression follows. - bool HasExpression; -}; - -/// All known assume clauses. -static constexpr AssumptionClauseMappingInfo AssumptionClauseMappings[] = { -#define OMP_ASSUME_CLAUSE(Identifier, StartsWith, HasDirectiveList, \ - HasExpression) \ - {Identifier, StartsWith, HasDirectiveList, HasExpression}, -#include "llvm/Frontend/OpenMP/OMPKinds.def" -}; - -inline std::string getAllAssumeClauseOptions() { - std::string S; - for (const AssumptionClauseMappingInfo &ACMI : AssumptionClauseMappings) - S += (S.empty() ? "'" : "', '") + ACMI.Identifier.str(); - return S + "'"; -} - } // end namespace omp } // end namespace llvm diff --git a/llvm/include/llvm/Frontend/OpenMP/OMPKinds.def b/llvm/include/llvm/Frontend/OpenMP/OMPKinds.def index ad4f8bd..947b0c8 100644 --- a/llvm/include/llvm/Frontend/OpenMP/OMPKinds.def +++ b/llvm/include/llvm/Frontend/OpenMP/OMPKinds.def @@ -1224,27 +1224,3 @@ OMP_LAST_TRAIT_PROPERTY( #undef __OMP_REQUIRES_TRAIT #undef OMP_REQUIRES_TRAIT ///} - - -/// Assumption clauses -/// -///{ - -#ifdef OMP_ASSUME_CLAUSE -#define __OMP_ASSUME_CLAUSE(Identifier, StartsWith, HasDirectiveList, HasExpression) \ -OMP_ASSUME_CLAUSE(Identifier, StartsWith, HasDirectiveList, HasExpression) -#else -#define __OMP_ASSUME_CLAUSE(...) -#endif - -__OMP_ASSUME_CLAUSE("ext_", true, false, false) -__OMP_ASSUME_CLAUSE("absent", false, true, false) -__OMP_ASSUME_CLAUSE("contains", false, true, false) -__OMP_ASSUME_CLAUSE("holds", false, false, true) -__OMP_ASSUME_CLAUSE("no_openmp", false, false, false) -__OMP_ASSUME_CLAUSE("no_openmp_routines", false, false, false) -__OMP_ASSUME_CLAUSE("no_parallelism", false, false, false) - -#undef __OMP_ASSUME_CLAUSE -#undef OMP_ASSUME_CLAUSE -///} |