Piotr Balcer
07d30c1fc9
This is a follow-up to #194333, which changed liboffload's kernel launch interface to take an array of pointers to arguments instead of a contiguous argument buffer, but left the old path intact for OpenMP, to be cleaned up iteratively in later changes. This patch modifies the offload host kernels, and the OpenMP clang codegen, to also use argument pointer arrays. The host was the only plugin that did not support the new submission path. With it converted, OpenMP can migrate to use the new path in all scenarios, after which everything related to contiguous argument buffer and its construction can be removed from plugin interface and the backends. The change itself is fairly straightforward. The bulk of the diff is automated test updates. In the runtime, the host kernel signature becomes an array of pointers (void **), and the codegen is updated to match. With each argument being a pointer, the kernel function now adds one load to read the argument's value. Assisted-by: Claude
272 lines
12 KiB
C++
272 lines
12 KiB
C++
// Only test codegen on target side, as private clause does not require any action on the host side
|
|
// Test target codegen - host bc file has to be created first.
|
|
// RUN: %clang_cc1 -verify -Wno-vla -fopenmp -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm-bc %s -o %t-ppc-host.bc
|
|
// RUN: %clang_cc1 -verify -Wno-vla -fopenmp -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm %s -fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s --check-prefix TCHECK --check-prefix TCHECK-64
|
|
// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-pch -fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o %t %s
|
|
// RUN: %clang_cc1 -fopenmp -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -std=c++11 -fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host.bc -include-pch %t -verify -Wno-vla %s -emit-llvm -o - | FileCheck %s --check-prefix TCHECK --check-prefix TCHECK-64
|
|
// RUN: %clang_cc1 -verify -Wno-vla -fopenmp -x c++ -triple i386-unknown-unknown -fopenmp-targets=i386-pc-linux-gnu -emit-llvm-bc %s -o %t-x86-host.bc
|
|
// RUN: %clang_cc1 -verify -Wno-vla -fopenmp -x c++ -triple i386-unknown-unknown -fopenmp-targets=i386-pc-linux-gnu -emit-llvm %s -fopenmp-is-target-device -fopenmp-host-ir-file-path %t-x86-host.bc -o - | FileCheck %s --check-prefix TCHECK --check-prefix TCHECK-32
|
|
// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple i386-unknown-unknown -fopenmp-targets=i386-pc-linux-gnu -emit-pch -fopenmp-is-target-device -fopenmp-host-ir-file-path %t-x86-host.bc -o %t %s
|
|
// RUN: %clang_cc1 -fopenmp -x c++ -triple i386-unknown-unknown -fopenmp-targets=i386-pc-linux-gnu -std=c++11 -fopenmp-is-target-device -fopenmp-host-ir-file-path %t-x86-host.bc -include-pch %t -verify -Wno-vla %s -emit-llvm -o - | FileCheck %s --check-prefix TCHECK --check-prefix TCHECK-32
|
|
|
|
// RUN: %clang_cc1 -verify -Wno-vla -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm-bc %s -o %t-ppc-host.bc
|
|
// RUN: %clang_cc1 -verify -Wno-vla -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm %s -fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck --check-prefix SIMD-ONLY0 %s
|
|
// RUN: %clang_cc1 -fopenmp-simd -x c++ -std=c++11 -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-pch -fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o %t %s
|
|
// RUN: %clang_cc1 -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -std=c++11 -fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host.bc -include-pch %t -verify -Wno-vla %s -emit-llvm -o - | FileCheck --check-prefix SIMD-ONLY0 %s
|
|
// RUN: %clang_cc1 -verify -Wno-vla -fopenmp-simd -x c++ -triple i386-unknown-unknown -fopenmp-targets=i386-pc-linux-gnu -emit-llvm-bc %s -o %t-x86-host.bc
|
|
// RUN: %clang_cc1 -verify -Wno-vla -fopenmp-simd -x c++ -triple i386-unknown-unknown -fopenmp-targets=i386-pc-linux-gnu -emit-llvm %s -fopenmp-is-target-device -fopenmp-host-ir-file-path %t-x86-host.bc -o - | FileCheck --check-prefix SIMD-ONLY0 %s
|
|
// RUN: %clang_cc1 -fopenmp-simd -x c++ -std=c++11 -triple i386-unknown-unknown -fopenmp-targets=i386-pc-linux-gnu -emit-pch -fopenmp-is-target-device -fopenmp-host-ir-file-path %t-x86-host.bc -o %t %s
|
|
// RUN: %clang_cc1 -fopenmp-simd -x c++ -triple i386-unknown-unknown -fopenmp-targets=i386-pc-linux-gnu -std=c++11 -fopenmp-is-target-device -fopenmp-host-ir-file-path %t-x86-host.bc -include-pch %t -verify -Wno-vla %s -emit-llvm -o - | FileCheck --check-prefix SIMD-ONLY0 %s
|
|
// SIMD-ONLY0-NOT: {{__kmpc|__tgt}}
|
|
|
|
// expected-no-diagnostics
|
|
#ifndef HEADER
|
|
#define HEADER
|
|
|
|
template<typename tx, typename ty>
|
|
struct TT{
|
|
tx X;
|
|
ty Y;
|
|
};
|
|
|
|
// TCHECK: [[TT:%.+]] = type { i64, i8 }
|
|
// TCHECK: [[S1:%.+]] = type { double }
|
|
|
|
int foo(int n) {
|
|
int a = 0;
|
|
short aa = 0;
|
|
float b[10];
|
|
float bn[n];
|
|
double c[5][10];
|
|
double cn[5][n];
|
|
TT<long long, char> d;
|
|
|
|
#pragma omp target private(a)
|
|
{
|
|
}
|
|
|
|
// TCHECK: define weak_odr protected void @__omp_offloading_{{.+}}(ptr {{[^,]+}})
|
|
// TCHECK: [[DYN_PTR:%.+]] = alloca ptr
|
|
// TCHECK: [[A:%.+]] = alloca i{{[0-9]+}},
|
|
// TCHECK-NOT: store {{.+}}, {{.+}} [[A]],
|
|
// TCHECK: ret void
|
|
|
|
#pragma omp target private(a)
|
|
{
|
|
a = 1;
|
|
}
|
|
|
|
// TCHECK: define weak_odr protected void @__omp_offloading_{{.+}}(ptr {{[^,]+}})
|
|
// TCHECK: [[DYN_PTR:%.+]] = alloca ptr
|
|
// TCHECK: [[A:%.+]] = alloca i{{[0-9]+}},
|
|
// TCHECK: store i{{[0-9]+}} 1, ptr [[A]],
|
|
// TCHECK: ret void
|
|
|
|
#pragma omp target private(a, aa)
|
|
{
|
|
a = 1;
|
|
aa = 1;
|
|
}
|
|
|
|
// TCHECK: define weak_odr protected void @__omp_offloading_{{.+}}(ptr {{[^,]+}})
|
|
// TCHECK: [[DYN_PTR:%.+]] = alloca ptr
|
|
// TCHECK: [[A:%.+]] = alloca i{{[0-9]+}},
|
|
// TCHECK: [[A2:%.+]] = alloca i{{[0-9]+}},
|
|
// TCHECK: store i{{[0-9]+}} 1, ptr [[A]],
|
|
// TCHECK: store i{{[0-9]+}} 1, ptr [[A2]],
|
|
// TCHECK: ret void
|
|
|
|
#pragma omp target private(a, b, bn, c, cn, d)
|
|
{
|
|
a = 1;
|
|
b[2] = 1.0;
|
|
bn[3] = 1.0;
|
|
c[1][2] = 1.0;
|
|
cn[1][3] = 1.0;
|
|
d.X = 1;
|
|
d.Y = 1;
|
|
}
|
|
// make sure that private variables are generated in all cases and that we use those instances for operations inside the
|
|
// target region
|
|
// TCHECK: define weak_odr protected void @__omp_offloading_{{.+}}(ptr noalias noundef %__context)
|
|
// TCHECK: [[DYN_PTR:%.+]] = alloca ptr
|
|
// TCHECK: [[A:%.+]] = alloca i{{[0-9]+}},
|
|
// TCHECK: [[B:%.+]] = alloca [10 x float],
|
|
// TCHECK: [[SSTACK:%.+]] = alloca ptr,
|
|
// TCHECK: [[C:%.+]] = alloca [5 x [10 x double]],
|
|
// TCHECK: [[D:%.+]] = alloca [[TT]],
|
|
// TCHECK: [[VLA_ADDR_REF:%.+]] = load i{{[0-9]+}}, ptr {{%.+}},
|
|
// TCHECK: [[VLA_ADDR_REF2:%.+]] = load i{{[0-9]+}}, ptr {{%.+}},
|
|
// TCHECK: [[VLA_ADDR_REF4:%.+]] = load i{{[0-9]+}}, ptr {{%.+}},
|
|
// TCHECK: [[RET_STACK:%.+]] = call ptr @llvm.stacksave.p0()
|
|
// TCHECK: store ptr [[RET_STACK]], ptr [[SSTACK]],
|
|
// TCHECK: [[VLA5:%.+]] = alloca float, i{{[0-9]+}} [[VLA_ADDR_REF]],
|
|
// TCHECK: [[VLA6_SIZE:%.+]] = mul{{.+}} i{{[0-9]+}} [[VLA_ADDR_REF2]], [[VLA_ADDR_REF4]]
|
|
// TCHECK: [[VLA6:%.+]] = alloca double, i{{[0-9]+}} [[VLA6_SIZE]],
|
|
|
|
// a = 1
|
|
// TCHECK: store i{{[0-9]+}} 1, ptr [[A]],
|
|
|
|
// b[2] = 1.0
|
|
// TCHECK: [[B_GEP:%.+]] = getelementptr inbounds [10 x float], ptr [[B]], i{{[0-9]+}} 0, i{{[0-9]+}} 2
|
|
// TCHECK: store float 1.0{{.*}}, ptr [[B_GEP]],
|
|
|
|
// bn[3] = 1.0
|
|
// TCHECK: [[BN_GEP:%.+]] = getelementptr inbounds float, ptr [[VLA5]], i{{[0-9]+}} 3
|
|
// TCHECK: store float 1.0{{.*}}, ptr [[BN_GEP]],
|
|
|
|
// c[1][2] = 1.0
|
|
// TCHECK: [[C_GEP1:%.+]] = getelementptr inbounds [5 x [10 x double]], ptr [[C]], i{{[0-9]+}} 0, i{{[0-9]+}} 1
|
|
// TCHECK: [[C_GEP2:%.+]] = getelementptr inbounds [10 x double], ptr [[C_GEP1]], i{{[0-9]+}} 0, i{{[0-9]+}} 2
|
|
// TCHECK: store double 1.0{{.*}}, ptr [[C_GEP2]],
|
|
|
|
// cn[1][3] = 1.0
|
|
// TCHECK: [[CN_IND:%.+]] = mul{{.+}} i{{[0-9]+}} 1, [[VLA_ADDR_REF4]]
|
|
// TCHECK: [[CN_GEP_IND:%.+]] = getelementptr inbounds double, ptr [[VLA6]], i{{[0-9]+}} [[CN_IND]]
|
|
// TCHECK: [[CN_GEP_3:%.+]] = getelementptr inbounds double, ptr [[CN_GEP_IND]], i{{[0-9]+}} 3
|
|
// TCHECK: store double 1.0{{.*}}, ptr [[CN_GEP_3]],
|
|
|
|
// d.X = 1
|
|
// [[X_FIELD:%.+]] = getelementptr inbounds nuw [[TT]] ptr [[D]], i{{[0-9]+}} 0, i{{[0-9]+}} 0
|
|
// store i{{[0-9]+}} 1, ptr [[X_FIELD]],
|
|
|
|
// d.Y = 1
|
|
// [[Y_FIELD:%.+]] = getelementptr inbounds nuw [[TT]] ptr [[D]], i{{[0-9]+}} 0, i{{[0-9]+}} 1
|
|
// store i{{[0-9]+}} 1, ptr [[Y_FIELD]],
|
|
|
|
// finish
|
|
// [[RELOAD_SSTACK:%.+]] = load ptr, ptr [[SSTACK]],
|
|
// call ovid @llvm.stackrestore.p0(ptr [[RELOAD_SSTACK]])
|
|
// ret void
|
|
|
|
return a;
|
|
}
|
|
|
|
|
|
template<typename tx>
|
|
tx ftemplate(int n) {
|
|
tx a = 0;
|
|
short aa = 0;
|
|
tx b[10];
|
|
|
|
#pragma omp target private(a,aa,b)
|
|
{
|
|
a = 1;
|
|
aa = 1;
|
|
b[2] = 1;
|
|
}
|
|
|
|
return a;
|
|
}
|
|
|
|
static
|
|
int fstatic(int n) {
|
|
int a = 0;
|
|
short aa = 0;
|
|
char aaa = 0;
|
|
int b[10];
|
|
|
|
#pragma omp target private(a,aa,aaa,b)
|
|
{
|
|
a = 1;
|
|
aa = 1;
|
|
aaa = 1;
|
|
b[2] = 1;
|
|
}
|
|
|
|
return a;
|
|
}
|
|
|
|
// TCHECK: define weak_odr protected void @__omp_offloading_{{.+}}(ptr {{[^,]+}})
|
|
// TCHECK: [[DYN_PTR:%.+]] = alloca ptr
|
|
// TCHECK: [[A:%.+]] = alloca i{{[0-9]+}},
|
|
// TCHECK: [[A2:%.+]] = alloca i{{[0-9]+}},
|
|
// TCHECK: [[A3:%.+]] = alloca i{{[0-9]+}},
|
|
// TCHECK: [[B:%.+]] = alloca [10 x i{{[0-9]+}}],
|
|
// TCHECK: store i{{[0-9]+}} 1, ptr [[A]],
|
|
// TCHECK: store i{{[0-9]+}} 1, ptr [[A2]],
|
|
// TCHECK: store i{{[0-9]+}} 1, ptr [[A3]],
|
|
// TCHECK: [[B_GEP:%.+]] = getelementptr inbounds [10 x i{{[0-9]+}}], ptr [[B]], i{{[0-9]+}} 0, i{{[0-9]+}} 2
|
|
// TCHECK: store i{{[0-9]+}} 1, ptr [[B_GEP]],
|
|
// TCHECK: ret void
|
|
|
|
struct S1 {
|
|
double a;
|
|
|
|
int r1(int n){
|
|
int b = n+1;
|
|
short int c[2][n];
|
|
|
|
#pragma omp target private(b,c)
|
|
{
|
|
this->a = (double)b + 1.5;
|
|
c[1][1] = ++a;
|
|
}
|
|
|
|
return c[1][1] + (int)b;
|
|
}
|
|
|
|
// TCHECK: define weak_odr protected void @__omp_offloading_{{.+}}(ptr noalias noundef %__context)
|
|
// TCHECK: [[DYN_PTR:%.+]] = alloca ptr
|
|
// TCHECK: [[B:%.+]] = alloca i{{[0-9]+}},
|
|
// TCHECK: [[SSTACK:%.+]] = alloca ptr,
|
|
// TCHECK: [[TH_SLOT:%.+]] = getelementptr inbounds ptr, ptr {{%.+}}, i32 0
|
|
// TCHECK: [[TH_PTR:%.+]] = load ptr, ptr [[TH_SLOT]],
|
|
// TCHECK: [[TH_ADDR_REF:%.+]] = load ptr, ptr [[TH_PTR]],
|
|
// TCHECK: [[VLA_ADDR_REF:%.+]] = load i{{[0-9]+}}, ptr {{%.+}},
|
|
// TCHECK: [[VLA_ADDR_REF2:%.+]] = load i{{[0-9]+}}, ptr {{%.+}},
|
|
// TCHECK: [[RET_STACK:%.+]] = call ptr @llvm.stacksave.p0()
|
|
// TCHECK: store ptr [[RET_STACK:%.+]], ptr [[SSTACK]],
|
|
|
|
// this->a = (double)b + 1.5;
|
|
// TCHECK: [[VLA_IND:%.+]] = mul{{.+}} i{{[0-9]+}} [[VLA_ADDR_REF]], [[VLA_ADDR_REF2]]
|
|
// TCHECK: [[VLA3:%.+]] = alloca i{{[0-9]+}}, i{{[0-9]+}} [[VLA_IND]],
|
|
// TCHECK: [[B_VAL:%.+]] = load i{{[0-9]+}}, ptr [[B]],
|
|
// TCHECK: [[B_CONV:%.+]] = sitofp i{{[0-9]+}} [[B_VAL]] to double
|
|
// TCHECK: [[NEW_A_VAL:%.+]] = fadd double [[B_CONV]], 1.5{{.+}}+00
|
|
// TCHECK: [[A_FIELD:%.+]] = getelementptr inbounds nuw [[S1]], ptr [[TH_ADDR_REF]], i{{[0-9]+}} 0, i{{[0-9]+}} 0
|
|
// TCHECK: store double [[NEW_A_VAL]], ptr [[A_FIELD]],
|
|
|
|
// c[1][1] = ++a;
|
|
// TCHECK: [[A_FIELD4:%.+]] = getelementptr inbounds nuw [[S1]], ptr [[TH_ADDR_REF]], i{{[0-9]+}} 0, i{{[0-9]+}} 0
|
|
// TCHECK: [[A_FIELD4_VAL:%.+]] = load double, ptr [[A_FIELD4]],
|
|
// TCHECK: [[A_FIELD_INC:%.+]] = fadd double [[A_FIELD4_VAL]], 1.0{{.+}}+00
|
|
// TCHECK: store double [[A_FIELD_INC]], ptr [[A_FIELD4]],
|
|
// TCHECK: [[A_FIELD_INC_CONV:%.+]] = fptosi double [[A_FIELD_INC]] to i{{[0-9]+}}
|
|
// TCHECK: [[C_IND:%.+]] = mul{{.+}} i{{[0-9]+}} 1, [[VLA_ADDR_REF2]]
|
|
// TCHECK: [[C_1_REF:%.+]] = getelementptr inbounds i{{[0-9]+}}, ptr [[VLA3]], i{{[0-9]+}} [[C_IND]]
|
|
// TCHECK: [[C_1_1_REF:%.+]] = getelementptr inbounds i{{[0-9]+}}, ptr [[C_1_REF]], i{{[0-9]+}} 1
|
|
// TCHECK: store i{{[0-9]+}} [[A_FIELD_INC_CONV]], ptr [[C_1_1_REF]],
|
|
|
|
// finish
|
|
// TCHECK: [[RELOAD_SSTACK:%.+]] = load ptr, ptr [[SSTACK]],
|
|
// TCHECK: call void @llvm.stackrestore.p0(ptr [[RELOAD_SSTACK]])
|
|
// TCHECK: ret void
|
|
};
|
|
|
|
|
|
int bar(int n){
|
|
int a = 0;
|
|
a += foo(n);
|
|
S1 S;
|
|
a += S.r1(n);
|
|
a += fstatic(n);
|
|
a += ftemplate<int>(n);
|
|
|
|
return a;
|
|
}
|
|
|
|
// template
|
|
// TCHECK: define weak_odr protected void @__omp_offloading_{{.+}}(ptr {{[^,]+}})
|
|
// TCHECK: [[DYN_PTR:%.+]] = alloca ptr
|
|
// TCHECK: [[A:%.+]] = alloca i{{[0-9]+}},
|
|
// TCHECK: [[A2:%.+]] = alloca i{{[0-9]+}},
|
|
// TCHECK: [[B:%.+]] = alloca [10 x i{{[0-9]+}}],
|
|
// TCHECK: store i{{[0-9]+}} 1, ptr [[A]],
|
|
// TCHECK: store i{{[0-9]+}} 1, ptr [[A2]],
|
|
// TCHECK: [[B_GEP:%.+]] = getelementptr inbounds [10 x i{{[0-9]+}}], ptr [[B]], i{{[0-9]+}} 0, i{{[0-9]+}} 2
|
|
// TCHECK: store i{{[0-9]+}} 1, ptr [[B_GEP]],
|
|
// TCHECK: ret void
|
|
|
|
#endif
|