[libclc] 58/79: amdgcn: Fix datalayout after clang r324101
Andreas Boll
aboll-guest at moszumanska.debian.org
Mon Mar 19 16:51:00 UTC 2018
This is an automated email from the git hooks/post-receive script.
aboll-guest pushed a commit to branch master
in repository libclc.
commit 35cf067dbeff40d2c021850ec574bfaba535f015
Author: Jan Vesely <jan.vesely at rutgers.edu>
Date: Fri Feb 23 07:36:39 2018 +0000
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>
git-svn-id: https://llvm.org/svn/llvm-project/libclc/trunk@325863 91177308-0d34-0410-b5e6-96231b3b80d8
---
amdgcn-amdhsa/lib/OVERRIDES | 3 +++
amdgcn/lib/OVERRIDES_3.9 | 1 +
amdgcn/lib/{OVERRIDES_3.9 => OVERRIDES_4.0} | 1 +
amdgcn/lib/{OVERRIDES_3.9 => OVERRIDES_5.0} | 1 +
amdgcn/lib/{OVERRIDES_3.9 => OVERRIDES_6.0} | 1 +
amdgcn/lib/SOURCES | 1 -
amdgcn/lib/SOURCES_3.9 | 2 ++
amdgcn/lib/SOURCES_4.0 | 5 +++++
amdgcn/lib/SOURCES_5.0 | 4 ++++
amdgcn/lib/SOURCES_6.0 | 4 ++++
.../{minmax_helpers.ll => minmax_helpers.39.ll} | 0
amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.ll | 2 +-
amdgcn/lib/workitem/{get_global_size.ll => get_global_size.40.ll} | 0
amdgcn/lib/workitem/get_global_size.ll | 2 +-
amdgcn/lib/workitem/{get_local_size.ll => get_local_size.40.ll} | 0
amdgcn/lib/workitem/get_local_size.ll | 2 +-
amdgcn/lib/workitem/{get_num_groups.ll => get_num_groups.40.ll} | 0
amdgcn/lib/workitem/get_num_groups.ll | 2 +-
18 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/amdgcn-amdhsa/lib/OVERRIDES b/amdgcn-amdhsa/lib/OVERRIDES
index c9bd69b..18ce3f8 100644
--- a/amdgcn-amdhsa/lib/OVERRIDES
+++ b/amdgcn-amdhsa/lib/OVERRIDES
@@ -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
diff --git a/amdgcn/lib/OVERRIDES_3.9 b/amdgcn/lib/OVERRIDES_3.9
index f26fbbe..3268f67 100644
--- a/amdgcn/lib/OVERRIDES_3.9
+++ b/amdgcn/lib/OVERRIDES_3.9
@@ -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
diff --git a/amdgcn/lib/OVERRIDES_3.9 b/amdgcn/lib/OVERRIDES_4.0
similarity index 63%
copy from amdgcn/lib/OVERRIDES_3.9
copy to amdgcn/lib/OVERRIDES_4.0
index f26fbbe..3268f67 100644
--- a/amdgcn/lib/OVERRIDES_3.9
+++ b/amdgcn/lib/OVERRIDES_4.0
@@ -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
diff --git a/amdgcn/lib/OVERRIDES_3.9 b/amdgcn/lib/OVERRIDES_5.0
similarity index 63%
copy from amdgcn/lib/OVERRIDES_3.9
copy to amdgcn/lib/OVERRIDES_5.0
index f26fbbe..3268f67 100644
--- a/amdgcn/lib/OVERRIDES_3.9
+++ b/amdgcn/lib/OVERRIDES_5.0
@@ -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
diff --git a/amdgcn/lib/OVERRIDES_3.9 b/amdgcn/lib/OVERRIDES_6.0
similarity index 63%
copy from amdgcn/lib/OVERRIDES_3.9
copy to amdgcn/lib/OVERRIDES_6.0
index f26fbbe..3268f67 100644
--- a/amdgcn/lib/OVERRIDES_3.9
+++ b/amdgcn/lib/OVERRIDES_6.0
@@ -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
diff --git a/amdgcn/lib/SOURCES b/amdgcn/lib/SOURCES
index 8c177bd..8e14ce2 100644
--- a/amdgcn/lib/SOURCES
+++ b/amdgcn/lib/SOURCES
@@ -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
diff --git a/amdgcn/lib/SOURCES_3.9 b/amdgcn/lib/SOURCES_3.9
index 6ee7cb8..3cecdb0 100644
--- a/amdgcn/lib/SOURCES_3.9
+++ b/amdgcn/lib/SOURCES_3.9
@@ -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
diff --git a/amdgcn/lib/SOURCES_4.0 b/amdgcn/lib/SOURCES_4.0
new file mode 100644
index 0000000..5ed1d7c
--- /dev/null
+++ b/amdgcn/lib/SOURCES_4.0
@@ -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
diff --git a/amdgcn/lib/SOURCES_5.0 b/amdgcn/lib/SOURCES_5.0
new file mode 100644
index 0000000..45c51ec
--- /dev/null
+++ b/amdgcn/lib/SOURCES_5.0
@@ -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
diff --git a/amdgcn/lib/SOURCES_6.0 b/amdgcn/lib/SOURCES_6.0
new file mode 100644
index 0000000..45c51ec
--- /dev/null
+++ b/amdgcn/lib/SOURCES_6.0
@@ -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
diff --git a/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.ll b/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.39.ll
similarity index 100%
copy from amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.ll
copy to amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.39.ll
diff --git a/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.ll b/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.ll
index ec14179..509d535 100644
--- a/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.ll
+++ b/amdgcn/lib/cl_khr_int64_extended_atomics/minmax_helpers.ll
@@ -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:
diff --git a/amdgcn/lib/workitem/get_global_size.ll b/amdgcn/lib/workitem/get_global_size.40.ll
similarity index 100%
copy from amdgcn/lib/workitem/get_global_size.ll
copy to amdgcn/lib/workitem/get_global_size.40.ll
diff --git a/amdgcn/lib/workitem/get_global_size.ll b/amdgcn/lib/workitem/get_global_size.ll
index 3d26d2f..3292af5 100644
--- a/amdgcn/lib/workitem/get_global_size.ll
+++ b/amdgcn/lib/workitem/get_global_size.ll
@@ -2,7 +2,7 @@ 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"
+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]
diff --git a/amdgcn/lib/workitem/get_local_size.ll b/amdgcn/lib/workitem/get_local_size.40.ll
similarity index 100%
copy from amdgcn/lib/workitem/get_local_size.ll
copy to amdgcn/lib/workitem/get_local_size.40.ll
diff --git a/amdgcn/lib/workitem/get_local_size.ll b/amdgcn/lib/workitem/get_local_size.ll
index 36141f9..1b5fec1 100644
--- a/amdgcn/lib/workitem/get_local_size.ll
+++ b/amdgcn/lib/workitem/get_local_size.ll
@@ -2,7 +2,7 @@ declare i32 @llvm.r600.read.local.size.x() nounwind readnone
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]
diff --git a/amdgcn/lib/workitem/get_num_groups.ll b/amdgcn/lib/workitem/get_num_groups.40.ll
similarity index 100%
copy from amdgcn/lib/workitem/get_num_groups.ll
copy to amdgcn/lib/workitem/get_num_groups.40.ll
diff --git a/amdgcn/lib/workitem/get_num_groups.ll b/amdgcn/lib/workitem/get_num_groups.ll
index 12ec8ea..8fb55ed 100644
--- a/amdgcn/lib/workitem/get_num_groups.ll
+++ b/amdgcn/lib/workitem/get_num_groups.ll
@@ -2,7 +2,7 @@ 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-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]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/libclc.git
More information about the Pkg-opencl-commits
mailing list