Skip to content

Commit e7da136

Browse files
committed
AMDGPU: Update for datalayout change
llvm-svn: 324748
1 parent 923712b commit e7da136

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

clang/lib/Basic/Targets/AMDGPU.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ static const char *const DataLayoutStringR600 =
3333
"-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-A5";
3434

3535
static const char *const DataLayoutStringSIPrivateIsZero =
36-
"e-p:32:32-p1:64:64-p2:64:64-p3:32:32-p4:64:64-p5:32:32"
36+
"e-p:32:32-p1:64:64-p2:64:64-p3:32:32-p4:64:64-p5:32:32-p6:32:32"
3737
"-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128"
3838
"-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64";
3939

4040
static const char *const DataLayoutStringSIGenericIsZero =
41-
"e-p:64:64-p1:64:64-p2:64:64-p3:32:32-p4:32:32-p5:32:32"
41+
"e-p:64:64-p1:64:64-p2:64:64-p3:32:32-p4:32:32-p5:32:32-p6:32:32"
4242
"-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128"
4343
"-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-A5";
4444

@@ -144,7 +144,7 @@ const char *const AMDGPUTargetInfo::GCCRegNames[] = {
144144
"s104", "s105", "s106", "s107", "s108", "s109", "s110", "s111", "s112",
145145
"s113", "s114", "s115", "s116", "s117", "s118", "s119", "s120", "s121",
146146
"s122", "s123", "s124", "s125", "s126", "s127", "exec", "vcc", "scc",
147-
"m0", "flat_scratch", "exec_lo", "exec_hi", "vcc_lo", "vcc_hi",
147+
"m0", "flat_scratch", "exec_lo", "exec_hi", "vcc_lo", "vcc_hi",
148148
"flat_scratch_lo", "flat_scratch_hi"
149149
};
150150

clang/test/CodeGen/target-data.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,12 @@
132132

133133
// RUN: %clang_cc1 -triple amdgcn-unknown -target-cpu hawaii -o - -emit-llvm %s \
134134
// RUN: | FileCheck %s -check-prefix=R600SI
135-
// R600SI: 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"
135+
// R600SI: target datalayout = "e-p:64:64-p1:64:64-p2:64:64-p3:32:32-p4:32:32-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-A5"
136136

137137
// Test default -target-cpu
138138
// RUN: %clang_cc1 -triple amdgcn-unknown -o - -emit-llvm %s \
139139
// RUN: | FileCheck %s -check-prefix=R600SIDefault
140-
// R600SIDefault: 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"
140+
// R600SIDefault: target datalayout = "e-p:64:64-p1:64:64-p2:64:64-p3:32:32-p4:32:32-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-A5"
141141

142142
// RUN: %clang_cc1 -triple arm64-unknown -o - -emit-llvm %s | \
143143
// RUN: FileCheck %s -check-prefix=AARCH64
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %clang_cc1 %s -O0 -triple amdgcn -emit-llvm -o - | FileCheck %s
22
// RUN: %clang_cc1 %s -O0 -triple amdgcn---opencl -emit-llvm -o - | FileCheck %s
33

4-
// CHECK: 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"
4+
// CHECK: target datalayout = "e-p:64:64-p1:64:64-p2:64:64-p3:32:32-p4:32:32-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-A5"
55
void foo(void) {}

0 commit comments

Comments
 (0)