diff options
-rw-r--r-- | include/gomp-constants.h | 2 | ||||
-rw-r--r-- | libgomp/testsuite/lib/libgomp.exp | 12 | ||||
-rw-r--r-- | libgomp/testsuite/libgomp.c-c++-common/on_device_arch.h | 13 | ||||
-rw-r--r-- | libgomp/testsuite/libgomp.c-c++-common/requires-4a.c | 39 |
4 files changed, 65 insertions, 1 deletions
diff --git a/include/gomp-constants.h b/include/gomp-constants.h index 84316f9..fac7316 100644 --- a/include/gomp-constants.h +++ b/include/gomp-constants.h @@ -230,7 +230,7 @@ enum gomp_map_kind #define GOMP_DEVICE_NOT_HOST 4 #define GOMP_DEVICE_NVIDIA_PTX 5 #define GOMP_DEVICE_INTEL_MIC 6 -#define GOMP_DEVICE_HSA 7 +/* #define GOMP_DEVICE_HSA 7 removed. */ #define GOMP_DEVICE_GCN 8 /* We have a compatibility issue. OpenMP 5.2 introduced diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index 107a3c2..4b8c64d 100644 --- a/libgomp/testsuite/lib/libgomp.exp +++ b/libgomp/testsuite/lib/libgomp.exp @@ -415,6 +415,18 @@ proc check_effective_target_offload_device_nvptx { } { } ] } +# Return 1 if using a GCN offload device. +proc check_effective_target_offload_device_gcn { } { + return [check_runtime_nocache offload_device_gcn { + #include <omp.h> + #include "testsuite/libgomp.c-c++-common/on_device_arch.h" + int main () + { + return !on_device_arch_gcn (); + } + } ] +} + # Return 1 if at least one Nvidia GPU is accessible. proc check_effective_target_openacc_nvidia_accel_present { } { diff --git a/libgomp/testsuite/libgomp.c-c++-common/on_device_arch.h b/libgomp/testsuite/libgomp.c-c++-common/on_device_arch.h index f92743b..6f66dbd 100644 --- a/libgomp/testsuite/libgomp.c-c++-common/on_device_arch.h +++ b/libgomp/testsuite/libgomp.c-c++-common/on_device_arch.h @@ -8,12 +8,19 @@ device_arch_nvptx (void) } /* static */ int +device_arch_gcn (void) +{ + return GOMP_DEVICE_GCN; +} + +/* static */ int device_arch_intel_mic (void) { return GOMP_DEVICE_INTEL_MIC; } #pragma omp declare variant (device_arch_nvptx) match(construct={target},device={arch(nvptx)}) +#pragma omp declare variant (device_arch_gcn) match(construct={target},device={arch(gcn)}) #pragma omp declare variant (device_arch_intel_mic) match(construct={target},device={arch(intel_mic)}) /* static */ int device_arch (void) @@ -38,6 +45,12 @@ on_device_arch_nvptx () } int +on_device_arch_gcn () +{ + return on_device_arch (GOMP_DEVICE_GCN); +} + +int on_device_arch_intel_mic () { return on_device_arch (GOMP_DEVICE_INTEL_MIC); diff --git a/libgomp/testsuite/libgomp.c-c++-common/requires-4a.c b/libgomp/testsuite/libgomp.c-c++-common/requires-4a.c new file mode 100644 index 0000000..4fb9783 --- /dev/null +++ b/libgomp/testsuite/libgomp.c-c++-common/requires-4a.c @@ -0,0 +1,39 @@ +/* { dg-additional-options "-flto" } */ +/* { dg-additional-options "-foffload-options=nvptx-none=-misa=sm_35" { target { offload_target_nvptx } } } */ +/* { dg-additional-sources requires-4-aux.c } */ + +/* Same as requires-4.c, but uses heap memory for 'a'. */ + +/* Check no diagnostic by device-compiler's or host compiler's lto1. + Other file uses: 'requires reverse_offload', but that's inactive as + there are no declare target directives, device constructs nor device routines */ + +/* Depending on offload device capabilities, it may print something like the + following (only) if GOMP_DEBUG=1: + "devices present but 'omp requires unified_address, unified_shared_memory, reverse_offload' cannot be fulfilled" + and in that case does host-fallback execution. + + No offload devices support USM at present, so we may verify host-fallback + execution by presence of separate memory spaces. */ + +#pragma omp requires unified_address,unified_shared_memory + +int *a; +extern void foo (void); + +int +main (void) +{ + a = (int *) __builtin_calloc (sizeof (int), 10); + #pragma omp target map(to: a) + for (int i = 0; i < 10; i++) + a[i] = i; + + for (int i = 0; i < 10; i++) + if (a[i] != i) + __builtin_abort (); + + foo (); + __builtin_free (a); + return 0; +} |