tianshilei1992 created this revision.
tianshilei1992 added reviewers: jdoerfert, ABataev.
Herald added subscribers: arphaman, guansong, yaxunl.
tianshilei1992 requested review of this revision.
Herald added subscribers: llvm-commits, cfe-commits, sstefan1.
Herald added projects: clang, LLVM.
This patch adds the support for `atomic compare capture` in parser and part of
sema. For better post-sema operations, a dummy clause `compare_capture` is
created. That is because the spec doesn't say `compare` and `capture` clauses
should be used tightly, we cannot look one more token ahead in the parser. That
being said, there should be no actual AST node created.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D116261
Files:
clang/include/clang/AST/OpenMPClause.h
clang/include/clang/AST/RecursiveASTVisitor.h
clang/include/clang/Sema/Sema.h
clang/lib/AST/OpenMPClause.cpp
clang/lib/AST/StmtProfile.cpp
clang/lib/Basic/OpenMPKinds.cpp
clang/lib/CodeGen/CGStmtOpenMP.cpp
clang/lib/Parse/ParseOpenMP.cpp
clang/lib/Sema/SemaOpenMP.cpp
clang/lib/Sema/TreeTransform.h
clang/lib/Serialization/ASTReader.cpp
clang/lib/Serialization/ASTWriter.cpp
clang/tools/libclang/CIndex.cpp
llvm/include/llvm/Frontend/OpenMP/OMP.td
Index: llvm/include/llvm/Frontend/OpenMP/OMP.td
===================================================================
--- llvm/include/llvm/Frontend/OpenMP/OMP.td
+++ llvm/include/llvm/Frontend/OpenMP/OMP.td
@@ -181,6 +181,10 @@
def OMPC_Update : Clause<"update"> { let clangClass = "OMPUpdateClause"; }
def OMPC_Capture : Clause<"capture"> { let clangClass = "OMPCaptureClause"; }
def OMPC_Compare : Clause<"compare"> { let clangClass = "OMPCompareClause"; }
+// A dummy clause if compare and capture clauses are present.
+def OMPC_CompareCapture : Clause<"compare_capture"> {
+ let clangClass = "OMPCompareCaptureClause";
+}
def OMPC_SeqCst : Clause<"seq_cst"> { let clangClass = "OMPSeqCstClause"; }
def OMPC_AcqRel : Clause<"acq_rel"> { let clangClass = "OMPAcqRelClause"; }
def OMPC_Acquire : Clause<"acquire"> { let clangClass = "OMPAcquireClause"; }
@@ -283,7 +287,7 @@
def OMPC_NonTemporal : Clause<"nontemporal"> {
let clangClass = "OMPNontemporalClause";
let flangClass = "Name";
- let isValueList = true;
+ let isValueList = true;
}
def OMP_ORDER_concurrent : ClauseVal<"concurrent",1,1> {}
Index: clang/tools/libclang/CIndex.cpp
===================================================================
--- clang/tools/libclang/CIndex.cpp
+++ clang/tools/libclang/CIndex.cpp
@@ -2277,6 +2277,9 @@
void OMPClauseEnqueue::VisitOMPCompareClause(const OMPCompareClause *) {}
+void OMPClauseEnqueue::VisitOMPCompareCaptureClause(
+ const OMPCompareCaptureClause *) {}
+
void OMPClauseEnqueue::VisitOMPSeqCstClause(const OMPSeqCstClause *) {}
void OMPClauseEnqueue::VisitOMPAcqRelClause(const OMPAcqRelClause *) {}
Index: clang/lib/Serialization/ASTWriter.cpp
===================================================================
--- clang/lib/Serialization/ASTWriter.cpp
+++ clang/lib/Serialization/ASTWriter.cpp
@@ -6254,6 +6254,8 @@
void OMPClauseWriter::VisitOMPCompareClause(OMPCompareClause *) {}
+void OMPClauseWriter::VisitOMPCompareCaptureClause(OMPCompareCaptureClause *) {}
+
void OMPClauseWriter::VisitOMPSeqCstClause(OMPSeqCstClause *) {}
void OMPClauseWriter::VisitOMPAcqRelClause(OMPAcqRelClause *) {}
Index: clang/lib/Serialization/ASTReader.cpp
===================================================================
--- clang/lib/Serialization/ASTReader.cpp
+++ clang/lib/Serialization/ASTReader.cpp
@@ -11768,6 +11768,9 @@
case llvm::omp::OMPC_compare:
C = new (Context) OMPCompareClause();
break;
+ case llvm::omp::OMPC_compare_capture:
+ C = new (Context) OMPCompareCaptureClause();
+ break;
case llvm::omp::OMPC_seq_cst:
C = new (Context) OMPSeqCstClause();
break;
@@ -12128,6 +12131,8 @@
void OMPClauseReader::VisitOMPCompareClause(OMPCompareClause *) {}
+void OMPClauseReader::VisitOMPCompareCaptureClause(OMPCompareCaptureClause *) {}
+
void OMPClauseReader::VisitOMPSeqCstClause(OMPSeqCstClause *) {}
void OMPClauseReader::VisitOMPAcqRelClause(OMPAcqRelClause *) {}
Index: clang/lib/Sema/TreeTransform.h
===================================================================
--- clang/lib/Sema/TreeTransform.h
+++ clang/lib/Sema/TreeTransform.h
@@ -9467,6 +9467,13 @@
return C;
}
+template <typename Derived>
+OMPClause *TreeTransform<Derived>::TransformOMPCompareCaptureClause(
+ OMPCompareCaptureClause *C) {
+ // No need to rebuild this clause, no template-dependent parameters.
+ return C;
+}
+
template <typename Derived>
OMPClause *
TreeTransform<Derived>::TransformOMPSeqCstClause(OMPSeqCstClause *C) {
Index: clang/lib/Sema/SemaOpenMP.cpp
===================================================================
--- clang/lib/Sema/SemaOpenMP.cpp
+++ clang/lib/Sema/SemaOpenMP.cpp
@@ -35,6 +35,7 @@
#include "llvm/ADT/IndexedMap.h"
#include "llvm/ADT/PointerEmbeddedInt.h"
#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/Frontend/OpenMP/OMPConstants.h"
#include <set>
@@ -6355,6 +6356,7 @@
case OMPC_update:
case OMPC_capture:
case OMPC_compare:
+ case OMPC_compare_capture:
case OMPC_seq_cst:
case OMPC_acq_rel:
case OMPC_acquire:
@@ -10935,14 +10937,18 @@
SourceLocation AtomicKindLoc;
OpenMPClauseKind MemOrderKind = OMPC_unknown;
SourceLocation MemOrderLoc;
+ bool MutexClauseEncountered = false;
+ llvm::SmallSet<OpenMPClauseKind, 2> EncounteredAtomicKinds;
for (const OMPClause *C : Clauses) {
switch (C->getClauseKind()) {
case OMPC_read:
case OMPC_write:
case OMPC_update:
+ MutexClauseEncountered = true;
+ [[clang::fallthrough]];
case OMPC_capture:
case OMPC_compare: {
- if (AtomicKind != OMPC_unknown) {
+ if (AtomicKind != OMPC_unknown && MutexClauseEncountered) {
Diag(C->getBeginLoc(), diag::err_omp_atomic_several_clauses)
<< SourceRange(C->getBeginLoc(), C->getEndLoc());
Diag(AtomicKindLoc, diag::note_omp_previous_mem_order_clause)
@@ -10950,6 +10956,7 @@
} else {
AtomicKind = C->getClauseKind();
AtomicKindLoc = C->getBeginLoc();
+ EncounteredAtomicKinds.insert(C->getClauseKind());
}
break;
}
@@ -10973,10 +10980,15 @@
// The following clauses are allowed, but we don't need to do anything here.
case OMPC_hint:
break;
+ case OMPC_compare_capture:
+ llvm_unreachable("OMPC_compare_capture should never be created");
default:
llvm_unreachable("unknown clause is encountered");
}
}
+ if (EncounteredAtomicKinds.contains(OMPC_compare) &&
+ EncounteredAtomicKinds.contains(OMPC_capture))
+ AtomicKind = OMPC_compare_capture;
// OpenMP 5.0, 2.17.7 atomic Construct, Restrictions
// If atomic-clause is read then memory-order-clause must not be acq_rel or
// release.
@@ -13481,6 +13493,7 @@
case OMPC_update:
case OMPC_capture:
case OMPC_compare:
+ case OMPC_compare_capture:
case OMPC_seq_cst:
case OMPC_acq_rel:
case OMPC_acquire:
@@ -14313,6 +14326,7 @@
case OMPC_update:
case OMPC_capture:
case OMPC_compare:
+ case OMPC_compare_capture:
case OMPC_seq_cst:
case OMPC_acq_rel:
case OMPC_acquire:
@@ -14775,6 +14789,7 @@
case OMPC_write:
case OMPC_capture:
case OMPC_compare:
+ case OMPC_compare_capture:
case OMPC_seq_cst:
case OMPC_acq_rel:
case OMPC_acquire:
@@ -15081,6 +15096,7 @@
case OMPC_update:
case OMPC_capture:
case OMPC_compare:
+ case OMPC_compare_capture:
case OMPC_seq_cst:
case OMPC_acq_rel:
case OMPC_acquire:
@@ -15272,6 +15288,9 @@
case OMPC_compare:
Res = ActOnOpenMPCompareClause(StartLoc, EndLoc);
break;
+ case OMPC_compare_capture:
+ Res = ActOnOpenMPCompareCaptureClause(StartLoc, EndLoc);
+ break;
case OMPC_seq_cst:
Res = ActOnOpenMPSeqCstClause(StartLoc, EndLoc);
break;
@@ -15423,6 +15442,11 @@
return new (Context) OMPCompareClause(StartLoc, EndLoc);
}
+OMPClause *Sema::ActOnOpenMPCompareCaptureClause(SourceLocation StartLoc,
+ SourceLocation EndLoc) {
+ return new (Context) OMPCompareCaptureClause(StartLoc, EndLoc);
+}
+
OMPClause *Sema::ActOnOpenMPSeqCstClause(SourceLocation StartLoc,
SourceLocation EndLoc) {
return new (Context) OMPSeqCstClause(StartLoc, EndLoc);
@@ -15892,6 +15916,7 @@
case OMPC_update:
case OMPC_capture:
case OMPC_compare:
+ case OMPC_compare_capture:
case OMPC_seq_cst:
case OMPC_acq_rel:
case OMPC_acquire:
Index: clang/lib/Parse/ParseOpenMP.cpp
===================================================================
--- clang/lib/Parse/ParseOpenMP.cpp
+++ clang/lib/Parse/ParseOpenMP.cpp
@@ -3193,6 +3193,7 @@
case OMPC_write:
case OMPC_capture:
case OMPC_compare:
+ case OMPC_compare_capture:
case OMPC_seq_cst:
case OMPC_acq_rel:
case OMPC_acquire:
Index: clang/lib/CodeGen/CGStmtOpenMP.cpp
===================================================================
--- clang/lib/CodeGen/CGStmtOpenMP.cpp
+++ clang/lib/CodeGen/CGStmtOpenMP.cpp
@@ -5970,6 +5970,9 @@
case OMPC_compare:
// Do nothing here as we already emit an error.
break;
+ case OMPC_compare_capture:
+ // Do nothing here as we already emit an error.
+ break;
case OMPC_if:
case OMPC_final:
case OMPC_num_threads:
Index: clang/lib/Basic/OpenMPKinds.cpp
===================================================================
--- clang/lib/Basic/OpenMPKinds.cpp
+++ clang/lib/Basic/OpenMPKinds.cpp
@@ -164,6 +164,7 @@
case OMPC_write:
case OMPC_capture:
case OMPC_compare:
+ case OMPC_compare_capture:
case OMPC_seq_cst:
case OMPC_acq_rel:
case OMPC_acquire:
@@ -430,6 +431,7 @@
case OMPC_write:
case OMPC_capture:
case OMPC_compare:
+ case OMPC_compare_capture:
case OMPC_seq_cst:
case OMPC_acq_rel:
case OMPC_acquire:
Index: clang/lib/AST/StmtProfile.cpp
===================================================================
--- clang/lib/AST/StmtProfile.cpp
+++ clang/lib/AST/StmtProfile.cpp
@@ -553,6 +553,9 @@
void OMPClauseProfiler::VisitOMPCompareClause(const OMPCompareClause *) {}
+void OMPClauseProfiler::VisitOMPCompareCaptureClause(
+ const OMPCompareCaptureClause *) {}
+
void OMPClauseProfiler::VisitOMPSeqCstClause(const OMPSeqCstClause *) {}
void OMPClauseProfiler::VisitOMPAcqRelClause(const OMPAcqRelClause *) {}
Index: clang/lib/AST/OpenMPClause.cpp
===================================================================
--- clang/lib/AST/OpenMPClause.cpp
+++ clang/lib/AST/OpenMPClause.cpp
@@ -127,6 +127,7 @@
case OMPC_update:
case OMPC_capture:
case OMPC_compare:
+ case OMPC_compare_capture:
case OMPC_seq_cst:
case OMPC_acq_rel:
case OMPC_acquire:
@@ -219,6 +220,7 @@
case OMPC_update:
case OMPC_capture:
case OMPC_compare:
+ case OMPC_compare_capture:
case OMPC_seq_cst:
case OMPC_acq_rel:
case OMPC_acquire:
@@ -1798,6 +1800,10 @@
OS << "compare";
}
+void OMPClausePrinter::VisitOMPCompareCaptureClause(OMPCompareCaptureClause *) {
+ // Do nothing as it is dummy.
+}
+
void OMPClausePrinter::VisitOMPSeqCstClause(OMPSeqCstClause *) {
OS << "seq_cst";
}
Index: clang/include/clang/Sema/Sema.h
===================================================================
--- clang/include/clang/Sema/Sema.h
+++ clang/include/clang/Sema/Sema.h
@@ -11193,6 +11193,9 @@
/// Called on well-formed 'compare' clause.
OMPClause *ActOnOpenMPCompareClause(SourceLocation StartLoc,
SourceLocation EndLoc);
+ /// Called on well-formed 'compare' and 'capture' clauses.
+ OMPClause *ActOnOpenMPCompareCaptureClause(SourceLocation StartLoc,
+ SourceLocation EndLoc);
/// Called on well-formed 'seq_cst' clause.
OMPClause *ActOnOpenMPSeqCstClause(SourceLocation StartLoc,
SourceLocation EndLoc);
Index: clang/include/clang/AST/RecursiveASTVisitor.h
===================================================================
--- clang/include/clang/AST/RecursiveASTVisitor.h
+++ clang/include/clang/AST/RecursiveASTVisitor.h
@@ -3239,6 +3239,12 @@
return true;
}
+template <typename Derived>
+bool RecursiveASTVisitor<Derived>::VisitOMPCompareCaptureClause(
+ OMPCompareCaptureClause *) {
+ return true;
+}
+
template <typename Derived>
bool RecursiveASTVisitor<Derived>::VisitOMPSeqCstClause(OMPSeqCstClause *) {
return true;
Index: clang/include/clang/AST/OpenMPClause.h
===================================================================
--- clang/include/clang/AST/OpenMPClause.h
+++ clang/include/clang/AST/OpenMPClause.h
@@ -2265,6 +2265,48 @@
}
};
+/// This is a dummy clause that represents 'compare' and 'capture' clauses are
+/// present in the '#pragma omp atomic' directive.
+///
+/// \code
+/// #pragma omp atomic compare capture
+/// \endcode
+/// In this example directive '#pragma omp atomic' has 'compare' and 'capture'
+/// clauses.
+class OMPCompareCaptureClause : public OMPClause {
+public:
+ /// Build 'compare' clause.
+ ///
+ /// \param StartLoc Starting location of the clause.
+ /// \param EndLoc Ending location of the clause.
+ OMPCompareCaptureClause(SourceLocation StartLoc, SourceLocation EndLoc)
+ : OMPClause(llvm::omp::OMPC_compare_capture, StartLoc, EndLoc) {}
+
+ /// Build an empty clause.
+ OMPCompareCaptureClause()
+ : OMPClause(llvm::omp::OMPC_compare_capture, SourceLocation(),
+ SourceLocation()) {}
+
+ child_range children() {
+ return child_range(child_iterator(), child_iterator());
+ }
+
+ const_child_range children() const {
+ return const_child_range(const_child_iterator(), const_child_iterator());
+ }
+
+ child_range used_children() {
+ return child_range(child_iterator(), child_iterator());
+ }
+ const_child_range used_children() const {
+ return const_child_range(const_child_iterator(), const_child_iterator());
+ }
+
+ static bool classof(const OMPClause *T) {
+ return T->getClauseKind() == llvm::omp::OMPC_compare_capture;
+ }
+};
+
/// This represents 'seq_cst' clause in the '#pragma omp atomic'
/// directive.
///
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
