From 31019dfdf54752de841c17ad49911008465129ef Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Sun, 26 Jan 2020 22:01:33 +0300 Subject: [PATCH] [NFC][MCA] Re-autogenerate all check lines in all X86 MCA tests Some whitespace issues have crept in, and some znver2 check lines were missing.. --- .../tools/llvm-mca/X86/Generic/resources-clzero.s | 4 +- .../tools/llvm-mca/X86/Znver1/resources-clzero.s | 4 +- llvm/test/tools/llvm-mca/X86/bextr-read-after-ld.s | 12 ++++ llvm/test/tools/llvm-mca/X86/bzhi-read-after-ld.s | 10 +++ llvm/test/tools/llvm-mca/X86/read-after-ld-1.s | 4 +- llvm/test/tools/llvm-mca/X86/read-after-ld-2.s | 83 +++++++++++----------- .../tools/llvm-mca/X86/scheduler-queue-usage.s | 7 +- .../llvm-mca/X86/variable-blend-read-after-ld-2.s | 1 - 8 files changed, 77 insertions(+), 48 deletions(-) diff --git a/llvm/test/tools/llvm-mca/X86/Generic/resources-clzero.s b/llvm/test/tools/llvm-mca/X86/Generic/resources-clzero.s index 69fbb9f..d4582c9 100644 --- a/llvm/test/tools/llvm-mca/X86/Generic/resources-clzero.s +++ b/llvm/test/tools/llvm-mca/X86/Generic/resources-clzero.s @@ -12,7 +12,7 @@ clzero # CHECK-NEXT: [6]: HasSideEffects (U) # CHECK: [1] [2] [3] [4] [5] [6] Instructions: -# CHECK-NEXT: 1 5 0.50 U clzero +# CHECK-NEXT: 1 5 0.50 U clzero # CHECK: Resources: # CHECK-NEXT: [0] - SBDivider @@ -30,4 +30,4 @@ clzero # CHECK: Resource pressure by instruction: # CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6.0] [6.1] Instructions: -# CHECK-NEXT: - - - - - - 0.50 0.50 clzero +# CHECK-NEXT: - - - - - - 0.50 0.50 clzero diff --git a/llvm/test/tools/llvm-mca/X86/Znver1/resources-clzero.s b/llvm/test/tools/llvm-mca/X86/Znver1/resources-clzero.s index fafef25..4209421 100644 --- a/llvm/test/tools/llvm-mca/X86/Znver1/resources-clzero.s +++ b/llvm/test/tools/llvm-mca/X86/Znver1/resources-clzero.s @@ -12,7 +12,7 @@ clzero # CHECK-NEXT: [6]: HasSideEffects (U) # CHECK: [1] [2] [3] [4] [5] [6] Instructions: -# CHECK-NEXT: 1 8 0.50 U clzero +# CHECK-NEXT: 1 8 0.50 U clzero # CHECK: Resources: # CHECK-NEXT: [0] - ZnAGU0 @@ -30,7 +30,7 @@ clzero # CHECK: Resource pressure per iteration: # CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] -# CHECK-NEXT: 0.50 0.50 - - - - - - - - - - +# CHECK-NEXT: 0.50 0.50 - - - - - - - - - - # CHECK: Resource pressure by instruction: # CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] Instructions: diff --git a/llvm/test/tools/llvm-mca/X86/bextr-read-after-ld.s b/llvm/test/tools/llvm-mca/X86/bextr-read-after-ld.s index 5efcc8a..294d473 100644 --- a/llvm/test/tools/llvm-mca/X86/bextr-read-after-ld.s +++ b/llvm/test/tools/llvm-mca/X86/bextr-read-after-ld.s @@ -64,6 +64,11 @@ bextrl %esi, (%rdi), %eax # ZNVER1-NEXT: IPC: 0.25 # ZNVER1-NEXT: Block RThroughput: 0.8 +# ZNVER2: Dispatch Width: 4 +# ZNVER2-NEXT: uOps Per Cycle: 0.38 +# ZNVER2-NEXT: IPC: 0.25 +# ZNVER2-NEXT: Block RThroughput: 0.8 + # ALL: Instruction Info: # ALL-NEXT: [1]: #uOps # ALL-NEXT: [2]: Latency @@ -92,6 +97,9 @@ bextrl %esi, (%rdi), %eax # ZNVER1-NEXT: 1 1 0.25 addl %edi, %esi # ZNVER1-NEXT: 2 5 0.50 * bextrl %esi, (%rdi), %eax +# ZNVER2-NEXT: 1 1 0.25 addl %edi, %esi +# ZNVER2-NEXT: 2 5 0.33 * bextrl %esi, (%rdi), %eax + # ALL: Timeline view: # BDVER2-NEXT: Index 012345678 @@ -100,6 +108,7 @@ bextrl %esi, (%rdi), %eax # HASWELL-NEXT: Index 0123456789 # SKYLAKE-NEXT: Index 0123456789 # ZNVER1-NEXT: Index 01234567 +# ZNVER2-NEXT: Index 01234567 # BDVER2: [0,0] DeER . . addl %edi, %esi # BDVER2-NEXT: [0,1] DeeeeeeER bextrl %esi, (%rdi), %eax @@ -119,6 +128,9 @@ bextrl %esi, (%rdi), %eax # ZNVER1: [0,0] DeER . . addl %edi, %esi # ZNVER1-NEXT: [0,1] DeeeeeER bextrl %esi, (%rdi), %eax +# ZNVER2: [0,0] DeER . . addl %edi, %esi +# ZNVER2-NEXT: [0,1] DeeeeeER bextrl %esi, (%rdi), %eax + # ALL: Average Wait times (based on the timeline view): # ALL-NEXT: [0]: Executions # ALL-NEXT: [1]: Average time spent waiting in a scheduler's queue diff --git a/llvm/test/tools/llvm-mca/X86/bzhi-read-after-ld.s b/llvm/test/tools/llvm-mca/X86/bzhi-read-after-ld.s index fb7b60b..17bf9b2 100644 --- a/llvm/test/tools/llvm-mca/X86/bzhi-read-after-ld.s +++ b/llvm/test/tools/llvm-mca/X86/bzhi-read-after-ld.s @@ -39,6 +39,11 @@ bzhil %esi, (%rdi), %eax # ZNVER1-NEXT: IPC: 0.25 # ZNVER1-NEXT: Block RThroughput: 0.8 +# ZNVER2: Dispatch Width: 4 +# ZNVER2-NEXT: uOps Per Cycle: 0.38 +# ZNVER2-NEXT: IPC: 0.25 +# ZNVER2-NEXT: Block RThroughput: 0.8 + # ALL: Instruction Info: # ALL-NEXT: [1]: #uOps # ALL-NEXT: [2]: Latency @@ -54,6 +59,7 @@ bzhil %esi, (%rdi), %eax # HASWELL-NEXT: 2 6 0.50 * bzhil %esi, (%rdi), %eax # SKYLAKE-NEXT: 2 6 0.50 * bzhil %esi, (%rdi), %eax # ZNVER1-NEXT: 2 5 0.50 * bzhil %esi, (%rdi), %eax +# ZNVER2-NEXT: 2 5 0.33 * bzhil %esi, (%rdi), %eax # ALL: Timeline view: @@ -61,6 +67,7 @@ bzhil %esi, (%rdi), %eax # HASWELL-NEXT: Index 012345678 # SKYLAKE-NEXT: Index 012345678 # ZNVER1-NEXT: Index 01234567 +# ZNVER2-NEXT: Index 01234567 # BDWELL: [0,0] DeER . . addl %edi, %esi # BDWELL-NEXT: [0,1] DeeeeeeER bzhil %esi, (%rdi), %eax @@ -74,6 +81,9 @@ bzhil %esi, (%rdi), %eax # ZNVER1: [0,0] DeER . . addl %edi, %esi # ZNVER1-NEXT: [0,1] DeeeeeER bzhil %esi, (%rdi), %eax +# ZNVER2: [0,0] DeER . . addl %edi, %esi +# ZNVER2-NEXT: [0,1] DeeeeeER bzhil %esi, (%rdi), %eax + # ALL: Average Wait times (based on the timeline view): # ALL-NEXT: [0]: Executions # ALL-NEXT: [1]: Average time spent waiting in a scheduler's queue diff --git a/llvm/test/tools/llvm-mca/X86/read-after-ld-1.s b/llvm/test/tools/llvm-mca/X86/read-after-ld-1.s index 2ed1a1e..56473af 100644 --- a/llvm/test/tools/llvm-mca/X86/read-after-ld-1.s +++ b/llvm/test/tools/llvm-mca/X86/read-after-ld-1.s @@ -114,7 +114,7 @@ vaddps (%rax), %xmm1, %xmm1 # ZNVER1-NEXT: Index 0123456789 # ZNVER2-NEXT: 0123456789 -# ZNVER2-NEXT: Index 0123456789 +# ZNVER2-NEXT: Index 0123456789 0 # BARCELONA: [0,0] DeeeeeeeeeeeeeeER . vdivps %xmm0, %xmm1, %xmm1 # BARCELONA-NEXT: [0,1] D========eeeeeeeeeER vaddps (%rax), %xmm1, %xmm1 @@ -140,7 +140,7 @@ vaddps (%rax), %xmm1, %xmm1 # ZNVER1: [0,0] DeeeeeeeeeeeeeeeER . vdivps %xmm0, %xmm1, %xmm1 # ZNVER1-NEXT: [0,1] D=======eeeeeeeeeeER vaddps (%rax), %xmm1, %xmm1 -# ZNVER2: [0,0] DeeeeeeeeeeeeeeeER . vdivps %xmm0, %xmm1, %xmm1 +# ZNVER2: [0,0] DeeeeeeeeeeeeeeeER . vdivps %xmm0, %xmm1, %xmm1 # ZNVER2-NEXT: [0,1] D========eeeeeeeeeeER vaddps (%rax), %xmm1, %xmm1 # ALL: Average Wait times (based on the timeline view): diff --git a/llvm/test/tools/llvm-mca/X86/read-after-ld-2.s b/llvm/test/tools/llvm-mca/X86/read-after-ld-2.s index 36684e0..c958b27 100644 --- a/llvm/test/tools/llvm-mca/X86/read-after-ld-2.s +++ b/llvm/test/tools/llvm-mca/X86/read-after-ld-2.s @@ -31,6 +31,9 @@ cmp %edi, %edx # ZNVER1-NEXT: Total Cycles: 110 # ZNVER1-NEXT: Total uOps: 400 +# ZNVER2-NEXT: Total Cycles: 110 +# ZNVER2-NEXT: Total uOps: 400 + # BDWELL: Dispatch Width: 4 # BDWELL-NEXT: uOps Per Cycle: 3.52 # BDWELL-NEXT: IPC: 2.82 @@ -237,46 +240,46 @@ cmp %edi, %edx # ZNVER1-NEXT: [9,2] . . DeE-------R addq $32, %r8 # ZNVER1-NEXT: [9,3] . . D=eE------R cmpl %edi, %edx -# ZNVER2: [0,0] DeER . . . . addl $1, %edx -# ZNVER2-NEXT: [0,1] DeeeeeeeeER . . vpaddd (%r8), %ymm0, %ymm0 -# ZNVER2-NEXT: [0,2] DeE-------R . . addq $32, %r8 -# ZNVER2-NEXT: [0,3] D=eE------R . . cmpl %edi, %edx -# ZNVER2-NEXT: [1,0] .DeE------R . . addl $1, %edx -# ZNVER2-NEXT: [1,1] .DeeeeeeeeER . . vpaddd (%r8), %ymm0, %ymm0 -# ZNVER2-NEXT: [1,2] .DeE-------R . . addq $32, %r8 -# ZNVER2-NEXT: [1,3] .D=eE------R . . cmpl %edi, %edx -# ZNVER2-NEXT: [2,0] . DeE------R . . addl $1, %edx -# ZNVER2-NEXT: [2,1] . DeeeeeeeeER . . vpaddd (%r8), %ymm0, %ymm0 -# ZNVER2-NEXT: [2,2] . DeE-------R . . addq $32, %r8 -# ZNVER2-NEXT: [2,3] . D=eE------R . . cmpl %edi, %edx -# ZNVER2-NEXT: [3,0] . DeE------R . . addl $1, %edx -# ZNVER2-NEXT: [3,1] . DeeeeeeeeER . . vpaddd (%r8), %ymm0, %ymm0 -# ZNVER2-NEXT: [3,2] . DeE-------R . . addq $32, %r8 -# ZNVER2-NEXT: [3,3] . D=eE------R . . cmpl %edi, %edx -# ZNVER2-NEXT: [4,0] . DeE------R . . addl $1, %edx -# ZNVER2-NEXT: [4,1] . DeeeeeeeeER. . vpaddd (%r8), %ymm0, %ymm0 -# ZNVER2-NEXT: [4,2] . DeE-------R. . addq $32, %r8 -# ZNVER2-NEXT: [4,3] . D=eE------R. . cmpl %edi, %edx -# ZNVER2-NEXT: [5,0] . DeE------R. . addl $1, %edx -# ZNVER2-NEXT: [5,1] . DeeeeeeeeER . vpaddd (%r8), %ymm0, %ymm0 -# ZNVER2-NEXT: [5,2] . DeE-------R . addq $32, %r8 -# ZNVER2-NEXT: [5,3] . D=eE------R . cmpl %edi, %edx -# ZNVER2-NEXT: [6,0] . .DeE------R . addl $1, %edx -# ZNVER2-NEXT: [6,1] . .DeeeeeeeeER . vpaddd (%r8), %ymm0, %ymm0 -# ZNVER2-NEXT: [6,2] . .DeE-------R . addq $32, %r8 -# ZNVER2-NEXT: [6,3] . .D=eE------R . cmpl %edi, %edx -# ZNVER2-NEXT: [7,0] . . DeE------R . addl $1, %edx -# ZNVER2-NEXT: [7,1] . . DeeeeeeeeER . vpaddd (%r8), %ymm0, %ymm0 -# ZNVER2-NEXT: [7,2] . . DeE-------R . addq $32, %r8 -# ZNVER2-NEXT: [7,3] . . D=eE------R . cmpl %edi, %edx -# ZNVER2-NEXT: [8,0] . . DeE------R . addl $1, %edx -# ZNVER2-NEXT: [8,1] . . DeeeeeeeeER. vpaddd (%r8), %ymm0, %ymm0 -# ZNVER2-NEXT: [8,2] . . DeE-------R. addq $32, %r8 -# ZNVER2-NEXT: [8,3] . . D=eE------R. cmpl %edi, %edx -# ZNVER2-NEXT: [9,0] . . DeE------R. addl $1, %edx -# ZNVER2-NEXT: [9,1] . . DeeeeeeeeER vpaddd (%r8), %ymm0, %ymm0 -# ZNVER2-NEXT: [9,2] . . DeE-------R addq $32, %r8 -# ZNVER2-NEXT: [9,3] . . D=eE------R cmpl %edi, %edx +# ZNVER2: [0,0] DeER . . . . addl $1, %edx +# ZNVER2-NEXT: [0,1] DeeeeeeeeER . . vpaddd (%r8), %ymm0, %ymm0 +# ZNVER2-NEXT: [0,2] DeE-------R . . addq $32, %r8 +# ZNVER2-NEXT: [0,3] D=eE------R . . cmpl %edi, %edx +# ZNVER2-NEXT: [1,0] .DeE------R . . addl $1, %edx +# ZNVER2-NEXT: [1,1] .DeeeeeeeeER . . vpaddd (%r8), %ymm0, %ymm0 +# ZNVER2-NEXT: [1,2] .DeE-------R . . addq $32, %r8 +# ZNVER2-NEXT: [1,3] .D=eE------R . . cmpl %edi, %edx +# ZNVER2-NEXT: [2,0] . DeE------R . . addl $1, %edx +# ZNVER2-NEXT: [2,1] . DeeeeeeeeER . . vpaddd (%r8), %ymm0, %ymm0 +# ZNVER2-NEXT: [2,2] . DeE-------R . . addq $32, %r8 +# ZNVER2-NEXT: [2,3] . D=eE------R . . cmpl %edi, %edx +# ZNVER2-NEXT: [3,0] . DeE------R . . addl $1, %edx +# ZNVER2-NEXT: [3,1] . DeeeeeeeeER . . vpaddd (%r8), %ymm0, %ymm0 +# ZNVER2-NEXT: [3,2] . DeE-------R . . addq $32, %r8 +# ZNVER2-NEXT: [3,3] . D=eE------R . . cmpl %edi, %edx +# ZNVER2-NEXT: [4,0] . DeE------R . . addl $1, %edx +# ZNVER2-NEXT: [4,1] . DeeeeeeeeER. . vpaddd (%r8), %ymm0, %ymm0 +# ZNVER2-NEXT: [4,2] . DeE-------R. . addq $32, %r8 +# ZNVER2-NEXT: [4,3] . D=eE------R. . cmpl %edi, %edx +# ZNVER2-NEXT: [5,0] . DeE------R. . addl $1, %edx +# ZNVER2-NEXT: [5,1] . DeeeeeeeeER . vpaddd (%r8), %ymm0, %ymm0 +# ZNVER2-NEXT: [5,2] . DeE-------R . addq $32, %r8 +# ZNVER2-NEXT: [5,3] . D=eE------R . cmpl %edi, %edx +# ZNVER2-NEXT: [6,0] . .DeE------R . addl $1, %edx +# ZNVER2-NEXT: [6,1] . .DeeeeeeeeER . vpaddd (%r8), %ymm0, %ymm0 +# ZNVER2-NEXT: [6,2] . .DeE-------R . addq $32, %r8 +# ZNVER2-NEXT: [6,3] . .D=eE------R . cmpl %edi, %edx +# ZNVER2-NEXT: [7,0] . . DeE------R . addl $1, %edx +# ZNVER2-NEXT: [7,1] . . DeeeeeeeeER . vpaddd (%r8), %ymm0, %ymm0 +# ZNVER2-NEXT: [7,2] . . DeE-------R . addq $32, %r8 +# ZNVER2-NEXT: [7,3] . . D=eE------R . cmpl %edi, %edx +# ZNVER2-NEXT: [8,0] . . DeE------R . addl $1, %edx +# ZNVER2-NEXT: [8,1] . . DeeeeeeeeER. vpaddd (%r8), %ymm0, %ymm0 +# ZNVER2-NEXT: [8,2] . . DeE-------R. addq $32, %r8 +# ZNVER2-NEXT: [8,3] . . D=eE------R. cmpl %edi, %edx +# ZNVER2-NEXT: [9,0] . . DeE------R. addl $1, %edx +# ZNVER2-NEXT: [9,1] . . DeeeeeeeeER vpaddd (%r8), %ymm0, %ymm0 +# ZNVER2-NEXT: [9,2] . . DeE-------R addq $32, %r8 +# ZNVER2-NEXT: [9,3] . . D=eE------R cmpl %edi, %edx # ALL: Average Wait times (based on the timeline view): # ALL-NEXT: [0]: Executions diff --git a/llvm/test/tools/llvm-mca/X86/scheduler-queue-usage.s b/llvm/test/tools/llvm-mca/X86/scheduler-queue-usage.s index fb35e60..509e5f6 100644 --- a/llvm/test/tools/llvm-mca/X86/scheduler-queue-usage.s +++ b/llvm/test/tools/llvm-mca/X86/scheduler-queue-usage.s @@ -89,7 +89,7 @@ xor %eax, %ebx # ZNVER1-NEXT: [3] Maximum number of used buffer entries. # ZNVER1-NEXT: [4] Total number of buffer entries. -# ZNVER2: Scheduler's queue usage: +# ZNVER2: Scheduler's queue usage: # ZNVER2-NEXT: [1] Resource name. # ZNVER2-NEXT: [2] Average number of used buffer entries. # ZNVER2-NEXT: [3] Maximum number of used buffer entries. @@ -134,3 +134,8 @@ xor %eax, %ebx # ZNVER1-NEXT: ZnAGU 0 0 28 # ZNVER1-NEXT: ZnALU 0 1 56 # ZNVER1-NEXT: ZnFPU 0 0 36 + +# ZNVER2: [1] [2] [3] [4] +# ZNVER2-NEXT: Zn2AGU 0 0 28 +# ZNVER2-NEXT: Zn2ALU 0 1 64 +# ZNVER2-NEXT: Zn2FPU 0 0 36 diff --git a/llvm/test/tools/llvm-mca/X86/variable-blend-read-after-ld-2.s b/llvm/test/tools/llvm-mca/X86/variable-blend-read-after-ld-2.s index 771cb83..4403c17 100644 --- a/llvm/test/tools/llvm-mca/X86/variable-blend-read-after-ld-2.s +++ b/llvm/test/tools/llvm-mca/X86/variable-blend-read-after-ld-2.s @@ -191,4 +191,3 @@ vblendvps %xmm1, (%rdi), %xmm2, %xmm3 # ZNVER2-NEXT: 1. 1 1.0 0.0 0.0 vblendvps %xmm1, (%rdi), %xmm2, %xmm3 # ZNVER2-NEXT: 1 1.0 0.5 0.0 - -- 2.7.4