https://github.com/ddpagan updated
https://github.com/llvm/llvm-project/pull/158336
>From 3a758d9ee772a3200c0c47c37215d083c204683f Mon Sep 17 00:00:00 2001
From: Dave Pagan <dave.pa...@amd.com>
Date: Fri, 12 Sep 2025 10:36:21 -0500
Subject: [PATCH 1/2] [clang][OpenMP] 6.0: Add defaultmap implicit-behavior
'storage'
Per OpenMP 6.0 specification, section 7.9.9
Argument keywords, page 291, L17
Additional information, page 291, L24-25
24 The value alloc may also be specified as implicit-behavior with
identical meaning to the value 25 storage.
Testing:
Updated 'defaultmap' error message and codegen LIT tests to verify
behavior in OpenMP 6.0.
---
clang/docs/ReleaseNotes.rst | 1 +
clang/include/clang/Basic/OpenMPKinds.def | 1 +
clang/lib/Basic/OpenMPKinds.cpp | 10 +++++--
clang/lib/Sema/SemaOpenMP.cpp | 11 +++++--
.../OpenMP/target_defaultmap_codegen_01.cpp | 12 ++++++--
.../OpenMP/target_defaultmap_messages.cpp | 30 +++++++++++--------
6 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index bdf8334f78cea..b363650f62f4c 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -527,6 +527,7 @@ OpenMP Support
- Fixed non-contiguous strided update in the ``omp target update`` directive
with the ``from`` clause.
- Properly handle array section/assumed-size array privatization in C/C++.
- Added support for ``variable-category`` modifier in ``default clause``.
+- Added support for ``defaultmap`` directive implicit-behavior ``storage``.
Improvements
^^^^^^^^^^^^
diff --git a/clang/include/clang/Basic/OpenMPKinds.def
b/clang/include/clang/Basic/OpenMPKinds.def
index 79c11b851c557..69a1061727859 100644
--- a/clang/include/clang/Basic/OpenMPKinds.def
+++ b/clang/include/clang/Basic/OpenMPKinds.def
@@ -137,6 +137,7 @@ OPENMP_DEFAULTMAP_MODIFIER(firstprivate)
OPENMP_DEFAULTMAP_MODIFIER(none)
OPENMP_DEFAULTMAP_MODIFIER(default)
OPENMP_DEFAULTMAP_MODIFIER(present)
+OPENMP_DEFAULTMAP_MODIFIER(storage)
// Static attributes for 'depend' clause.
OPENMP_DEPEND_KIND(in)
diff --git a/clang/lib/Basic/OpenMPKinds.cpp b/clang/lib/Basic/OpenMPKinds.cpp
index 3255da8548cbc..73daf0f40ef44 100644
--- a/clang/lib/Basic/OpenMPKinds.cpp
+++ b/clang/lib/Basic/OpenMPKinds.cpp
@@ -110,14 +110,18 @@ unsigned
clang::getOpenMPSimpleClauseType(OpenMPClauseKind Kind, StringRef Str,
#define OPENMP_DIST_SCHEDULE_KIND(Name) .Case(#Name, OMPC_DIST_SCHEDULE_##Name)
#include "clang/Basic/OpenMPKinds.def"
.Default(OMPC_DIST_SCHEDULE_unknown);
- case OMPC_defaultmap:
- return llvm::StringSwitch<unsigned>(Str)
+ case OMPC_defaultmap: {
+ unsigned Type = llvm::StringSwitch<unsigned>(Str)
#define OPENMP_DEFAULTMAP_KIND(Name)
\
.Case(#Name, static_cast<unsigned>(OMPC_DEFAULTMAP_##Name))
#define OPENMP_DEFAULTMAP_MODIFIER(Name)
\
.Case(#Name, static_cast<unsigned>(OMPC_DEFAULTMAP_MODIFIER_##Name))
#include "clang/Basic/OpenMPKinds.def"
- .Default(OMPC_DEFAULTMAP_unknown);
+ .Default(OMPC_DEFAULTMAP_unknown);
+ if (LangOpts.OpenMP < 60 && Type == OMPC_DEFAULTMAP_MODIFIER_storage)
+ return OMPC_DEFAULTMAP_MODIFIER_unknown;
+ return Type;
+ }
case OMPC_atomic_default_mem_order:
return llvm::StringSwitch<OpenMPAtomicDefaultMemOrderClauseKind>(Str)
#define OPENMP_ATOMIC_DEFAULT_MEM_ORDER_KIND(Name) \
diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp
index 66bdd6e72d827..981c8fe9f0c2f 100644
--- a/clang/lib/Sema/SemaOpenMP.cpp
+++ b/clang/lib/Sema/SemaOpenMP.cpp
@@ -843,7 +843,8 @@ class DSAStackTy {
(M == OMPC_DEFAULTMAP_MODIFIER_to) ||
(M == OMPC_DEFAULTMAP_MODIFIER_from) ||
(M == OMPC_DEFAULTMAP_MODIFIER_tofrom) ||
- (M == OMPC_DEFAULTMAP_MODIFIER_present);
+ (M == OMPC_DEFAULTMAP_MODIFIER_present) ||
+ (M == OMPC_DEFAULTMAP_MODIFIER_storage);
}
return true;
}
@@ -3748,6 +3749,7 @@
getMapClauseKindFromModifier(OpenMPDefaultmapClauseModifier M,
OpenMPMapClauseKind Kind = OMPC_MAP_unknown;
switch (M) {
case OMPC_DEFAULTMAP_MODIFIER_alloc:
+ case OMPC_DEFAULTMAP_MODIFIER_storage:
Kind = OMPC_MAP_alloc;
break;
case OMPC_DEFAULTMAP_MODIFIER_to:
@@ -23112,8 +23114,11 @@ OMPClause *SemaOpenMP::ActOnOpenMPDefaultmapClause(
}
} else {
StringRef ModifierValue =
- "'alloc', 'from', 'to', 'tofrom', "
- "'firstprivate', 'none', 'default', 'present'";
+ getLangOpts().OpenMP < 60
+ ? "'alloc', 'from', 'to', 'tofrom', "
+ "'firstprivate', 'none', 'default', 'present'"
+ : "'storage', 'from', 'to', 'tofrom', "
+ "'firstprivate', 'none', 'default', 'present'";
if (!isDefaultmapKind && isDefaultmapModifier) {
Diag(KindLoc, diag::err_omp_unexpected_clause_value)
<< KindValue << getOpenMPClauseNameForDiag(OMPC_defaultmap);
diff --git a/clang/test/OpenMP/target_defaultmap_codegen_01.cpp
b/clang/test/OpenMP/target_defaultmap_codegen_01.cpp
index ce862632dd940..0936aa08e21e7 100644
--- a/clang/test/OpenMP/target_defaultmap_codegen_01.cpp
+++ b/clang/test/OpenMP/target_defaultmap_codegen_01.cpp
@@ -6,6 +6,8 @@
///==========================================================================///
// RUN: %clang_cc1 -no-enable-noundef-analysis -DCK1 -verify -Wno-vla -fopenmp
-fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple
powerpc64le-unknown-unknown -emit-llvm %s -o - | FileCheck
-allow-deprecated-dag-overlap %s --check-prefix CK1
+// Verify implicit-behavior 'storage' as alias for 'alloc' in OpenMP 6.0
+// RUN: %clang_cc1 -no-enable-noundef-analysis -DCK1 -DOMP6 -verify -Wno-vla
-fopenmp -fopenmp-version=60 -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++
-triple powerpc64le-unknown-unknown -emit-llvm %s -o - | FileCheck
-allow-deprecated-dag-overlap %s --check-prefix CK1
// RUN: %clang_cc1 -no-enable-noundef-analysis -DCK1 -fopenmp
-fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -std=c++11 -triple
powerpc64le-unknown-unknown -emit-pch -o %t %s
// RUN: %clang_cc1 -no-enable-noundef-analysis -fopenmp
-fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple
powerpc64le-unknown-unknown -std=c++11 -include-pch %t -verify -Wno-vla %s
-emit-llvm -o - | FileCheck -allow-deprecated-dag-overlap %s --check-prefix
CK1
// RUN: %clang_cc1 -no-enable-noundef-analysis -DCK1 -verify -Wno-vla -fopenmp
-fopenmp-targets=i386-pc-linux-gnu -x c++ -triple i386-unknown-unknown
-emit-llvm %s -o - | FileCheck -allow-deprecated-dag-overlap %s
--check-prefix CK1
@@ -43,8 +45,12 @@ void implicit_maps_double_complex (int a){
// CK1-DAG: store ptr [[PTR]], ptr [[P1]]
// CK1: call void [[KERNEL:@.+]](ptr [[PTR]])
-#pragma omp target defaultmap(alloc \
- : scalar)
+#ifdef OMP6
+// 'storage' is an alias for 'alloc' in OpenMP 6.0
+#pragma omp target defaultmap(storage : scalar)
+#else
+#pragma omp target defaultmap(alloc : scalar)
+#endif // OMP6
{
dc *= dc;
}
@@ -235,6 +241,8 @@ void implicit_maps_double (int a){
#endif
///==========================================================================///
// RUN: %clang_cc1 -no-enable-noundef-analysis -DCK5 -verify -Wno-vla
-fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple
powerpc64le-unknown-unknown -emit-llvm %s -o - | FileCheck
-allow-deprecated-dag-overlap %s --check-prefix CK5
+// Verify implicit-behavior 'alloc' still accepted in OpenMP 6.0
+// RUN: %clang_cc1 -no-enable-noundef-analysis -DCK5 -verify -Wno-vla
-fopenmp -fopenmp-version=60 -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++
-triple powerpc64le-unknown-unknown -emit-llvm %s -o - | FileCheck
-allow-deprecated-dag-overlap %s --check-prefix CK5
// RUN: %clang_cc1 -no-enable-noundef-analysis -DCK5 -fopenmp
-fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -std=c++11 -triple
powerpc64le-unknown-unknown -emit-pch -o %t %s
// RUN: %clang_cc1 -no-enable-noundef-analysis -fopenmp
-fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple
powerpc64le-unknown-unknown -std=c++11 -include-pch %t -verify -Wno-vla %s
-emit-llvm -o - | FileCheck -allow-deprecated-dag-overlap %s --check-prefix
CK5
// RUN: %clang_cc1 -no-enable-noundef-analysis -DCK5 -verify -Wno-vla
-fopenmp -fopenmp-targets=i386-pc-linux-gnu -x c++ -triple i386-unknown-unknown
-emit-llvm %s -o - | FileCheck -allow-deprecated-dag-overlap %s
--check-prefix CK5
diff --git a/clang/test/OpenMP/target_defaultmap_messages.cpp
b/clang/test/OpenMP/target_defaultmap_messages.cpp
index 88ae3b7962d55..7675d22df7be6 100644
--- a/clang/test/OpenMP/target_defaultmap_messages.cpp
+++ b/clang/test/OpenMP/target_defaultmap_messages.cpp
@@ -1,5 +1,8 @@
-// RUN: %clang_cc1 -verify -Wno-vla -fopenmp %s -fopenmp-version=52
-verify=expected,omp5x,omp52 -Wuninitialized
-// RUN: %clang_cc1 -verify -Wno-vla -fopenmp-simd %s -fopenmp-version=52
-verify=expected,omp5x,omp52 -Wuninitialized
+// RUN: %clang_cc1 -verify -Wno-vla -fopenmp %s -fopenmp-version=60
-verify=expected,omp-ge52,omp60 -Wuninitialized
+// RUN: %clang_cc1 -verify -Wno-vla -fopenmp-simd %s -fopenmp-version=60
-verify=expected,omp-ge52,omp60 -Wuninitialized
+
+// RUN: %clang_cc1 -verify -Wno-vla -fopenmp %s -fopenmp-version=52
-verify=expected,omp5x,omp-ge52 -Wuninitialized
+// RUN: %clang_cc1 -verify -Wno-vla -fopenmp-simd %s -fopenmp-version=52
-verify=expected,omp5x,omp-ge52 -Wuninitialized
// RUN: %clang_cc1 -verify -Wno-vla -fopenmp %s -fopenmp-version=51
-verify=expected,omp5x,omp51 -Wuninitialized -DOMP51
// RUN: %clang_cc1 -verify -Wno-vla -fopenmp-simd %s -fopenmp-version=51
-verify=expected,omp5x,omp51 -Wuninitialized -DOMP51
@@ -33,23 +36,23 @@ template <class T, typename S, int N, int ST>
T tmain(T argc, S **argv) {
#pragma omp target defaultmap // expected-error {{expected '(' after
'defaultmap'}}
foo();
-#pragma omp target defaultmap( // omp5x-error {{expected 'alloc', 'from',
'to', 'tofrom', 'firstprivate', 'none', 'default', 'present' in OpenMP clause
'defaultmap'}} omp5-error {{expected 'alloc', 'from', 'to', 'tofrom',
'firstprivate', 'none', 'default' in OpenMP clause 'defaultmap'}}
expected-error {{expected ')'}} expected-note {{to match this '('}} omp45-error
{{expected 'tofrom' in OpenMP clause 'defaultmap'}}
+#pragma omp target defaultmap( // omp60-error {{expected 'storage', 'from',
'to', 'tofrom', 'firstprivate', 'none', 'default', 'present' in OpenMP clause
'defaultmap'}} omp5x-error {{expected 'alloc', 'from', 'to', 'tofrom',
'firstprivate', 'none', 'default', 'present' in OpenMP clause 'defaultmap'}}
omp5-error {{expected 'alloc', 'from', 'to', 'tofrom', 'firstprivate', 'none',
'default' in OpenMP clause 'defaultmap'}} expected-error {{expected ')'}}
expected-note {{to match this '('}} omp45-error {{expected 'tofrom' in OpenMP
clause 'defaultmap'}}
foo();
-#pragma omp target defaultmap() // omp5x-error {{expected 'alloc', 'from',
'to', 'tofrom', 'firstprivate', 'none', 'default', 'present' in OpenMP clause
'defaultmap'}} omp5-error {{expected 'alloc', 'from', 'to', 'tofrom',
'firstprivate', 'none', 'default' in OpenMP clause 'defaultmap'}} omp45-error
{{expected 'tofrom' in OpenMP clause 'defaultmap'}}
+#pragma omp target defaultmap() // omp60-error {{expected 'storage', 'from',
'to', 'tofrom', 'firstprivate', 'none', 'default', 'present' in OpenMP clause
'defaultmap'}} omp5x-error {{expected 'alloc', 'from', 'to', 'tofrom',
'firstprivate', 'none', 'default', 'present' in OpenMP clause 'defaultmap'}}
omp5-error {{expected 'alloc', 'from', 'to', 'tofrom', 'firstprivate', 'none',
'default' in OpenMP clause 'defaultmap'}} omp45-error {{expected 'tofrom' in
OpenMP clause 'defaultmap'}}
foo();
#pragma omp target defaultmap(tofrom // expected-error {{expected ')'}}
expected-note {{to match this '('}} omp45-warning {{missing ':' after
defaultmap modifier - ignoring}} omp45-error {{expected 'scalar' in OpenMP
clause 'defaultmap'}}
foo();
- #pragma omp target defaultmap (tofrom: // expected-error {{expected ')'}}
expected-note {{to match this '('}} omp52-error {{expected 'scalar',
'aggregate', 'pointer', 'all' in OpenMP clause 'defaultmap'}} omp51-error
{{expected 'scalar', 'aggregate', 'pointer' in OpenMP clause 'defaultmap'}}
omp5-error {{expected 'scalar', 'aggregate', 'pointer' in OpenMP clause
'defaultmap'}} omp45-error {{expected 'scalar' in OpenMP clause 'defaultmap'}}
+ #pragma omp target defaultmap (tofrom: // expected-error {{expected ')'}}
expected-note {{to match this '('}} omp-ge52-error {{expected 'scalar',
'aggregate', 'pointer', 'all' in OpenMP clause 'defaultmap'}} omp51-error
{{expected 'scalar', 'aggregate', 'pointer' in OpenMP clause 'defaultmap'}}
omp5-error {{expected 'scalar', 'aggregate', 'pointer' in OpenMP clause
'defaultmap'}} omp45-error {{expected 'scalar' in OpenMP clause 'defaultmap'}}
foo();
#pragma omp target defaultmap(tofrom) // omp45-warning {{missing ':' after
defaultmap modifier - ignoring}} omp45-error {{expected 'scalar' in OpenMP
clause 'defaultmap'}}
foo();
#pragma omp target defaultmap(tofrom, // expected-error {{expected ')'}}
omp45-warning {{missing ':' after defaultmap modifier - ignoring}}
expected-note {{to match this '('}} omp45-error {{expected 'scalar' in OpenMP
clause 'defaultmap'}}
foo();
- #pragma omp target defaultmap (scalar: // omp5x-error {{expected 'alloc',
'from', 'to', 'tofrom', 'firstprivate', 'none', 'default', 'present' in OpenMP
clause 'defaultmap'}} omp52-error {{expected 'scalar', 'aggregate', 'pointer',
'all' in OpenMP clause 'defaultmap'}} omp51-error {{expected 'scalar',
'aggregate', 'pointer' in OpenMP clause 'defaultmap'}} omp5-error {{expected
'scalar', 'aggregate', 'pointer' in OpenMP clause 'defaultmap'}} expected-error
{{expected ')'}} omp5-error {{expected 'alloc', 'from', 'to', 'tofrom',
'firstprivate', 'none', 'default' in OpenMP clause 'defaultmap'}} expected-note
{{to match this '('}} omp45-error {{expected 'tofrom' in OpenMP clause
'defaultmap'}}
+ #pragma omp target defaultmap (scalar: // omp60-error {{expected 'storage',
'from', 'to', 'tofrom', 'firstprivate', 'none', 'default', 'present' in OpenMP
clause 'defaultmap'}} omp5x-error {{expected 'alloc', 'from', 'to', 'tofrom',
'firstprivate', 'none', 'default', 'present' in OpenMP clause 'defaultmap'}}
omp-ge52-error {{expected 'scalar', 'aggregate', 'pointer', 'all' in OpenMP
clause 'defaultmap'}} omp51-error {{expected 'scalar', 'aggregate', 'pointer'
in OpenMP clause 'defaultmap'}} omp5-error {{expected 'scalar', 'aggregate',
'pointer' in OpenMP clause 'defaultmap'}} expected-error {{expected ')'}}
omp5-error {{expected 'alloc', 'from', 'to', 'tofrom', 'firstprivate', 'none',
'default' in OpenMP clause 'defaultmap'}} expected-note {{to match this '('}}
omp45-error {{expected 'tofrom' in OpenMP clause 'defaultmap'}}
foo();
#pragma omp target defaultmap(tofrom, scalar // expected-error {{expected
')'}} omp45-warning {{missing ':' after defaultmap modifier - ignoring}}
expected-note {{to match this '('}} omp45-error {{expected 'scalar' in OpenMP
clause 'defaultmap'}}
foo();
- #pragma omp target defaultmap(tofrom:scalar) defaultmap(tofrom:scalar) //
omp45-error {{directive '#pragma omp target' cannot contain more than one
'defaultmap' clause}} omp5-error {{at most one defaultmap clause for each
variable-category can appear on the directive}} omp5x-error {{at most one
defaultmap clause for each variable-category can appear on the directive}}
+ #pragma omp target defaultmap(tofrom:scalar) defaultmap(tofrom:scalar) //
omp45-error {{directive '#pragma omp target' cannot contain more than one
'defaultmap' clause}} omp5-error {{at most one defaultmap clause for each
variable-category can appear on the directive}} omp5x-error {{at most one
defaultmap clause for each variable-category can appear on the directive}}
omp60-error {{at most one defaultmap clause for each variable-category can
appear on the directive}}
foo();
@@ -96,23 +99,26 @@ T tmain(T argc, S **argv) {
int main(int argc, char **argv) {
#pragma omp target defaultmap // expected-error {{expected '(' after
'defaultmap'}}
foo();
-#pragma omp target defaultmap( // omp5x-error {{expected 'alloc', 'from',
'to', 'tofrom', 'firstprivate', 'none', 'default', 'present' in OpenMP clause
'defaultmap'}} omp5-error {{expected 'alloc', 'from', 'to', 'tofrom',
'firstprivate', 'none', 'default' in OpenMP clause 'defaultmap'}}
expected-error {{expected ')'}} expected-note {{to match this '('}} omp45-error
{{expected 'tofrom' in OpenMP clause 'defaultmap'}}
+#pragma omp target defaultmap( // omp60-error {{expected 'storage', 'from',
'to', 'tofrom', 'firstprivate', 'none', 'default', 'present' in OpenMP clause
'defaultmap'}} omp5x-error {{expected 'alloc', 'from', 'to', 'tofrom',
'firstprivate', 'none', 'default', 'present' in OpenMP clause 'defaultmap'}}
omp5-error {{expected 'alloc', 'from', 'to', 'tofrom', 'firstprivate', 'none',
'default' in OpenMP clause 'defaultmap'}} expected-error {{expected ')'}}
expected-note {{to match this '('}} omp45-error {{expected 'tofrom' in OpenMP
clause 'defaultmap'}}
foo();
-#pragma omp target defaultmap() // omp5x-error {{expected 'alloc', 'from',
'to', 'tofrom', 'firstprivate', 'none', 'default', 'present' in OpenMP clause
'defaultmap'}} omp5-error {{expected 'alloc', 'from', 'to', 'tofrom',
'firstprivate', 'none', 'default' in OpenMP clause 'defaultmap'}} omp45-error
{{expected 'tofrom' in OpenMP clause 'defaultmap'}}
+#pragma omp target defaultmap() // omp60-error {{expected 'storage', 'from',
'to', 'tofrom', 'firstprivate', 'none', 'default', 'present' in OpenMP clause
'defaultmap'}} omp5x-error {{expected 'alloc', 'from', 'to', 'tofrom',
'firstprivate', 'none', 'default', 'present' in OpenMP clause 'defaultmap'}}
omp5-error {{expected 'alloc', 'from', 'to', 'tofrom', 'firstprivate', 'none',
'default' in OpenMP clause 'defaultmap'}} omp45-error {{expected 'tofrom' in
OpenMP clause 'defaultmap'}}
foo();
#pragma omp target defaultmap(tofrom // expected-error {{expected ')'}}
expected-note {{to match this '('}} omp45-warning {{missing ':' after
defaultmap modifier - ignoring}} omp45-error {{expected 'scalar' in OpenMP
clause 'defaultmap'}}
foo();
-#pragma omp target defaultmap(tofrom: // expected-error {{expected ')'}}
expected-note {{to match this '('}} omp52-error {{expected 'scalar',
'aggregate', 'pointer', 'all' in OpenMP clause 'defaultmap'}} omp51-error
{{expected 'scalar', 'aggregate', 'pointer' in OpenMP clause 'defaultmap'}}
omp5-error {{expected 'scalar', 'aggregate', 'pointer' in OpenMP clause
'defaultmap'}} omp45-error {{expected 'scalar' in OpenMP clause 'defaultmap'}}
+#pragma omp target defaultmap(tofrom: // expected-error {{expected ')'}}
expected-note {{to match this '('}} omp-ge52-error {{expected 'scalar',
'aggregate', 'pointer', 'all' in OpenMP clause 'defaultmap'}} omp51-error
{{expected 'scalar', 'aggregate', 'pointer' in OpenMP clause 'defaultmap'}}
omp5-error {{expected 'scalar', 'aggregate', 'pointer' in OpenMP clause
'defaultmap'}} omp45-error {{expected 'scalar' in OpenMP clause 'defaultmap'}}
foo();
#pragma omp target defaultmap(tofrom) // omp45-warning {{missing ':' after
defaultmap modifier - ignoring}} omp45-error {{expected 'scalar' in OpenMP
clause 'defaultmap'}}
foo();
#pragma omp target defaultmap(tofrom, // expected-error {{expected ')'}}
omp45-warning {{missing ':' after defaultmap modifier - ignoring}}
expected-note {{to match this '('}} omp45-error {{expected 'scalar' in OpenMP
clause 'defaultmap'}}
foo();
-#pragma omp target defaultmap(scalar: // omp5x-error {{expected 'alloc',
'from', 'to', 'tofrom', 'firstprivate', 'none', 'default', 'present' in OpenMP
clause 'defaultmap'}} omp52-error {{expected 'scalar', 'aggregate', 'pointer',
'all' in OpenMP clause 'defaultmap'}} omp51-error {{expected 'scalar',
'aggregate', 'pointer' in OpenMP clause 'defaultmap'}} omp5-error {{expected
'scalar', 'aggregate', 'pointer' in OpenMP clause 'defaultmap'}} expected-error
{{expected ')'}} omp5-error {{expected 'alloc', 'from', 'to', 'tofrom',
'firstprivate', 'none', 'default' in OpenMP clause 'defaultmap'}} expected-note
{{to match this '('}} omp45-error {{expected 'tofrom' in OpenMP clause
'defaultmap'}}
+#pragma omp target defaultmap(scalar: // omp60-error {{expected 'storage',
'from', 'to', 'tofrom', 'firstprivate', 'none', 'default', 'present' in OpenMP
clause 'defaultmap'}} omp5x-error {{expected 'alloc', 'from', 'to', 'tofrom',
'firstprivate', 'none', 'default', 'present' in OpenMP clause 'defaultmap'}}
omp-ge52-error {{expected 'scalar', 'aggregate', 'pointer', 'all' in OpenMP
clause 'defaultmap'}} omp51-error {{expected 'scalar', 'aggregate', 'pointer'
in OpenMP clause 'defaultmap'}} omp5-error {{expected 'scalar', 'aggregate',
'pointer' in OpenMP clause 'defaultmap'}} expected-error {{expected ')'}}
omp5-error {{expected 'alloc', 'from', 'to', 'tofrom', 'firstprivate', 'none',
'default' in OpenMP clause 'defaultmap'}} expected-note {{to match this '('}}
omp45-error {{expected 'tofrom' in OpenMP clause 'defaultmap'}}
foo();
#pragma omp target defaultmap(tofrom, scalar // expected-error {{expected
')'}} omp45-warning {{missing ':' after defaultmap modifier - ignoring}}
expected-note {{to match this '('}} omp45-error {{expected 'scalar' in OpenMP
clause 'defaultmap'}}
foo();
-#pragma omp target defaultmap(tofrom: scalar) defaultmap(tofrom: scalar) //
omp45-error {{directive '#pragma omp target' cannot contain more than one
'defaultmap' clause}} omp5-error {{at most one defaultmap clause for each
variable-category can appear on the directive}} omp5x-error {{at most one
defaultmap clause for each variable-category can appear on the directive}}
+#pragma omp target defaultmap(tofrom: scalar) defaultmap(tofrom: scalar) //
omp45-error {{directive '#pragma omp target' cannot contain more than one
'defaultmap' clause}} omp5-error {{at most one defaultmap clause for each
variable-category can appear on the directive}} omp5x-error {{at most one
defaultmap clause for each variable-category can appear on the directive}}
omp60-error {{at most one defaultmap clause for each variable-category can
appear on the directive}}
+ foo();
+ // Verify 'storage' causes an error prior to OpenMP 6.0
+#pragma omp target defaultmap(storage) // omp5x-error {{expected 'alloc',
'from', 'to', 'tofrom', 'firstprivate', 'none', 'default', 'present' in OpenMP
clause 'defaultmap'}} omp5-error {{expected 'alloc', 'from', 'to', 'tofrom',
'firstprivate', 'none', 'default' in OpenMP clause 'defaultmap'}} omp45-error
{{expected 'tofrom' in OpenMP clause 'defaultmap'}}
foo();
#ifdef OMP5
>From e070b4da0e07334cbc290366707d6c5b736dde61 Mon Sep 17 00:00:00 2001
From: Dave Pagan <dave.pa...@amd.com>
Date: Mon, 15 Sep 2025 12:27:14 -0500
Subject: [PATCH 2/2] Per review comment, update OpenMPSupport.rst
---
clang/docs/OpenMPSupport.rst | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/clang/docs/OpenMPSupport.rst b/clang/docs/OpenMPSupport.rst
index 0bc8590815220..54c8f9a151f51 100644
--- a/clang/docs/OpenMPSupport.rst
+++ b/clang/docs/OpenMPSupport.rst
@@ -580,7 +580,8 @@ implementation.
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
| Changes to omp_target_is_accessible | :part:`In
Progress` | :part:`In Progress` |
|
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
-
+| defaultmap implicit-behavior 'storage' | :good:`done`
| :none:`unclaimed` |
https://github.com/llvm/llvm-project/pull/158336 |
++-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
.. _OpenMP 6.1 implementation details:
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
