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>
51 lines
1.3 KiB
C
51 lines
1.3 KiB
C
// Check that omp atomic is permitted and behaves when strictly nested within
|
|
// omp target teams. This is an extension to OpenMP 5.2 and is enabled by
|
|
// default.
|
|
|
|
// RUN: %libomptarget-compile-run-and-check-generic
|
|
|
|
#include <omp.h>
|
|
#include <stdbool.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
// High parallelism increases our chances of detecting a lack of atomicity.
|
|
#define NUM_TEAMS_TRY 256
|
|
|
|
int main() {
|
|
// CHECK: update: num_teams=[[#NUM_TEAMS:]]{{$}}
|
|
// CHECK-NEXT: update: x=[[#NUM_TEAMS]]{{$}}
|
|
int x = 0;
|
|
int numTeams;
|
|
#pragma omp target teams num_teams(NUM_TEAMS_TRY) map(tofrom : x, numTeams)
|
|
{
|
|
#pragma omp atomic update
|
|
++x;
|
|
if (omp_get_team_num() == 0)
|
|
numTeams = omp_get_num_teams();
|
|
}
|
|
printf("update: num_teams=%d\n", numTeams);
|
|
printf("update: x=%d\n", x);
|
|
|
|
// CHECK-NEXT: capture: x=[[#NUM_TEAMS]]{{$}}
|
|
// CHECK-NEXT: capture: xCapturedCount=[[#NUM_TEAMS]]{{$}}
|
|
bool xCaptured[numTeams];
|
|
memset(xCaptured, 0, sizeof xCaptured);
|
|
x = 0;
|
|
#pragma omp target teams num_teams(NUM_TEAMS_TRY) map(tofrom : x, numTeams)
|
|
{
|
|
int v;
|
|
#pragma omp atomic capture
|
|
v = x++;
|
|
xCaptured[v] = true;
|
|
}
|
|
printf("capture: x=%d\n", x);
|
|
int xCapturedCount = 0;
|
|
for (int i = 0; i < numTeams; ++i) {
|
|
if (xCaptured[i])
|
|
++xCapturedCount;
|
|
}
|
|
printf("capture: xCapturedCount=%d\n", xCapturedCount);
|
|
return 0;
|
|
}
|