From d2d4854e58875ad719191488f424f58ad9e7c995 Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Fri, 28 Sep 2018 08:21:39 +0000 Subject: [X86][BtVer2] Fix PHMINPOS schedule resources typo PHMINPOS can run on either JFPU pipe --- llvm/lib/Target/X86/X86ScheduleBtVer2.td | 2 +- llvm/test/CodeGen/X86/sse41-schedule.ll | 4 ++-- llvm/test/tools/llvm-mca/X86/BtVer2/resources-avx1.s | 8 ++++---- llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse41.s | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/llvm/lib/Target/X86/X86ScheduleBtVer2.td b/llvm/lib/Target/X86/X86ScheduleBtVer2.td index 691428b677d..364d64b1b4f 100644 --- a/llvm/lib/Target/X86/X86ScheduleBtVer2.td +++ b/llvm/lib/Target/X86/X86ScheduleBtVer2.td @@ -487,7 +487,7 @@ defm : JWriteResFpuPair; defm : JWriteResFpuPair; defm : X86WriteResPairUnsupported; defm : X86WriteResPairUnsupported; -defm : JWriteResFpuPair; +defm : JWriteResFpuPair; defm : JWriteResFpuPair; defm : JWriteResFpuPair; defm : X86WriteResPairUnsupported; diff --git a/llvm/test/CodeGen/X86/sse41-schedule.ll b/llvm/test/CodeGen/X86/sse41-schedule.ll index f38dd4aafa5..14a5ae73305 100644 --- a/llvm/test/CodeGen/X86/sse41-schedule.ll +++ b/llvm/test/CodeGen/X86/sse41-schedule.ll @@ -2078,13 +2078,13 @@ define <8 x i16> @test_phminposuw(<8 x i16> *%a0) { ; BTVER2-SSE-LABEL: test_phminposuw: ; BTVER2-SSE: # %bb.0: ; BTVER2-SSE-NEXT: phminposuw (%rdi), %xmm0 # sched: [7:1.00] -; BTVER2-SSE-NEXT: phminposuw %xmm0, %xmm0 # sched: [2:1.00] +; BTVER2-SSE-NEXT: phminposuw %xmm0, %xmm0 # sched: [2:0.50] ; BTVER2-SSE-NEXT: retq # sched: [4:1.00] ; ; BTVER2-LABEL: test_phminposuw: ; BTVER2: # %bb.0: ; BTVER2-NEXT: vphminposuw (%rdi), %xmm0 # sched: [7:1.00] -; BTVER2-NEXT: vphminposuw %xmm0, %xmm0 # sched: [2:1.00] +; BTVER2-NEXT: vphminposuw %xmm0, %xmm0 # sched: [2:0.50] ; BTVER2-NEXT: retq # sched: [4:1.00] ; ; ZNVER1-SSE-LABEL: test_phminposuw: diff --git a/llvm/test/tools/llvm-mca/X86/BtVer2/resources-avx1.s b/llvm/test/tools/llvm-mca/X86/BtVer2/resources-avx1.s index a73751f88c9..0cd13649168 100644 --- a/llvm/test/tools/llvm-mca/X86/BtVer2/resources-avx1.s +++ b/llvm/test/tools/llvm-mca/X86/BtVer2/resources-avx1.s @@ -1441,7 +1441,7 @@ vzeroupper # CHECK-NEXT: 1 6 1.00 * vphaddsw (%rax), %xmm1, %xmm2 # CHECK-NEXT: 1 1 0.50 vphaddw %xmm0, %xmm1, %xmm2 # CHECK-NEXT: 1 6 1.00 * vphaddw (%rax), %xmm1, %xmm2 -# CHECK-NEXT: 1 2 1.00 vphminposuw %xmm0, %xmm2 +# CHECK-NEXT: 1 2 0.50 vphminposuw %xmm0, %xmm2 # CHECK-NEXT: 1 7 1.00 * vphminposuw (%rax), %xmm2 # CHECK-NEXT: 1 1 0.50 vphsubd %xmm0, %xmm1, %xmm2 # CHECK-NEXT: 1 6 1.00 * vphsubd (%rax), %xmm1, %xmm2 @@ -1720,7 +1720,7 @@ vzeroupper # CHECK: Resource pressure per iteration: # CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] -# CHECK-NEXT: 48.00 - - 357.00 915.00 404.50 424.50 382.00 - 43.00 132.00 119.50 119.50 38.00 +# CHECK-NEXT: 48.00 - - 357.00 915.00 403.50 425.50 382.00 - 43.00 132.00 119.50 119.50 38.00 # CHECK: Resource pressure by instruction: # CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] Instructions: @@ -2147,8 +2147,8 @@ vzeroupper # CHECK-NEXT: - - - - - 0.50 0.50 1.00 - - - 0.50 0.50 - vphaddsw (%rax), %xmm1, %xmm2 # CHECK-NEXT: - - - - - 0.50 0.50 - - - - 0.50 0.50 - vphaddw %xmm0, %xmm1, %xmm2 # CHECK-NEXT: - - - - - 0.50 0.50 1.00 - - - 0.50 0.50 - vphaddw (%rax), %xmm1, %xmm2 -# CHECK-NEXT: - - - - - 1.00 - - - - - 0.50 0.50 - vphminposuw %xmm0, %xmm2 -# CHECK-NEXT: - - - - - 1.00 - 1.00 - - - 0.50 0.50 - vphminposuw (%rax), %xmm2 +# CHECK-NEXT: - - - - - 0.50 0.50 - - - - 0.50 0.50 - vphminposuw %xmm0, %xmm2 +# CHECK-NEXT: - - - - - 0.50 0.50 1.00 - - - 0.50 0.50 - vphminposuw (%rax), %xmm2 # CHECK-NEXT: - - - - - 0.50 0.50 - - - - 0.50 0.50 - vphsubd %xmm0, %xmm1, %xmm2 # CHECK-NEXT: - - - - - 0.50 0.50 1.00 - - - 0.50 0.50 - vphsubd (%rax), %xmm1, %xmm2 # CHECK-NEXT: - - - - - 0.50 0.50 - - - - 0.50 0.50 - vphsubsw %xmm0, %xmm1, %xmm2 diff --git a/llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse41.s b/llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse41.s index 5ffe77247c9..87634c1be10 100644 --- a/llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse41.s +++ b/llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse41.s @@ -189,7 +189,7 @@ roundss $1, (%rax), %xmm2 # CHECK-NEXT: 1 3 1.00 pextrq $1, %xmm0, %rcx # CHECK-NEXT: 1 3 1.00 * pextrq $1, %xmm0, (%rax) # CHECK-NEXT: 1 3 1.00 * pextrw $1, %xmm0, (%rax) -# CHECK-NEXT: 1 2 1.00 phminposuw %xmm0, %xmm2 +# CHECK-NEXT: 1 2 0.50 phminposuw %xmm0, %xmm2 # CHECK-NEXT: 1 7 1.00 * phminposuw (%rax), %xmm2 # CHECK-NEXT: 2 7 0.50 pinsrb $1, %eax, %xmm1 # CHECK-NEXT: 1 4 1.00 * pinsrb $1, (%rax), %xmm1 @@ -270,7 +270,7 @@ roundss $1, (%rax), %xmm2 # CHECK: Resource pressure per iteration: # CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] -# CHECK-NEXT: 6.00 - - 29.00 23.00 49.50 50.50 44.00 - 5.00 13.00 32.50 32.50 10.00 +# CHECK-NEXT: 6.00 - - 29.00 23.00 48.50 51.50 44.00 - 5.00 13.00 32.50 32.50 10.00 # CHECK: Resource pressure by instruction: # CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] Instructions: @@ -308,8 +308,8 @@ roundss $1, (%rax), %xmm2 # CHECK-NEXT: 1.00 - - 1.00 - 1.00 - - - - - - - - pextrq $1, %xmm0, %rcx # CHECK-NEXT: - - - - - - 1.00 - - 1.00 1.00 - - - pextrq $1, %xmm0, (%rax) # CHECK-NEXT: - - - - - - 1.00 - - 1.00 1.00 - - - pextrw $1, %xmm0, (%rax) -# CHECK-NEXT: - - - - - 1.00 - - - - - 0.50 0.50 - phminposuw %xmm0, %xmm2 -# CHECK-NEXT: - - - - - 1.00 - 1.00 - - - 0.50 0.50 - phminposuw (%rax), %xmm2 +# CHECK-NEXT: - - - - - 0.50 0.50 - - - - 0.50 0.50 - phminposuw %xmm0, %xmm2 +# CHECK-NEXT: - - - - - 0.50 0.50 1.00 - - - 0.50 0.50 - phminposuw (%rax), %xmm2 # CHECK-NEXT: - - - - - 0.50 0.50 - - - - 0.50 0.50 - pinsrb $1, %eax, %xmm1 # CHECK-NEXT: - - - - - 0.50 0.50 1.00 - - - 0.50 0.50 - pinsrb $1, (%rax), %xmm1 # CHECK-NEXT: - - - - - 0.50 0.50 - - - - 0.50 0.50 - pinsrd $1, %eax, %xmm1 -- cgit v1.2.3