Author: jvesely
Date: Sat Nov 3 17:39:20 2018
New Revision: 346080
URL: http://llvm.org/viewvc/llvm-project?rev=346080&view=rev
Log:
amdgcn: Convert get_global_size to clc
Signed-off-by: Jan Vesely <jan.ves...@rutgers.edu>
Reviewed-By: Aaron Watry <awa...@gmail.com>
Added:
libclc/trunk/amdgcn/lib/workitem/get_global_size.cl
Removed:
libclc/trunk/amdgcn/lib/workitem/get_global_size.39.ll
libclc/trunk/amdgcn/lib/workitem/get_global_size.40.ll
libclc/trunk/amdgcn/lib/workitem/get_global_size.ll
Modified:
libclc/trunk/amdgcn/lib/OVERRIDES_3.9
libclc/trunk/amdgcn/lib/OVERRIDES_4.0
libclc/trunk/amdgcn/lib/OVERRIDES_5.0
libclc/trunk/amdgcn/lib/OVERRIDES_6.0
libclc/trunk/amdgcn/lib/SOURCES
libclc/trunk/amdgcn/lib/SOURCES_3.9
libclc/trunk/amdgcn/lib/SOURCES_4.0
libclc/trunk/amdgcn/lib/SOURCES_5.0
libclc/trunk/amdgcn/lib/SOURCES_6.0
Modified: libclc/trunk/amdgcn/lib/OVERRIDES_3.9
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/OVERRIDES_3.9?rev=346080&r1=346079&r2=346080&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/OVERRIDES_3.9 (original)
+++ libclc/trunk/amdgcn/lib/OVERRIDES_3.9 Sat Nov 3 17:39:20 2018
@@ -1,3 +1,2 @@
cl_khr_int64_extended_atomics/minmax_helpers.ll
-workitem/get_global_size.ll
workitem/get_num_groups.ll
Modified: libclc/trunk/amdgcn/lib/OVERRIDES_4.0
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/OVERRIDES_4.0?rev=346080&r1=346079&r2=346080&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/OVERRIDES_4.0 (original)
+++ libclc/trunk/amdgcn/lib/OVERRIDES_4.0 Sat Nov 3 17:39:20 2018
@@ -1,3 +1,2 @@
cl_khr_int64_extended_atomics/minmax_helpers.ll
-workitem/get_global_size.ll
workitem/get_num_groups.ll
Modified: libclc/trunk/amdgcn/lib/OVERRIDES_5.0
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/OVERRIDES_5.0?rev=346080&r1=346079&r2=346080&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/OVERRIDES_5.0 (original)
+++ libclc/trunk/amdgcn/lib/OVERRIDES_5.0 Sat Nov 3 17:39:20 2018
@@ -1,3 +1,2 @@
cl_khr_int64_extended_atomics/minmax_helpers.ll
-workitem/get_global_size.ll
workitem/get_num_groups.ll
Modified: libclc/trunk/amdgcn/lib/OVERRIDES_6.0
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/OVERRIDES_6.0?rev=346080&r1=346079&r2=346080&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/OVERRIDES_6.0 (original)
+++ libclc/trunk/amdgcn/lib/OVERRIDES_6.0 Sat Nov 3 17:39:20 2018
@@ -1,3 +1,2 @@
cl_khr_int64_extended_atomics/minmax_helpers.ll
-workitem/get_global_size.ll
workitem/get_num_groups.ll
Modified: libclc/trunk/amdgcn/lib/SOURCES
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/SOURCES?rev=346080&r1=346079&r2=346080&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/SOURCES (original)
+++ libclc/trunk/amdgcn/lib/SOURCES Sat Nov 3 17:39:20 2018
@@ -7,7 +7,7 @@ mem_fence/fence.cl
synchronization/barrier.cl
workitem/get_global_offset.cl
workitem/get_group_id.cl
-workitem/get_global_size.ll
+workitem/get_global_size.cl
workitem/get_local_id.cl
workitem/get_local_size.cl
workitem/get_num_groups.ll
Modified: libclc/trunk/amdgcn/lib/SOURCES_3.9
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/SOURCES_3.9?rev=346080&r1=346079&r2=346080&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/SOURCES_3.9 (original)
+++ libclc/trunk/amdgcn/lib/SOURCES_3.9 Sat Nov 3 17:39:20 2018
@@ -1,4 +1,3 @@
cl_khr_int64_extended_atomics/minmax_helpers.39.ll
mem_fence/waitcnt.ll
-workitem/get_global_size.39.ll
workitem/get_num_groups.39.ll
Modified: libclc/trunk/amdgcn/lib/SOURCES_4.0
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/SOURCES_4.0?rev=346080&r1=346079&r2=346080&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/SOURCES_4.0 (original)
+++ libclc/trunk/amdgcn/lib/SOURCES_4.0 Sat Nov 3 17:39:20 2018
@@ -1,4 +1,3 @@
cl_khr_int64_extended_atomics/minmax_helpers.39.ll
mem_fence/waitcnt.ll
-workitem/get_global_size.40.ll
workitem/get_num_groups.40.ll
Modified: libclc/trunk/amdgcn/lib/SOURCES_5.0
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/SOURCES_5.0?rev=346080&r1=346079&r2=346080&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/SOURCES_5.0 (original)
+++ libclc/trunk/amdgcn/lib/SOURCES_5.0 Sat Nov 3 17:39:20 2018
@@ -1,3 +1,2 @@
cl_khr_int64_extended_atomics/minmax_helpers.39.ll
-workitem/get_global_size.40.ll
workitem/get_num_groups.40.ll
Modified: libclc/trunk/amdgcn/lib/SOURCES_6.0
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/SOURCES_6.0?rev=346080&r1=346079&r2=346080&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/SOURCES_6.0 (original)
+++ libclc/trunk/amdgcn/lib/SOURCES_6.0 Sat Nov 3 17:39:20 2018
@@ -1,3 +1,2 @@
cl_khr_int64_extended_atomics/minmax_helpers.39.ll
-workitem/get_global_size.40.ll
workitem/get_num_groups.40.ll
Removed: libclc/trunk/amdgcn/lib/workitem/get_global_size.39.ll
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/workitem/get_global_size.39.ll?rev=346079&view=auto
==============================================================================
--- libclc/trunk/amdgcn/lib/workitem/get_global_size.39.ll (original)
+++ libclc/trunk/amdgcn/lib/workitem/get_global_size.39.ll (removed)
@@ -1,20 +0,0 @@
-declare i32 @llvm.r600.read.global.size.x() nounwind readnone
-declare i32 @llvm.r600.read.global.size.y() nounwind readnone
-declare i32 @llvm.r600.read.global.size.z() nounwind readnone
-
-target datalayout =
"e-p:32:32-p1:64:64-p2:64:64-p3:32:32-p4:64:64-p5:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64"
-
-define i32 @get_global_size(i32 %dim) nounwind readnone alwaysinline {
- switch i32 %dim, label %default [i32 0, label %x_dim i32 1, label %y_dim i32
2, label %z_dim]
-x_dim:
- %x = call i32 @llvm.r600.read.global.size.x()
- ret i32 %x
-y_dim:
- %y = call i32 @llvm.r600.read.global.size.y()
- ret i32 %y
-z_dim:
- %z = call i32 @llvm.r600.read.global.size.z()
- ret i32 %z
-default:
- ret i32 1
-}
Removed: libclc/trunk/amdgcn/lib/workitem/get_global_size.40.ll
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/workitem/get_global_size.40.ll?rev=346079&view=auto
==============================================================================
--- libclc/trunk/amdgcn/lib/workitem/get_global_size.40.ll (original)
+++ libclc/trunk/amdgcn/lib/workitem/get_global_size.40.ll (removed)
@@ -1,23 +0,0 @@
-declare i32 @llvm.r600.read.global.size.x() nounwind readnone
-declare i32 @llvm.r600.read.global.size.y() nounwind readnone
-declare i32 @llvm.r600.read.global.size.z() nounwind readnone
-
-target datalayout =
"e-p:32:32-p1:64:64-p2:64:64-p3:32:32-p4:64:64-p5:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64"
-
-define i64 @get_global_size(i32 %dim) nounwind readnone alwaysinline {
- switch i32 %dim, label %default [i32 0, label %x_dim i32 1, label %y_dim i32
2, label %z_dim]
-x_dim:
- %x = call i32 @llvm.r600.read.global.size.x()
- %x.ext = zext i32 %x to i64
- ret i64 %x.ext
-y_dim:
- %y = call i32 @llvm.r600.read.global.size.y()
- %y.ext = zext i32 %y to i64
- ret i64 %y.ext
-z_dim:
- %z = call i32 @llvm.r600.read.global.size.z()
- %z.ext = zext i32 %z to i64
- ret i64 %z.ext
-default:
- ret i64 1
-}
Added: libclc/trunk/amdgcn/lib/workitem/get_global_size.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/workitem/get_global_size.cl?rev=346080&view=auto
==============================================================================
--- libclc/trunk/amdgcn/lib/workitem/get_global_size.cl (added)
+++ libclc/trunk/amdgcn/lib/workitem/get_global_size.cl Sat Nov 3 17:39:20 2018
@@ -0,0 +1,15 @@
+#include <clc/clc.h>
+
+uint __clc_amdgcn_get_global_size_x(void)
__asm("llvm.r600.read.global.size.x");
+uint __clc_amdgcn_get_global_size_y(void)
__asm("llvm.r600.read.global.size.y");
+uint __clc_amdgcn_get_global_size_z(void)
__asm("llvm.r600.read.global.size.z");
+
+_CLC_DEF size_t get_global_size(uint dim)
+{
+ switch (dim) {
+ case 0: return __clc_amdgcn_get_global_size_x();
+ case 1: return __clc_amdgcn_get_global_size_y();
+ case 2: return __clc_amdgcn_get_global_size_z();
+ default: return 1;
+ }
+}
Removed: libclc/trunk/amdgcn/lib/workitem/get_global_size.ll
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/workitem/get_global_size.ll?rev=346079&view=auto
==============================================================================
--- libclc/trunk/amdgcn/lib/workitem/get_global_size.ll (original)
+++ libclc/trunk/amdgcn/lib/workitem/get_global_size.ll (removed)
@@ -1,23 +0,0 @@
-declare i32 @llvm.r600.read.global.size.x() nounwind readnone
-declare i32 @llvm.r600.read.global.size.y() nounwind readnone
-declare i32 @llvm.r600.read.global.size.z() nounwind readnone
-
-target datalayout =
"e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5"
-
-define i64 @get_global_size(i32 %dim) nounwind readnone alwaysinline {
- switch i32 %dim, label %default [i32 0, label %x_dim i32 1, label %y_dim i32
2, label %z_dim]
-x_dim:
- %x = call i32 @llvm.r600.read.global.size.x()
- %x.ext = zext i32 %x to i64
- ret i64 %x.ext
-y_dim:
- %y = call i32 @llvm.r600.read.global.size.y()
- %y.ext = zext i32 %y to i64
- ret i64 %y.ext
-z_dim:
- %z = call i32 @llvm.r600.read.global.size.z()
- %z.ext = zext i32 %z to i64
- ret i64 %z.ext
-default:
- ret i64 1
-}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
