[Openmp-commits] [openmp] [OpenMP][NFC] Move debug declares into CMAKE out of "private.h" (PR #73732)
via Openmp-commits
openmp-commits at lists.llvm.org
Tue Nov 28 17:30:48 PST 2023
github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff 4eb421192479dbecae2621b868e55aaf6d945b02 4fb01419cefae13550b27a8e3c8080ffbb7d11f0 -- openmp/libomptarget/src/private.h openmp/libomptarget/test/env/omp_target_debug.c openmp/libomptarget/test/mapping/alloc_fail.c openmp/libomptarget/test/mapping/ompx_hold/omp_target_disassociate_ptr.c openmp/libomptarget/test/mapping/padding_not_mapped.c openmp/libomptarget/test/mapping/present/target.c openmp/libomptarget/test/mapping/present/target_array_extension.c openmp/libomptarget/test/mapping/present/target_data.c openmp/libomptarget/test/mapping/present/target_data_array_extension.c openmp/libomptarget/test/mapping/present/target_data_at_exit.c openmp/libomptarget/test/mapping/present/target_enter_data.c openmp/libomptarget/test/mapping/present/target_exit_data_delete.c openmp/libomptarget/test/mapping/present/target_exit_data_release.c openmp/libomptarget/test/mapping/present/target_update.c openmp/libomptarget/test/mapping/present/target_update_array_extension.c openmp/libomptarget/test/mapping/present/unified_shared_memory.c openmp/libomptarget/test/mapping/present/zero_length_array_section.c openmp/libomptarget/test/mapping/present/zero_length_array_section_exit.c openmp/libomptarget/test/mapping/target_data_array_extension_at_exit.c openmp/libomptarget/test/mapping/target_update_array_extension.c openmp/libomptarget/test/mapping/target_wrong_use_device_addr.c openmp/libomptarget/test/offloading/info.c openmp/libomptarget/test/offloading/mandatory_but_no_devices.c
``````````
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/openmp/libomptarget/test/mapping/alloc_fail.c b/openmp/libomptarget/test/mapping/alloc_fail.c
index c4ae70fc73..31912d4bdb 100644
--- a/openmp/libomptarget/test/mapping/alloc_fail.c
+++ b/openmp/libomptarget/test/mapping/alloc_fail.c
@@ -2,9 +2,11 @@
// RUN: %libomptarget-run-fail-generic 2>&1 \
// RUN: | %fcheck-generic
-// CHECK: omptarget message: explicit extension not allowed: host address specified is 0x{{.*}} (8 bytes), but device allocation maps to host at 0x{{.*}} (8 bytes)
-// CHECK: omptarget error: Call to getTargetPointer returned null pointer (device failure or illegal mapping).
-// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
+// CHECK: omptarget message: explicit extension not allowed: host address
+// specified is 0x{{.*}} (8 bytes), but device allocation maps to host at
+// 0x{{.*}} (8 bytes) CHECK: omptarget error: Call to getTargetPointer returned
+// null pointer (device failure or illegal mapping). CHECK: omptarget fatal
+// error 1: failure of target construct while offloading is mandatory
int main() {
int arr[4] = {0, 1, 2, 3};
diff --git a/openmp/libomptarget/test/mapping/padding_not_mapped.c b/openmp/libomptarget/test/mapping/padding_not_mapped.c
index 3ee70ab640..88bef3b9c8 100644
--- a/openmp/libomptarget/test/mapping/padding_not_mapped.c
+++ b/openmp/libomptarget/test/mapping/padding_not_mapped.c
@@ -34,10 +34,12 @@ int main() {
#pragma omp target update from(s.x) // should have no effect
fprintf(stderr, "s.x = %d\n", s.x);
- // CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
- // CHECK: omptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
- // CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
- #pragma omp target enter data map(present, alloc: s.x)
+// CHECK: omptarget message: device mapping required by 'present' map type
+// modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]]
+// bytes) CHECK: omptarget error: Call to getTargetPointer returned null pointer
+// ('present' map type modifier). CHECK: omptarget fatal error 1: failure of
+// target construct while offloading is mandatory
+#pragma omp target enter data map(present, alloc : s.x)
return 0;
}
diff --git a/openmp/libomptarget/test/mapping/present/target.c b/openmp/libomptarget/test/mapping/present/target.c
index 4344c42c80..e5cab61374 100644
--- a/openmp/libomptarget/test/mapping/present/target.c
+++ b/openmp/libomptarget/test/mapping/present/target.c
@@ -18,11 +18,13 @@ int main() {
// CHECK: i is present
fprintf(stderr, "i is present\n");
- // CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
- // CHECK: omptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
- // CHECK: omptarget error: Call to targetDataBegin failed, abort target.
- // CHECK: omptarget error: Failed to process data before launching the kernel.
- // CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
+ // CHECK: omptarget message: device mapping required by 'present' map type
+ // modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]]
+ // bytes) CHECK: omptarget error: Call to getTargetPointer returned null
+ // pointer ('present' map type modifier). CHECK: omptarget error: Call to
+ // targetDataBegin failed, abort target. CHECK: omptarget error: Failed to
+ // process data before launching the kernel. CHECK: omptarget fatal error 1:
+ // failure of target construct while offloading is mandatory
#pragma omp target map(present, alloc : i)
;
diff --git a/openmp/libomptarget/test/mapping/present/target_array_extension.c b/openmp/libomptarget/test/mapping/present/target_array_extension.c
index 873b2b3617..3e3d991b40 100644
--- a/openmp/libomptarget/test/mapping/present/target_array_extension.c
+++ b/openmp/libomptarget/test/mapping/present/target_array_extension.c
@@ -70,12 +70,16 @@ int main() {
// CHECK: arr is present
fprintf(stderr, "arr is present\n");
- // CHECK: omptarget message: explicit extension not allowed: host address specified is 0x{{0*}}[[#LARGE_ADDR]] ([[#LARGE_BYTES]] bytes), but device allocation maps to host at 0x{{0*}}[[#SMALL_ADDR]] ([[#SMALL_BYTES]] bytes)
- // CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#LARGE_ADDR]] ([[#LARGE_BYTES]] bytes)
- // CHECK: omptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
- // CHECK: omptarget error: Call to targetDataBegin failed, abort target.
- // CHECK: omptarget error: Failed to process data before launching the kernel.
- // CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
+ // CHECK: omptarget message: explicit extension not allowed: host address
+ // specified is 0x{{0*}}[[#LARGE_ADDR]] ([[#LARGE_BYTES]] bytes), but device
+ // allocation maps to host at 0x{{0*}}[[#SMALL_ADDR]] ([[#SMALL_BYTES]] bytes)
+ // CHECK: omptarget message: device mapping required by 'present' map type
+ // modifier does not exist for host address 0x{{0*}}[[#LARGE_ADDR]]
+ // ([[#LARGE_BYTES]] bytes) CHECK: omptarget error: Call to getTargetPointer
+ // returned null pointer ('present' map type modifier). CHECK: omptarget
+ // error: Call to targetDataBegin failed, abort target. CHECK: omptarget
+ // error: Failed to process data before launching the kernel. CHECK: omptarget
+ // fatal error 1: failure of target construct while offloading is mandatory
#pragma omp target data map(alloc : arr[SMALL])
{
#pragma omp target map(present, tofrom : arr[LARGE])
diff --git a/openmp/libomptarget/test/mapping/present/target_data.c b/openmp/libomptarget/test/mapping/present/target_data.c
index f894283a0c..ae3b762c34 100644
--- a/openmp/libomptarget/test/mapping/present/target_data.c
+++ b/openmp/libomptarget/test/mapping/present/target_data.c
@@ -18,8 +18,10 @@ int main() {
// CHECK: i is present
fprintf(stderr, "i is present\n");
- // CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
- // CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
+ // CHECK: omptarget message: device mapping required by 'present' map type
+ // modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]]
+ // bytes) CHECK: omptarget fatal error 1: failure of target construct while
+ // offloading is mandatory
#pragma omp target data map(present, alloc : i)
;
diff --git a/openmp/libomptarget/test/mapping/present/target_data_array_extension.c b/openmp/libomptarget/test/mapping/present/target_data_array_extension.c
index 794543a246..828351ef6b 100644
--- a/openmp/libomptarget/test/mapping/present/target_data_array_extension.c
+++ b/openmp/libomptarget/test/mapping/present/target_data_array_extension.c
@@ -70,10 +70,14 @@ int main() {
// CHECK: arr is present
fprintf(stderr, "arr is present\n");
- // CHECK: omptarget message: explicit extension not allowed: host address specified is 0x{{0*}}[[#LARGE_ADDR]] ([[#LARGE_BYTES]] bytes), but device allocation maps to host at 0x{{0*}}[[#SMALL_ADDR]] ([[#SMALL_BYTES]] bytes)
- // CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#LARGE_ADDR]] ([[#LARGE_BYTES]] bytes)
- // CHECK: omptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
- // CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
+ // CHECK: omptarget message: explicit extension not allowed: host address
+ // specified is 0x{{0*}}[[#LARGE_ADDR]] ([[#LARGE_BYTES]] bytes), but device
+ // allocation maps to host at 0x{{0*}}[[#SMALL_ADDR]] ([[#SMALL_BYTES]] bytes)
+ // CHECK: omptarget message: device mapping required by 'present' map type
+ // modifier does not exist for host address 0x{{0*}}[[#LARGE_ADDR]]
+ // ([[#LARGE_BYTES]] bytes) CHECK: omptarget error: Call to getTargetPointer
+ // returned null pointer ('present' map type modifier). CHECK: omptarget fatal
+ // error 1: failure of target construct while offloading is mandatory
#pragma omp target data map(alloc : arr[SMALL])
{
#pragma omp target data map(present, tofrom : arr[LARGE])
diff --git a/openmp/libomptarget/test/mapping/present/target_enter_data.c b/openmp/libomptarget/test/mapping/present/target_enter_data.c
index 871a05290e..633277ddf0 100644
--- a/openmp/libomptarget/test/mapping/present/target_enter_data.c
+++ b/openmp/libomptarget/test/mapping/present/target_enter_data.c
@@ -18,9 +18,11 @@ int main() {
// CHECK: i is present
fprintf(stderr, "i is present\n");
- // CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
- // CHECK: omptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
- // CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
+ // CHECK: omptarget message: device mapping required by 'present' map type
+ // modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]]
+ // bytes) CHECK: omptarget error: Call to getTargetPointer returned null
+ // pointer ('present' map type modifier). CHECK: omptarget fatal error 1:
+ // failure of target construct while offloading is mandatory
#pragma omp target enter data map(present, alloc : i)
// CHECK-NOT: i is present
diff --git a/openmp/libomptarget/test/mapping/present/target_exit_data_delete.c b/openmp/libomptarget/test/mapping/present/target_exit_data_delete.c
index 0fb812b299..d791166147 100644
--- a/openmp/libomptarget/test/mapping/present/target_exit_data_delete.c
+++ b/openmp/libomptarget/test/mapping/present/target_exit_data_delete.c
@@ -17,8 +17,10 @@ int main() {
// CHECK: i was present
fprintf(stderr, "i was present\n");
-// CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
-// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
+// CHECK: omptarget message: device mapping required by 'present' map type
+// modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]]
+// bytes) CHECK: omptarget fatal error 1: failure of target construct while
+// offloading is mandatory
#pragma omp target exit data map(present, delete : i)
// CHECK-NOT: i was present
diff --git a/openmp/libomptarget/test/mapping/present/target_exit_data_release.c b/openmp/libomptarget/test/mapping/present/target_exit_data_release.c
index 14be22faba..083f6c080d 100644
--- a/openmp/libomptarget/test/mapping/present/target_exit_data_release.c
+++ b/openmp/libomptarget/test/mapping/present/target_exit_data_release.c
@@ -17,8 +17,10 @@ int main() {
// CHECK: i was present
fprintf(stderr, "i was present\n");
-// CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
-// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
+// CHECK: omptarget message: device mapping required by 'present' map type
+// modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]]
+// bytes) CHECK: omptarget fatal error 1: failure of target construct while
+// offloading is mandatory
#pragma omp target exit data map(present, release : i)
// CHECK-NOT: i was present
diff --git a/openmp/libomptarget/test/mapping/present/target_update.c b/openmp/libomptarget/test/mapping/present/target_update.c
index 9f6783b6ef..5df4eee6fc 100644
--- a/openmp/libomptarget/test/mapping/present/target_update.c
+++ b/openmp/libomptarget/test/mapping/present/target_update.c
@@ -32,8 +32,10 @@ int main() {
// CHECK: i is present
fprintf(stderr, "i is present\n");
- // CHECK: omptarget message: device mapping required by 'present' motion modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
- // CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
+ // CHECK: omptarget message: device mapping required by 'present' motion
+ // modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]]
+ // bytes) CHECK: omptarget fatal error 1: failure of target construct while
+ // offloading is mandatory
#pragma omp target update CLAUSE(present : i)
// CHECK-NOT: i is present
diff --git a/openmp/libomptarget/test/mapping/present/target_update_array_extension.c b/openmp/libomptarget/test/mapping/present/target_update_array_extension.c
index 11ad4a8d49..f8f3c94d21 100644
--- a/openmp/libomptarget/test/mapping/present/target_update_array_extension.c
+++ b/openmp/libomptarget/test/mapping/present/target_update_array_extension.c
@@ -66,8 +66,10 @@ int main() {
// CHECK: arr is present
fprintf(stderr, "arr is present\n");
- // CHECK: omptarget message: device mapping required by 'present' motion modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
- // CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
+ // CHECK: omptarget message: device mapping required by 'present' motion
+ // modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]]
+ // bytes) CHECK: omptarget fatal error 1: failure of target construct while
+ // offloading is mandatory
#pragma omp target data map(alloc : arr[SMALL])
{
#pragma omp target update CLAUSE(present : arr[LARGE])
diff --git a/openmp/libomptarget/test/mapping/present/zero_length_array_section.c b/openmp/libomptarget/test/mapping/present/zero_length_array_section.c
index e903a268ef..4759585845 100644
--- a/openmp/libomptarget/test/mapping/present/zero_length_array_section.c
+++ b/openmp/libomptarget/test/mapping/present/zero_length_array_section.c
@@ -20,11 +20,13 @@ int main() {
// arr[0:0] doesn't create an actual mapping in the first directive.
//
- // CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] (0 bytes)
- // CHECK: omptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
- // CHECK: omptarget error: Call to targetDataBegin failed, abort target.
- // CHECK: omptarget error: Failed to process data before launching the kernel.
- // CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
+ // CHECK: omptarget message: device mapping required by 'present' map type
+ // modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] (0 bytes)
+ // CHECK: omptarget error: Call to getTargetPointer returned null pointer
+ // ('present' map type modifier). CHECK: omptarget error: Call to
+ // targetDataBegin failed, abort target. CHECK: omptarget error: Failed to
+ // process data before launching the kernel. CHECK: omptarget fatal error 1:
+ // failure of target construct while offloading is mandatory
#pragma omp target data map(alloc : arr[0 : 0])
#pragma omp target map(present, alloc : arr[0 : 0])
;
diff --git a/openmp/libomptarget/test/mapping/present/zero_length_array_section_exit.c b/openmp/libomptarget/test/mapping/present/zero_length_array_section_exit.c
index 5a7360542e..c88c47f115 100644
--- a/openmp/libomptarget/test/mapping/present/zero_length_array_section_exit.c
+++ b/openmp/libomptarget/test/mapping/present/zero_length_array_section_exit.c
@@ -19,8 +19,10 @@ int main() {
// arr[0:0] doesn't create an actual mapping in the first directive.
//
- // CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] (0 bytes)
- // CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
+ // CHECK: omptarget message: device mapping required by 'present' map type
+ // modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] (0 bytes)
+ // CHECK: omptarget fatal error 1: failure of target construct while
+ // offloading is mandatory
#pragma omp target enter data map(alloc : arr[0 : 0])
#pragma omp target exit data map(present, release : arr[0 : 0])
diff --git a/openmp/libomptarget/test/offloading/mandatory_but_no_devices.c b/openmp/libomptarget/test/offloading/mandatory_but_no_devices.c
index ecdee72aca..c44b3f6ba8 100644
--- a/openmp/libomptarget/test/offloading/mandatory_but_no_devices.c
+++ b/openmp/libomptarget/test/offloading/mandatory_but_no_devices.c
@@ -47,7 +47,8 @@
#include <omp.h>
#include <stdio.h>
-// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
+// CHECK: omptarget fatal error 1: failure of target construct while offloading
+// is mandatory
int main(void) {
int X;
#pragma omp DIR device(omp_get_initial_device())
``````````
</details>
https://github.com/llvm/llvm-project/pull/73732
More information about the Openmp-commits
mailing list