In a nutshell, this moves our libomptarget code to populate the offload subproject. With this commit, users need to enable the new LLVM/Offload subproject as a runtime in their cmake configuration. No further changes are expected for downstream code. Tests and other components still depend on OpenMP and have also not been renamed. The results below are for a build in which OpenMP and Offload are enabled runtimes. In addition to the pure `git mv`, we needed to adjust some CMake files. Nothing is intended to change semantics. ``` ninja check-offload ``` Works with the X86 and AMDGPU offload tests ``` ninja check-openmp ``` Still works but doesn't build offload tests anymore. ``` ls install/lib ``` Shows all expected libraries, incl. - `libomptarget.devicertl.a` - `libomptarget-nvptx-sm_90.bc` - `libomptarget.rtl.amdgpu.so` -> `libomptarget.rtl.amdgpu.so.18git` - `libomptarget.so` -> `libomptarget.so.18git` Fixes: https://github.com/llvm/llvm-project/issues/75124 --------- Co-authored-by: Saiyedul Islam <Saiyedul.Islam@amd.com>
88 lines
2.9 KiB
C++
88 lines
2.9 KiB
C++
// clang-format off
|
|
// RUN: %libomptarget-compilexx-generic
|
|
// RUN: env OMPX_APU_MAPS=1 HSA_XNACK=1 LIBOMPTARGET_INFO=60 %libomptarget-run-generic 2>&1 \
|
|
// RUN: | %fcheck-generic -check-prefix=CHECK
|
|
|
|
// UNSUPPORTED: aarch64-unknown-linux-gnu
|
|
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
|
|
// UNSUPPORTED: nvptx64-nvidia-cuda
|
|
// UNSUPPORTED: nvptx64-nvidia-cuda-LTO
|
|
// UNSUPPORTED: x86_64-pc-linux-gnu
|
|
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
|
|
// UNSUPPORTED: s390x-ibm-linux-gnu
|
|
// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
|
|
|
|
// REQUIRES: unified_shared_memory
|
|
|
|
// clang-format on
|
|
|
|
#include <cstdint>
|
|
#include <cstdio>
|
|
|
|
/// Test for globals under automatic zero-copy.
|
|
/// Because we are building without unified_shared_memory
|
|
/// requirement pragma, all globals are allocated in the device
|
|
/// memory of all used GPUs. To ensure those globals contain the intended
|
|
/// values, we need to execute H2D and D2H memory copies even if we are running
|
|
/// in automatic zero-copy. This only applies to globals. Local variables (their
|
|
/// host pointers) are passed to the kernels by-value, according to the
|
|
/// automatic zero-copy behavior.
|
|
|
|
#pragma omp begin declare target
|
|
int32_t x; // 4 bytes
|
|
int32_t z[10]; // 40 bytes
|
|
int32_t *k; // 20 bytes
|
|
#pragma omp end declare target
|
|
|
|
int main() {
|
|
int32_t *dev_k = nullptr;
|
|
x = 3;
|
|
int32_t y = -1;
|
|
for (size_t t = 0; t < 10; t++)
|
|
z[t] = t;
|
|
k = new int32_t[5];
|
|
|
|
printf("Host pointer for k = %p\n", k);
|
|
for (size_t t = 0; t < 5; t++)
|
|
k[t] = -t;
|
|
|
|
/// target update to forces a copy between host and device global, which we must
|
|
/// execute to keep the two global copies consistent. CHECK: Copying data from
|
|
/// host to device, HstPtr={{.*}}, TgtPtr={{.*}}, Size=40, Name=z
|
|
#pragma omp target update to(z[ : 10])
|
|
|
|
/// target map with always modifier (for x) forces a copy between host and
|
|
/// device global, which we must execute to keep the two global copies
|
|
/// consistent. k's content (host address) is passed by-value to the kernel
|
|
/// (Size=20 case). y, being a local variable, is also passed by-value to the
|
|
/// kernel (Size=4 case) CHECK: Return HstPtrBegin {{.*}} Size=4 for unified
|
|
/// shared memory CHECK: Return HstPtrBegin {{.*}} Size=20 for unified shared
|
|
/// memory CHECK: Copying data from host to device, HstPtr={{.*}},
|
|
/// TgtPtr={{.*}}, Size=4, Name=x
|
|
#pragma omp target map(to : k[ : 5]) map(always, tofrom : x) map(tofrom : y) \
|
|
map(from : dev_k)
|
|
{
|
|
x++;
|
|
y++;
|
|
for (size_t t = 0; t < 10; t++)
|
|
z[t]++;
|
|
dev_k = k;
|
|
}
|
|
/// CHECK-NOT: Copying data from device to host, TgtPtr={{.*}}, HstPtr={{.*}},
|
|
/// Size=20, Name=k
|
|
|
|
/// CHECK: Copying data from device to host, TgtPtr={{.*}}, HstPtr={{.*}},
|
|
/// Size=4, Name=x
|
|
|
|
/// CHECK: Copying data from device to host, TgtPtr={{.*}}, HstPtr={{.*}},
|
|
/// Size=40, Name=z
|
|
#pragma omp target update from(z[ : 10])
|
|
|
|
/// CHECK-NOT: k pointer not correctly passed to kernel
|
|
if (dev_k != k)
|
|
printf("k pointer not correctly passed to kernel\n");
|
|
|
|
delete[] k;
|
|
return 0;
|
|
}
|