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>
99 lines
1.4 KiB
C++
99 lines
1.4 KiB
C++
// RUN: %libomptarget-compile-generic -fopenmp-version=51
|
|
// RUN: %libomptarget-run-generic 2>&1 \
|
|
// RUN: | %fcheck-generic
|
|
|
|
extern "C" int printf(const char *, ...);
|
|
template <typename T> class A {
|
|
protected:
|
|
T X;
|
|
T Y;
|
|
|
|
public:
|
|
A(T x, T y) : X{x}, Y{y} {};
|
|
};
|
|
|
|
template <typename T> class B : public A<T> {
|
|
using A<T>::X;
|
|
using A<T>::Y;
|
|
|
|
public:
|
|
T res;
|
|
|
|
B(T x, T y) : A<T>(x, y), res{0} {};
|
|
|
|
void run(void) {
|
|
#pragma omp target map(res)
|
|
{ res = X + Y; }
|
|
}
|
|
};
|
|
|
|
class X {
|
|
protected:
|
|
int A;
|
|
|
|
public:
|
|
X(int a) : A{a} {};
|
|
};
|
|
class Y : public X {
|
|
using X::A;
|
|
|
|
protected:
|
|
int B;
|
|
|
|
public:
|
|
Y(int a, int b) : X(a), B{b} {};
|
|
};
|
|
class Z : public Y {
|
|
using X::A;
|
|
using Y::B;
|
|
|
|
public:
|
|
int res;
|
|
Z(int a, int b) : Y(a, b), res{0} {};
|
|
void run(void) {
|
|
#pragma omp target map(res)
|
|
{ res = A + B; }
|
|
}
|
|
};
|
|
struct descriptor {
|
|
int A;
|
|
int C;
|
|
};
|
|
|
|
class BASE {};
|
|
|
|
class C : public BASE {
|
|
public:
|
|
void bar(descriptor &d) {
|
|
auto Asize = 4;
|
|
auto Csize = 4;
|
|
|
|
#pragma omp target data map(from : d.C)
|
|
{
|
|
#pragma omp target teams firstprivate(Csize)
|
|
d.C = 1;
|
|
}
|
|
#pragma omp target map(from : d.A)
|
|
d.A = 3;
|
|
}
|
|
};
|
|
|
|
int main(int argc, char *argv[]) {
|
|
B<int> b(2, 3);
|
|
b.run();
|
|
// CHECK: 5
|
|
printf("b.res = %d \n", b.res);
|
|
Z c(2, 3);
|
|
c.run();
|
|
// CHECK: 5
|
|
printf("c.res = %d \n", c.res);
|
|
|
|
descriptor d;
|
|
C z;
|
|
z.bar(d);
|
|
// CHECK 1
|
|
printf("%d\n", d.C);
|
|
// CHECK 3
|
|
printf("%d\n", d.A);
|
|
}
|