[X86][Sched] Update scheduling information for VZEROALL on HWS, BDW, SKX, SNB.

[courbet]

Summary

While looking at PR35606, I found out that the scheduling info is incorrect in HSW/BDW/SKX.

One can check that it's really a P5+P6 and not a 2*P56 with:
echo -e 'vzeroall\nvandps %xmm1, %xmm2, %xmm3' | ./bin/llvm-exegesis -mode=uops -snippets-file=-
(vandps executes on P5 only)

[courbet]

• [X86][Sched] Add scheduling information for VZEROALL on SNB.
• [X86][Sched] Fix scheduling info for VZEROALL on SKX.
• [X86][Sched] Fix scheduling information for VZEROALL on BDW.

[RKSimon]

I think you'll need to regenerate the tests in both schedule-avx.ll and the llvm-mca resources-avx1.s files

[courbet]

update tests

[RKSimon]

LGTM - please submit the additions of the uops counters as a separate pre-commit

[courbet]

This was submitted as rL343447.

lib/Target/X86/X86PfmCounters.td

 def SBCycleCounter : PfmCycleCounter<"unhalted_core_cycles">;
 def SBPort0Counter : PfmIssueCounter<SBPort0, ["uops_dispatched_port:port_0"]>;
 def SBPort1Counter : PfmIssueCounter<SBPort1, ["uops_dispatched_port:port_1"]>;
 def SBPort23Counter : PfmIssueCounter<SBPort23,
                                       ["uops_dispatched_port:port_2",
                                        "uops_dispatched_port:port_3"]>;
 def SBPort4Counter : PfmIssueCounter<SBPort4, ["uops_dispatched_port:port_4"]>;
 def SBPort5Counter : PfmIssueCounter<SBPort5, ["uops_dispatched_port:port_5"]>;
+def SBUopsCounter  : PfmUopsCounter<"uops_issued:any">;
 }
 
 let SchedModel = HaswellModel in {
 def HWCycleCounter : PfmCycleCounter<"unhalted_core_cycles">;
 def HWPort0Counter : PfmIssueCounter<HWPort0, ["uops_dispatched_port:port_0"]>;
 def HWPort1Counter : PfmIssueCounter<HWPort1, ["uops_dispatched_port:port_1"]>;
 def HWPort2Counter : PfmIssueCounter<HWPort2, ["uops_dispatched_port:port_2"]>;
 def HWPort3Counter : PfmIssueCounter<HWPort3, ["uops_dispatched_port:port_3"]>;

 def BWPort0Counter : PfmIssueCounter<BWPort0, ["uops_executed_port:port_0"]>;
 def BWPort1Counter : PfmIssueCounter<BWPort1, ["uops_executed_port:port_1"]>;
 def BWPort2Counter : PfmIssueCounter<BWPort2, ["uops_executed_port:port_2"]>;
 def BWPort3Counter : PfmIssueCounter<BWPort3, ["uops_executed_port:port_3"]>;
 def BWPort4Counter : PfmIssueCounter<BWPort4, ["uops_executed_port:port_4"]>;
 def BWPort5Counter : PfmIssueCounter<BWPort5, ["uops_executed_port:port_5"]>;
 def BWPort6Counter : PfmIssueCounter<BWPort6, ["uops_executed_port:port_6"]>;
 def BWPort7Counter : PfmIssueCounter<BWPort7, ["uops_executed_port:port_7"]>;
+def BWUopsCounter  : PfmUopsCounter<"uops_issued:any">;
 }
 
 let SchedModel = SkylakeClientModel in {
 def SKLCycleCounter : PfmCycleCounter<"unhalted_core_cycles">;
 def SKLPort0Counter : PfmIssueCounter<SKLPort0, ["uops_dispatched_port:port_0"]>;
 def SKLPort1Counter : PfmIssueCounter<SKLPort1, ["uops_dispatched_port:port_1"]>;
 def SKLPort2Counter : PfmIssueCounter<SKLPort2, ["uops_dispatched_port:port_2"]>;
 def SKLPort3Counter : PfmIssueCounter<SKLPort3, ["uops_dispatched_port:port_3"]>;
 def SKLPort4Counter : PfmIssueCounter<SKLPort4, ["uops_dispatched_port:port_4"]>;
 def SKLPort5Counter : PfmIssueCounter<SKLPort5, ["uops_dispatched_port:port_5"]>;
 def SKLPort6Counter : PfmIssueCounter<SKLPort6, ["uops_dispatched_port:port_6"]>;
 def SKLPort7Counter : PfmIssueCounter<SKLPort7, ["uops_dispatched_port:port_7"]>;
 }
 
 let SchedModel = SkylakeServerModel in {
 def SKXCycleCounter : PfmCycleCounter<"unhalted_core_cycles">;
 def SKXPort0Counter : PfmIssueCounter<SKXPort0, ["uops_dispatched_port:port_0"]>;
 def SKXPort1Counter : PfmIssueCounter<SKXPort1, ["uops_dispatched_port:port_1"]>;
 def SKXPort2Counter : PfmIssueCounter<SKXPort2, ["uops_dispatched_port:port_2"]>;
 def SKXPort3Counter : PfmIssueCounter<SKXPort3, ["uops_dispatched_port:port_3"]>;
 def SKXPort4Counter : PfmIssueCounter<SKXPort4, ["uops_dispatched_port:port_4"]>;
 def SKXPort5Counter : PfmIssueCounter<SKXPort5, ["uops_dispatched_port:port_5"]>;
 def SKXPort6Counter : PfmIssueCounter<SKXPort6, ["uops_dispatched_port:port_6"]>;
 def SKXPort7Counter : PfmIssueCounter<SKXPort7, ["uops_dispatched_port:port_7"]>;
+def SKXUopsCounter  : PfmUopsCounter<"uops_issued:any">;
 }
 
 let SchedModel = BtVer2Model in {
 def JCycleCounter : PfmCycleCounter<"cpu_clk_unhalted">;
 def JUopsCounter  : PfmUopsCounter<"retired_uops">;
 def JFPU0Counter  : PfmIssueCounter<JFPU0, ["dispatched_fpu:pipe0"]>;
 def JFPU1Counter  : PfmIssueCounter<JFPU1, ["dispatched_fpu:pipe1"]>;
 }

lib/Target/X86/X86SchedBroadwell.td

 
 def BWWriteResGroup153 : SchedWriteRes<[BWPort4,BWPort23,BWPort237,BWPort06,BWPort15,BWPort0156]> {
   let Latency = 16;
   let NumMicroOps = 14;
   let ResourceCycles = [1,1,1,4,2,5];
 }
 def: InstRW<[BWWriteResGroup153], (instrs CMPXCHG8B)>;
 
-def BWWriteResGroup154 : SchedWriteRes<[BWPort5]> {
-  let Latency = 16;
-  let NumMicroOps = 16;
-  let ResourceCycles = [16];
+def BWWriteResGroup154 : SchedWriteRes<[BWPort5,BWPort6]> {
+  let Latency = 8;
+  let NumMicroOps = 20;
+  let ResourceCycles = [1,1];
 }
 def: InstRW<[BWWriteResGroup154], (instrs VZEROALL)>;
 
 def BWWriteResGroup159 : SchedWriteRes<[BWPort5,BWPort6,BWPort06,BWPort0156]> {
   let Latency = 18;
   let NumMicroOps = 8;
   let ResourceCycles = [1,1,1,5];
 }

lib/Target/X86/X86SchedHaswell.td

 
 def HWWriteResGroup144 : SchedWriteRes<[HWPort4,HWPort5,HWPort6,HWPort23,HWPort237,HWPort06,HWPort0156]> {
   let Latency = 21;
   let NumMicroOps = 8;
   let ResourceCycles = [1,1,1,1,1,1,2];
 }
 def: InstRW<[HWWriteResGroup144], (instrs INSB, INSL, INSW)>;
 
-def HWWriteResGroup145 : SchedWriteRes<[HWPort5]> {
-  let Latency = 16;
-  let NumMicroOps = 16;
-  let ResourceCycles = [16];
+def HWWriteResGroup145 : SchedWriteRes<[HWPort5, HWPort6]> {
+  let Latency = 8;
+  let NumMicroOps = 20;
+  let ResourceCycles = [1,1];
 }
 def: InstRW<[HWWriteResGroup145], (instrs VZEROALL)>;
 
 def HWWriteResGroup146 : SchedWriteRes<[HWPort0,HWPort4,HWPort5,HWPort23,HWPort237,HWPort06,HWPort0156]> {
   let Latency = 22;
   let NumMicroOps = 19;
   let ResourceCycles = [2,1,4,1,1,4,6];
 }

lib/Target/X86/X86SchedSandyBridge.td

 
 def SBWriteResGroup131 : SchedWriteRes<[SBPort0,SBPort1,SBPort23]> {
   let Latency = 34;
   let NumMicroOps = 3;
   let ResourceCycles = [1,1,1];
 }
 def: InstRW<[SBWriteResGroup131], (instregex "DIV(R?)_FI(16|32)m")>;
 
+def SBWriteResGroupVzeroall : SchedWriteRes<[SBPort5]> {
+  let Latency = 9;
+  let NumMicroOps = 20;
+  let ResourceCycles = [2];
+}
+def: InstRW<[SBWriteResGroupVzeroall], (instrs VZEROALL)>;
+
 def: InstRW<[WriteZero], (instrs CLC)>;
 
 // Intruction variants handled by the renamer. These might not need execution
 // ports in certain conditions.
 // See Agner's Fog "The microarchitecture of Intel, AMD and VIA CPUs",
 // section "Sandy Bridge and Ivy Bridge Pipeline" > "Register allocation and
 // renaming".
 // These can be investigated with llvm-exegesis, e.g.

lib/Target/X86/X86SchedSkylakeServer.td

 
 def SKXWriteResGroup199 : SchedWriteRes<[SKXPort4,SKXPort23,SKXPort237,SKXPort06,SKXPort15,SKXPort0156]> {
   let Latency = 16;
   let NumMicroOps = 14;
   let ResourceCycles = [1,1,1,4,2,5];
 }
 def: InstRW<[SKXWriteResGroup199], (instrs CMPXCHG8B)>;
 
-def SKXWriteResGroup200 : SchedWriteRes<[SKXPort0156]> {
-  let Latency = 16;
-  let NumMicroOps = 16;
-  let ResourceCycles = [16];
+def SKXWriteResGroup200 : SchedWriteRes<[SKXPort1, SKXPort05, SKXPort6]> {
+  let Latency = 12;
+  let NumMicroOps = 34;
+  let ResourceCycles = [1, 4, 5];
 }
 def: InstRW<[SKXWriteResGroup200], (instrs VZEROALL)>;
 
 def SKXWriteResGroup201 : SchedWriteRes<[SKXPort0,SKXPort23,SKXFPDivider]> {
   let Latency = 17;
   let NumMicroOps = 2;
   let ResourceCycles = [1,1,5];
 }

test/CodeGen/X86/avx-schedule.ll

; ZNVER1-NEXT:    retq # sched: [1:0.50]
   %7 = bitcast <4 x i64> %6 to <8 x float>
   %8 = fadd <8 x float> %a1, %7
   ret <8 x float> %8
 }
 
 define void @test_zeroall() {
 ; GENERIC-LABEL: test_zeroall:
 ; GENERIC:       # %bb.0:
-; GENERIC-NEXT:    vzeroall # sched: [100:0.33]
+; GENERIC-NEXT:    vzeroall # sched: [9:2.00]
 ; GENERIC-NEXT:    retq # sched: [1:1.00]
 ;
 ; SANDY-LABEL: test_zeroall:
 ; SANDY:       # %bb.0:
-; SANDY-NEXT:    vzeroall # sched: [100:0.33]
+; SANDY-NEXT:    vzeroall # sched: [9:2.00]
 ; SANDY-NEXT:    retq # sched: [1:1.00]
 ;
 ; HASWELL-LABEL: test_zeroall:
 ; HASWELL:       # %bb.0:
-; HASWELL-NEXT:    vzeroall # sched: [16:16.00]
+; HASWELL-NEXT:    vzeroall # sched: [8:1.00]
 ; HASWELL-NEXT:    retq # sched: [7:1.00]
 ;
 ; BROADWELL-LABEL: test_zeroall:
 ; BROADWELL:       # %bb.0:
-; BROADWELL-NEXT:    vzeroall # sched: [16:16.00]
+; BROADWELL-NEXT:    vzeroall # sched: [8:1.00]
 ; BROADWELL-NEXT:    retq # sched: [7:1.00]
 ;
 ; SKYLAKE-LABEL: test_zeroall:
 ; SKYLAKE:       # %bb.0:
 ; SKYLAKE-NEXT:    vzeroall # sched: [16:4.00]
 ; SKYLAKE-NEXT:    retq # sched: [7:1.00]
 ;
 ; SKX-LABEL: test_zeroall:
 ; SKX:       # %bb.0:
-; SKX-NEXT:    vzeroall # sched: [16:4.00]
+; SKX-NEXT:    vzeroall # sched: [12:5.00]
 ; SKX-NEXT:    retq # sched: [7:1.00]
 ;
 ; BTVER2-LABEL: test_zeroall:
 ; BTVER2:       # %bb.0:
 ; BTVER2-NEXT:    vzeroall # sched: [90:36.50]
 ; BTVER2-NEXT:    retq # sched: [4:1.00]
 ;
 ; ZNVER1-LABEL: test_zeroall:

test/tools/llvm-mca/X86/Broadwell/resources-avx1.s

 # CHECK-NEXT:  1      1     1.00                        vxorpd  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  2      6     1.00    *                   vxorpd  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  1      1     1.00                        vxorpd  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  2      7     1.00    *                   vxorpd  (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  1      1     1.00                        vxorps  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  2      6     1.00    *                   vxorps  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  1      1     1.00                        vxorps  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  2      7     1.00    *                   vxorps  (%rax), %ymm1, %ymm2
-# CHECK-NEXT:  16     16    16.00   *      *      U     vzeroall
+# CHECK-NEXT:  20     8     1.00    *      *      U     vzeroall
 # CHECK-NEXT:  4      4     1.00    *      *      U     vzeroupper
 
 # CHECK:      Resources:
 # CHECK-NEXT: [0]   - BWDivider
 # CHECK-NEXT: [1]   - BWFPDivider
 # CHECK-NEXT: [2]   - BWPort0
 # CHECK-NEXT: [3]   - BWPort1
 # CHECK-NEXT: [4]   - BWPort2
 # 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:  -     257.00 216.33 236.33 176.17 176.17 38.00  442.33 2.00   12.67
+# CHECK-NEXT:  -     257.00 216.33 236.33 176.17 176.17 38.00  427.33 3.00   12.67
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    Instructions:
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -      -      -     vaddpd  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -     1.00   0.50   0.50    -      -      -      -     vaddpd  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -      -      -     vaddpd  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -     1.00   0.50   0.50    -      -      -      -     vaddpd  (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -      -      -     vaddps  %xmm0, %xmm1, %xmm2

 # CHECK-NEXT:  -      -      -      -      -      -      -     1.00    -      -     vxorpd  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -      -     0.50   0.50    -     1.00    -      -     vxorpd  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -      -      -      -      -     1.00    -      -     vxorpd  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -      -     0.50   0.50    -     1.00    -      -     vxorpd  (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -      -      -      -      -     1.00    -      -     vxorps  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -      -     0.50   0.50    -     1.00    -      -     vxorps  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -      -      -      -      -     1.00    -      -     vxorps  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -      -     0.50   0.50    -     1.00    -      -     vxorps  (%rax), %ymm1, %ymm2
-# CHECK-NEXT:  -      -      -      -      -      -      -     16.00   -      -     vzeroall
+# CHECK-NEXT:  -      -      -      -      -      -      -     1.00   1.00    -     vzeroall
 # CHECK-NEXT:  -      -     1.08   1.08    -      -      -     1.08   0.75    -     vzeroupper

test/tools/llvm-mca/X86/Generic/resources-avx1.s

 # CHECK-NEXT:  1      1     1.00                        vxorpd  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  2      7     1.00    *                   vxorpd  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  1      1     1.00                        vxorpd  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  2      8     1.00    *                   vxorpd  (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  1      1     1.00                        vxorps  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  2      7     1.00    *                   vxorps  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  1      1     1.00                        vxorps  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  2      8     1.00    *                   vxorps  (%rax), %ymm1, %ymm2
-# CHECK-NEXT:  1      100   0.33    *      *      U     vzeroall
+# CHECK-NEXT:  20     9     2.00    *      *      U     vzeroall
 # CHECK-NEXT:  1      100   0.33    *      *      U     vzeroupper
 
 # CHECK:      Resources:
 # CHECK-NEXT: [0]   - SBDivider
 # CHECK-NEXT: [1]   - SBFPDivider
 # CHECK-NEXT: [2]   - SBPort0
 # CHECK-NEXT: [3]   - SBPort1
 # CHECK-NEXT: [4]   - SBPort4
 # CHECK-NEXT: [5]   - SBPort5
 # CHECK-NEXT: [6.0] - SBPort23
 # CHECK-NEXT: [6.1] - SBPort23
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]
-# CHECK-NEXT:  -     572.00 247.17 317.67 39.00  364.17 179.50 179.50
+# CHECK-NEXT:  -     572.00 246.83 317.33 39.00  365.83 179.50 179.50
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]  Instructions:
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -     vaddpd  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -     1.00    -      -     0.50   0.50   vaddpd  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -     vaddpd  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -     1.00    -      -     0.50   0.50   vaddpd  (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -     vaddps  %xmm0, %xmm1, %xmm2

 # CHECK-NEXT:  -      -      -      -      -     1.00    -      -     vxorpd  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -      -      -     1.00   0.50   0.50   vxorpd  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -      -      -     1.00    -      -     vxorpd  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -      -      -     1.00   0.50   0.50   vxorpd  (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -      -      -     1.00    -      -     vxorps  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -      -      -     1.00   0.50   0.50   vxorps  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -      -      -     1.00    -      -     vxorps  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -      -      -     1.00   0.50   0.50   vxorps  (%rax), %ymm1, %ymm2
-# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     vzeroall
+# CHECK-NEXT:  -      -      -      -      -     2.00    -      -     vzeroall
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     vzeroupper

test/tools/llvm-mca/X86/Haswell/resources-avx1.s

 # CHECK-NEXT:  1      1     1.00                        vxorpd  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  2      7     1.00    *                   vxorpd  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  1      1     1.00                        vxorpd  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  2      8     1.00    *                   vxorpd  (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  1      1     1.00                        vxorps  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  2      7     1.00    *                   vxorps  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  1      1     1.00                        vxorps  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  2      8     1.00    *                   vxorps  (%rax), %ymm1, %ymm2
-# CHECK-NEXT:  16     16    16.00   *      *      U     vzeroall
+# CHECK-NEXT:  20     8     1.00    *      *      U     vzeroall
 # CHECK-NEXT:  4      4     1.00    *      *      U     vzeroupper
 
 # CHECK:      Resources:
 # CHECK-NEXT: [0]   - HWDivider
 # CHECK-NEXT: [1]   - HWFPDivider
 # CHECK-NEXT: [2]   - HWPort0
 # CHECK-NEXT: [3]   - HWPort1
 # CHECK-NEXT: [4]   - HWPort2
 # 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:  -     336.00 215.67 237.67 176.17 176.17 38.00  445.67 2.00   12.67
+# CHECK-NEXT:  -     336.00 215.67 237.67 176.17 176.17 38.00  430.67 3.00   12.67
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    Instructions:
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -      -      -     vaddpd  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -     1.00   0.50   0.50    -      -      -      -     vaddpd  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -      -      -     vaddpd  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -     1.00   0.50   0.50    -      -      -      -     vaddpd  (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -      -      -     vaddps  %xmm0, %xmm1, %xmm2

 # CHECK-NEXT:  -      -      -      -      -      -      -     1.00    -      -     vxorpd  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -      -     0.50   0.50    -     1.00    -      -     vxorpd  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -      -      -      -      -     1.00    -      -     vxorpd  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -      -     0.50   0.50    -     1.00    -      -     vxorpd  (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -      -      -      -      -     1.00    -      -     vxorps  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -      -     0.50   0.50    -     1.00    -      -     vxorps  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -      -      -      -      -     1.00    -      -     vxorps  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -      -     0.50   0.50    -     1.00    -      -     vxorps  (%rax), %ymm1, %ymm2
-# CHECK-NEXT:  -      -      -      -      -      -      -     16.00   -      -     vzeroall
+# CHECK-NEXT:  -      -      -      -      -      -      -     1.00   1.00    -     vzeroall
 # CHECK-NEXT:  -      -     1.08   1.08    -      -      -     1.08   0.75    -     vzeroupper

test/tools/llvm-mca/X86/SandyBridge/resources-avx1.s

 # CHECK-NEXT:  1      1     1.00                        vxorpd  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  2      7     1.00    *                   vxorpd  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  1      1     1.00                        vxorpd  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  2      8     1.00    *                   vxorpd  (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  1      1     1.00                        vxorps  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  2      7     1.00    *                   vxorps  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  1      1     1.00                        vxorps  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  2      8     1.00    *                   vxorps  (%rax), %ymm1, %ymm2
-# CHECK-NEXT:  1      100   0.33    *      *      U     vzeroall
+# CHECK-NEXT:  20     9     2.00    *      *      U     vzeroall
 # CHECK-NEXT:  1      100   0.33    *      *      U     vzeroupper
 
 # CHECK:      Resources:
 # CHECK-NEXT: [0]   - SBDivider
 # CHECK-NEXT: [1]   - SBFPDivider
 # CHECK-NEXT: [2]   - SBPort0
 # CHECK-NEXT: [3]   - SBPort1
 # CHECK-NEXT: [4]   - SBPort4
 # CHECK-NEXT: [5]   - SBPort5
 # CHECK-NEXT: [6.0] - SBPort23
 # CHECK-NEXT: [6.1] - SBPort23
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]
-# CHECK-NEXT:  -     572.00 247.17 317.67 39.00  364.17 179.50 179.50
+# CHECK-NEXT:  -     572.00 246.83 317.33 39.00  365.83 179.50 179.50
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]  Instructions:
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -     vaddpd  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -     1.00    -      -     0.50   0.50   vaddpd  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -     vaddpd  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -     1.00    -      -     0.50   0.50   vaddpd  (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -     vaddps  %xmm0, %xmm1, %xmm2

 # CHECK-NEXT:  -      -      -      -      -     1.00    -      -     vxorpd  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -      -      -     1.00   0.50   0.50   vxorpd  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -      -      -     1.00    -      -     vxorpd  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -      -      -     1.00   0.50   0.50   vxorpd  (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -      -      -     1.00    -      -     vxorps  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -      -      -     1.00   0.50   0.50   vxorps  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -      -      -     1.00    -      -     vxorps  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  -      -      -      -      -     1.00   0.50   0.50   vxorps  (%rax), %ymm1, %ymm2
-# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     vzeroall
+# CHECK-NEXT:  -      -      -      -      -     2.00    -      -     vzeroall
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     vzeroupper

test/tools/llvm-mca/X86/SkylakeServer/resources-avx1.s

 # CHECK-NEXT:  1      1     0.33                        vxorpd  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  2      7     0.50    *                   vxorpd  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  1      1     0.33                        vxorpd  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  2      8     0.50    *                   vxorpd  (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  1      1     0.33                        vxorps  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  2      7     0.50    *                   vxorps  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  1      1     0.33                        vxorps  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  2      8     0.50    *                   vxorps  (%rax), %ymm1, %ymm2
-# CHECK-NEXT:  16     16    4.00    *      *      U     vzeroall
+# CHECK-NEXT:  34     12    5.00    *      *      U     vzeroall
 # CHECK-NEXT:  4      4     1.00    *      *      U     vzeroupper
 
 # CHECK:      Resources:
 # CHECK-NEXT: [0]   - SKXDivider
 # CHECK-NEXT: [1]   - SKXFPDivider
 # CHECK-NEXT: [2]   - SKXPort0
 # CHECK-NEXT: [3]   - SKXPort1
 # CHECK-NEXT: [4]   - SKXPort2
 # CHECK-NEXT: [5]   - SKXPort3
 # CHECK-NEXT: [6]   - SKXPort4
 # CHECK-NEXT: [7]   - SKXPort5
 # CHECK-NEXT: [8]   - SKXPort6
 # CHECK-NEXT: [9]   - SKXPort7
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]
-# CHECK-NEXT:  -     123.00 320.50 200.50 173.17 173.17 34.00  341.00 6.00   12.67
+# CHECK-NEXT:  -     123.00 318.50 197.50 173.17 173.17 34.00  339.00 7.00   12.67
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    Instructions:
 # CHECK-NEXT:  -      -     0.50   0.50    -      -      -      -      -      -     vaddpd  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  -      -     0.50   0.50   0.50   0.50    -      -      -      -     vaddpd  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -     0.50   0.50    -      -      -      -      -      -     vaddpd  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  -      -     0.50   0.50   0.50   0.50    -      -      -      -     vaddpd  (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  -      -     0.50   0.50    -      -      -      -      -      -     vaddps  %xmm0, %xmm1, %xmm2

 # CHECK-NEXT:  -      -     0.33   0.33    -      -      -     0.33    -      -     vxorpd  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  -      -     0.33   0.33   0.50   0.50    -     0.33    -      -     vxorpd  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -     0.33   0.33    -      -      -     0.33    -      -     vxorpd  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  -      -     0.33   0.33   0.50   0.50    -     0.33    -      -     vxorpd  (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  -      -     0.33   0.33    -      -      -     0.33    -      -     vxorps  %xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  -      -     0.33   0.33   0.50   0.50    -     0.33    -      -     vxorps  (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -     0.33   0.33    -      -      -     0.33    -      -     vxorps  %ymm0, %ymm1, %ymm2
 # CHECK-NEXT:  -      -     0.33   0.33   0.50   0.50    -     0.33    -      -     vxorps  (%rax), %ymm1, %ymm2
-# CHECK-NEXT:  -      -     4.00   4.00    -      -      -     4.00   4.00    -     vzeroall
+# CHECK-NEXT:  -      -     2.00   1.00    -      -      -     2.00   5.00    -     vzeroall
 # CHECK-NEXT:  -      -     1.08   1.08    -      -      -     1.08   0.75    -     vzeroupper