Skip to content

Commit 48b4083

Browse files
committed
[SystemZ] Support z15 processor name
The recently announced IBM z15 processor implements the architecture already supported as "arch13" in LLVM. This patch adds support for "z15" as an alternate architecture name for arch13. Corrsponding LLVM support was committed as rev. 372435. llvm-svn: 372436
1 parent 819c165 commit 48b4083

11 files changed

+18
-7
lines changed

clang/lib/Basic/Targets/SystemZ.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ static constexpr ISANameRevision ISARevisions[] = {
9292
{{"arch10"}, 10}, {{"zEC12"}, 10},
9393
{{"arch11"}, 11}, {{"z13"}, 11},
9494
{{"arch12"}, 12}, {{"z14"}, 12},
95-
{{"arch13"}, 13},
95+
{{"arch13"}, 13}, {{"z15"}, 13}
9696
};
9797

9898
int SystemZTargetInfo::getISARevision(StringRef Name) const {

clang/test/CodeGen/builtins-systemz-vector3-error.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// REQUIRES: systemz-registered-target
2-
// RUN: %clang_cc1 -target-cpu arch13 -triple s390x-unknown-unknown \
2+
// RUN: %clang_cc1 -target-cpu z15 -triple s390x-unknown-unknown \
33
// RUN: -Wall -Wno-unused -Werror -fsyntax-only -verify %s
44

55
typedef __attribute__((vector_size(16))) signed char vec_schar;

clang/test/CodeGen/builtins-systemz-vector3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// REQUIRES: systemz-registered-target
2-
// RUN: %clang_cc1 -target-cpu arch13 -triple s390x-ibm-linux -flax-vector-conversions=none \
2+
// RUN: %clang_cc1 -target-cpu z15 -triple s390x-ibm-linux -flax-vector-conversions=none \
33
// RUN: -Wall -Wno-unused -Werror -emit-llvm %s -o - | FileCheck %s
44

55
typedef __attribute__((vector_size(16))) signed char vec_schar;

clang/test/CodeGen/builtins-systemz-zvector3-error.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// REQUIRES: systemz-registered-target
2-
// RUN: %clang_cc1 -target-cpu arch13 -triple s390x-linux-gnu \
2+
// RUN: %clang_cc1 -target-cpu z15 -triple s390x-linux-gnu \
33
// RUN: -fzvector -flax-vector-conversions=none \
44
// RUN: -Wall -Wno-unused -Werror -fsyntax-only -verify %s
55

clang/test/CodeGen/builtins-systemz-zvector3.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// REQUIRES: systemz-registered-target
2-
// RUN: %clang_cc1 -target-cpu arch13 -triple s390x-linux-gnu \
2+
// RUN: %clang_cc1 -target-cpu z15 -triple s390x-linux-gnu \
33
// RUN: -O -fzvector -flax-vector-conversions=none \
44
// RUN: -Wall -Wno-unused -Werror -emit-llvm %s -o - | FileCheck %s
5-
// RUN: %clang_cc1 -target-cpu arch13 -triple s390x-linux-gnu \
5+
// RUN: %clang_cc1 -target-cpu z15 -triple s390x-linux-gnu \
66
// RUN: -O -fzvector -flax-vector-conversions=none \
77
// RUN: -Wall -Wno-unused -Werror -S %s -o - | FileCheck %s --check-prefix=CHECK-ASM
88

clang/test/CodeGen/systemz-abi-vector.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
// RUN: -emit-llvm -o - %s | FileCheck --check-prefix=CHECK-VECTOR %s
1111
// RUN: %clang_cc1 -triple s390x-linux-gnu -target-cpu arch12 \
1212
// RUN: -emit-llvm -o - %s | FileCheck --check-prefix=CHECK-VECTOR %s
13+
// RUN: %clang_cc1 -triple s390x-linux-gnu -target-cpu z15 \
14+
// RUN: -emit-llvm -o - %s | FileCheck --check-prefix=CHECK-VECTOR %s
1315
// RUN: %clang_cc1 -triple s390x-linux-gnu -target-cpu arch13 \
1416
// RUN: -emit-llvm -o - %s | FileCheck --check-prefix=CHECK-VECTOR %s
1517

clang/test/CodeGen/systemz-abi.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
// RUN: -emit-llvm -o - %s | FileCheck %s
1111
// RUN: %clang_cc1 -triple s390x-linux-gnu -target-cpu arch12 \
1212
// RUN: -emit-llvm -o - %s | FileCheck %s
13+
// RUN: %clang_cc1 -triple s390x-linux-gnu -target-cpu z15 \
14+
// RUN: -emit-llvm -o - %s | FileCheck %s
1315
// RUN: %clang_cc1 -triple s390x-linux-gnu -target-cpu arch13 \
1416
// RUN: -emit-llvm -o - %s | FileCheck %s
1517

clang/test/CodeGen/target-data.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@
199199
// RUN: FileCheck %s -check-prefix=SYSTEMZ-VECTOR
200200
// RUN: %clang_cc1 -triple s390x-unknown -target-cpu arch12 -o - -emit-llvm %s | \
201201
// RUN: FileCheck %s -check-prefix=SYSTEMZ-VECTOR
202+
// RUN: %clang_cc1 -triple s390x-unknown -target-cpu z15 -o - -emit-llvm %s | \
203+
// RUN: FileCheck %s -check-prefix=SYSTEMZ-VECTOR
202204
// RUN: %clang_cc1 -triple s390x-unknown -target-cpu arch13 -o - -emit-llvm %s | \
203205
// RUN: FileCheck %s -check-prefix=SYSTEMZ-VECTOR
204206
// SYSTEMZ-VECTOR: target datalayout = "E-m:e-i1:8:16-i8:8:16-i64:64-f128:64-v128:64-a:8:16-n32:64"

clang/test/Driver/systemz-march.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// RUN: %clang -target s390x -### -S -emit-llvm -march=arch11 %s 2>&1 | FileCheck --check-prefix=CHECK-ARCH11 %s
1212
// RUN: %clang -target s390x -### -S -emit-llvm -march=z14 %s 2>&1 | FileCheck --check-prefix=CHECK-Z14 %s
1313
// RUN: %clang -target s390x -### -S -emit-llvm -march=arch12 %s 2>&1 | FileCheck --check-prefix=CHECK-ARCH12 %s
14+
// RUN: %clang -target s390x -### -S -emit-llvm -march=z15 %s 2>&1 | FileCheck --check-prefix=CHECK-Z15 %s
1415
// RUN: %clang -target s390x -### -S -emit-llvm -march=arch13 %s 2>&1 | FileCheck --check-prefix=CHECK-ARCH13 %s
1516

1617
// CHECK-Z9: error: unknown target CPU 'z9'
@@ -24,6 +25,7 @@
2425
// CHECK-ARCH11: "-target-cpu" "arch11"
2526
// CHECK-Z14: "-target-cpu" "z14"
2627
// CHECK-ARCH12: "-target-cpu" "arch12"
28+
// CHECK-Z15: "-target-cpu" "z15"
2729
// CHECK-ARCH13: "-target-cpu" "arch13"
2830

2931
int x;

clang/test/Misc/target-invalid-cpu-note.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
// RUN: not %clang_cc1 -triple systemz--- -target-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix SYSTEMZ
6161
// SYSTEMZ: error: unknown target CPU 'not-a-cpu'
6262
// SYSTEMZ: note: valid target CPU values are: arch8, z10, arch9, z196, arch10,
63-
// SYSTEMZ-SAME: zEC12, arch11, z13, arch12, z14, arch13
63+
// SYSTEMZ-SAME: zEC12, arch11, z13, arch12, z14, arch13, z15
6464

6565
// RUN: not %clang_cc1 -triple sparc--- -target-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix SPARC
6666
// SPARC: error: unknown target CPU 'not-a-cpu'

clang/test/Preprocessor/predefined-arch-macros.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3242,6 +3242,9 @@
32423242
// RUN: %clang -march=arch13 -E -dM %s -o - 2>&1 \
32433243
// RUN: -target s390x-unknown-linux \
32443244
// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH13
3245+
// RUN: %clang -march=z15 -E -dM %s -o - 2>&1 \
3246+
// RUN: -target s390x-unknown-linux \
3247+
// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH13
32453248
// CHECK_SYSTEMZ_ARCH13: #define __ARCH__ 13
32463249
// CHECK_SYSTEMZ_ARCH13: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
32473250
// CHECK_SYSTEMZ_ARCH13: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1

0 commit comments

Comments
 (0)