[libclc] r325863 - amdgcn: Fix datalayout after clang r324101

Jan Vesely via cfe-commits cfe-commits at lists.llvm.org
Thu Feb 22 23:36:39 PST 2018


Author: jvesely
Date: Thu Feb 22 23:36:39 2018
New Revision: 325863

URL: http://llvm.org/viewvc/llvm-project?rev=325863&view=rev
Log:
amdgcn: Fix datalayout after clang r324101

r324101 switched around AS numbering

Acked-by: Aaron Watry <awatry at gmail.com>
Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>

Added:
    libclc/trunk/amdgcn/lib/OVERRIDES_4.0
      - copied, changed from r325061, libclc/trunk/amdgcn/lib/OVERRIDES_3.9
    libclc/trunk/amdgcn/lib/OVERRIDES_5.0
      - copied, changed from r325061, libclc/trunk/amdgcn/lib/OVERRIDES_3.9
    libclc/trunk/amdgcn/lib/OVERRIDES_6.0
      - copied, changed from r325061, libclc/trunk/amdgcn/lib/OVERRIDES_3.9
    libclc/trunk/amdgcn/lib/SOURCES_4.0
    libclc/trunk/amdgcn/lib/SOURCES_5.0
    libclc/trunk/amdgcn/lib/SOURCES_6.0
    libclc/trunk/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.39.ll
      - copied, changed from r325061, libclc/trunk/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.ll
    libclc/trunk/amdgcn/lib/workitem/get_global_size.40.ll
      - copied, changed from r325061, libclc/trunk/amdgcn/lib/workitem/get_global_size.ll
    libclc/trunk/amdgcn/lib/workitem/get_local_size.40.ll
      - copied, changed from r325061, libclc/trunk/amdgcn/lib/workitem/get_local_size.ll
    libclc/trunk/amdgcn/lib/workitem/get_num_groups.40.ll
      - copied, changed from r325061, libclc/trunk/amdgcn/lib/workitem/get_num_groups.ll
Modified:
    libclc/trunk/amdgcn-amdhsa/lib/OVERRIDES
    libclc/trunk/amdgcn/lib/OVERRIDES_3.9
    libclc/trunk/amdgcn/lib/SOURCES
    libclc/trunk/amdgcn/lib/SOURCES_3.9
    libclc/trunk/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.ll
    libclc/trunk/amdgcn/lib/workitem/get_global_size.ll
    libclc/trunk/amdgcn/lib/workitem/get_local_size.ll
    libclc/trunk/amdgcn/lib/workitem/get_num_groups.ll

Modified: libclc/trunk/amdgcn-amdhsa/lib/OVERRIDES
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn-amdhsa/lib/OVERRIDES?rev=325863&r1=325862&r2=325863&view=diff
==============================================================================
--- libclc/trunk/amdgcn-amdhsa/lib/OVERRIDES (original)
+++ libclc/trunk/amdgcn-amdhsa/lib/OVERRIDES Thu Feb 22 23:36:39 2018
@@ -1 +1,4 @@
 workitem/get_num_groups.ll
+workitem/get_num_groups.40.ll
+workitem/get_global_size.40.ll
+workitem/get_local_size.40.ll

Modified: libclc/trunk/amdgcn/lib/OVERRIDES_3.9
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/OVERRIDES_3.9?rev=325863&r1=325862&r2=325863&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/OVERRIDES_3.9 (original)
+++ libclc/trunk/amdgcn/lib/OVERRIDES_3.9 Thu Feb 22 23:36:39 2018
@@ -1,3 +1,4 @@
+cl_khr_int64_extended_atomics/minmax_helpers.ll
 workitem/get_global_size.ll
 workitem/get_local_size.ll
 workitem/get_num_groups.ll

Copied: libclc/trunk/amdgcn/lib/OVERRIDES_4.0 (from r325061, libclc/trunk/amdgcn/lib/OVERRIDES_3.9)
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/OVERRIDES_4.0?p2=libclc/trunk/amdgcn/lib/OVERRIDES_4.0&p1=libclc/trunk/amdgcn/lib/OVERRIDES_3.9&r1=325061&r2=325863&rev=325863&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/OVERRIDES_3.9 (original)
+++ libclc/trunk/amdgcn/lib/OVERRIDES_4.0 Thu Feb 22 23:36:39 2018
@@ -1,3 +1,4 @@
+cl_khr_int64_extended_atomics/minmax_helpers.ll
 workitem/get_global_size.ll
 workitem/get_local_size.ll
 workitem/get_num_groups.ll

Copied: libclc/trunk/amdgcn/lib/OVERRIDES_5.0 (from r325061, libclc/trunk/amdgcn/lib/OVERRIDES_3.9)
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/OVERRIDES_5.0?p2=libclc/trunk/amdgcn/lib/OVERRIDES_5.0&p1=libclc/trunk/amdgcn/lib/OVERRIDES_3.9&r1=325061&r2=325863&rev=325863&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/OVERRIDES_3.9 (original)
+++ libclc/trunk/amdgcn/lib/OVERRIDES_5.0 Thu Feb 22 23:36:39 2018
@@ -1,3 +1,4 @@
+cl_khr_int64_extended_atomics/minmax_helpers.ll
 workitem/get_global_size.ll
 workitem/get_local_size.ll
 workitem/get_num_groups.ll

Copied: libclc/trunk/amdgcn/lib/OVERRIDES_6.0 (from r325061, libclc/trunk/amdgcn/lib/OVERRIDES_3.9)
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/OVERRIDES_6.0?p2=libclc/trunk/amdgcn/lib/OVERRIDES_6.0&p1=libclc/trunk/amdgcn/lib/OVERRIDES_3.9&r1=325061&r2=325863&rev=325863&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/OVERRIDES_3.9 (original)
+++ libclc/trunk/amdgcn/lib/OVERRIDES_6.0 Thu Feb 22 23:36:39 2018
@@ -1,3 +1,4 @@
+cl_khr_int64_extended_atomics/minmax_helpers.ll
 workitem/get_global_size.ll
 workitem/get_local_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=325863&r1=325862&r2=325863&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/SOURCES (original)
+++ libclc/trunk/amdgcn/lib/SOURCES Thu Feb 22 23:36:39 2018
@@ -1,7 +1,6 @@
 cl_khr_int64_extended_atomics/minmax_helpers.ll
 math/ldexp.cl
 mem_fence/fence.cl
-mem_fence/waitcnt.ll
 synchronization/barrier.cl
 workitem/get_global_offset.cl
 workitem/get_group_id.cl

Modified: libclc/trunk/amdgcn/lib/SOURCES_3.9
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/SOURCES_3.9?rev=325863&r1=325862&r2=325863&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/SOURCES_3.9 (original)
+++ libclc/trunk/amdgcn/lib/SOURCES_3.9 Thu Feb 22 23:36:39 2018
@@ -1,3 +1,5 @@
+cl_khr_int64_extended_atomics/minmax_helpers.39.ll
+mem_fence/waitcnt.ll
 workitem/get_global_size.39.ll
 workitem/get_local_size.39.ll
 workitem/get_num_groups.39.ll

Added: libclc/trunk/amdgcn/lib/SOURCES_4.0
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/SOURCES_4.0?rev=325863&view=auto
==============================================================================
--- libclc/trunk/amdgcn/lib/SOURCES_4.0 (added)
+++ libclc/trunk/amdgcn/lib/SOURCES_4.0 Thu Feb 22 23:36:39 2018
@@ -0,0 +1,5 @@
+cl_khr_int64_extended_atomics/minmax_helpers.39.ll
+mem_fence/waitcnt.ll
+workitem/get_global_size.40.ll
+workitem/get_local_size.40.ll
+workitem/get_num_groups.40.ll

Added: libclc/trunk/amdgcn/lib/SOURCES_5.0
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/SOURCES_5.0?rev=325863&view=auto
==============================================================================
--- libclc/trunk/amdgcn/lib/SOURCES_5.0 (added)
+++ libclc/trunk/amdgcn/lib/SOURCES_5.0 Thu Feb 22 23:36:39 2018
@@ -0,0 +1,4 @@
+cl_khr_int64_extended_atomics/minmax_helpers.39.ll
+workitem/get_global_size.40.ll
+workitem/get_local_size.40.ll
+workitem/get_num_groups.40.ll

Added: libclc/trunk/amdgcn/lib/SOURCES_6.0
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/SOURCES_6.0?rev=325863&view=auto
==============================================================================
--- libclc/trunk/amdgcn/lib/SOURCES_6.0 (added)
+++ libclc/trunk/amdgcn/lib/SOURCES_6.0 Thu Feb 22 23:36:39 2018
@@ -0,0 +1,4 @@
+cl_khr_int64_extended_atomics/minmax_helpers.39.ll
+workitem/get_global_size.40.ll
+workitem/get_local_size.40.ll
+workitem/get_num_groups.40.ll

Copied: libclc/trunk/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.39.ll (from r325061, libclc/trunk/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.ll)
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.39.ll?p2=libclc/trunk/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.39.ll&p1=libclc/trunk/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.ll&r1=325061&r2=325863&rev=325863&view=diff
==============================================================================
    (empty)

Modified: libclc/trunk/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.ll
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.ll?rev=325863&r1=325862&r2=325863&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.ll (original)
+++ libclc/trunk/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.ll Thu Feb 22 23:36:39 2018
@@ -1,4 +1,4 @@
-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"
+target datalayout = "e-p:64:64-p1:64:64-p2:64:64-p3:32:32-p4:32:32-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-A5"
 
 define i64 @__clc__sync_fetch_and_min_global_8(i64 addrspace(1)* nocapture %ptr, i64 %value) nounwind alwaysinline {
 entry:

Copied: libclc/trunk/amdgcn/lib/workitem/get_global_size.40.ll (from r325061, libclc/trunk/amdgcn/lib/workitem/get_global_size.ll)
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/workitem/get_global_size.40.ll?p2=libclc/trunk/amdgcn/lib/workitem/get_global_size.40.ll&p1=libclc/trunk/amdgcn/lib/workitem/get_global_size.ll&r1=325061&r2=325863&rev=325863&view=diff
==============================================================================
    (empty)

Modified: 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=325863&r1=325862&r2=325863&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/workitem/get_global_size.ll (original)
+++ libclc/trunk/amdgcn/lib/workitem/get_global_size.ll Thu Feb 22 23:36:39 2018
@@ -2,7 +2,7 @@ declare i32 @llvm.r600.read.global.size.
 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"
+target datalayout = "e-p:64:64-p1:64:64-p2:64:64-p3:32:32-p4:32:32-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-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]

Copied: libclc/trunk/amdgcn/lib/workitem/get_local_size.40.ll (from r325061, libclc/trunk/amdgcn/lib/workitem/get_local_size.ll)
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/workitem/get_local_size.40.ll?p2=libclc/trunk/amdgcn/lib/workitem/get_local_size.40.ll&p1=libclc/trunk/amdgcn/lib/workitem/get_local_size.ll&r1=325061&r2=325863&rev=325863&view=diff
==============================================================================
    (empty)

Modified: libclc/trunk/amdgcn/lib/workitem/get_local_size.ll
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/workitem/get_local_size.ll?rev=325863&r1=325862&r2=325863&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/workitem/get_local_size.ll (original)
+++ libclc/trunk/amdgcn/lib/workitem/get_local_size.ll Thu Feb 22 23:36:39 2018
@@ -2,7 +2,7 @@ declare i32 @llvm.r600.read.local.size.x
 declare i32 @llvm.r600.read.local.size.y() nounwind readnone
 declare i32 @llvm.r600.read.local.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"
+target datalayout = "e-p:64:64-p1:64:64-p2:64:64-p3:32:32-p4:32:32-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-A5"
 
 define i64 @get_local_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]

Copied: libclc/trunk/amdgcn/lib/workitem/get_num_groups.40.ll (from r325061, libclc/trunk/amdgcn/lib/workitem/get_num_groups.ll)
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/workitem/get_num_groups.40.ll?p2=libclc/trunk/amdgcn/lib/workitem/get_num_groups.40.ll&p1=libclc/trunk/amdgcn/lib/workitem/get_num_groups.ll&r1=325061&r2=325863&rev=325863&view=diff
==============================================================================
    (empty)

Modified: libclc/trunk/amdgcn/lib/workitem/get_num_groups.ll
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/amdgcn/lib/workitem/get_num_groups.ll?rev=325863&r1=325862&r2=325863&view=diff
==============================================================================
--- libclc/trunk/amdgcn/lib/workitem/get_num_groups.ll (original)
+++ libclc/trunk/amdgcn/lib/workitem/get_num_groups.ll Thu Feb 22 23:36:39 2018
@@ -2,7 +2,7 @@ declare i32 @llvm.r600.read.ngroups.x()
 declare i32 @llvm.r600.read.ngroups.y() nounwind readnone
 declare i32 @llvm.r600.read.ngroups.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"
+target datalayout = "e-p:64:64-p1:64:64-p2:64:64-p3:32:32-p4:32:32-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-A5"
 
 define i64 @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]




More information about the cfe-commits mailing list