[libclc] r346077 - r600: Convert get_num_groups to clc

Jan Vesely via cfe-commits cfe-commits at lists.llvm.org
Sat Nov 3 17:35:12 PDT 2018


Author: jvesely
Date: Sat Nov  3 17:35:12 2018
New Revision: 346077

URL: http://llvm.org/viewvc/llvm-project?rev=346077&view=rev
Log:
r600: Convert get_num_groups to clc

Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>
Reviewer: Aaron Watry

Added:
    libclc/trunk/r600/lib/workitem/get_num_groups.cl
Removed:
    libclc/trunk/r600/lib/workitem/get_num_groups.39.ll
    libclc/trunk/r600/lib/workitem/get_num_groups.ll
Modified:
    libclc/trunk/r600/lib/OVERRIDES_3.9
    libclc/trunk/r600/lib/OVERRIDES_4.0
    libclc/trunk/r600/lib/OVERRIDES_5.0
    libclc/trunk/r600/lib/OVERRIDES_6.0
    libclc/trunk/r600/lib/SOURCES
    libclc/trunk/r600/lib/SOURCES_3.9
    libclc/trunk/r600/lib/SOURCES_4.0
    libclc/trunk/r600/lib/SOURCES_5.0
    libclc/trunk/r600/lib/SOURCES_6.0

Modified: libclc/trunk/r600/lib/OVERRIDES_3.9
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/OVERRIDES_3.9?rev=346077&r1=346076&r2=346077&view=diff
==============================================================================
--- libclc/trunk/r600/lib/OVERRIDES_3.9 (original)
+++ libclc/trunk/r600/lib/OVERRIDES_3.9 Sat Nov  3 17:35:12 2018
@@ -1,2 +1 @@
 synchronization/barrier_impl.ll
-workitem/get_num_groups.ll

Modified: libclc/trunk/r600/lib/OVERRIDES_4.0
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/OVERRIDES_4.0?rev=346077&r1=346076&r2=346077&view=diff
==============================================================================
--- libclc/trunk/r600/lib/OVERRIDES_4.0 (original)
+++ libclc/trunk/r600/lib/OVERRIDES_4.0 Sat Nov  3 17:35:12 2018
@@ -1,2 +1 @@
 synchronization/barrier_impl.ll
-workitem/get_num_groups.ll

Modified: libclc/trunk/r600/lib/OVERRIDES_5.0
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/OVERRIDES_5.0?rev=346077&r1=346076&r2=346077&view=diff
==============================================================================
--- libclc/trunk/r600/lib/OVERRIDES_5.0 (original)
+++ libclc/trunk/r600/lib/OVERRIDES_5.0 Sat Nov  3 17:35:12 2018
@@ -1,2 +1 @@
 synchronization/barrier_impl.ll
-workitem/get_num_groups.ll

Modified: libclc/trunk/r600/lib/OVERRIDES_6.0
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/OVERRIDES_6.0?rev=346077&r1=346076&r2=346077&view=diff
==============================================================================
--- libclc/trunk/r600/lib/OVERRIDES_6.0 (original)
+++ libclc/trunk/r600/lib/OVERRIDES_6.0 Sat Nov  3 17:35:12 2018
@@ -1,2 +1 @@
 synchronization/barrier_impl.ll
-workitem/get_num_groups.ll

Modified: libclc/trunk/r600/lib/SOURCES
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/SOURCES?rev=346077&r1=346076&r2=346077&view=diff
==============================================================================
--- libclc/trunk/r600/lib/SOURCES (original)
+++ libclc/trunk/r600/lib/SOURCES Sat Nov  3 17:35:12 2018
@@ -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

Modified: libclc/trunk/r600/lib/SOURCES_3.9
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/SOURCES_3.9?rev=346077&r1=346076&r2=346077&view=diff
==============================================================================
--- libclc/trunk/r600/lib/SOURCES_3.9 (original)
+++ libclc/trunk/r600/lib/SOURCES_3.9 Sat Nov  3 17:35:12 2018
@@ -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

Modified: libclc/trunk/r600/lib/SOURCES_4.0
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/SOURCES_4.0?rev=346077&r1=346076&r2=346077&view=diff
==============================================================================
--- libclc/trunk/r600/lib/SOURCES_4.0 (original)
+++ libclc/trunk/r600/lib/SOURCES_4.0 Sat Nov  3 17:35:12 2018
@@ -1,2 +1 @@
 synchronization/barrier_impl.39.ll
-workitem/get_num_groups.39.ll

Modified: libclc/trunk/r600/lib/SOURCES_5.0
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/SOURCES_5.0?rev=346077&r1=346076&r2=346077&view=diff
==============================================================================
--- libclc/trunk/r600/lib/SOURCES_5.0 (original)
+++ libclc/trunk/r600/lib/SOURCES_5.0 Sat Nov  3 17:35:12 2018
@@ -1,2 +1 @@
 synchronization/barrier_impl.39.ll
-workitem/get_num_groups.39.ll

Modified: libclc/trunk/r600/lib/SOURCES_6.0
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/SOURCES_6.0?rev=346077&r1=346076&r2=346077&view=diff
==============================================================================
--- libclc/trunk/r600/lib/SOURCES_6.0 (original)
+++ libclc/trunk/r600/lib/SOURCES_6.0 Sat Nov  3 17:35:12 2018
@@ -1,2 +1 @@
 synchronization/barrier_impl.39.ll
-workitem/get_num_groups.39.ll

Removed: libclc/trunk/r600/lib/workitem/get_num_groups.39.ll
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/workitem/get_num_groups.39.ll?rev=346076&view=auto
==============================================================================
--- libclc/trunk/r600/lib/workitem/get_num_groups.39.ll (original)
+++ libclc/trunk/r600/lib/workitem/get_num_groups.39.ll (removed)
@@ -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
-}

Added: libclc/trunk/r600/lib/workitem/get_num_groups.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/workitem/get_num_groups.cl?rev=346077&view=auto
==============================================================================
--- libclc/trunk/r600/lib/workitem/get_num_groups.cl (added)
+++ libclc/trunk/r600/lib/workitem/get_num_groups.cl Sat Nov  3 17:35:12 2018
@@ -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;
+	}
+}

Removed: libclc/trunk/r600/lib/workitem/get_num_groups.ll
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/workitem/get_num_groups.ll?rev=346076&view=auto
==============================================================================
--- libclc/trunk/r600/lib/workitem/get_num_groups.ll (original)
+++ libclc/trunk/r600/lib/workitem/get_num_groups.ll (removed)
@@ -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
-}




More information about the cfe-commits mailing list