Skip to content

Commit 4f37e85

Browse files
author
mattarde
committed
fix type
1 parent d47f879 commit 4f37e85

38 files changed

+4228
-4265
lines changed

llvm/lib/Target/X86/X86SchedLunarlakeP.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1817,7 +1817,7 @@ def LNLPWriteResGroupX236 : SchedWriteRes<[LNLPPort00_01_02_03_04_05, LNLPPort01
18171817
let NumMicroOps = 2;
18181818
}
18191819
def : InstRW<[LNLPWriteResGroupX236], (instregex "^SMSW(32|64)r$")>;
1820-
def LNLPWriteResGroupX237 : SchedWriteRes<[ADLPPort00, LNLPPort20_21_22]> {
1820+
def LNLPWriteResGroupX237 : SchedWriteRes<[LNLPPort00, LNLPPort20_21_22]> {
18211821
let Latency = 24;
18221822
let NumMicroOps = 2;
18231823
}

llvm/test/tools/llvm-mca/X86/LunarlakeP/independent-load-stores.s

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -52,43 +52,42 @@
5252
# ALL-NEXT: 4 12 0.67 * * addq $44, 640(%r14)
5353

5454
# ALL: Resources:
55-
# ALL-NEXT: [0] - ADLPPort00
56-
# ALL-NEXT: [1] - LNLPPort00
57-
# ALL-NEXT: [2] - LNLPPort01
58-
# ALL-NEXT: [3] - LNLPPort02
59-
# ALL-NEXT: [4] - LNLPPort03
60-
# ALL-NEXT: [5] - LNLPPort04
61-
# ALL-NEXT: [6] - LNLPPort05
62-
# ALL-NEXT: [7] - LNLPPort10
63-
# ALL-NEXT: [8] - LNLPPort11
64-
# ALL-NEXT: [9] - LNLPPort20
65-
# ALL-NEXT: [10] - LNLPPort21
66-
# ALL-NEXT: [11] - LNLPPort22
67-
# ALL-NEXT: [12] - LNLPPort25
68-
# ALL-NEXT: [13] - LNLPPort26
69-
# ALL-NEXT: [14] - LNLPPort27
70-
# ALL-NEXT: [15] - LNLPPortInvalid
71-
# ALL-NEXT: [16] - LNLPVPort00
72-
# ALL-NEXT: [17] - LNLPVPort01
73-
# ALL-NEXT: [18] - LNLPVPort02
74-
# ALL-NEXT: [19] - LNLPVPort03
55+
# ALL-NEXT: [0] - LNLPPort00
56+
# ALL-NEXT: [1] - LNLPPort01
57+
# ALL-NEXT: [2] - LNLPPort02
58+
# ALL-NEXT: [3] - LNLPPort03
59+
# ALL-NEXT: [4] - LNLPPort04
60+
# ALL-NEXT: [5] - LNLPPort05
61+
# ALL-NEXT: [6] - LNLPPort10
62+
# ALL-NEXT: [7] - LNLPPort11
63+
# ALL-NEXT: [8] - LNLPPort20
64+
# ALL-NEXT: [9] - LNLPPort21
65+
# ALL-NEXT: [10] - LNLPPort22
66+
# ALL-NEXT: [11] - LNLPPort25
67+
# ALL-NEXT: [12] - LNLPPort26
68+
# ALL-NEXT: [13] - LNLPPort27
69+
# ALL-NEXT: [14] - LNLPPortInvalid
70+
# ALL-NEXT: [15] - LNLPVPort00
71+
# ALL-NEXT: [16] - LNLPVPort01
72+
# ALL-NEXT: [17] - LNLPVPort02
73+
# ALL-NEXT: [18] - LNLPVPort03
7574

7675
# ALL: Resource pressure per iteration:
77-
# ALL-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] [14] [15] [16] [17] [18] [19]
78-
# ALL-NEXT: - - 3.33 - 3.33 - 3.34 5.00 5.00 6.66 6.66 6.68 3.33 3.33 3.34 - - - - -
76+
# ALL-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] [14] [15] [16] [17] [18]
77+
# ALL-NEXT: - 3.33 - 3.33 - 3.34 5.00 5.00 6.66 6.66 6.68 3.33 3.33 3.34 - - - - -
7978

8079
# ALL: Resource pressure by instruction:
81-
# ALL-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] [14] [15] [16] [17] [18] [19] Instructions:
82-
# ALL-NEXT: - - 0.33 - 0.33 - 0.34 - 1.00 0.66 0.66 0.68 0.33 0.33 0.34 - - - - - addq $44, 64(%r14)
83-
# ALL-NEXT: - - 0.33 - 0.34 - 0.33 1.00 - 0.66 0.68 0.66 0.33 0.34 0.33 - - - - - addq $44, 128(%r14)
84-
# ALL-NEXT: - - 0.34 - 0.33 - 0.33 - 1.00 0.68 0.66 0.66 0.34 0.33 0.33 - - - - - addq $44, 192(%r14)
85-
# ALL-NEXT: - - 0.33 - 0.33 - 0.34 1.00 - 0.66 0.66 0.68 0.33 0.33 0.34 - - - - - addq $44, 256(%r14)
86-
# ALL-NEXT: - - 0.33 - 0.34 - 0.33 - 1.00 0.66 0.68 0.66 0.33 0.34 0.33 - - - - - addq $44, 320(%r14)
87-
# ALL-NEXT: - - 0.34 - 0.33 - 0.33 1.00 - 0.68 0.66 0.66 0.34 0.33 0.33 - - - - - addq $44, 384(%r14)
88-
# ALL-NEXT: - - 0.33 - 0.33 - 0.34 - 1.00 0.66 0.66 0.68 0.33 0.33 0.34 - - - - - addq $44, 448(%r14)
89-
# ALL-NEXT: - - 0.33 - 0.34 - 0.33 1.00 - 0.66 0.68 0.66 0.33 0.34 0.33 - - - - - addq $44, 512(%r14)
90-
# ALL-NEXT: - - 0.34 - 0.33 - 0.33 - 1.00 0.68 0.66 0.66 0.34 0.33 0.33 - - - - - addq $44, 576(%r14)
91-
# ALL-NEXT: - - 0.33 - 0.33 - 0.34 1.00 - 0.66 0.66 0.68 0.33 0.33 0.34 - - - - - addq $44, 640(%r14)
80+
# ALL-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] [14] [15] [16] [17] [18] Instructions:
81+
# ALL-NEXT: - 0.33 - 0.33 - 0.34 - 1.00 0.66 0.66 0.68 0.33 0.33 0.34 - - - - - addq $44, 64(%r14)
82+
# ALL-NEXT: - 0.33 - 0.34 - 0.33 1.00 - 0.66 0.68 0.66 0.33 0.34 0.33 - - - - - addq $44, 128(%r14)
83+
# ALL-NEXT: - 0.34 - 0.33 - 0.33 - 1.00 0.68 0.66 0.66 0.34 0.33 0.33 - - - - - addq $44, 192(%r14)
84+
# ALL-NEXT: - 0.33 - 0.33 - 0.34 1.00 - 0.66 0.66 0.68 0.33 0.33 0.34 - - - - - addq $44, 256(%r14)
85+
# ALL-NEXT: - 0.33 - 0.34 - 0.33 - 1.00 0.66 0.68 0.66 0.33 0.34 0.33 - - - - - addq $44, 320(%r14)
86+
# ALL-NEXT: - 0.34 - 0.33 - 0.33 1.00 - 0.68 0.66 0.66 0.34 0.33 0.33 - - - - - addq $44, 384(%r14)
87+
# ALL-NEXT: - 0.33 - 0.33 - 0.34 - 1.00 0.66 0.66 0.68 0.33 0.33 0.34 - - - - - addq $44, 448(%r14)
88+
# ALL-NEXT: - 0.33 - 0.34 - 0.33 1.00 - 0.66 0.68 0.66 0.33 0.34 0.33 - - - - - addq $44, 512(%r14)
89+
# ALL-NEXT: - 0.34 - 0.33 - 0.33 - 1.00 0.68 0.66 0.66 0.34 0.33 0.33 - - - - - addq $44, 576(%r14)
90+
# ALL-NEXT: - 0.33 - 0.33 - 0.34 1.00 - 0.66 0.66 0.68 0.33 0.33 0.34 - - - - - addq $44, 640(%r14)
9291

9392
# ALL: Timeline view:
9493

llvm/test/tools/llvm-mca/X86/LunarlakeP/resources-aes.s

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -32,38 +32,37 @@ aesenclast (%rax), %xmm2
3232
# CHECK-NEXT: 2 11 2.33 * aesenclast (%rax), %xmm2
3333

3434
# CHECK: Resources:
35-
# CHECK-NEXT: [0] - ADLPPort00
36-
# CHECK-NEXT: [1] - LNLPPort00
37-
# CHECK-NEXT: [2] - LNLPPort01
38-
# CHECK-NEXT: [3] - LNLPPort02
39-
# CHECK-NEXT: [4] - LNLPPort03
40-
# CHECK-NEXT: [5] - LNLPPort04
41-
# CHECK-NEXT: [6] - LNLPPort05
42-
# CHECK-NEXT: [7] - LNLPPort10
43-
# CHECK-NEXT: [8] - LNLPPort11
44-
# CHECK-NEXT: [9] - LNLPPort20
45-
# CHECK-NEXT: [10] - LNLPPort21
46-
# CHECK-NEXT: [11] - LNLPPort22
47-
# CHECK-NEXT: [12] - LNLPPort25
48-
# CHECK-NEXT: [13] - LNLPPort26
49-
# CHECK-NEXT: [14] - LNLPPort27
50-
# CHECK-NEXT: [15] - LNLPPortInvalid
51-
# CHECK-NEXT: [16] - LNLPVPort00
52-
# CHECK-NEXT: [17] - LNLPVPort01
53-
# CHECK-NEXT: [18] - LNLPVPort02
54-
# CHECK-NEXT: [19] - LNLPVPort03
35+
# CHECK-NEXT: [0] - LNLPPort00
36+
# CHECK-NEXT: [1] - LNLPPort01
37+
# CHECK-NEXT: [2] - LNLPPort02
38+
# CHECK-NEXT: [3] - LNLPPort03
39+
# CHECK-NEXT: [4] - LNLPPort04
40+
# CHECK-NEXT: [5] - LNLPPort05
41+
# CHECK-NEXT: [6] - LNLPPort10
42+
# CHECK-NEXT: [7] - LNLPPort11
43+
# CHECK-NEXT: [8] - LNLPPort20
44+
# CHECK-NEXT: [9] - LNLPPort21
45+
# CHECK-NEXT: [10] - LNLPPort22
46+
# CHECK-NEXT: [11] - LNLPPort25
47+
# CHECK-NEXT: [12] - LNLPPort26
48+
# CHECK-NEXT: [13] - LNLPPort27
49+
# CHECK-NEXT: [14] - LNLPPortInvalid
50+
# CHECK-NEXT: [15] - LNLPVPort00
51+
# CHECK-NEXT: [16] - LNLPVPort01
52+
# CHECK-NEXT: [17] - LNLPVPort02
53+
# CHECK-NEXT: [18] - LNLPVPort03
5554

5655
# CHECK: Resource pressure per iteration:
57-
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] [14] [15] [16] [17] [18] [19]
58-
# CHECK-NEXT: - - - - - - - - - 9.33 9.33 9.33 - - - - 16.00 16.00 - -
56+
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] [14] [15] [16] [17] [18]
57+
# CHECK-NEXT: - - - - - - - - 9.33 9.33 9.33 - - - - 16.00 16.00 - -
5958

6059
# CHECK: Resource pressure by instruction:
61-
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] [14] [15] [16] [17] [18] [19] Instructions:
62-
# CHECK-NEXT: - - - - - - - - - - - - - - - - 2.00 2.00 - - aesdec %xmm0, %xmm2
63-
# CHECK-NEXT: - - - - - - - - - 2.33 2.33 2.33 - - - - 2.00 2.00 - - aesdec (%rax), %xmm2
64-
# CHECK-NEXT: - - - - - - - - - - - - - - - - 2.00 2.00 - - aesdeclast %xmm0, %xmm2
65-
# CHECK-NEXT: - - - - - - - - - 2.33 2.33 2.33 - - - - 2.00 2.00 - - aesdeclast (%rax), %xmm2
66-
# CHECK-NEXT: - - - - - - - - - - - - - - - - 2.00 2.00 - - aesenc %xmm0, %xmm2
67-
# CHECK-NEXT: - - - - - - - - - 2.33 2.33 2.33 - - - - 2.00 2.00 - - aesenc (%rax), %xmm2
68-
# CHECK-NEXT: - - - - - - - - - - - - - - - - 2.00 2.00 - - aesenclast %xmm0, %xmm2
69-
# CHECK-NEXT: - - - - - - - - - 2.33 2.33 2.33 - - - - 2.00 2.00 - - aesenclast (%rax), %xmm2
60+
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] [14] [15] [16] [17] [18] Instructions:
61+
# CHECK-NEXT: - - - - - - - - - - - - - - - 2.00 2.00 - - aesdec %xmm0, %xmm2
62+
# CHECK-NEXT: - - - - - - - - 2.33 2.33 2.33 - - - - 2.00 2.00 - - aesdec (%rax), %xmm2
63+
# CHECK-NEXT: - - - - - - - - - - - - - - - 2.00 2.00 - - aesdeclast %xmm0, %xmm2
64+
# CHECK-NEXT: - - - - - - - - 2.33 2.33 2.33 - - - - 2.00 2.00 - - aesdeclast (%rax), %xmm2
65+
# CHECK-NEXT: - - - - - - - - - - - - - - - 2.00 2.00 - - aesenc %xmm0, %xmm2
66+
# CHECK-NEXT: - - - - - - - - 2.33 2.33 2.33 - - - - 2.00 2.00 - - aesenc (%rax), %xmm2
67+
# CHECK-NEXT: - - - - - - - - - - - - - - - 2.00 2.00 - - aesenclast %xmm0, %xmm2
68+
# CHECK-NEXT: - - - - - - - - 2.33 2.33 2.33 - - - - 2.00 2.00 - - aesenclast (%rax), %xmm2

0 commit comments

Comments
 (0)