Skip to content
This repository was archived by the owner on Apr 23, 2020. It is now read-only.

Commit 9e6a27f

Browse files
adibiagioadibiagio
committed
[llvm-mca] Correctly update the rank in Scheduler::select().
Found by inspection. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@338579 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 7e1cf4b commit 9e6a27f

File tree

2 files changed

+115
-1
lines changed

2 files changed

+115
-1
lines changed

‎test/tools/llvm-mca/X86/BtVer2/rank.s

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
2+
# RUN: llvm-mca -mtriple=x86_64-unknown-unknown -mcpu=btver2 -timeline -timeline-max-iterations=3 < %s | FileCheck %s
3+
4+
add %eax, %ecx
5+
add %eax, %edx
6+
add %eax, %ebx
7+
add %edx, %esi
8+
add %ebx, %eax
9+
add %edx, %esi
10+
add %ebx, %eax
11+
add %ebx, %eax
12+
13+
# CHECK: Iterations: 100
14+
# CHECK-NEXT: Instructions: 800
15+
# CHECK-NEXT: Total Cycles: 503
16+
# CHECK-NEXT: Dispatch Width: 2
17+
# CHECK-NEXT: IPC: 1.59
18+
# CHECK-NEXT: Block RThroughput: 4.0
19+
20+
# CHECK: Instruction Info:
21+
# CHECK-NEXT: [1]: #uOps
22+
# CHECK-NEXT: [2]: Latency
23+
# CHECK-NEXT: [3]: RThroughput
24+
# CHECK-NEXT: [4]: MayLoad
25+
# CHECK-NEXT: [5]: MayStore
26+
# CHECK-NEXT: [6]: HasSideEffects (U)
27+
28+
# CHECK: [1] [2] [3] [4] [5] [6] Instructions:
29+
# CHECK-NEXT: 1 1 0.50 addl %eax, %ecx
30+
# CHECK-NEXT: 1 1 0.50 addl %eax, %edx
31+
# CHECK-NEXT: 1 1 0.50 addl %eax, %ebx
32+
# CHECK-NEXT: 1 1 0.50 addl %edx, %esi
33+
# CHECK-NEXT: 1 1 0.50 addl %ebx, %eax
34+
# CHECK-NEXT: 1 1 0.50 addl %edx, %esi
35+
# CHECK-NEXT: 1 1 0.50 addl %ebx, %eax
36+
# CHECK-NEXT: 1 1 0.50 addl %ebx, %eax
37+
38+
# CHECK: Resources:
39+
# CHECK-NEXT: [0] - JALU0
40+
# CHECK-NEXT: [1] - JALU1
41+
# CHECK-NEXT: [2] - JDiv
42+
# CHECK-NEXT: [3] - JFPA
43+
# CHECK-NEXT: [4] - JFPM
44+
# CHECK-NEXT: [5] - JFPU0
45+
# CHECK-NEXT: [6] - JFPU1
46+
# CHECK-NEXT: [7] - JLAGU
47+
# CHECK-NEXT: [8] - JMul
48+
# CHECK-NEXT: [9] - JSAGU
49+
# CHECK-NEXT: [10] - JSTC
50+
# CHECK-NEXT: [11] - JVALU0
51+
# CHECK-NEXT: [12] - JVALU1
52+
# CHECK-NEXT: [13] - JVIMUL
53+
54+
# CHECK: Resource pressure per iteration:
55+
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13]
56+
# CHECK-NEXT: 4.00 4.00 - - - - - - - - - - - -
57+
58+
# CHECK: Resource pressure by instruction:
59+
# CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] Instructions:
60+
# CHECK-NEXT: 0.02 0.98 - - - - - - - - - - - - addl %eax, %ecx
61+
# CHECK-NEXT: 0.02 0.98 - - - - - - - - - - - - addl %eax, %edx
62+
# CHECK-NEXT: 0.96 0.04 - - - - - - - - - - - - addl %eax, %ebx
63+
# CHECK-NEXT: 1.00 - - - - - - - - - - - - - addl %edx, %esi
64+
# CHECK-NEXT: - 1.00 - - - - - - - - - - - - addl %ebx, %eax
65+
# CHECK-NEXT: 1.00 - - - - - - - - - - - - - addl %edx, %esi
66+
# CHECK-NEXT: - 1.00 - - - - - - - - - - - - addl %ebx, %eax
67+
# CHECK-NEXT: 1.00 - - - - - - - - - - - - - addl %ebx, %eax
68+
69+
# CHECK: Timeline view:
70+
# CHECK-NEXT: 01234567
71+
# CHECK-NEXT: Index 0123456789
72+
73+
# CHECK: [0,0] DeER . . . . addl %eax, %ecx
74+
# CHECK-NEXT: [0,1] DeER . . . . addl %eax, %edx
75+
# CHECK-NEXT: [0,2] .DeER. . . . addl %eax, %ebx
76+
# CHECK-NEXT: [0,3] .DeER. . . . addl %edx, %esi
77+
# CHECK-NEXT: [0,4] . DeER . . . addl %ebx, %eax
78+
# CHECK-NEXT: [0,5] . DeER . . . addl %edx, %esi
79+
# CHECK-NEXT: [0,6] . DeER . . . addl %ebx, %eax
80+
# CHECK-NEXT: [0,7] . D=eER . . . addl %ebx, %eax
81+
# CHECK-NEXT: [1,0] . D=eER . . . addl %eax, %ecx
82+
# CHECK-NEXT: [1,1] . D=eER . . . addl %eax, %edx
83+
# CHECK-NEXT: [1,2] . D=eER. . . addl %eax, %ebx
84+
# CHECK-NEXT: [1,3] . D=eER. . . addl %edx, %esi
85+
# CHECK-NEXT: [1,4] . .D=eER . . addl %ebx, %eax
86+
# CHECK-NEXT: [1,5] . .D=eER . . addl %edx, %esi
87+
# CHECK-NEXT: [1,6] . . D=eER . . addl %ebx, %eax
88+
# CHECK-NEXT: [1,7] . . D==eER . . addl %ebx, %eax
89+
# CHECK-NEXT: [2,0] . . D==eER . . addl %eax, %ecx
90+
# CHECK-NEXT: [2,1] . . D==eER . . addl %eax, %edx
91+
# CHECK-NEXT: [2,2] . . D==eER. . addl %eax, %ebx
92+
# CHECK-NEXT: [2,3] . . D==eER. . addl %edx, %esi
93+
# CHECK-NEXT: [2,4] . . D==eER . addl %ebx, %eax
94+
# CHECK-NEXT: [2,5] . . D==eER . addl %edx, %esi
95+
# CHECK-NEXT: [2,6] . . .D==eER. addl %ebx, %eax
96+
# CHECK-NEXT: [2,7] . . .D===eER addl %ebx, %eax
97+
98+
# CHECK: Average Wait times (based on the timeline view):
99+
# CHECK-NEXT: [0]: Executions
100+
# CHECK-NEXT: [1]: Average time spent waiting in a scheduler's queue
101+
# CHECK-NEXT: [2]: Average time spent waiting in a scheduler's queue while ready
102+
# CHECK-NEXT: [3]: Average time elapsed from WB until retire stage
103+
104+
# CHECK: [0] [1] [2] [3]
105+
# CHECK-NEXT: 0. 3 2.0 0.3 0.0 addl %eax, %ecx
106+
# CHECK-NEXT: 1. 3 2.0 0.3 0.0 addl %eax, %edx
107+
# CHECK-NEXT: 2. 3 2.0 1.0 0.0 addl %eax, %ebx
108+
# CHECK-NEXT: 3. 3 2.0 0.0 0.0 addl %edx, %esi
109+
# CHECK-NEXT: 4. 3 2.0 0.0 0.0 addl %ebx, %eax
110+
# CHECK-NEXT: 5. 3 2.0 0.0 0.0 addl %edx, %esi
111+
# CHECK-NEXT: 6. 3 2.0 0.0 0.0 addl %ebx, %eax
112+
# CHECK-NEXT: 7. 3 3.0 0.0 0.0 addl %ebx, %eax

‎tools/llvm-mca/Scheduler.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,10 @@ InstRef Scheduler::select() {
333333
int CurrentRank = I->first - I->second->getNumUsers();
334334
if (CurrentRank < Rank) {
335335
const InstrDesc &D = I->second->getDesc();
336-
if (Resources->canBeIssued(D))
336+
if (Resources->canBeIssued(D)) {
337+
Rank = CurrentRank;
337338
It = I;
339+
}
338340
}
339341
}
340342

0 commit comments

Comments
 (0)