Skip to content

Commit 39e3085

Browse files
lenarylenary
authored
[clang][NFC] Split invalid-cpu-note tests (#104601)
This change does two kinds of splits: - Splits each target into a different file. Some targets are left in the same files, such as riscv32/64 and x86/_64 as these tests and lists are very similar. - Splits up the very long 'note:' lines which contain a list of CPUs, using `CHECK-SAME`. There was a note about this not being possible before, but with `{{^}}`, this is now possible -- I have verified that this does the right thing if a single CPU anywhere in the list is left out. These tests had become quite annoying to change when adding a CPU, and I believe this change makes these easier to maintain, and should cut down on conflicts in these files (or at least makes conflicts easier to resolve). I apologise in advance for downstream conflicts, but hopefully that's a small amount of short term pain, in return for fewer conflicts in future.
1 parent 3f25f23 commit 39e3085

File tree

17 files changed

+1410
-96
lines changed

17 files changed

+1410
-96
lines changed

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

Lines changed: 0 additions & 96 deletions
This file was deleted.

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

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
// This test uses '<prefix>-SAME: {{^}}' to start matching immediately where the
2+
// previous check finished matching (specifically, caret is not treated as
3+
// matching a start of line when used like this in FileCheck).
4+
5+
// RUN: not %clang_cc1 -triple arm64--- -target-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s
6+
// RUN: not %clang_cc1 -triple arm64--- -tune-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s
7+
8+
// CHECK: error: unknown target CPU 'not-a-cpu'
9+
// CHECK-NEXT: note: valid target CPU values are:
10+
// CHECK-SAME: {{^}} a64fx
11+
// CHECK-SAME: {{^}}, ampere1
12+
// CHECK-SAME: {{^}}, ampere1a
13+
// CHECK-SAME: {{^}}, ampere1b
14+
// CHECK-SAME: {{^}}, apple-a10
15+
// CHECK-SAME: {{^}}, apple-a11
16+
// CHECK-SAME: {{^}}, apple-a12
17+
// CHECK-SAME: {{^}}, apple-a13
18+
// CHECK-SAME: {{^}}, apple-a14
19+
// CHECK-SAME: {{^}}, apple-a15
20+
// CHECK-SAME: {{^}}, apple-a16
21+
// CHECK-SAME: {{^}}, apple-a17
22+
// CHECK-SAME: {{^}}, apple-a7
23+
// CHECK-SAME: {{^}}, apple-a8
24+
// CHECK-SAME: {{^}}, apple-a9
25+
// CHECK-SAME: {{^}}, apple-m1
26+
// CHECK-SAME: {{^}}, apple-m2
27+
// CHECK-SAME: {{^}}, apple-m3
28+
// CHECK-SAME: {{^}}, apple-m4
29+
// CHECK-SAME: {{^}}, apple-s4
30+
// CHECK-SAME: {{^}}, apple-s5
31+
// CHECK-SAME: {{^}}, carmel
32+
// CHECK-SAME: {{^}}, cobalt-100
33+
// CHECK-SAME: {{^}}, cortex-a34
34+
// CHECK-SAME: {{^}}, cortex-a35
35+
// CHECK-SAME: {{^}}, cortex-a510
36+
// CHECK-SAME: {{^}}, cortex-a520
37+
// CHECK-SAME: {{^}}, cortex-a520ae
38+
// CHECK-SAME: {{^}}, cortex-a53
39+
// CHECK-SAME: {{^}}, cortex-a55
40+
// CHECK-SAME: {{^}}, cortex-a57
41+
// CHECK-SAME: {{^}}, cortex-a65
42+
// CHECK-SAME: {{^}}, cortex-a65ae
43+
// CHECK-SAME: {{^}}, cortex-a710
44+
// CHECK-SAME: {{^}}, cortex-a715
45+
// CHECK-SAME: {{^}}, cortex-a72
46+
// CHECK-SAME: {{^}}, cortex-a720
47+
// CHECK-SAME: {{^}}, cortex-a720ae
48+
// CHECK-SAME: {{^}}, cortex-a725
49+
// CHECK-SAME: {{^}}, cortex-a73
50+
// CHECK-SAME: {{^}}, cortex-a75
51+
// CHECK-SAME: {{^}}, cortex-a76
52+
// CHECK-SAME: {{^}}, cortex-a76ae
53+
// CHECK-SAME: {{^}}, cortex-a77
54+
// CHECK-SAME: {{^}}, cortex-a78
55+
// CHECK-SAME: {{^}}, cortex-a78ae
56+
// CHECK-SAME: {{^}}, cortex-a78c
57+
// CHECK-SAME: {{^}}, cortex-r82
58+
// CHECK-SAME: {{^}}, cortex-r82ae
59+
// CHECK-SAME: {{^}}, cortex-x1
60+
// CHECK-SAME: {{^}}, cortex-x1c
61+
// CHECK-SAME: {{^}}, cortex-x2
62+
// CHECK-SAME: {{^}}, cortex-x3
63+
// CHECK-SAME: {{^}}, cortex-x4
64+
// CHECK-SAME: {{^}}, cortex-x925
65+
// CHECK-SAME: {{^}}, cyclone
66+
// CHECK-SAME: {{^}}, exynos-m3
67+
// CHECK-SAME: {{^}}, exynos-m4
68+
// CHECK-SAME: {{^}}, exynos-m5
69+
// CHECK-SAME: {{^}}, falkor
70+
// CHECK-SAME: {{^}}, generic
71+
// CHECK-SAME: {{^}}, grace
72+
// CHECK-SAME: {{^}}, kryo
73+
// CHECK-SAME: {{^}}, neoverse-512tvb
74+
// CHECK-SAME: {{^}}, neoverse-e1
75+
// CHECK-SAME: {{^}}, neoverse-n1
76+
// CHECK-SAME: {{^}}, neoverse-n2
77+
// CHECK-SAME: {{^}}, neoverse-n3
78+
// CHECK-SAME: {{^}}, neoverse-v1
79+
// CHECK-SAME: {{^}}, neoverse-v2
80+
// CHECK-SAME: {{^}}, neoverse-v3
81+
// CHECK-SAME: {{^}}, neoverse-v3ae
82+
// CHECK-SAME: {{^}}, oryon-1
83+
// CHECK-SAME: {{^}}, saphira
84+
// CHECK-SAME: {{^}}, thunderx
85+
// CHECK-SAME: {{^}}, thunderx2t99
86+
// CHECK-SAME: {{^}}, thunderx3t110
87+
// CHECK-SAME: {{^}}, thunderxt81
88+
// CHECK-SAME: {{^}}, thunderxt83
89+
// CHECK-SAME: {{^}}, thunderxt88
90+
// CHECK-SAME: {{^}}, tsv110
91+
// CHECK-SAME: {{$}}
92+

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

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
// This test uses '<prefix>-SAME: {{^}}' to start matching immediately where the
2+
// previous check finished matching (specifically, caret is not treated as
3+
// matching a start of line when used like this in FileCheck).
4+
5+
// RUN: not %clang_cc1 -triple amdgcn--- -target-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s
6+
// CHECK: error: unknown target CPU 'not-a-cpu'
7+
// CHECK-NEXT: note: valid target CPU values are:
8+
// CHECK-SAME: {{^}} gfx600
9+
// CHECK-SAME: {{^}}, tahiti
10+
// CHECK-SAME: {{^}}, gfx601
11+
// CHECK-SAME: {{^}}, pitcairn
12+
// CHECK-SAME: {{^}}, verde
13+
// CHECK-SAME: {{^}}, gfx602
14+
// CHECK-SAME: {{^}}, hainan
15+
// CHECK-SAME: {{^}}, oland
16+
// CHECK-SAME: {{^}}, gfx700
17+
// CHECK-SAME: {{^}}, kaveri
18+
// CHECK-SAME: {{^}}, gfx701
19+
// CHECK-SAME: {{^}}, hawaii
20+
// CHECK-SAME: {{^}}, gfx702
21+
// CHECK-SAME: {{^}}, gfx703
22+
// CHECK-SAME: {{^}}, kabini
23+
// CHECK-SAME: {{^}}, mullins
24+
// CHECK-SAME: {{^}}, gfx704
25+
// CHECK-SAME: {{^}}, bonaire
26+
// CHECK-SAME: {{^}}, gfx705
27+
// CHECK-SAME: {{^}}, gfx801
28+
// CHECK-SAME: {{^}}, carrizo
29+
// CHECK-SAME: {{^}}, gfx802
30+
// CHECK-SAME: {{^}}, iceland
31+
// CHECK-SAME: {{^}}, tonga
32+
// CHECK-SAME: {{^}}, gfx803
33+
// CHECK-SAME: {{^}}, fiji
34+
// CHECK-SAME: {{^}}, polaris10
35+
// CHECK-SAME: {{^}}, polaris11
36+
// CHECK-SAME: {{^}}, gfx805
37+
// CHECK-SAME: {{^}}, tongapro
38+
// CHECK-SAME: {{^}}, gfx810
39+
// CHECK-SAME: {{^}}, stoney
40+
// CHECK-SAME: {{^}}, gfx900
41+
// CHECK-SAME: {{^}}, gfx902
42+
// CHECK-SAME: {{^}}, gfx904
43+
// CHECK-SAME: {{^}}, gfx906
44+
// CHECK-SAME: {{^}}, gfx908
45+
// CHECK-SAME: {{^}}, gfx909
46+
// CHECK-SAME: {{^}}, gfx90a
47+
// CHECK-SAME: {{^}}, gfx90c
48+
// CHECK-SAME: {{^}}, gfx940
49+
// CHECK-SAME: {{^}}, gfx941
50+
// CHECK-SAME: {{^}}, gfx942
51+
// CHECK-SAME: {{^}}, gfx1010
52+
// CHECK-SAME: {{^}}, gfx1011
53+
// CHECK-SAME: {{^}}, gfx1012
54+
// CHECK-SAME: {{^}}, gfx1013
55+
// CHECK-SAME: {{^}}, gfx1030
56+
// CHECK-SAME: {{^}}, gfx1031
57+
// CHECK-SAME: {{^}}, gfx1032
58+
// CHECK-SAME: {{^}}, gfx1033
59+
// CHECK-SAME: {{^}}, gfx1034
60+
// CHECK-SAME: {{^}}, gfx1035
61+
// CHECK-SAME: {{^}}, gfx1036
62+
// CHECK-SAME: {{^}}, gfx1100
63+
// CHECK-SAME: {{^}}, gfx1101
64+
// CHECK-SAME: {{^}}, gfx1102
65+
// CHECK-SAME: {{^}}, gfx1103
66+
// CHECK-SAME: {{^}}, gfx1150
67+
// CHECK-SAME: {{^}}, gfx1151
68+
// CHECK-SAME: {{^}}, gfx1152
69+
// CHECK-SAME: {{^}}, gfx1200
70+
// CHECK-SAME: {{^}}, gfx1201
71+
// CHECK-SAME: {{^}}, gfx9-generic
72+
// CHECK-SAME: {{^}}, gfx10-1-generic
73+
// CHECK-SAME: {{^}}, gfx10-3-generic
74+
// CHECK-SAME: {{^}}, gfx11-generic
75+
// CHECK-SAME: {{^}}, gfx12-generic
76+
// CHECK-SAME: {{$}}

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

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
// This test uses '<prefix>-SAME: {{^}}' to start matching immediately where the
2+
// previous check finished matching (specifically, caret is not treated as
3+
// matching a start of line when used like this in FileCheck).
4+
5+
// RUN: not %clang_cc1 -triple armv5--- -target-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s
6+
// CHECK: error: unknown target CPU 'not-a-cpu'
7+
// CHECK-NEXT: note: valid target CPU values are:
8+
// CHECK-SAME: {{^}} arm8
9+
// CHECK-SAME: {{^}}, arm810
10+
// CHECK-SAME: {{^}}, strongarm
11+
// CHECK-SAME: {{^}}, strongarm110
12+
// CHECK-SAME: {{^}}, strongarm1100
13+
// CHECK-SAME: {{^}}, strongarm1110
14+
// CHECK-SAME: {{^}}, arm7tdmi
15+
// CHECK-SAME: {{^}}, arm7tdmi-s
16+
// CHECK-SAME: {{^}}, arm710t
17+
// CHECK-SAME: {{^}}, arm720t
18+
// CHECK-SAME: {{^}}, arm9
19+
// CHECK-SAME: {{^}}, arm9tdmi
20+
// CHECK-SAME: {{^}}, arm920
21+
// CHECK-SAME: {{^}}, arm920t
22+
// CHECK-SAME: {{^}}, arm922t
23+
// CHECK-SAME: {{^}}, arm940t
24+
// CHECK-SAME: {{^}}, ep9312
25+
// CHECK-SAME: {{^}}, arm10tdmi
26+
// CHECK-SAME: {{^}}, arm1020t
27+
// CHECK-SAME: {{^}}, arm9e
28+
// CHECK-SAME: {{^}}, arm946e-s
29+
// CHECK-SAME: {{^}}, arm966e-s
30+
// CHECK-SAME: {{^}}, arm968e-s
31+
// CHECK-SAME: {{^}}, arm10e
32+
// CHECK-SAME: {{^}}, arm1020e
33+
// CHECK-SAME: {{^}}, arm1022e
34+
// CHECK-SAME: {{^}}, arm926ej-s
35+
// CHECK-SAME: {{^}}, arm1136j-s
36+
// CHECK-SAME: {{^}}, arm1136jf-s
37+
// CHECK-SAME: {{^}}, mpcore
38+
// CHECK-SAME: {{^}}, mpcorenovfp
39+
// CHECK-SAME: {{^}}, arm1176jz-s
40+
// CHECK-SAME: {{^}}, arm1176jzf-s
41+
// CHECK-SAME: {{^}}, arm1156t2-s
42+
// CHECK-SAME: {{^}}, arm1156t2f-s
43+
// CHECK-SAME: {{^}}, cortex-m0
44+
// CHECK-SAME: {{^}}, cortex-m0plus
45+
// CHECK-SAME: {{^}}, cortex-m1
46+
// CHECK-SAME: {{^}}, sc000
47+
// CHECK-SAME: {{^}}, cortex-a5
48+
// CHECK-SAME: {{^}}, cortex-a7
49+
// CHECK-SAME: {{^}}, cortex-a8
50+
// CHECK-SAME: {{^}}, cortex-a9
51+
// CHECK-SAME: {{^}}, cortex-a12
52+
// CHECK-SAME: {{^}}, cortex-a15
53+
// CHECK-SAME: {{^}}, cortex-a17
54+
// CHECK-SAME: {{^}}, krait
55+
// CHECK-SAME: {{^}}, cortex-r4
56+
// CHECK-SAME: {{^}}, cortex-r4f
57+
// CHECK-SAME: {{^}}, cortex-r5
58+
// CHECK-SAME: {{^}}, cortex-r7
59+
// CHECK-SAME: {{^}}, cortex-r8
60+
// CHECK-SAME: {{^}}, cortex-r52
61+
// CHECK-SAME: {{^}}, cortex-r52plus
62+
// CHECK-SAME: {{^}}, sc300
63+
// CHECK-SAME: {{^}}, cortex-m3
64+
// CHECK-SAME: {{^}}, cortex-m4
65+
// CHECK-SAME: {{^}}, cortex-m7
66+
// CHECK-SAME: {{^}}, cortex-m23
67+
// CHECK-SAME: {{^}}, cortex-m33
68+
// CHECK-SAME: {{^}}, cortex-m35p
69+
// CHECK-SAME: {{^}}, cortex-m55
70+
// CHECK-SAME: {{^}}, cortex-m85
71+
// CHECK-SAME: {{^}}, cortex-m52
72+
// CHECK-SAME: {{^}}, cortex-a32
73+
// CHECK-SAME: {{^}}, cortex-a35
74+
// CHECK-SAME: {{^}}, cortex-a53
75+
// CHECK-SAME: {{^}}, cortex-a55
76+
// CHECK-SAME: {{^}}, cortex-a57
77+
// CHECK-SAME: {{^}}, cortex-a72
78+
// CHECK-SAME: {{^}}, cortex-a73
79+
// CHECK-SAME: {{^}}, cortex-a75
80+
// CHECK-SAME: {{^}}, cortex-a76
81+
// CHECK-SAME: {{^}}, cortex-a76ae
82+
// CHECK-SAME: {{^}}, cortex-a77
83+
// CHECK-SAME: {{^}}, cortex-a78
84+
// CHECK-SAME: {{^}}, cortex-a78ae
85+
// CHECK-SAME: {{^}}, cortex-a78c
86+
// CHECK-SAME: {{^}}, cortex-a710
87+
// CHECK-SAME: {{^}}, cortex-x1
88+
// CHECK-SAME: {{^}}, cortex-x1c
89+
// CHECK-SAME: {{^}}, neoverse-n1
90+
// CHECK-SAME: {{^}}, neoverse-n2
91+
// CHECK-SAME: {{^}}, neoverse-v1
92+
// CHECK-SAME: {{^}}, cyclone
93+
// CHECK-SAME: {{^}}, exynos-m3
94+
// CHECK-SAME: {{^}}, exynos-m4
95+
// CHECK-SAME: {{^}}, exynos-m5
96+
// CHECK-SAME: {{^}}, kryo
97+
// CHECK-SAME: {{^}}, iwmmxt
98+
// CHECK-SAME: {{^}}, xscale
99+
// CHECK-SAME: {{^}}, swift
100+
// CHECK-SAME: {{$}}

0 commit comments

Comments
 (0)