r600: Convert get_num_groups to clc

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Reviewer: Aaron Watry
llvm-svn: 346077

12 files changed, 16 insertions, 49 deletions

diff --git a/libclc/r600/lib/OVERRIDES_3.9 b/libclc/r600/lib/OVERRIDES_3.9
index 40638ccfa183..c99f3fc7052e 100644
--- a/libclc/r600/lib/OVERRIDES_3.9
+++ b/libclc/r600/lib/OVERRIDES_3.9
@@ -1,2 +1 @@
 synchronization/barrier_impl.ll
-workitem/get_num_groups.ll
diff --git a/libclc/r600/lib/OVERRIDES_4.0 b/libclc/r600/lib/OVERRIDES_4.0
index 40638ccfa183..c99f3fc7052e 100644
--- a/libclc/r600/lib/OVERRIDES_4.0
+++ b/libclc/r600/lib/OVERRIDES_4.0
@@ -1,2 +1 @@
 synchronization/barrier_impl.ll
-workitem/get_num_groups.ll
diff --git a/libclc/r600/lib/OVERRIDES_5.0 b/libclc/r600/lib/OVERRIDES_5.0
index 40638ccfa183..c99f3fc7052e 100644
--- a/libclc/r600/lib/OVERRIDES_5.0
+++ b/libclc/r600/lib/OVERRIDES_5.0
@@ -1,2 +1 @@
 synchronization/barrier_impl.ll
-workitem/get_num_groups.ll
diff --git a/libclc/r600/lib/OVERRIDES_6.0 b/libclc/r600/lib/OVERRIDES_6.0
index 40638ccfa183..c99f3fc7052e 100644
--- a/libclc/r600/lib/OVERRIDES_6.0
+++ b/libclc/r600/lib/OVERRIDES_6.0
@@ -1,2 +1 @@
 synchronization/barrier_impl.ll
-workitem/get_num_groups.ll
diff --git a/libclc/r600/lib/SOURCES b/libclc/r600/lib/SOURCES
index 1d8d31dc38da..b3180ed70f08 100644
--- a/libclc/r600/lib/SOURCES
+++ b/libclc/r600/lib/SOURCES
@@ -6,5 +6,5 @@ workitem/get_group_id.cl
 workitem/get_global_size.cl
 workitem/get_local_id.cl
 workitem/get_local_size.cl
-workitem/get_num_groups.ll
+workitem/get_num_groups.cl
 workitem/get_work_dim.cl
diff --git a/libclc/r600/lib/SOURCES_3.9 b/libclc/r600/lib/SOURCES_3.9
index 9348387b22ce..560a86dbdaca 100644
--- a/libclc/r600/lib/SOURCES_3.9
+++ b/libclc/r600/lib/SOURCES_3.9
@@ -14,4 +14,3 @@ image/write_imagei.cl
 image/write_imageui.cl
 image/write_image_impl.ll
 synchronization/barrier_impl.39.ll
-workitem/get_num_groups.39.ll
diff --git a/libclc/r600/lib/SOURCES_4.0 b/libclc/r600/lib/SOURCES_4.0
index 93d333017bb2..3c56d8098f86 100644
--- a/libclc/r600/lib/SOURCES_4.0
+++ b/libclc/r600/lib/SOURCES_4.0
@@ -1,2 +1 @@
 synchronization/barrier_impl.39.ll
-workitem/get_num_groups.39.ll
diff --git a/libclc/r600/lib/SOURCES_5.0 b/libclc/r600/lib/SOURCES_5.0
index 93d333017bb2..3c56d8098f86 100644
--- a/libclc/r600/lib/SOURCES_5.0
+++ b/libclc/r600/lib/SOURCES_5.0
@@ -1,2 +1 @@
 synchronization/barrier_impl.39.ll
-workitem/get_num_groups.39.ll
diff --git a/libclc/r600/lib/SOURCES_6.0 b/libclc/r600/lib/SOURCES_6.0
index 93d333017bb2..3c56d8098f86 100644
--- a/libclc/r600/lib/SOURCES_6.0
+++ b/libclc/r600/lib/SOURCES_6.0
@@ -1,2 +1 @@
 synchronization/barrier_impl.39.ll
-workitem/get_num_groups.39.ll
diff --git a/libclc/r600/lib/workitem/get_num_groups.39.ll b/libclc/r600/lib/workitem/get_num_groups.39.ll
deleted file mode 100644
index 74ca78b49205..000000000000
--- a/libclc/r600/lib/workitem/get_num_groups.39.ll
+++ /dev/null
@@ -1,20 +0,0 @@
-declare i32 @llvm.r600.read.ngroups.x() nounwind readnone
-declare i32 @llvm.r600.read.ngroups.y() nounwind readnone
-declare i32 @llvm.r600.read.ngroups.z() nounwind readnone
-
-target datalayout = "e-p: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_num_groups(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.ngroups.x() nounwind readnone
-  ret i32 %x
-y_dim:
-  %y = call i32 @llvm.r600.read.ngroups.y() nounwind readnone
-  ret i32 %y
-z_dim:
-  %z = call i32 @llvm.r600.read.ngroups.z() nounwind readnone
-  ret i32 %z
-default:
-  ret i32 1
-}
diff --git a/libclc/r600/lib/workitem/get_num_groups.cl b/libclc/r600/lib/workitem/get_num_groups.cl
new file mode 100644
index 000000000000..dfe6cef22f8e
--- /dev/null
+++ b/libclc/r600/lib/workitem/get_num_groups.cl
@@ -0,0 +1,15 @@
+#include <clc/clc.h>
+
+uint __clc_r600_get_num_groups_x(void) __asm("llvm.r600.read.ngroups.x");
+uint __clc_r600_get_num_groups_y(void) __asm("llvm.r600.read.ngroups.y");
+uint __clc_r600_get_num_groups_z(void) __asm("llvm.r600.read.ngroups.z");
+
+_CLC_DEF size_t get_num_groups(uint dim)
+{
+	switch (dim) {
+	case 0: return __clc_r600_get_num_groups_x();
+	case 1: return __clc_r600_get_num_groups_y();
+	case 2: return __clc_r600_get_num_groups_z();
+	default: return 1;
+	}
+}
diff --git a/libclc/r600/lib/workitem/get_num_groups.ll b/libclc/r600/lib/workitem/get_num_groups.ll
deleted file mode 100644
index b31f4cf8b206..000000000000
--- a/libclc/r600/lib/workitem/get_num_groups.ll
+++ /dev/null
@@ -1,20 +0,0 @@
-declare i32 @llvm.r600.read.ngroups.x() nounwind readnone
-declare i32 @llvm.r600.read.ngroups.y() nounwind readnone
-declare i32 @llvm.r600.read.ngroups.z() nounwind readnone
-
-target datalayout = "e-p: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 i32 @get_num_groups(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.ngroups.x() nounwind readnone
-  ret i32 %x
-y_dim:
-  %y = call i32 @llvm.r600.read.ngroups.y() nounwind readnone
-  ret i32 %y
-z_dim:
-  %z = call i32 @llvm.r600.read.ngroups.z() nounwind readnone
-  ret i32 %z
-default:
-  ret i32 1
-}