Skip to content

Commit 5d57041

Browse files
jdoerfertjdoerfert
authored
[OpenMP][NFC] Move debug declares into CMAKE out of "private.h" (#73732)
Everywhere else we define this in the CMakeLists.txt and "private.h" needs to go. Rename "Libomptarget" into "omptarget", no benefit from "lib".
1 parent 5231605 commit 5d57041

24 files changed

+72
-71
lines changed

‎openmp/libomptarget/src/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
4444
"-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports")
4545
endif()
4646

47+
# Define the TARGET_NAME and DEBUG_PREFIX.
48+
target_compile_definitions(omptarget PRIVATE
49+
TARGET_NAME=omptarget
50+
DEBUG_PREFIX="omptarget"
51+
)
52+
4753
# libomptarget.so needs to be aware of where the plugins live as they
4854
# are now separated in the build directory.
4955
set_target_properties(omptarget PROPERTIES

‎openmp/libomptarget/src/private.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,6 @@ struct TargetMemsetArgsTy {
257257
}
258258
#endif
259259

260-
#define TARGET_NAME Libomptarget
261-
#ifndef DEBUG_PREFIX
262-
#define DEBUG_PREFIX GETNAME(TARGET_NAME)
263-
#endif
264-
265260
////////////////////////////////////////////////////////////////////////////////
266261
/// dump a table of all the host-target pointer pairs on failure
267262
static inline void dumpTargetPointerMappings(const ident_t *Loc,

‎openmp/libomptarget/test/env/omp_target_debug.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ int main(void) {
88
return 0;
99
}
1010

11-
// DEBUG: Libomptarget
12-
// NDEBUG-NOT: Libomptarget
11+
// DEBUG: omptarget
12+
// NDEBUG-NOT: omptarget
1313
// NDEBUG-NOT: Target

‎openmp/libomptarget/test/mapping/alloc_fail.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// RUN: %libomptarget-run-fail-generic 2>&1 \
33
// RUN: | %fcheck-generic
44

5-
// CHECK: Libomptarget message: explicit extension not allowed: host address specified is 0x{{.*}} (8 bytes), but device allocation maps to host at 0x{{.*}} (8 bytes)
6-
// CHECK: Libomptarget error: Call to getTargetPointer returned null pointer (device failure or illegal mapping).
7-
// CHECK: Libomptarget fatal error 1: failure of target construct while offloading is mandatory
5+
// CHECK: omptarget message: explicit extension not allowed: host address specified is 0x{{.*}} (8 bytes), but device allocation maps to host at 0x{{.*}} (8 bytes)
6+
// CHECK: omptarget error: Call to getTargetPointer returned null pointer (device failure or illegal mapping).
7+
// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
88

99
int main() {
1010
int arr[4] = {0, 1, 2, 3};

‎openmp/libomptarget/test/mapping/ompx_hold/omp_target_disassociate_ptr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ int main(int argc, char *argv[]) {
5656
#pragma omp target data map(ompx_hold, alloc : X)
5757
#endif
5858
{
59-
// CHECK: Libomptarget error: Trying to disassociate a pointer with a
59+
// CHECK: omptarget error: Trying to disassociate a pointer with a
6060
// CHECK-SAME: non-zero hold reference count
6161
// CHECK-NEXT: omp_target_disassociate_ptr failed
6262
if (omp_target_disassociate_ptr(&X, DevNum)) {

‎openmp/libomptarget/test/mapping/padding_not_mapped.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ int main() {
3434
#pragma omp target update from(s.x) // should have no effect
3535
fprintf(stderr, "s.x = %d\n", s.x);
3636

37-
// CHECK: Libomptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
38-
// CHECK: Libomptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
39-
// CHECK: Libomptarget fatal error 1: failure of target construct while offloading is mandatory
37+
// CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
38+
// CHECK: omptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
39+
// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
4040
#pragma omp target enter data map(present, alloc: s.x)
4141

4242
return 0;

‎openmp/libomptarget/test/mapping/present/target.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ int main() {
1010
// CHECK: addr=0x[[#%x,HOST_ADDR:]], size=[[#%u,SIZE:]]
1111
fprintf(stderr, "addr=%p, size=%ld\n", &i, sizeof i);
1212

13-
// CHECK-NOT: Libomptarget
13+
// CHECK-NOT: omptarget
1414
#pragma omp target data map(alloc : i)
1515
#pragma omp target map(present, alloc : i)
1616
;
1717

1818
// CHECK: i is present
1919
fprintf(stderr, "i is present\n");
2020

21-
// CHECK: Libomptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
22-
// CHECK: Libomptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
23-
// CHECK: Libomptarget error: Call to targetDataBegin failed, abort target.
24-
// CHECK: Libomptarget error: Failed to process data before launching the kernel.
25-
// CHECK: Libomptarget fatal error 1: failure of target construct while offloading is mandatory
21+
// CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
22+
// CHECK: omptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
23+
// CHECK: omptarget error: Call to targetDataBegin failed, abort target.
24+
// CHECK: omptarget error: Failed to process data before launching the kernel.
25+
// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
2626
#pragma omp target map(present, alloc : i)
2727
;
2828

‎openmp/libomptarget/test/mapping/present/target_array_extension.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ int main() {
6060
fprintf(stderr, "addr=%p, size=%ld\n", &arr[LARGE_BEG],
6161
LARGE_SIZE * sizeof arr[0]);
6262

63-
// CHECK-NOT: Libomptarget
63+
// CHECK-NOT: omptarget
6464
#pragma omp target data map(alloc : arr[LARGE])
6565
{
6666
#pragma omp target map(present, tofrom : arr[SMALL])
@@ -70,12 +70,12 @@ int main() {
7070
// CHECK: arr is present
7171
fprintf(stderr, "arr is present\n");
7272

73-
// CHECK: Libomptarget 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)
74-
// CHECK: Libomptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#LARGE_ADDR]] ([[#LARGE_BYTES]] bytes)
75-
// CHECK: Libomptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
76-
// CHECK: Libomptarget error: Call to targetDataBegin failed, abort target.
77-
// CHECK: Libomptarget error: Failed to process data before launching the kernel.
78-
// CHECK: Libomptarget fatal error 1: failure of target construct while offloading is mandatory
73+
// 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)
74+
// CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#LARGE_ADDR]] ([[#LARGE_BYTES]] bytes)
75+
// CHECK: omptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
76+
// CHECK: omptarget error: Call to targetDataBegin failed, abort target.
77+
// CHECK: omptarget error: Failed to process data before launching the kernel.
78+
// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
7979
#pragma omp target data map(alloc : arr[SMALL])
8080
{
8181
#pragma omp target map(present, tofrom : arr[LARGE])

‎openmp/libomptarget/test/mapping/present/target_data.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ int main() {
1010
// CHECK: addr=0x[[#%x,HOST_ADDR:]], size=[[#%u,SIZE:]]
1111
fprintf(stderr, "addr=%p, size=%ld\n", &i, sizeof i);
1212

13-
// CHECK-NOT: Libomptarget
13+
// CHECK-NOT: omptarget
1414
#pragma omp target data map(alloc : i)
1515
#pragma omp target data map(present, alloc : i)
1616
;
1717

1818
// CHECK: i is present
1919
fprintf(stderr, "i is present\n");
2020

21-
// CHECK: Libomptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
22-
// CHECK: Libomptarget fatal error 1: failure of target construct while offloading is mandatory
21+
// CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
22+
// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
2323
#pragma omp target data map(present, alloc : i)
2424
;
2525

‎openmp/libomptarget/test/mapping/present/target_data_array_extension.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ int main() {
6060
fprintf(stderr, "addr=%p, size=%ld\n", &arr[LARGE_BEG],
6161
LARGE_SIZE * sizeof arr[0]);
6262

63-
// CHECK-NOT: Libomptarget
63+
// CHECK-NOT: omptarget
6464
#pragma omp target data map(alloc : arr[LARGE])
6565
{
6666
#pragma omp target data map(present, tofrom : arr[SMALL])
@@ -70,10 +70,10 @@ int main() {
7070
// CHECK: arr is present
7171
fprintf(stderr, "arr is present\n");
7272

73-
// CHECK: Libomptarget 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)
74-
// CHECK: Libomptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#LARGE_ADDR]] ([[#LARGE_BYTES]] bytes)
75-
// CHECK: Libomptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
76-
// CHECK: Libomptarget fatal error 1: failure of target construct while offloading is mandatory
73+
// 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)
74+
// CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#LARGE_ADDR]] ([[#LARGE_BYTES]] bytes)
75+
// CHECK: omptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
76+
// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
7777
#pragma omp target data map(alloc : arr[SMALL])
7878
{
7979
#pragma omp target data map(present, tofrom : arr[LARGE])

‎openmp/libomptarget/test/mapping/present/target_data_at_exit.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ int main() {
1616
#pragma omp target exit data map(delete : i)
1717
}
1818

19-
// CHECK-NOT: Libomptarget
19+
// CHECK-NOT: omptarget
2020
// CHECK: success
21-
// CHECK-NOT: Libomptarget
21+
// CHECK-NOT: omptarget
2222
fprintf(stderr, "success\n");
2323

2424
return 0;

‎openmp/libomptarget/test/mapping/present/target_enter_data.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ int main() {
1010
// CHECK: addr=0x[[#%x,HOST_ADDR:]], size=[[#%u,SIZE:]]
1111
fprintf(stderr, "addr=%p, size=%ld\n", &i, sizeof i);
1212

13-
// CHECK-NOT: Libomptarget
13+
// CHECK-NOT: omptarget
1414
#pragma omp target enter data map(alloc : i)
1515
#pragma omp target enter data map(present, alloc : i)
1616
#pragma omp target exit data map(delete : i)
1717

1818
// CHECK: i is present
1919
fprintf(stderr, "i is present\n");
2020

21-
// CHECK: Libomptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
22-
// CHECK: Libomptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
23-
// CHECK: Libomptarget fatal error 1: failure of target construct while offloading is mandatory
21+
// CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
22+
// CHECK: omptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
23+
// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
2424
#pragma omp target enter data map(present, alloc : i)
2525

2626
// CHECK-NOT: i is present

‎openmp/libomptarget/test/mapping/present/target_exit_data_delete.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ int main() {
1010
// CHECK: addr=0x[[#%x,HOST_ADDR:]], size=[[#%u,SIZE:]]
1111
fprintf(stderr, "addr=%p, size=%ld\n", &i, sizeof i);
1212

13-
// CHECK-NOT: Libomptarget
13+
// CHECK-NOT: omptarget
1414
#pragma omp target enter data map(alloc : i)
1515
#pragma omp target exit data map(present, delete : i)
1616

1717
// CHECK: i was present
1818
fprintf(stderr, "i was present\n");
1919

20-
// CHECK: Libomptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
21-
// CHECK: Libomptarget fatal error 1: failure of target construct while offloading is mandatory
20+
// CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
21+
// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
2222
#pragma omp target exit data map(present, delete : i)
2323

2424
// CHECK-NOT: i was present

‎openmp/libomptarget/test/mapping/present/target_exit_data_release.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ int main() {
1010
// CHECK: addr=0x[[#%x,HOST_ADDR:]], size=[[#%u,SIZE:]]
1111
fprintf(stderr, "addr=%p, size=%ld\n", &i, sizeof i);
1212

13-
// CHECK-NOT: Libomptarget
13+
// CHECK-NOT: omptarget
1414
#pragma omp target enter data map(alloc : i)
1515
#pragma omp target exit data map(present, release : i)
1616

1717
// CHECK: i was present
1818
fprintf(stderr, "i was present\n");
1919

20-
// CHECK: Libomptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
21-
// CHECK: Libomptarget fatal error 1: failure of target construct while offloading is mandatory
20+
// CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
21+
// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
2222
#pragma omp target exit data map(present, release : i)
2323

2424
// CHECK-NOT: i was present

‎openmp/libomptarget/test/mapping/present/target_update.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ int main() {
2424
// CHECK: addr=0x[[#%x,HOST_ADDR:]], size=[[#%u,SIZE:]]
2525
fprintf(stderr, "addr=%p, size=%ld\n", &i, sizeof i);
2626

27-
// CHECK-NOT: Libomptarget
27+
// CHECK-NOT: omptarget
2828
#pragma omp target enter data map(alloc : i)
2929
#pragma omp target update CLAUSE(present : i)
3030
#pragma omp target exit data map(delete : i)
3131

3232
// CHECK: i is present
3333
fprintf(stderr, "i is present\n");
3434

35-
// CHECK: Libomptarget message: device mapping required by 'present' motion modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
36-
// CHECK: Libomptarget fatal error 1: failure of target construct while offloading is mandatory
35+
// CHECK: omptarget message: device mapping required by 'present' motion modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
36+
// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
3737
#pragma omp target update CLAUSE(present : i)
3838

3939
// CHECK-NOT: i is present

‎openmp/libomptarget/test/mapping/present/target_update_array_extension.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ int main() {
5757
// CHECK: addr=0x[[#%x,HOST_ADDR:]], size=[[#%u,SIZE:]]
5858
fprintf(stderr, "addr=%p, size=%ld\n", arr, sizeof arr);
5959

60-
// CHECK-NOT: Libomptarget
60+
// CHECK-NOT: omptarget
6161
#pragma omp target data map(alloc : arr[LARGE])
6262
{
6363
#pragma omp target update CLAUSE(present : arr[SMALL])
@@ -66,8 +66,8 @@ int main() {
6666
// CHECK: arr is present
6767
fprintf(stderr, "arr is present\n");
6868

69-
// CHECK: Libomptarget message: device mapping required by 'present' motion modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
70-
// CHECK: Libomptarget fatal error 1: failure of target construct while offloading is mandatory
69+
// CHECK: omptarget message: device mapping required by 'present' motion modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
70+
// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
7171
#pragma omp target data map(alloc : arr[SMALL])
7272
{
7373
#pragma omp target update CLAUSE(present : arr[LARGE])

‎openmp/libomptarget/test/mapping/present/unified_shared_memory.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
int main() {
1313
int i;
1414

15-
// CHECK-NOT: Libomptarget
15+
// CHECK-NOT: omptarget
1616
#pragma omp target data map(alloc : i)
1717
#pragma omp target map(present, alloc : i)
1818
;
1919

2020
// CHECK: i is present
2121
fprintf(stderr, "i is present\n");
2222

23-
// CHECK-NOT: Libomptarget
23+
// CHECK-NOT: omptarget
2424
#pragma omp target map(present, alloc : i)
2525
;
2626

‎openmp/libomptarget/test/mapping/present/zero_length_array_section.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ int main() {
1010
// CHECK: addr=0x[[#%x,HOST_ADDR:]]
1111
fprintf(stderr, "addr=%p\n", arr);
1212

13-
// CHECK-NOT: Libomptarget
13+
// CHECK-NOT: omptarget
1414
#pragma omp target data map(alloc : arr[0 : 5])
1515
#pragma omp target map(present, alloc : arr[0 : 0])
1616
;
@@ -20,11 +20,11 @@ int main() {
2020

2121
// arr[0:0] doesn't create an actual mapping in the first directive.
2222
//
23-
// CHECK: Libomptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] (0 bytes)
24-
// CHECK: Libomptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
25-
// CHECK: Libomptarget error: Call to targetDataBegin failed, abort target.
26-
// CHECK: Libomptarget error: Failed to process data before launching the kernel.
27-
// CHECK: Libomptarget fatal error 1: failure of target construct while offloading is mandatory
23+
// CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] (0 bytes)
24+
// CHECK: omptarget error: Call to getTargetPointer returned null pointer ('present' map type modifier).
25+
// CHECK: omptarget error: Call to targetDataBegin failed, abort target.
26+
// CHECK: omptarget error: Failed to process data before launching the kernel.
27+
// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
2828
#pragma omp target data map(alloc : arr[0 : 0])
2929
#pragma omp target map(present, alloc : arr[0 : 0])
3030
;

‎openmp/libomptarget/test/mapping/present/zero_length_array_section_exit.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ int main() {
1010
// CHECK: addr=0x[[#%x,HOST_ADDR:]]
1111
fprintf(stderr, "addr=%p\n", arr);
1212

13-
// CHECK-NOT: Libomptarget
13+
// CHECK-NOT: omptarget
1414
#pragma omp target enter data map(alloc : arr[0 : 5])
1515
#pragma omp target exit data map(present, release : arr[0 : 0])
1616

@@ -19,8 +19,8 @@ int main() {
1919

2020
// arr[0:0] doesn't create an actual mapping in the first directive.
2121
//
22-
// CHECK: Libomptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] (0 bytes)
23-
// CHECK: Libomptarget fatal error 1: failure of target construct while offloading is mandatory
22+
// CHECK: omptarget message: device mapping required by 'present' map type modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] (0 bytes)
23+
// CHECK: omptarget fatal error 1: failure of target construct while offloading is mandatory
2424
#pragma omp target enter data map(alloc : arr[0 : 0])
2525
#pragma omp target exit data map(present, release : arr[0 : 0])
2626

‎openmp/libomptarget/test/mapping/target_data_array_extension_at_exit.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ void check_not_present() {
6666
arr[i] = 88;
6767
}
6868

69-
// CHECK-NOT: Libomptarget
69+
// CHECK-NOT: omptarget
7070
// CHECK-NOT: error
7171
for (int i = 0; i < SIZE; ++i) {
7272
if (arr[i] != 99)
@@ -95,7 +95,7 @@ void check_is_present() {
9595
arr[i] = 88;
9696
}
9797

98-
// CHECK-NOT: Libomptarget
98+
// CHECK-NOT: omptarget
9999
// CHECK-NOT: error
100100
for (int i = 0; i < SIZE; ++i) {
101101
if (SMALL_BEG <= i && i < SMALL_END) {

‎openmp/libomptarget/test/mapping/target_update_array_extension.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
int main() {
5555
int arr[5];
5656

57-
// CHECK-NOT: Libomptarget
57+
// CHECK-NOT: omptarget
5858
#pragma omp target data map(alloc : arr[LARGE])
5959
{
6060
#pragma omp target update CLAUSE(arr[SMALL])
@@ -63,7 +63,7 @@ int main() {
6363
// CHECK: success
6464
fprintf(stderr, "success\n");
6565

66-
// CHECK-NOT: Libomptarget
66+
// CHECK-NOT: omptarget
6767
#pragma omp target data map(alloc : arr[SMALL])
6868
{
6969
#pragma omp target update CLAUSE(arr[LARGE])

‎openmp/libomptarget/test/mapping/target_wrong_use_device_addr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ int main() {
1313

1414
#pragma omp target data map(to : x [0:10])
1515
{
16-
// CHECK: Libomptarget device 0 info: variable x does not have a valid device
16+
// CHECK: omptarget device 0 info: variable x does not have a valid device
1717
// counterpart
1818
#pragma omp target data use_device_addr(x)
1919
{

‎openmp/libomptarget/test/offloading/info.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ int main() {
6464
{ val = 1; }
6565

6666
__tgt_set_info_flag(0x0);
67-
// INFO-NOT: Libomptarget device 0 info: {{.*}}
67+
// INFO-NOT: omptarget device 0 info: {{.*}}
6868
#pragma omp target
6969
{}
7070

0 commit comments

Comments
 (0)