diff options
author | Simon Pilgrim <llvm-dev@redking.me.uk> | 2018-09-30 16:38:38 +0000 |
---|---|---|
committer | Simon Pilgrim <llvm-dev@redking.me.uk> | 2018-09-30 16:38:38 +0000 |
commit | 4f5693ac8de445d849364f999dff58facaa09019 (patch) | |
tree | f7954803ac392c0587397baf6bd94c7b10ce82bc | |
parent | 518cb2d5608b8bedb68c7e626d380a1531d17145 (diff) | |
download | bcm5719-llvm-4f5693ac8de445d849364f999dff58facaa09019.tar.gz bcm5719-llvm-4f5693ac8de445d849364f999dff58facaa09019.zip |
[X86][Btver2] Fix PCmpIStrI/PCmpIStrM schedules
Missing JFPU0 pipe and double JFPU1 pipe (to match JVALU1) resources
Match AMD Fam16h SOG + llvm-exegesis tests
llvm-svn: 343413
-rw-r--r-- | llvm/lib/Target/X86/X86ScheduleBtVer2.td | 4 | ||||
-rw-r--r-- | llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse42.s | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/llvm/lib/Target/X86/X86ScheduleBtVer2.td b/llvm/lib/Target/X86/X86ScheduleBtVer2.td index 438f13eddd8..2729e7f8e4e 100644 --- a/llvm/lib/Target/X86/X86ScheduleBtVer2.td +++ b/llvm/lib/Target/X86/X86ScheduleBtVer2.td @@ -528,8 +528,8 @@ defm : X86WriteRes<WriteVecExtractSt, [JFPU1, JSTC, JSAGU], 3, [1,1,1], 1>; // SSE42 String instructions. //////////////////////////////////////////////////////////////////////////////// -defm : JWriteResFpuPair<WritePCmpIStrI, [JFPU1, JVALU1, JFPA, JALU0], 7, [1, 2, 1, 1], 3>; -defm : JWriteResFpuPair<WritePCmpIStrM, [JFPU1, JVALU1, JFPA, JALU0], 8, [1, 2, 1, 1], 3>; +defm : JWriteResFpuPair<WritePCmpIStrI, [JFPU1, JVALU1, JFPU0, JFPA, JALU0], 7, [2, 2, 1, 1, 1], 3>; +defm : JWriteResFpuPair<WritePCmpIStrM, [JFPU1, JVALU1, JFPU0, JFPA, JALU0], 8, [2, 2, 1, 1, 1], 3>; defm : JWriteResFpuPair<WritePCmpEStrI, [JFPU1, JSAGU, JLAGU, JVALU, JVALU1, JFPA, JALU0], 14, [1, 2, 2, 6, 4, 1, 1], 9>; defm : JWriteResFpuPair<WritePCmpEStrM, [JFPU1, JSAGU, JLAGU, JVALU, JVALU1, JFPA, JALU0], 14, [1, 2, 2, 6, 4, 1, 1], 9>; diff --git a/llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse42.s b/llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse42.s index fa530656cf4..b61a6df497e 100644 --- a/llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse42.s +++ b/llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse42.s @@ -79,7 +79,7 @@ pcmpgtq (%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: 28.00 20.00 - 8.00 - 1.00 9.00 18.00 - 8.00 - 13.00 37.00 - +# CHECK-NEXT: 28.00 20.00 - 8.00 - 5.00 13.00 18.00 - 8.00 - 13.00 37.00 - # CHECK: Resource pressure by instruction: # CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] Instructions: @@ -97,9 +97,9 @@ pcmpgtq (%rax), %xmm2 # CHECK-NEXT: 1.00 - - 1.00 - - 1.00 3.00 - 2.00 - 3.00 7.00 - pcmpestri $1, (%rax), %xmm2 # CHECK-NEXT: 1.00 - - 1.00 - - 1.00 2.00 - 2.00 - 3.00 7.00 - pcmpestrm $1, %xmm0, %xmm2 # CHECK-NEXT: 1.00 - - 1.00 - - 1.00 3.00 - 2.00 - 3.00 7.00 - pcmpestrm $1, (%rax), %xmm2 -# CHECK-NEXT: 1.00 - - 1.00 - - 1.00 - - - - - 2.00 - pcmpistri $1, %xmm0, %xmm2 -# CHECK-NEXT: 1.00 - - 1.00 - - 1.00 1.00 - - - - 2.00 - pcmpistri $1, (%rax), %xmm2 -# CHECK-NEXT: 1.00 - - 1.00 - - 1.00 - - - - - 2.00 - pcmpistrm $1, %xmm0, %xmm2 -# CHECK-NEXT: 1.00 - - 1.00 - - 1.00 1.00 - - - - 2.00 - pcmpistrm $1, (%rax), %xmm2 +# CHECK-NEXT: 1.00 - - 1.00 - 1.00 2.00 - - - - - 2.00 - pcmpistri $1, %xmm0, %xmm2 +# CHECK-NEXT: 1.00 - - 1.00 - 1.00 2.00 1.00 - - - - 2.00 - pcmpistri $1, (%rax), %xmm2 +# CHECK-NEXT: 1.00 - - 1.00 - 1.00 2.00 - - - - - 2.00 - pcmpistrm $1, %xmm0, %xmm2 +# CHECK-NEXT: 1.00 - - 1.00 - 1.00 2.00 1.00 - - - - 2.00 - pcmpistrm $1, (%rax), %xmm2 # CHECK-NEXT: - - - - - 0.50 0.50 - - - - 0.50 0.50 - pcmpgtq %xmm0, %xmm2 # CHECK-NEXT: - - - - - 0.50 0.50 1.00 - - - 0.50 0.50 - pcmpgtq (%rax), %xmm2 |