Skip to content

Commit d2646ca

Browse files
RKSimonRKSimon
authored
[llvm-mca][x86] Sync resource tests using generic base references (#157511)
Some of the targets isa test coverage seems to have bitrotted or is just missing - resync with the generic reference test files
1 parent e11f93e commit d2646ca

File tree

5 files changed

+223
-2
lines changed

5 files changed

+223
-2
lines changed

‎llvm/test/tools/llvm-mca/X86/Znver2/resources-cmpxchg.s‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
cmpxchg8b (%rax)
55
cmpxchg16b (%rax)
6+
lock cmpxchg8b (%rax)
7+
lock cmpxchg16b (%rax)
68

79
# CHECK: Instruction Info:
810
# CHECK-NEXT: [1]: #uOps
@@ -15,6 +17,8 @@ cmpxchg16b (%rax)
1517
# CHECK: [1] [2] [3] [4] [5] [6] Instructions:
1618
# CHECK-NEXT: 18 1 0.33 * * cmpxchg8b (%rax)
1719
# CHECK-NEXT: 1 100 0.25 * * cmpxchg16b (%rax)
20+
# CHECK-NEXT: 18 1 0.33 * * lock cmpxchg8b (%rax)
21+
# CHECK-NEXT: 1 100 0.25 * * lock cmpxchg16b (%rax)
1822

1923
# CHECK: Resources:
2024
# CHECK-NEXT: [0] - Zn2AGU0
@@ -33,9 +37,11 @@ cmpxchg16b (%rax)
3337

3438
# CHECK: Resource pressure per iteration:
3539
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12]
36-
# CHECK-NEXT: 0.33 0.33 0.33 0.25 0.25 0.25 0.25 - - - - - -
40+
# CHECK-NEXT: 0.67 0.67 0.67 0.50 0.50 0.50 0.50 - - - - - -
3741

3842
# CHECK: Resource pressure by instruction:
3943
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] Instructions:
4044
# CHECK-NEXT: 0.33 0.33 0.33 0.25 0.25 0.25 0.25 - - - - - - cmpxchg8b (%rax)
4145
# CHECK-NEXT: - - - - - - - - - - - - - cmpxchg16b (%rax)
46+
# CHECK-NEXT: 0.33 0.33 0.33 0.25 0.25 0.25 0.25 - - - - - - lock cmpxchg8b (%rax)
47+
# CHECK-NEXT: - - - - - - - - - - - - - lock cmpxchg16b (%rax)

‎llvm/test/tools/llvm-mca/X86/Znver3/resources-cmpxchg.s‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
cmpxchg8b (%rax)
55
cmpxchg16b (%rax)
6+
lock cmpxchg8b (%rax)
7+
lock cmpxchg16b (%rax)
68

79
# CHECK: Instruction Info:
810
# CHECK-NEXT: [1]: #uOps
@@ -15,6 +17,8 @@ cmpxchg16b (%rax)
1517
# CHECK: [1] [2] [3] [4] [5] [6] Instructions:
1618
# CHECK-NEXT: 19 3 6.00 * * cmpxchg8b (%rax)
1719
# CHECK-NEXT: 28 4 14.75 * * cmpxchg16b (%rax)
20+
# CHECK-NEXT: 19 3 6.00 * * lock cmpxchg8b (%rax)
21+
# CHECK-NEXT: 28 4 14.75 * * lock cmpxchg16b (%rax)
1822

1923
# CHECK: Resources:
2024
# CHECK-NEXT: [0] - Zn3AGU0
@@ -43,9 +47,11 @@ cmpxchg16b (%rax)
4347

4448
# CHECK: Resource pressure per iteration:
4549
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12.0] [12.1] [13] [14.0] [14.1] [14.2] [15.0] [15.1] [15.2] [16.0] [16.1]
46-
# CHECK-NEXT: - - - 20.75 20.75 20.75 20.75 - - - - - - - - - - - - - - - -
50+
# CHECK-NEXT: - - - 41.50 41.50 41.50 41.50 - - - - - - - - - - - - - - - -
4751

4852
# CHECK: Resource pressure by instruction:
4953
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12.0] [12.1] [13] [14.0] [14.1] [14.2] [15.0] [15.1] [15.2] [16.0] [16.1] Instructions:
5054
# CHECK-NEXT: - - - 6.00 6.00 6.00 6.00 - - - - - - - - - - - - - - - - cmpxchg8b (%rax)
5155
# CHECK-NEXT: - - - 14.75 14.75 14.75 14.75 - - - - - - - - - - - - - - - - cmpxchg16b (%rax)
56+
# CHECK-NEXT: - - - 6.00 6.00 6.00 6.00 - - - - - - - - - - - - - - - - lock cmpxchg8b (%rax)
57+
# CHECK-NEXT: - - - 14.75 14.75 14.75 14.75 - - - - - - - - - - - - - - - - lock cmpxchg16b (%rax)

‎llvm/test/tools/llvm-mca/X86/Znver4/resources-mwaitx.s‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
2+
# RUN: llvm-mca -mtriple=x86_64-unknown-unknown -mcpu=znver4 -instruction-tables < %s | FileCheck %s
3+
4+
monitorx
5+
mwaitx
6+
7+
# CHECK: Instruction Info:
8+
# CHECK-NEXT: [1]: #uOps
9+
# CHECK-NEXT: [2]: Latency
10+
# CHECK-NEXT: [3]: RThroughput
11+
# CHECK-NEXT: [4]: MayLoad
12+
# CHECK-NEXT: [5]: MayStore
13+
# CHECK-NEXT: [6]: HasSideEffects (U)
14+
15+
# CHECK: [1] [2] [3] [4] [5] [6] Instructions:
16+
# CHECK-NEXT: 100 100 25.00 U monitorx
17+
# CHECK-NEXT: 100 100 25.00 U mwaitx
18+
19+
# CHECK: Resources:
20+
# CHECK-NEXT: [0] - Zn4AGU0
21+
# CHECK-NEXT: [1] - Zn4AGU1
22+
# CHECK-NEXT: [2] - Zn4AGU2
23+
# CHECK-NEXT: [3] - Zn4ALU0
24+
# CHECK-NEXT: [4] - Zn4ALU1
25+
# CHECK-NEXT: [5] - Zn4ALU2
26+
# CHECK-NEXT: [6] - Zn4ALU3
27+
# CHECK-NEXT: [7] - Zn4BRU1
28+
# CHECK-NEXT: [8] - Zn4FP0
29+
# CHECK-NEXT: [9] - Zn4FP1
30+
# CHECK-NEXT: [10] - Zn4FP2
31+
# CHECK-NEXT: [11] - Zn4FP3
32+
# CHECK-NEXT: [12.0] - Zn4FP45
33+
# CHECK-NEXT: [12.1] - Zn4FP45
34+
# CHECK-NEXT: [13] - Zn4FPSt
35+
# CHECK-NEXT: [14.0] - Zn4LSU
36+
# CHECK-NEXT: [14.1] - Zn4LSU
37+
# CHECK-NEXT: [14.2] - Zn4LSU
38+
# CHECK-NEXT: [15.0] - Zn4Load
39+
# CHECK-NEXT: [15.1] - Zn4Load
40+
# CHECK-NEXT: [15.2] - Zn4Load
41+
# CHECK-NEXT: [16.0] - Zn4Store
42+
# CHECK-NEXT: [16.1] - Zn4Store
43+
44+
# CHECK: Resource pressure per iteration:
45+
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12.0] [12.1] [13] [14.0] [14.1] [14.2] [15.0] [15.1] [15.2] [16.0] [16.1]
46+
# CHECK-NEXT: - - - 50.00 50.00 50.00 50.00 - - - - - - - - - - - - - - - -
47+
48+
# CHECK: Resource pressure by instruction:
49+
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12.0] [12.1] [13] [14.0] [14.1] [14.2] [15.0] [15.1] [15.2] [16.0] [16.1] Instructions:
50+
# CHECK-NEXT: - - - 25.00 25.00 25.00 25.00 - - - - - - - - - - - - - - - - monitorx
51+
# CHECK-NEXT: - - - 25.00 25.00 25.00 25.00 - - - - - - - - - - - - - - - - mwaitx

‎llvm/test/tools/llvm-mca/X86/Znver4/resources-sha.s‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
2+
# RUN: llvm-mca -mtriple=x86_64-unknown-unknown -mcpu=znver4 -instruction-tables < %s | FileCheck %s
3+
4+
sha1msg1 %xmm0, %xmm2
5+
sha1msg1 (%rax), %xmm2
6+
7+
sha1msg2 %xmm0, %xmm2
8+
sha1msg2 (%rax), %xmm2
9+
10+
sha1nexte %xmm0, %xmm2
11+
sha1nexte (%rax), %xmm2
12+
13+
sha1rnds4 $3, %xmm0, %xmm2
14+
sha1rnds4 $3, (%rax), %xmm2
15+
16+
sha256msg1 %xmm0, %xmm2
17+
sha256msg1 (%rax), %xmm2
18+
19+
sha256msg2 %xmm0, %xmm2
20+
sha256msg2 (%rax), %xmm2
21+
22+
sha256rnds2 %xmm0, %xmm2
23+
sha256rnds2 (%rax), %xmm2
24+
25+
# CHECK: Instruction Info:
26+
# CHECK-NEXT: [1]: #uOps
27+
# CHECK-NEXT: [2]: Latency
28+
# CHECK-NEXT: [3]: RThroughput
29+
# CHECK-NEXT: [4]: MayLoad
30+
# CHECK-NEXT: [5]: MayStore
31+
# CHECK-NEXT: [6]: HasSideEffects (U)
32+
33+
# CHECK: [1] [2] [3] [4] [5] [6] Instructions:
34+
# CHECK-NEXT: 2 2 0.50 sha1msg1 %xmm0, %xmm2
35+
# CHECK-NEXT: 2 6 0.50 * sha1msg1 (%rax), %xmm2
36+
# CHECK-NEXT: 1 1 0.50 sha1msg2 %xmm0, %xmm2
37+
# CHECK-NEXT: 1 5 0.50 * sha1msg2 (%rax), %xmm2
38+
# CHECK-NEXT: 1 1 0.50 sha1nexte %xmm0, %xmm2
39+
# CHECK-NEXT: 1 5 0.50 * sha1nexte (%rax), %xmm2
40+
# CHECK-NEXT: 1 6 2.00 sha1rnds4 $3, %xmm0, %xmm2
41+
# CHECK-NEXT: 1 10 0.50 * sha1rnds4 $3, (%rax), %xmm2
42+
# CHECK-NEXT: 2 2 0.75 sha256msg1 %xmm0, %xmm2
43+
# CHECK-NEXT: 2 6 0.75 * sha256msg1 (%rax), %xmm2
44+
# CHECK-NEXT: 4 3 2.00 sha256msg2 %xmm0, %xmm2
45+
# CHECK-NEXT: 5 7 2.00 * sha256msg2 (%rax), %xmm2
46+
# CHECK-NEXT: 1 4 2.00 sha256rnds2 %xmm0, %xmm0, %xmm2
47+
# CHECK-NEXT: 1 10 0.50 * sha256rnds2 %xmm0, (%rax), %xmm2
48+
49+
# CHECK: Resources:
50+
# CHECK-NEXT: [0] - Zn4AGU0
51+
# CHECK-NEXT: [1] - Zn4AGU1
52+
# CHECK-NEXT: [2] - Zn4AGU2
53+
# CHECK-NEXT: [3] - Zn4ALU0
54+
# CHECK-NEXT: [4] - Zn4ALU1
55+
# CHECK-NEXT: [5] - Zn4ALU2
56+
# CHECK-NEXT: [6] - Zn4ALU3
57+
# CHECK-NEXT: [7] - Zn4BRU1
58+
# CHECK-NEXT: [8] - Zn4FP0
59+
# CHECK-NEXT: [9] - Zn4FP1
60+
# CHECK-NEXT: [10] - Zn4FP2
61+
# CHECK-NEXT: [11] - Zn4FP3
62+
# CHECK-NEXT: [12.0] - Zn4FP45
63+
# CHECK-NEXT: [12.1] - Zn4FP45
64+
# CHECK-NEXT: [13] - Zn4FPSt
65+
# CHECK-NEXT: [14.0] - Zn4LSU
66+
# CHECK-NEXT: [14.1] - Zn4LSU
67+
# CHECK-NEXT: [14.2] - Zn4LSU
68+
# CHECK-NEXT: [15.0] - Zn4Load
69+
# CHECK-NEXT: [15.1] - Zn4Load
70+
# CHECK-NEXT: [15.2] - Zn4Load
71+
# CHECK-NEXT: [16.0] - Zn4Store
72+
# CHECK-NEXT: [16.1] - Zn4Store
73+
74+
# CHECK: Resource pressure per iteration:
75+
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12.0] [12.1] [13] [14.0] [14.1] [14.2] [15.0] [15.1] [15.2] [16.0] [16.1]
76+
# CHECK-NEXT: 1.67 1.67 1.67 - - - - - 13.50 12.50 12.50 13.50 1.00 1.00 - 2.33 2.33 2.33 2.33 2.33 2.33 - -
77+
78+
# CHECK: Resource pressure by instruction:
79+
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12.0] [12.1] [13] [14.0] [14.1] [14.2] [15.0] [15.1] [15.2] [16.0] [16.1] Instructions:
80+
# CHECK-NEXT: - - - - - - - - 0.50 0.50 0.50 0.50 - - - - - - - - - - - sha1msg1 %xmm0, %xmm2
81+
# CHECK-NEXT: 0.33 0.33 0.33 - - - - - 0.50 0.50 0.50 0.50 - - - 0.33 0.33 0.33 0.33 0.33 0.33 - - sha1msg1 (%rax), %xmm2
82+
# CHECK-NEXT: - - - - - - - - 0.50 0.50 0.50 0.50 - - - - - - - - - - - sha1msg2 %xmm0, %xmm2
83+
# CHECK-NEXT: 0.33 0.33 0.33 - - - - - 0.50 0.50 0.50 0.50 - - - 0.33 0.33 0.33 0.33 0.33 0.33 - - sha1msg2 (%rax), %xmm2
84+
# CHECK-NEXT: - - - - - - - - 0.50 0.50 0.50 0.50 - - - - - - - - - - - sha1nexte %xmm0, %xmm2
85+
# CHECK-NEXT: 0.33 0.33 0.33 - - - - - 0.50 0.50 0.50 0.50 - - - 0.33 0.33 0.33 0.33 0.33 0.33 - - sha1nexte (%rax), %xmm2
86+
# CHECK-NEXT: - - - - - - - - 2.00 2.00 2.00 2.00 - - - - - - - - - - - sha1rnds4 $3, %xmm0, %xmm2
87+
# CHECK-NEXT: - - - - - - - - 0.50 - - 0.50 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - sha1rnds4 $3, (%rax), %xmm2
88+
# CHECK-NEXT: - - - - - - - - 0.75 0.75 0.75 0.75 - - - - - - - - - - - sha256msg1 %xmm0, %xmm2
89+
# CHECK-NEXT: 0.33 0.33 0.33 - - - - - 0.75 0.75 0.75 0.75 - - - 0.33 0.33 0.33 0.33 0.33 0.33 - - sha256msg1 (%rax), %xmm2
90+
# CHECK-NEXT: - - - - - - - - 2.00 2.00 2.00 2.00 - - - - - - - - - - - sha256msg2 %xmm0, %xmm2
91+
# CHECK-NEXT: 0.33 0.33 0.33 - - - - - 2.00 2.00 2.00 2.00 - - - 0.33 0.33 0.33 0.33 0.33 0.33 - - sha256msg2 (%rax), %xmm2
92+
# CHECK-NEXT: - - - - - - - - 2.00 2.00 2.00 2.00 - - - - - - - - - - - sha256rnds2 %xmm0, %xmm0, %xmm2
93+
# CHECK-NEXT: - - - - - - - - 0.50 - - 0.50 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - sha256rnds2 %xmm0, (%rax), %xmm2

‎llvm/test/tools/llvm-mca/X86/Znver4/resources-sse4a.s‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
2+
# RUN: llvm-mca -mtriple=x86_64-unknown-unknown -mcpu=znver4 -instruction-tables < %s | FileCheck %s
3+
4+
extrq %xmm0, %xmm2
5+
extrq $22, $2, %xmm2
6+
7+
insertq %xmm0, %xmm2
8+
insertq $22, $22, %xmm0, %xmm2
9+
10+
movntsd %xmm0, (%rax)
11+
movntss %xmm0, (%rax)
12+
13+
# CHECK: Instruction Info:
14+
# CHECK-NEXT: [1]: #uOps
15+
# CHECK-NEXT: [2]: Latency
16+
# CHECK-NEXT: [3]: RThroughput
17+
# CHECK-NEXT: [4]: MayLoad
18+
# CHECK-NEXT: [5]: MayStore
19+
# CHECK-NEXT: [6]: HasSideEffects (U)
20+
21+
# CHECK: [1] [2] [3] [4] [5] [6] Instructions:
22+
# CHECK-NEXT: 1 3 0.50 extrq %xmm0, %xmm2
23+
# CHECK-NEXT: 2 3 0.50 extrq $22, $2, %xmm2
24+
# CHECK-NEXT: 1 3 0.50 insertq %xmm0, %xmm2
25+
# CHECK-NEXT: 2 3 0.50 insertq $22, $22, %xmm0, %xmm2
26+
# CHECK-NEXT: 1 1 1.00 * movntsd %xmm0, (%rax)
27+
# CHECK-NEXT: 1 1 1.00 * movntss %xmm0, (%rax)
28+
29+
# CHECK: Resources:
30+
# CHECK-NEXT: [0] - Zn4AGU0
31+
# CHECK-NEXT: [1] - Zn4AGU1
32+
# CHECK-NEXT: [2] - Zn4AGU2
33+
# CHECK-NEXT: [3] - Zn4ALU0
34+
# CHECK-NEXT: [4] - Zn4ALU1
35+
# CHECK-NEXT: [5] - Zn4ALU2
36+
# CHECK-NEXT: [6] - Zn4ALU3
37+
# CHECK-NEXT: [7] - Zn4BRU1
38+
# CHECK-NEXT: [8] - Zn4FP0
39+
# CHECK-NEXT: [9] - Zn4FP1
40+
# CHECK-NEXT: [10] - Zn4FP2
41+
# CHECK-NEXT: [11] - Zn4FP3
42+
# CHECK-NEXT: [12.0] - Zn4FP45
43+
# CHECK-NEXT: [12.1] - Zn4FP45
44+
# CHECK-NEXT: [13] - Zn4FPSt
45+
# CHECK-NEXT: [14.0] - Zn4LSU
46+
# CHECK-NEXT: [14.1] - Zn4LSU
47+
# CHECK-NEXT: [14.2] - Zn4LSU
48+
# CHECK-NEXT: [15.0] - Zn4Load
49+
# CHECK-NEXT: [15.1] - Zn4Load
50+
# CHECK-NEXT: [15.2] - Zn4Load
51+
# CHECK-NEXT: [16.0] - Zn4Store
52+
# CHECK-NEXT: [16.1] - Zn4Store
53+
54+
# CHECK: Resource pressure per iteration:
55+
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12.0] [12.1] [13] [14.0] [14.1] [14.2] [15.0] [15.1] [15.2] [16.0] [16.1]
56+
# CHECK-NEXT: - - - - - - - - - 2.00 2.00 - 3.00 3.00 2.00 0.67 0.67 0.67 - - - 1.00 1.00
57+
58+
# CHECK: Resource pressure by instruction:
59+
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12.0] [12.1] [13] [14.0] [14.1] [14.2] [15.0] [15.1] [15.2] [16.0] [16.1] Instructions:
60+
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 - 0.50 0.50 - - - - - - - - - extrq %xmm0, %xmm2
61+
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 - 0.50 0.50 - - - - - - - - - extrq $22, $2, %xmm2
62+
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 - 0.50 0.50 - - - - - - - - - insertq %xmm0, %xmm2
63+
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 - 0.50 0.50 - - - - - - - - - insertq $22, $22, %xmm0, %xmm2
64+
# CHECK-NEXT: - - - - - - - - - - - - 0.50 0.50 1.00 0.33 0.33 0.33 - - - 0.50 0.50 movntsd %xmm0, (%rax)
65+
# CHECK-NEXT: - - - - - - - - - - - - 0.50 0.50 1.00 0.33 0.33 0.33 - - - 0.50 0.50 movntss %xmm0, (%rax)

0 commit comments

Comments
 (0)