Author: arsenm
Date: Tue Aug 27 12:25:40 2019
New Revision: 370101
URL: http://llvm.org/viewvc/llvm-project?rev=370101&view=rev
Log:
AMDGPU: Always emit amdgpu-flat-work-group-size
The backend default maximum should be the hardware maximum, so the
frontend should set the implementation defined default maximum.
Modified:
cfe/trunk/lib/CodeGen/TargetInfo.cpp
cfe/trunk/test/CodeGenOpenCL/amdgpu-attrs.cl
Modified: cfe/trunk/lib/CodeGen/TargetInfo.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/TargetInfo.cpp?rev=370101&r1=370100&r2=370101&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/TargetInfo.cpp (original)
+++ cfe/trunk/lib/CodeGen/TargetInfo.cpp Tue Aug 27 12:25:40 2019
@@ -7912,8 +7912,11 @@ void AMDGPUTargetCodeGenInfo::setTargetA
const auto *ReqdWGS = M.getLangOpts().OpenCL ?
FD->getAttr<ReqdWorkGroupSizeAttr>() : nullptr;
- if (((M.getLangOpts().OpenCL && FD->hasAttr<OpenCLKernelAttr>()) ||
- (M.getLangOpts().HIP && FD->hasAttr<CUDAGlobalAttr>())) &&
+
+ const bool IsOpenCLKernel = M.getLangOpts().OpenCL &&
+ FD->hasAttr<OpenCLKernelAttr>();
+ if ((IsOpenCLKernel ||
+ (M.getLangOpts().HIP && FD->hasAttr<CUDAGlobalAttr>())) &&
(M.getTriple().getOS() == llvm::Triple::AMDHSA))
F->addFnAttr("amdgpu-implicitarg-num-bytes", "56");
@@ -7939,6 +7942,9 @@ void AMDGPUTargetCodeGenInfo::setTargetA
F->addFnAttr("amdgpu-flat-work-group-size", AttrVal);
} else
assert(Max == 0 && "Max must be zero");
+ } else if (IsOpenCLKernel) {
+ // By default, restrict the maximum size to 256.
+ F->addFnAttr("amdgpu-flat-work-group-size", "1,256");
}
if (const auto *Attr = FD->getAttr<AMDGPUWavesPerEUAttr>()) {
Modified: cfe/trunk/test/CodeGenOpenCL/amdgpu-attrs.cl
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/amdgpu-attrs.cl?rev=370101&r1=370100&r2=370101&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenOpenCL/amdgpu-attrs.cl (original)
+++ cfe/trunk/test/CodeGenOpenCL/amdgpu-attrs.cl Tue Aug 27 12:25:40 2019
@@ -143,6 +143,10 @@ void a_function() {
// CHECK: define void @a_function() [[A_FUNCTION:#[0-9]+]]
}
+kernel void default_kernel() {
+// CHECK: define amdgpu_kernel void @default_kernel()
[[DEFAULT_KERNEL_ATTRS:#[0-9]+]]
+}
+
// Make sure this is silently accepted on other targets.
// X86-NOT: "amdgpu-flat-work-group-size"
@@ -158,23 +162,25 @@ void a_function() {
// CHECK-NOT: "amdgpu-num-sgpr"="0"
// CHECK-NOT: "amdgpu-num-vgpr"="0"
-// CHECK-DAG: attributes [[FLAT_WORK_GROUP_SIZE_32_64]] = { convergent
noinline nounwind optnone "amdgpu-flat-work-group-size"="32,64"
"amdgpu-implicitarg-num-bytes"="56"
-// CHECK-DAG: attributes [[FLAT_WORK_GROUP_SIZE_64_64]] = { convergent
noinline nounwind optnone "amdgpu-flat-work-group-size"="64,64"
"amdgpu-implicitarg-num-bytes"="56"
-// CHECK-DAG: attributes [[FLAT_WORK_GROUP_SIZE_16_128]] = { convergent
noinline nounwind optnone "amdgpu-flat-work-group-size"="16,128"
"amdgpu-implicitarg-num-bytes"="56"
-// CHECK-DAG: attributes [[WAVES_PER_EU_2]] = { convergent noinline nounwind
optnone "amdgpu-implicitarg-num-bytes"="56" "amdgpu-waves-per-eu"="2"
-// CHECK-DAG: attributes [[WAVES_PER_EU_2_4]] = { convergent noinline nounwind
optnone "amdgpu-implicitarg-num-bytes"="56" "amdgpu-waves-per-eu"="2,4"
-// CHECK-DAG: attributes [[NUM_SGPR_32]] = { convergent noinline nounwind
optnone "amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-sgpr"="32"
-// CHECK-DAG: attributes [[NUM_VGPR_64]] = { convergent noinline nounwind
optnone "amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-vgpr"="64"
+// CHECK-DAG: attributes [[FLAT_WORK_GROUP_SIZE_32_64]] = { convergent
noinline nounwind optnone "amdgpu-flat-work-group-size"="32,64"
"amdgpu-implicitarg-num-bytes"="56"
+// CHECK-DAG: attributes [[FLAT_WORK_GROUP_SIZE_64_64]] = { convergent
noinline nounwind optnone "amdgpu-flat-work-group-size"="64,64"
"amdgpu-implicitarg-num-bytes"="56"
+// CHECK-DAG: attributes [[FLAT_WORK_GROUP_SIZE_16_128]] = { convergent
noinline nounwind optnone "amdgpu-flat-work-group-size"="16,128"
"amdgpu-implicitarg-num-bytes"="56"
+
+// CHECK-DAG: attributes [[WAVES_PER_EU_2]] = { convergent noinline nounwind
optnone "amdgpu-flat-work-group-size"="1,256"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-waves-per-eu"="2"
+
+// CHECK-DAG: attributes [[WAVES_PER_EU_2_4]] = { convergent noinline nounwind
optnone "amdgpu-flat-work-group-size"="1,256"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-waves-per-eu"="2,4"
+// CHECK-DAG: attributes [[NUM_SGPR_32]] = { convergent noinline nounwind
optnone "amdgpu-flat-work-group-size"="1,256"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-sgpr"="32"
+// CHECK-DAG: attributes [[NUM_VGPR_64]] = { convergent noinline nounwind
optnone "amdgpu-flat-work-group-size"="1,256"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-vgpr"="64"
// CHECK-DAG: attributes [[FLAT_WORK_GROUP_SIZE_32_64_WAVES_PER_EU_2]] = {
convergent noinline nounwind optnone "amdgpu-flat-work-group-size"="32,64"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-waves-per-eu"="2"
// CHECK-DAG: attributes [[FLAT_WORK_GROUP_SIZE_32_64_WAVES_PER_EU_2_4]] = {
convergent noinline nounwind optnone "amdgpu-flat-work-group-size"="32,64"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-waves-per-eu"="2,4"
-// CHECK-DAG: attributes [[FLAT_WORK_GROUP_SIZE_32_64_NUM_SGPR_32]] = {
convergent noinline nounwind optnone "amdgpu-flat-work-group-size"="32,64"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-sgpr"="32"
-// CHECK-DAG: attributes [[FLAT_WORK_GROUP_SIZE_32_64_NUM_VGPR_64]] = {
convergent noinline nounwind optnone "amdgpu-flat-work-group-size"="32,64"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-vgpr"="64"
-// CHECK-DAG: attributes [[WAVES_PER_EU_2_NUM_SGPR_32]] = { convergent
noinline nounwind optnone "amdgpu-implicitarg-num-bytes"="56"
"amdgpu-num-sgpr"="32" "amdgpu-waves-per-eu"="2"
-// CHECK-DAG: attributes [[WAVES_PER_EU_2_NUM_VGPR_64]] = { convergent
noinline nounwind optnone "amdgpu-implicitarg-num-bytes"="56"
"amdgpu-num-vgpr"="64" "amdgpu-waves-per-eu"="2"
-// CHECK-DAG: attributes [[WAVES_PER_EU_2_4_NUM_SGPR_32]] = { convergent
noinline nounwind optnone "amdgpu-implicitarg-num-bytes"="56"
"amdgpu-num-sgpr"="32" "amdgpu-waves-per-eu"="2,4"
-// CHECK-DAG: attributes [[WAVES_PER_EU_2_4_NUM_VGPR_64]] = { convergent
noinline nounwind optnone "amdgpu-implicitarg-num-bytes"="56"
"amdgpu-num-vgpr"="64" "amdgpu-waves-per-eu"="2,4"
-// CHECK-DAG: attributes [[NUM_SGPR_32_NUM_VGPR_64]] = { convergent noinline
nounwind optnone "amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-sgpr"="32"
"amdgpu-num-vgpr"="64"
+// CHECK-DAG: attributes [[FLAT_WORK_GROUP_SIZE_32_64_NUM_SGPR_32]] = {
convergent noinline nounwind optnone "amdgpu-flat-work-group-size"="32,64"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-sgpr"="32"
+// CHECK-DAG: attributes [[FLAT_WORK_GROUP_SIZE_32_64_NUM_VGPR_64]] = {
convergent noinline nounwind optnone "amdgpu-flat-work-group-size"="32,64"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-vgpr"="64"
+// CHECK-DAG: attributes [[WAVES_PER_EU_2_NUM_SGPR_32]] = { convergent
noinline nounwind optnone "amdgpu-flat-work-group-size"="1,256"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-sgpr"="32"
"amdgpu-waves-per-eu"="2"
+// CHECK-DAG: attributes [[WAVES_PER_EU_2_NUM_VGPR_64]] = { convergent
noinline nounwind optnone "amdgpu-flat-work-group-size"="1,256"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-vgpr"="64"
"amdgpu-waves-per-eu"="2"
+// CHECK-DAG: attributes [[WAVES_PER_EU_2_4_NUM_SGPR_32]] = { convergent
noinline nounwind optnone "amdgpu-flat-work-group-size"="1,256"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-sgpr"="32"
"amdgpu-waves-per-eu"="2,4"
+// CHECK-DAG: attributes [[WAVES_PER_EU_2_4_NUM_VGPR_64]] = { convergent
noinline nounwind optnone "amdgpu-flat-work-group-size"="1,256"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-vgpr"="64"
"amdgpu-waves-per-eu"="2,4"
+// CHECK-DAG: attributes [[NUM_SGPR_32_NUM_VGPR_64]] = { convergent noinline
nounwind optnone "amdgpu-flat-work-group-size"="1,256"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-sgpr"="32"
"amdgpu-num-vgpr"="64"
// CHECK-DAG: attributes
[[FLAT_WORK_GROUP_SIZE_32_64_WAVES_PER_EU_2_NUM_SGPR_32]] = { convergent
noinline nounwind optnone "amdgpu-flat-work-group-size"="32,64"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-sgpr"="32"
"amdgpu-waves-per-eu"="2"
// CHECK-DAG: attributes
[[FLAT_WORK_GROUP_SIZE_32_64_WAVES_PER_EU_2_NUM_VGPR_64]] = { convergent
noinline nounwind optnone "amdgpu-flat-work-group-size"="32,64"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-vgpr"="64"
"amdgpu-waves-per-eu"="2"
@@ -185,3 +191,4 @@ void a_function() {
// CHECK-DAG: attributes
[[FLAT_WORK_GROUP_SIZE_32_64_WAVES_PER_EU_2_4_NUM_SGPR_32_NUM_VGPR_64]] = {
convergent noinline nounwind optnone "amdgpu-flat-work-group-size"="32,64"
"amdgpu-implicitarg-num-bytes"="56" "amdgpu-num-sgpr"="32"
"amdgpu-num-vgpr"="64" "amdgpu-waves-per-eu"="2,4"
// CHECK-DAG: attributes [[A_FUNCTION]] = { convergent noinline nounwind
optnone "correctly-rounded-divide-sqrt-fp-math"="false"
+// CHECK-DAG: attributes [[DEFAULT_KERNEL_ATTRS]] = { convergent noinline
nounwind optnone "amdgpu-flat-work-group-size"="1,256"
"amdgpu-implicitarg-num-bytes"="56"
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
