Skip to content

Commit eda97fc

Browse files
bryanpkcbryanpkc
committed
[Driver] Update FileCheck patterns for AArch64 target features
...after upstream commit 13e977d changed how target feature dependencies are handled.
1 parent 1107635 commit eda97fc

File tree

3 files changed

+38
-36
lines changed

3 files changed

+38
-36
lines changed

‎clang/test/Driver/emit-flang-attrs.f90

+21-19
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
! RUN: %flang -### -target aarch64-linux-gnu -march=armv8-a -c %s 2>&1 | FileCheck --check-prefix=CHECK-ATTRS-NEON %s
44
! RUN: %flang -### -target aarch64-linux-gnu -march=armv8-a+sve -c %s 2>&1 | FileCheck --check-prefix=CHECK-ATTRS-SVE %s
55
! RUN: %flang -### -target aarch64-linux-gnu -march=armv8-a+nosve -c %s 2>&1 | FileCheck --check-prefix=CHECK-ATTRS-NOSVE %s
6-
! RUN: %flang -### -target aarch64-linux-gnu -march=armv8-a+sve+nosve -c %s 2>&1 | FileCheck --check-prefix=CHECK-ATTRS-NOSVE %s
6+
! RUN: %flang -### -target aarch64-linux-gnu -march=armv8-a+sve+nosve -c %s 2>&1 | FileCheck --check-prefix=CHECK-ATTRS-SVE-REVERT %s
77
! RUN: %flang -### -target aarch64-linux-gnu -march=armv8-a+sve2+nosve2 -c %s 2>&1 | FileCheck %s --check-prefix=CHECK-SVE2-REVERT
88
! RUN: %flang -### -target aarch64-linux-gnu -march=armv8-a+sve2-aes -c %s 2>&1 | FileCheck %s --check-prefix=CHECK-SVE2-AES
99
! RUN: %flang -### -target aarch64-linux-gnu -march=armv8-a+sve2-sm4 -c %s 2>&1 | FileCheck %s --check-prefix=CHECK-SVE2-SM4
@@ -21,38 +21,40 @@
2121
! RUN: %flang -### -target aarch64-linux-gnu -march=armv8-a+sve2-aes+nosve2-aes %s 2>&1 | FileCheck %s --check-prefix=CHECK-SVE2-AES-REVERT
2222

2323
! CHECK-ATTRS-NEON: "{{.*}}flang2"
24-
! CHECK-ATTRS-NEON-SAME: "-target_features" "+neon,+v8a"
24+
! CHECK-ATTRS-NEON-SAME: "-target_features" "+v8a,+fp-armv8,+neon"
2525
! CHECK-ATTRS-SVE: "{{.*}}flang2"
26-
! CHECK-ATTRS-SVE-SAME: "-target_features" "+neon,+v8a,+sve"
26+
! CHECK-ATTRS-SVE-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve"
2727
! CHECK-ATTRS-NOSVE: "{{.*}}flang2"
28-
! CHECK-ATTRS-NOSVE-SAME: "-target_features" "+neon,+v8a,-sve,-sve2,-sve2-bitperm,-sve2-sha3,-sve2-aes,-sve2-sm4"
28+
! CHECK-ATTRS-NOSVE-SAME: "-target_features" "+v8a,+fp-armv8,+neon"
29+
! CHECK-ATTRS-SVE-REVERT: "{{.*}}flang2"
30+
! CHECK-ATTRS-SVE-REVERT-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,-sve"
2931
! CHECK-SVE2-REVERT: "{{.*}}flang2"
30-
! CHECK-SVE2-REVERT-SAME: "-target_features" "+neon,+v8a,+sve,-sve2,-sve2-bitperm,-sve2-sha3,-sve2-aes,-sve2-sm4"
32+
! CHECK-SVE2-REVERT-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,-sve2"
3133
! CHECK-SVE2-AES: "{{.*}}flang2"
32-
! CHECK-SVE2-AES-SAME: "-target_features" "+neon,+v8a,+sve2-aes,+sve,+sve2"
34+
! CHECK-SVE2-AES-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2-aes,+sve2"
3335
! CHECK-SVE2-SM4: "{{.*}}flang2"
34-
! CHECK-SVE2-SM4-SAME: "-target_features" "+neon,+v8a,+sve2-sm4,+sve,+sve2"
36+
! CHECK-SVE2-SM4-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2-sm4,+sve2"
3537
! CHECK-SVE2-SHA3: "{{.*}}flang2"
36-
! CHECK-SVE2-SHA3-SAME: "-target_features" "+neon,+v8a,+sve2-sha3,+sve,+sve2"
38+
! CHECK-SVE2-SHA3-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2-sha3,+sve2"
3739
! CHECK-SVE2-BITPERM-REVERT: "{{.*}}flang2"
38-
! CHECK-SVE2-BITPERM-REVERT-SAME: "-target_features" "+neon,+v8a,+sve,+sve2,-sve2-bitperm"
40+
! CHECK-SVE2-BITPERM-REVERT-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,-sve2-bitperm,+sve2"
3941
! CHECK-SVE2-IMPLY: "{{.*}}flang2"
40-
! CHECK-SVE2-IMPLY-SAME: "-target_features" "+neon,+v8a,+sve2,+sve"
42+
! CHECK-SVE2-IMPLY-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2"
4143
! CHECK-SVE2-CONFLICT-REV: "{{.*}}flang2"
42-
! CHECK-SVE2-CONFLICT-REV-SAME: "-target_features" "+neon,+v8a,-sve2-bitperm,-sve2-sha3,-sve2-aes,-sve2-sm4,+sve2,+sve"
44+
! CHECK-SVE2-CONFLICT-REV-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2"
4345
! CHECK-SVE-SVE2: "{{.*}}flang2"
44-
! CHECK-SVE-SVE2-SAME: "-target_features" "+neon,+v8a,+sve2,+sve"
46+
! CHECK-SVE-SVE2-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2"
4547
! CHECK-SVE2-BITPERM: "{{.*}}flang2"
46-
! CHECK-SVE2-BITPERM-SAME: "-target_features" "+neon,+v8a,+sve2-bitperm,+sve,+sve2"
48+
! CHECK-SVE2-BITPERM-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2-bitperm,+sve2"
4749
! CHECK-SVE-SUBFEATURE-CONFLICT-REV: "{{.*}}flang2"
48-
! CHECK-SVE-SUBFEATURE-CONFLICT-REV-SAME: "-target_features" "+neon,+v8a,-sve2-bitperm,-sve2-sha3,-sve2-sm4,+sve2-aes,+sve,+sve2"
50+
! CHECK-SVE-SUBFEATURE-CONFLICT-REV-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2-aes,+sve2"
4951
! CHECK-SVE2-SUBFEATURE-CONFLICT: "{{.*}}flang2"
50-
! CHECK-SVE2-SUBFEATURE-CONFLICT-SAME: "-target_features" "+neon,+v8a,+sve,-sve2,-sve2-bitperm,-sve2-sha3,-sve2-aes,-sve2-sm4"
52+
! CHECK-SVE2-SUBFEATURE-CONFLICT-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,-sve2-sm4,-sve2"
5153
! CHECK-SVE2-SUBFEATURE-MIX: "{{.*}}flang2"
52-
! CHECK-SVE2-SUBFEATURE-MIX-SAME: "-target_features" "+neon,+v8a,+sve2-bitperm,+sve,+sve2,-sve2-aes"
54+
! CHECK-SVE2-SUBFEATURE-MIX-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2-bitperm,+sve2"
5355
! CHECK-SVE2-SM4-REVERT: "{{.*}}flang2"
54-
! CHECK-SVE2-SM4-REVERT-SAME: "-target_features" "+neon,+v8a,+sve,+sve2,-sve2-sm4"
56+
! CHECK-SVE2-SM4-REVERT-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,-sve2-sm4,+sve2"
5557
! CHECK-SVE2-SHA3-REVERT: "{{.*}}flang2"
56-
! CHECK-SVE2-SHA3-REVERT-SAME: "-target_features" "+neon,+v8a,+sve,+sve2,-sve2-sha3"
58+
! CHECK-SVE2-SHA3-REVERT-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,-sve2-sha3,+sve2"
5759
! CHECK-SVE2-AES-REVERT: "{{.*}}flang2"
58-
! CHECK-SVE2-AES-REVERT-SAME: "-target_features" "+neon,+v8a,+sve,+sve2,-sve2-aes"
60+
! CHECK-SVE2-AES-REVERT-SAME: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,-sve2-aes,+sve2"

‎clang/test/Driver/flang/classic-flang-vscale-mbits.f95

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
// RUN: %clang --driver-mode=flang -### -S --target=aarch64 -march=armv8-a+sve2-sha3 -msve-vector-bits=2048+ %s 2>&1 | FileCheck -check-prefix=CHECK-SVE2SHA3-2048PLUS %s
99
// RUN: %clang --driver-mode=flang -### -S --target=aarch64 -march=armv8-a+sve2 -msve-vector-bits=scalable %s 2>&1 | FileCheck -check-prefix=CHECK-SVE2-SCALABLE %s
1010

11-
// CHECK-SVE-128: "-target_features" "+neon,+v8a,+sve"
11+
// CHECK-SVE-128: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve"
1212
// CHECK-SVE-128-DAG: "-vscale_range_min" "1" "-vscale_range_max" "1"
13-
// CHECK-SVE-128PLUS: "-target_features" "+neon,+v8a,+sve"
13+
// CHECK-SVE-128PLUS: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve"
1414
// CHECK-SVE-128PLUS-DAG: "-vscale_range_min" "1" "-vscale_range_max" "0"
15-
// CHECK-SVE-256: "-target_features" "+neon,+v8a,+sve"
15+
// CHECK-SVE-256: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve"
1616
// CHECK-SVE-256-DAG: "-vscale_range_min" "2" "-vscale_range_max" "2"
17-
// CHECK-SVE-256PLUS: "-target_features" "+neon,+v8a,+sve"
17+
// CHECK-SVE-256PLUS: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve"
1818
// CHECK-SVE-256PLUS-DAG: "-vscale_range_min" "2" "-vscale_range_max" "0"
19-
// CHECK-SVE2-512: "-target_features" "+neon,+v8a,+sve2,+sve"
19+
// CHECK-SVE2-512: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2"
2020
// CHECK-SVE2-512-DAG: "-vscale_range_min" "4" "-vscale_range_max" "4"
21-
// CHECK-SVE2-512PLUS: "-target_features" "+neon,+v8a,+sve2,+sve"
21+
// CHECK-SVE2-512PLUS: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2"
2222
// CHECK-SVE2-512PLUS-DAG: "-vscale_range_min" "4" "-vscale_range_max" "0"
23-
// CHECK-SVE2SHA3-2048: "-target_features" "+neon,+v8a,+sve2-sha3,+sve,+sve2"
23+
// CHECK-SVE2SHA3-2048: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2-sha3,+sve2"
2424
// CHECK-SVE2SHA3-2048-DAG: "-vscale_range_min" "16" "-vscale_range_max" "16"
25-
// CHECK-SVE2SHA3-2048PLUS: "-target_features" "+neon,+v8a,+sve2-sha3,+sve,+sve2"
25+
// CHECK-SVE2SHA3-2048PLUS: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2-sha3,+sve2"
2626
// CHECK-SVE2SHA3-2048PLUS-DAG: "-vscale_range_min" "16" "-vscale_range_max" "0"
27-
// CHECK-SVE2-SCALABLE: "-target_features" "+neon,+v8a,+sve2,+sve"
27+
// CHECK-SVE2-SCALABLE: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2"
2828
// CHECK-SVE2-SCALABLE-DAG: "-vscale_range_min" "1" "-vscale_range_max" "16"

‎clang/test/Driver/flang/classic-flang-vscale.f95

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77
// RUN: %clang --driver-mode=flang -### -S --target=aarch64 -march=armv8-a+sve2-sha3+nosve2 %s 2>&1 | FileCheck -check-prefix=CHECK-SVE2SHA3-NOSVE2 %s
88
// RUN: %clang --driver-mode=flang -### -S --target=aarch64 -march=armv8-a+sve2-sha3+nosve %s 2>&1 | FileCheck -check-prefix=CHECK-SVE2SHA3-NOSVE %s
99

10-
// CHECK-NEON: "-target_features" "+neon,+v8a"
10+
// CHECK-NEON: "-target_features" "+v8a,+fp-armv8,+neon"
1111
// CHECK-NEON-NOT: "-vscale_range_min"
1212
// CHECK-NEON-NOT: "-vscale_range_max"
13-
// CHECK-SVE: "-target_features" "+neon,+v8a,+sve"
13+
// CHECK-SVE: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve"
1414
// CHECK-SVE-DAG: "-vscale_range_min" "1" "-vscale_range_max" "16"
15-
// CHECK-SVE2: "-target_features" "+neon,+v8a,+sve2,+sve"
15+
// CHECK-SVE2: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2"
1616
// CHECK-SVE2-DAG: "-vscale_range_min" "1" "-vscale_range_max" "16"
17-
// CHECK-SVE2SHA3: "-target_features" "+neon,+v8a,+sve2-sha3,+sve,+sve2"
17+
// CHECK-SVE2SHA3: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2-sha3,+sve2"
1818
// CHECK-SVE2SHA3-DAG: "-vscale_range_min" "1" "-vscale_range_max" "16"
19-
// CHECK-SVE-NOSVE: "-target_features" "+neon,+v8a,-sve,-sve2,-sve2-bitperm,-sve2-sha3,-sve2-aes,-sve2-sm4"
19+
// CHECK-SVE-NOSVE: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,-sve"
2020
// CHECK-SVE-NOSVE-NOT: "-vscale_range_min"
2121
// CHECK-SVE-NOSVE-NOT: "-vscale_range_max"
22-
// CHECK-SVE2-NOSVE2SHA3: "-target_features" "+neon,+v8a,+sve2,+sve,-sve2-sha3"
22+
// CHECK-SVE2-NOSVE2SHA3: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,+sve2"
2323
// CHECK-SVE2-NOSVE2SHA3-DAG: "-vscale_range_min" "1" "-vscale_range_max" "16"
24-
// CHECK-SVE2SHA3-NOSVE2: "-target_features" "+neon,+v8a,+sve,-sve2,-sve2-bitperm,-sve2-sha3,-sve2-aes,-sve2-sm4"
24+
// CHECK-SVE2SHA3-NOSVE2: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,+sve,-sve2-sha3,-sve2"
2525
// CHECK-SVE2SHA3-NOSVE2-DAG: "-vscale_range_min" "1" "-vscale_range_max" "16"
26-
// CHECK-SVE2SHA3-NOSVE: "-target_features" "+neon,+v8a,-sve,-sve2,-sve2-bitperm,-sve2-sha3,-sve2-aes,-sve2-sm4"
26+
// CHECK-SVE2SHA3-NOSVE: "-target_features" "+v8a,+fp-armv8,+fullfp16,+neon,-sve,-sve2-sha3,-sve2"
2727
// CHECK-SVE2SHA3-NOSVE-NOT: "-vscale_range_min"
2828
// CHECK-SVE2SHA3-NOSVE-NOT: "-vscale_range_max"

0 commit comments

Comments
 (0)