diff --git a/llvm/lib/Target/X86/X86SchedSandyBridge.td b/llvm/lib/Target/X86/X86SchedSandyBridge.td index 0f90036eb38e32..b1dd52da3fa237 100644 --- a/llvm/lib/Target/X86/X86SchedSandyBridge.td +++ b/llvm/lib/Target/X86/X86SchedSandyBridge.td @@ -1002,13 +1002,6 @@ def SBWriteResGroup87 : SchedWriteRes<[SBPort4,SBPort5,SBPort01,SBPort23]> { } def: InstRW<[SBWriteResGroup87], (instrs FARCALL64m)>; -def SBWriteResGroup93 : SchedWriteRes<[SBPort0,SBPort1,SBPort23]> { - let Latency = 9; - let NumMicroOps = 3; - let ResourceCycles = [1,1,1]; -} -def: InstRW<[SBWriteResGroup93], (instregex "CVT(T?)(SD|SS)2SI(64)?rm")>; - def SBWriteResGroup95 : SchedWriteRes<[SBPort5,SBPort01,SBPort23]> { let Latency = 9; let NumMicroOps = 3; diff --git a/llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse1.s index 39a99e8a12408f..291b8cd43cb4ed 100644 --- a/llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse1.s +++ b/llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse1.s @@ -218,14 +218,14 @@ xorps (%rax), %xmm2 # CHECK-NEXT: 3 10 1.00 * cvtsi2ssq (%rax), %xmm2 # CHECK-NEXT: 2 5 1.00 cvtss2si %xmm0, %ecx # CHECK-NEXT: 2 5 1.00 cvtss2si %xmm0, %rcx -# CHECK-NEXT: 3 9 1.00 * cvtss2si (%rax), %ecx -# CHECK-NEXT: 3 9 1.00 * cvtss2si (%rax), %rcx +# CHECK-NEXT: 3 10 1.00 * cvtss2si (%rax), %ecx +# CHECK-NEXT: 3 10 1.00 * cvtss2si (%rax), %rcx # CHECK-NEXT: 1 3 1.00 cvttps2pi %xmm0, %mm2 # CHECK-NEXT: 2 9 1.00 * cvttps2pi (%rax), %mm2 # CHECK-NEXT: 2 5 1.00 cvttss2si %xmm0, %ecx # CHECK-NEXT: 2 5 1.00 cvttss2si %xmm0, %rcx -# CHECK-NEXT: 3 9 1.00 * cvttss2si (%rax), %ecx -# CHECK-NEXT: 3 9 1.00 * cvttss2si (%rax), %rcx +# CHECK-NEXT: 3 10 1.00 * cvttss2si (%rax), %ecx +# CHECK-NEXT: 3 10 1.00 * cvttss2si (%rax), %rcx # CHECK-NEXT: 1 14 14.00 divps %xmm0, %xmm2 # CHECK-NEXT: 2 20 14.00 * divps (%rax), %xmm2 # CHECK-NEXT: 1 14 14.00 divss %xmm0, %xmm2 diff --git a/llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse2.s index 7a8d4b03a9356b..904454a547077c 100644 --- a/llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse2.s +++ b/llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse2.s @@ -440,8 +440,8 @@ xorpd (%rax), %xmm2 # CHECK-NEXT: 2 7 1.00 * cvtps2pd (%rax), %xmm2 # CHECK-NEXT: 2 5 1.00 cvtsd2si %xmm0, %ecx # CHECK-NEXT: 2 5 1.00 cvtsd2si %xmm0, %rcx -# CHECK-NEXT: 3 9 1.00 * cvtsd2si (%rax), %ecx -# CHECK-NEXT: 3 9 1.00 * cvtsd2si (%rax), %rcx +# CHECK-NEXT: 3 10 1.00 * cvtsd2si (%rax), %ecx +# CHECK-NEXT: 3 10 1.00 * cvtsd2si (%rax), %rcx # CHECK-NEXT: 2 4 1.00 cvtsd2ss %xmm0, %xmm2 # CHECK-NEXT: 3 10 1.00 * cvtsd2ss (%rax), %xmm2 # CHECK-NEXT: 2 4 1.00 cvtsi2sd %ecx, %xmm2 @@ -458,8 +458,8 @@ xorpd (%rax), %xmm2 # CHECK-NEXT: 2 9 1.00 * cvttps2dq (%rax), %xmm2 # CHECK-NEXT: 2 5 1.00 cvttsd2si %xmm0, %ecx # CHECK-NEXT: 2 5 1.00 cvttsd2si %xmm0, %rcx -# CHECK-NEXT: 3 9 1.00 * cvttsd2si (%rax), %ecx -# CHECK-NEXT: 3 9 1.00 * cvttsd2si (%rax), %rcx +# CHECK-NEXT: 3 10 1.00 * cvttsd2si (%rax), %ecx +# CHECK-NEXT: 3 10 1.00 * cvttsd2si (%rax), %rcx # CHECK-NEXT: 1 22 22.00 divpd %xmm0, %xmm2 # CHECK-NEXT: 2 28 22.00 * divpd (%rax), %xmm2 # CHECK-NEXT: 1 22 22.00 divsd %xmm0, %xmm2 diff --git a/llvm/test/tools/llvm-mca/X86/Generic/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/Generic/resources-sse1.s index 39a99e8a12408f..291b8cd43cb4ed 100644 --- a/llvm/test/tools/llvm-mca/X86/Generic/resources-sse1.s +++ b/llvm/test/tools/llvm-mca/X86/Generic/resources-sse1.s @@ -218,14 +218,14 @@ xorps (%rax), %xmm2 # CHECK-NEXT: 3 10 1.00 * cvtsi2ssq (%rax), %xmm2 # CHECK-NEXT: 2 5 1.00 cvtss2si %xmm0, %ecx # CHECK-NEXT: 2 5 1.00 cvtss2si %xmm0, %rcx -# CHECK-NEXT: 3 9 1.00 * cvtss2si (%rax), %ecx -# CHECK-NEXT: 3 9 1.00 * cvtss2si (%rax), %rcx +# CHECK-NEXT: 3 10 1.00 * cvtss2si (%rax), %ecx +# CHECK-NEXT: 3 10 1.00 * cvtss2si (%rax), %rcx # CHECK-NEXT: 1 3 1.00 cvttps2pi %xmm0, %mm2 # CHECK-NEXT: 2 9 1.00 * cvttps2pi (%rax), %mm2 # CHECK-NEXT: 2 5 1.00 cvttss2si %xmm0, %ecx # CHECK-NEXT: 2 5 1.00 cvttss2si %xmm0, %rcx -# CHECK-NEXT: 3 9 1.00 * cvttss2si (%rax), %ecx -# CHECK-NEXT: 3 9 1.00 * cvttss2si (%rax), %rcx +# CHECK-NEXT: 3 10 1.00 * cvttss2si (%rax), %ecx +# CHECK-NEXT: 3 10 1.00 * cvttss2si (%rax), %rcx # CHECK-NEXT: 1 14 14.00 divps %xmm0, %xmm2 # CHECK-NEXT: 2 20 14.00 * divps (%rax), %xmm2 # CHECK-NEXT: 1 14 14.00 divss %xmm0, %xmm2 diff --git a/llvm/test/tools/llvm-mca/X86/Generic/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/Generic/resources-sse2.s index 7a8d4b03a9356b..904454a547077c 100644 --- a/llvm/test/tools/llvm-mca/X86/Generic/resources-sse2.s +++ b/llvm/test/tools/llvm-mca/X86/Generic/resources-sse2.s @@ -440,8 +440,8 @@ xorpd (%rax), %xmm2 # CHECK-NEXT: 2 7 1.00 * cvtps2pd (%rax), %xmm2 # CHECK-NEXT: 2 5 1.00 cvtsd2si %xmm0, %ecx # CHECK-NEXT: 2 5 1.00 cvtsd2si %xmm0, %rcx -# CHECK-NEXT: 3 9 1.00 * cvtsd2si (%rax), %ecx -# CHECK-NEXT: 3 9 1.00 * cvtsd2si (%rax), %rcx +# CHECK-NEXT: 3 10 1.00 * cvtsd2si (%rax), %ecx +# CHECK-NEXT: 3 10 1.00 * cvtsd2si (%rax), %rcx # CHECK-NEXT: 2 4 1.00 cvtsd2ss %xmm0, %xmm2 # CHECK-NEXT: 3 10 1.00 * cvtsd2ss (%rax), %xmm2 # CHECK-NEXT: 2 4 1.00 cvtsi2sd %ecx, %xmm2 @@ -458,8 +458,8 @@ xorpd (%rax), %xmm2 # CHECK-NEXT: 2 9 1.00 * cvttps2dq (%rax), %xmm2 # CHECK-NEXT: 2 5 1.00 cvttsd2si %xmm0, %ecx # CHECK-NEXT: 2 5 1.00 cvttsd2si %xmm0, %rcx -# CHECK-NEXT: 3 9 1.00 * cvttsd2si (%rax), %ecx -# CHECK-NEXT: 3 9 1.00 * cvttsd2si (%rax), %rcx +# CHECK-NEXT: 3 10 1.00 * cvttsd2si (%rax), %ecx +# CHECK-NEXT: 3 10 1.00 * cvttsd2si (%rax), %rcx # CHECK-NEXT: 1 22 22.00 divpd %xmm0, %xmm2 # CHECK-NEXT: 2 28 22.00 * divpd (%rax), %xmm2 # CHECK-NEXT: 1 22 22.00 divsd %xmm0, %xmm2 diff --git a/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse1.s index 28915f49790d9a..02b5810cda4179 100644 --- a/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse1.s +++ b/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse1.s @@ -218,14 +218,14 @@ xorps (%rax), %xmm2 # CHECK-NEXT: 3 10 1.00 * cvtsi2ssq (%rax), %xmm2 # CHECK-NEXT: 2 5 1.00 cvtss2si %xmm0, %ecx # CHECK-NEXT: 2 5 1.00 cvtss2si %xmm0, %rcx -# CHECK-NEXT: 3 9 1.00 * cvtss2si (%rax), %ecx -# CHECK-NEXT: 3 9 1.00 * cvtss2si (%rax), %rcx +# CHECK-NEXT: 3 10 1.00 * cvtss2si (%rax), %ecx +# CHECK-NEXT: 3 10 1.00 * cvtss2si (%rax), %rcx # CHECK-NEXT: 1 3 1.00 cvttps2pi %xmm0, %mm2 # CHECK-NEXT: 2 9 1.00 * cvttps2pi (%rax), %mm2 # CHECK-NEXT: 2 5 1.00 cvttss2si %xmm0, %ecx # CHECK-NEXT: 2 5 1.00 cvttss2si %xmm0, %rcx -# CHECK-NEXT: 3 9 1.00 * cvttss2si (%rax), %ecx -# CHECK-NEXT: 3 9 1.00 * cvttss2si (%rax), %rcx +# CHECK-NEXT: 3 10 1.00 * cvttss2si (%rax), %ecx +# CHECK-NEXT: 3 10 1.00 * cvttss2si (%rax), %rcx # CHECK-NEXT: 1 14 14.00 divps %xmm0, %xmm2 # CHECK-NEXT: 2 20 14.00 * divps (%rax), %xmm2 # CHECK-NEXT: 1 14 14.00 divss %xmm0, %xmm2 diff --git a/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse2.s index 2b6255c697fa12..c3b8b7389df4cb 100644 --- a/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse2.s +++ b/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse2.s @@ -440,8 +440,8 @@ xorpd (%rax), %xmm2 # CHECK-NEXT: 2 7 1.00 * cvtps2pd (%rax), %xmm2 # CHECK-NEXT: 2 5 1.00 cvtsd2si %xmm0, %ecx # CHECK-NEXT: 2 5 1.00 cvtsd2si %xmm0, %rcx -# CHECK-NEXT: 3 9 1.00 * cvtsd2si (%rax), %ecx -# CHECK-NEXT: 3 9 1.00 * cvtsd2si (%rax), %rcx +# CHECK-NEXT: 3 10 1.00 * cvtsd2si (%rax), %ecx +# CHECK-NEXT: 3 10 1.00 * cvtsd2si (%rax), %rcx # CHECK-NEXT: 2 4 1.00 cvtsd2ss %xmm0, %xmm2 # CHECK-NEXT: 3 10 1.00 * cvtsd2ss (%rax), %xmm2 # CHECK-NEXT: 2 4 1.00 cvtsi2sd %ecx, %xmm2 @@ -458,8 +458,8 @@ xorpd (%rax), %xmm2 # CHECK-NEXT: 2 9 1.00 * cvttps2dq (%rax), %xmm2 # CHECK-NEXT: 2 5 1.00 cvttsd2si %xmm0, %ecx # CHECK-NEXT: 2 5 1.00 cvttsd2si %xmm0, %rcx -# CHECK-NEXT: 3 9 1.00 * cvttsd2si (%rax), %ecx -# CHECK-NEXT: 3 9 1.00 * cvttsd2si (%rax), %rcx +# CHECK-NEXT: 3 10 1.00 * cvttsd2si (%rax), %ecx +# CHECK-NEXT: 3 10 1.00 * cvttsd2si (%rax), %rcx # CHECK-NEXT: 1 22 22.00 divpd %xmm0, %xmm2 # CHECK-NEXT: 2 28 22.00 * divpd (%rax), %xmm2 # CHECK-NEXT: 1 22 22.00 divsd %xmm0, %xmm2