[X86] Fix NOOP sched overrides on BDW/HSW/SKL.

[courbet]

Summary

Noop certainly does not use resources.

[courbet]

Update missing test.

[craig.topper]

The Intel optimization manual talks about nops executing and says that the multi byte nop has an execution dependency on whatever register is encoded in the modrm byte. So that sorta sounds like it uses resources.

[courbet]

In D48028#1128342, @craig.topper wrote:

The Intel optimization manual talks about nops executing and says that the multi byte nop has an execution dependency on whatever register is encoded in the modrm byte. So that sorta sounds like it uses resources.

I meant issue ports (llvm ProcResources). I went and looked at the optimization manual, that states:

The one byte NOP:[XCHG EAX,EAX] has special hardware support. Although it still consumes a µop and
its accompanying resources, the dependence upon the old value of EAX is removed. This µop can be
executed at the earliest possible opportunity, reducing the number of outstanding instructions and is the
lowest cost NOP.
The other NOPs have no special hardware support. Their input and output registers are interpreted by the
hardware. Therefore, a code generator should arrange to use the register containing the oldest value as
input, so that the NOP will dispatch and release RS resources at the earliest possible opportunity.

On the other hand, elsewhere, it says:

Some micro-ops can execute to completion during rename and are removed from the pipeline at that
point, effectively costing no execution bandwidth. These include:
• Zero idioms (dependency breaking idioms).
• NOP.
• VZEROUPPER.
• FXCHG

I guess what it means is that multi-byte NOPs still consume a ROB entry and wait for deata dependencies, but we do measure multi-byte NOPs and see no issue port usage:

[craig.topper]

The only way they would wait for a data dependency is if they actually went into the RS. And I would expect the only way out of the RS is to go out an execution port. I wonder if Intel failed to update the optimization manual after some uarch change. If I remember from my days in hardware design long ago during Nehalem, the only uop that was removed during rename was FXCH. So maybe some things changed during Sandy Bridge when the phyiscal register file was added. Or when move elimimination was added.

[courbet]

I guess that's the manual was never updated then. I've done some more experimenting, see the code here: https://github.com/google/EXEgesis/tree/master/exegesis/mysteries/nop

Unless I'm mistaken, it really seems that the NOP uop makes it out of the RS without passing through an execution port (or never gets there in the first place).

[craig.topper]

LGTM

[courbet]

Thanks.

llvm/trunk/lib/Target/X86/X86SchedBroadwell.td

 def: InstRW<[BWWriteResGroup8], (instregex "VPBLENDD(Y?)rri")>;
 
 def BWWriteResGroup9 : SchedWriteRes<[BWPort0156]> {
   let Latency = 1;
   let NumMicroOps = 1;
   let ResourceCycles = [1];
 }
 def: InstRW<[BWWriteResGroup9], (instrs LAHF, SAHF)>; // TODO: This doesnt match Agner's data
-def: InstRW<[BWWriteResGroup9], (instregex "NOOP",
-                                           "SGDT64m",
+def: InstRW<[BWWriteResGroup9], (instregex "SGDT64m",
                                            "SIDT64m",
                                            "SMSW16m",
                                            "STRm",
                                            "SYSCALL")>;
 
 def BWWriteResGroup10 : SchedWriteRes<[BWPort4,BWPort237]> {
   let Latency = 1;
   let NumMicroOps = 2;

llvm/trunk/lib/Target/X86/X86SchedHaswell.td

 def HWWriteResGroup10 : SchedWriteRes<[HWPort0156]> {
   let Latency = 1;
   let NumMicroOps = 1;
   let ResourceCycles = [1];
 }
 def: InstRW<[HWWriteResGroup10], (instrs CBW, CWDE, CDQE,
                                          CMC, STC)>;
 def: InstRW<[HWWriteResGroup10], (instrs LAHF, SAHF)>; // TODO: This doesn't match Agner's data
-def: InstRW<[HWWriteResGroup10], (instregex "NOOP",
-                                            "SGDT64m",
+def: InstRW<[HWWriteResGroup10], (instregex "SGDT64m",
                                             "SIDT64m",
                                             "SMSW16m",
                                             "STRm",
                                             "SYSCALL")>;
 
 def HWWriteResGroup11 : SchedWriteRes<[HWPort0,HWPort23]> {
   let Latency = 6;
   let NumMicroOps = 2;

llvm/trunk/lib/Target/X86/X86SchedSkylakeClient.td

 def SKLWriteResGroup10 : SchedWriteRes<[SKLPort0156]> {
   let Latency = 1;
   let NumMicroOps = 1;
   let ResourceCycles = [1];
 }
 def: InstRW<[SKLWriteResGroup10], (instrs CBW, CWDE, CDQE,
                                           CMC, STC)>;
 def: InstRW<[SKLWriteResGroup10], (instrs LAHF, SAHF)>; // TODO: This doesn't match Agner's data
-def: InstRW<[SKLWriteResGroup10], (instregex "NOOP",
-                                             "SGDT64m",
+def: InstRW<[SKLWriteResGroup10], (instregex "SGDT64m",
                                              "SIDT64m",
                                              "SMSW16m",
                                              "STRm",
                                              "SYSCALL")>;
 
 def SKLWriteResGroup11 : SchedWriteRes<[SKLPort4,SKLPort237]> {
   let Latency = 1;
   let NumMicroOps = 2;

llvm/trunk/test/CodeGen/X86/schedule-x86_64.ll

 ; BROADWELL-NEXT:    nopq %rdx # sched: [1:0.25]
 ; BROADWELL-NEXT:    nopq (%r9) # sched: [1:0.25]
 ; BROADWELL-NEXT:    #NO_APP
 ; BROADWELL-NEXT:    retq # sched: [7:1.00]
 ;
 ; SKYLAKE-LABEL: test_nop:
 ; SKYLAKE:       # %bb.0:
 ; SKYLAKE-NEXT:    #APP
-; SKYLAKE-NEXT:    nop # sched: [1:0.25]
-; SKYLAKE-NEXT:    nopw %di # sched: [1:0.25]
-; SKYLAKE-NEXT:    nopw (%rcx) # sched: [1:0.25]
-; SKYLAKE-NEXT:    nopl %esi # sched: [1:0.25]
-; SKYLAKE-NEXT:    nopl (%r8) # sched: [1:0.25]
-; SKYLAKE-NEXT:    nopq %rdx # sched: [1:0.25]
-; SKYLAKE-NEXT:    nopq (%r9) # sched: [1:0.25]
+; SKYLAKE-NEXT:    nop # sched: [1:0.17]
+; SKYLAKE-NEXT:    nopw %di # sched: [1:0.17]
+; SKYLAKE-NEXT:    nopw (%rcx) # sched: [1:0.17]
+; SKYLAKE-NEXT:    nopl %esi # sched: [1:0.17]
+; SKYLAKE-NEXT:    nopl (%r8) # sched: [1:0.17]
+; SKYLAKE-NEXT:    nopq %rdx # sched: [1:0.17]
+; SKYLAKE-NEXT:    nopq (%r9) # sched: [1:0.17]
 ; SKYLAKE-NEXT:    #NO_APP
 ; SKYLAKE-NEXT:    retq # sched: [7:1.00]
 ;
 ; SKX-LABEL: test_nop:
 ; SKX:       # %bb.0:
 ; SKX-NEXT:    #APP
 ; SKX-NEXT:    nop # sched: [1:0.17]
 ; SKX-NEXT:    nopw %di # sched: [1:0.17]

llvm/trunk/test/CodeGen/X86/sse-schedule.ll

 ; BROADWELL-NEXT:    nop # sched: [1:0.25]
 ; BROADWELL-NEXT:    #NO_APP
 ; BROADWELL-NEXT:    vxorps %xmm0, %xmm0, %xmm0 # sched: [1:1.00]
 ; BROADWELL-NEXT:    retq # sched: [7:1.00]
 ;
 ; SKYLAKE-SSE-LABEL: test_fnop:
 ; SKYLAKE-SSE:       # %bb.0:
 ; SKYLAKE-SSE-NEXT:    #APP
-; SKYLAKE-SSE-NEXT:    nop # sched: [1:0.25]
+; SKYLAKE-SSE-NEXT:    nop # sched: [1:0.17]
 ; SKYLAKE-SSE-NEXT:    #NO_APP
 ; SKYLAKE-SSE-NEXT:    xorps %xmm0, %xmm0 # sched: [1:0.33]
 ; SKYLAKE-SSE-NEXT:    retq # sched: [7:1.00]
 ;
 ; SKYLAKE-LABEL: test_fnop:
 ; SKYLAKE:       # %bb.0:
 ; SKYLAKE-NEXT:    #APP
-; SKYLAKE-NEXT:    nop # sched: [1:0.25]
+; SKYLAKE-NEXT:    nop # sched: [1:0.17]
 ; SKYLAKE-NEXT:    #NO_APP
 ; SKYLAKE-NEXT:    vxorps %xmm0, %xmm0, %xmm0 # sched: [1:0.33]
 ; SKYLAKE-NEXT:    retq # sched: [7:1.00]
 ;
 ; SKX-SSE-LABEL: test_fnop:
 ; SKX-SSE:       # %bb.0:
 ; SKX-SSE-NEXT:    #APP
 ; SKX-SSE-NEXT:    nop # sched: [1:0.17]

llvm/trunk/test/tools/llvm-mca/X86/Broadwell/resources-x86_64.s

 # CHECK-NEXT: [5]   - BWPort3
 # CHECK-NEXT: [6]   - BWPort4
 # CHECK-NEXT: [7]   - BWPort5
 # CHECK-NEXT: [8]   - BWPort6
 # CHECK-NEXT: [9]   - BWPort7
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]
-# CHECK-NEXT: 50.00   -     363.75 244.25 202.00 202.00 167.00 149.75 329.25 69.00
+# CHECK-NEXT: 50.00   -     362.00 242.50 202.00 202.00 167.00 148.00 327.50 69.00
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    Instructions:
 # CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     adcb  $7, %al
 # CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     adcb  $7, %dil
 # CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   adcb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -      -      -      -      -     0.50    -     adcb  %sil, %dil
 # CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   adcb  %sil, (%rax)

 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     negb  %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   negb  (%r8)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     negw  %si
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   negw  (%r9)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     negl  %edx
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   negl  (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     negq  %rcx
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   negq  (%r10)
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nop
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopw  %di
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopw  (%rcx)
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopl  %esi
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopl  (%r8)
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopq  %rdx
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopq  (%r9)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nop
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopw  %di
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopw  (%rcx)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopl  %esi
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopl  (%r8)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopq  %rdx
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopq  (%r9)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     notb  %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   notb  (%r8)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     notw  %si
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   notw  (%r9)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     notl  %edx
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   notl  (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     notq  %rcx
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   notq  (%r10)

llvm/trunk/test/tools/llvm-mca/X86/Haswell/resources-x86_64.s

 # CHECK-NEXT: [5]   - HWPort3
 # CHECK-NEXT: [6]   - HWPort4
 # CHECK-NEXT: [7]   - HWPort5
 # CHECK-NEXT: [8]   - HWPort6
 # CHECK-NEXT: [9]   - HWPort7
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]
-# CHECK-NEXT: 80.00   -     414.75 265.25 193.00 193.00 158.00 172.75 409.25 66.00
+# CHECK-NEXT: 80.00   -     413.00 263.50 193.00 193.00 158.00 171.00 407.50 66.00
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    Instructions:
 # CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     adcb  $7, %al
 # CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     adcb  $7, %dil
 # CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   adcb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     adcb  %sil, %dil
 # CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   adcb  %sil, (%rax)

 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     negb  %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   negb  (%r8)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     negw  %si
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   negw  (%r9)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     negl  %edx
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   negl  (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     negq  %rcx
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   negq  (%r10)
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nop
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopw  %di
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopw  (%rcx)
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopl  %esi
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopl  (%r8)
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopq  %rdx
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopq  (%r9)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nop
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopw  %di
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopw  (%rcx)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopl  %esi
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopl  (%r8)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopq  %rdx
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopq  (%r9)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     notb  %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   notb  (%r8)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     notw  %si
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   notw  (%r9)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     notl  %edx
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   notl  (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     notq  %rcx
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   notq  (%r10)

llvm/trunk/test/tools/llvm-mca/X86/SkylakeClient/resources-x86_64.s

 # CHECK-NEXT:  1      1     0.25                        negb  %dil
 # CHECK-NEXT:  3      7     1.00    *      *            negb  (%r8)
 # CHECK-NEXT:  1      1     0.25                        negw  %si
 # CHECK-NEXT:  3      7     1.00    *      *            negw  (%r9)
 # CHECK-NEXT:  1      1     0.25                        negl  %edx
 # CHECK-NEXT:  3      7     1.00    *      *            negl  (%rax)
 # CHECK-NEXT:  1      1     0.25                        negq  %rcx
 # CHECK-NEXT:  3      7     1.00    *      *            negq  (%r10)
-# CHECK-NEXT:  1      1     0.25                        nop
-# CHECK-NEXT:  1      1     0.25                        nopw  %di
-# CHECK-NEXT:  1      1     0.25                        nopw  (%rcx)
-# CHECK-NEXT:  1      1     0.25                        nopl  %esi
-# CHECK-NEXT:  1      1     0.25                        nopl  (%r8)
-# CHECK-NEXT:  1      1     0.25                        nopq  %rdx
-# CHECK-NEXT:  1      1     0.25                        nopq  (%r9)
+# CHECK-NEXT:  1      1     0.17                        nop
+# CHECK-NEXT:  1      1     0.17                        nopw  %di
+# CHECK-NEXT:  1      1     0.17                        nopw  (%rcx)
+# CHECK-NEXT:  1      1     0.17                        nopl  %esi
+# CHECK-NEXT:  1      1     0.17                        nopl  (%r8)
+# CHECK-NEXT:  1      1     0.17                        nopq  %rdx
+# CHECK-NEXT:  1      1     0.17                        nopq  (%r9)
 # CHECK-NEXT:  1      1     0.25                        notb  %dil
 # CHECK-NEXT:  3      7     1.00    *      *            notb  (%r8)
 # CHECK-NEXT:  1      1     0.25                        notw  %si
 # CHECK-NEXT:  3      7     1.00    *      *            notw  (%r9)
 # CHECK-NEXT:  1      1     0.25                        notl  %edx
 # CHECK-NEXT:  3      7     1.00    *      *            notl  (%rax)
 # CHECK-NEXT:  1      1     0.25                        notq  %rcx
 # CHECK-NEXT:  3      7     1.00    *      *            notq  (%r10)

 # CHECK-NEXT: [5]   - SKLPort3
 # CHECK-NEXT: [6]   - SKLPort4
 # CHECK-NEXT: [7]   - SKLPort5
 # CHECK-NEXT: [8]   - SKLPort6
 # CHECK-NEXT: [9]   - SKLPort7
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]
-# CHECK-NEXT: 60.00   -     431.25 225.25 202.00 202.00 167.00 185.75 415.75 69.00
+# CHECK-NEXT: 60.00   -     429.50 223.50 202.00 202.00 167.00 184.00 414.00 69.00
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    Instructions:
 # CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     adcb  $7, %al
 # CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     adcb  $7, %dil
 # CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   adcb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -      -      -      -      -     0.50    -     adcb  %sil, %dil
 # CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   adcb  %sil, (%rax)

 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     negb  %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   negb  (%r8)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     negw  %si
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   negw  (%r9)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     negl  %edx
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   negl  (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     negq  %rcx
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   negq  (%r10)
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nop
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopw  %di
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopw  (%rcx)
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopl  %esi
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopl  (%r8)
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopq  %rdx
-# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     nopq  (%r9)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nop
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopw  %di
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopw  (%rcx)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopl  %esi
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopl  (%r8)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopq  %rdx
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     nopq  (%r9)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     notb  %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   notb  (%r8)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     notw  %si
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   notw  (%r9)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     notl  %edx
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   notl  (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     notq  %rcx
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   notq  (%r10)