330d8983d2
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>
85 lines
2.5 KiB
C
85 lines
2.5 KiB
C
// clang-format off
|
|
// RUN: %libomptarget-compile-generic -DREQ=1 && %libomptarget-run-generic 2>&1 | %fcheck-generic -check-prefix=GOOD
|
|
// RUN: %libomptarget-compile-generic -DREQ=2 && not %libomptarget-run-generic 2>&1 | %fcheck-generic -check-prefix=BAD
|
|
// clang-format on
|
|
|
|
/*
|
|
Test for the 'requires' clause check.
|
|
When a target region is used, the requires flags are set in the
|
|
runtime for the entire compilation unit. If the flags are set again,
|
|
(for whatever reason) the set must be consistent with previously
|
|
set values.
|
|
*/
|
|
#include <omp.h>
|
|
#include <stdio.h>
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Various definitions copied from OpenMP RTL
|
|
|
|
typedef struct {
|
|
void *addr;
|
|
char *name;
|
|
size_t size;
|
|
int32_t flags;
|
|
int32_t data;
|
|
} __tgt_offload_entry;
|
|
|
|
enum Flags {
|
|
OMP_REGISTER_REQUIRES = 0x10,
|
|
};
|
|
|
|
typedef struct {
|
|
void *ImageStart;
|
|
void *ImageEnd;
|
|
__tgt_offload_entry *EntriesBegin;
|
|
__tgt_offload_entry *EntriesEnd;
|
|
} __tgt_device_image;
|
|
|
|
typedef struct {
|
|
int32_t NumDeviceImages;
|
|
__tgt_device_image *DeviceImages;
|
|
__tgt_offload_entry *HostEntriesBegin;
|
|
__tgt_offload_entry *HostEntriesEnd;
|
|
} __tgt_bin_desc;
|
|
|
|
void __tgt_register_lib(__tgt_bin_desc *Desc);
|
|
void __tgt_unregister_lib(__tgt_bin_desc *Desc);
|
|
|
|
// End of definitions copied from OpenMP RTL.
|
|
// ---------------------------------------------------------------------------
|
|
|
|
void run_reg_requires() {
|
|
// Before the target region is registered, the requires registers the status
|
|
// of the requires clauses. Since there are no requires clauses in this file
|
|
// the flags state can only be OMP_REQ_NONE i.e. 1.
|
|
|
|
// This is the 2nd time this function is called so it should print SUCCESS if
|
|
// REQ is compatible with `1` and otherwise cause an error.
|
|
__tgt_offload_entry entries[] = {{NULL, "", 0, OMP_REGISTER_REQUIRES, 1},
|
|
{NULL, "", 0, OMP_REGISTER_REQUIRES, REQ}};
|
|
__tgt_device_image image = {NULL, NULL, &entries[0], &entries[1] + 1};
|
|
__tgt_bin_desc bin = {1, &image, &entries[0], &entries[1] + 1};
|
|
|
|
__tgt_register_lib(&bin);
|
|
|
|
printf("SUCCESS");
|
|
|
|
__tgt_unregister_lib(&bin);
|
|
|
|
// clang-format off
|
|
// GOOD: SUCCESS
|
|
// BAD: omptarget fatal error 2: '#pragma omp requires reverse_offload' not used consistently!
|
|
// clang-format on
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
int main() {
|
|
run_reg_requires();
|
|
|
|
// This also runs reg requires for the first time.
|
|
#pragma omp target
|
|
{}
|
|
|
|
return 0;
|
|
}
|