diff options
| -rwxr-xr-x | llvm/lib/Target/X86/X86SchedBroadwell.td | 2 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86SchedHaswell.td | 2 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86SchedSandyBridge.td | 2 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86SchedSkylakeClient.td | 2 | ||||
| -rwxr-xr-x | llvm/lib/Target/X86/X86SchedSkylakeServer.td | 2 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/schedule-x86_32.ll | 20 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/schedule-x86_64.ll | 12 |
7 files changed, 21 insertions, 21 deletions
diff --git a/llvm/lib/Target/X86/X86SchedBroadwell.td b/llvm/lib/Target/X86/X86SchedBroadwell.td index bd06a275d41..795b6ae55c0 100755 --- a/llvm/lib/Target/X86/X86SchedBroadwell.td +++ b/llvm/lib/Target/X86/X86SchedBroadwell.td @@ -1043,7 +1043,7 @@ def: InstRW<[BWWriteResGroup20], (instregex "ADC8i8")>; def: InstRW<[BWWriteResGroup20], (instregex "ADC8ri")>; def: InstRW<[BWWriteResGroup20], (instregex "CMOV(A|BE)(16|32|64)rr")>; def: InstRW<[BWWriteResGroup20], (instrs CWD)>; -def: InstRW<[BWWriteResGroup20], (instregex "JRCXZ")>; +def: InstRW<[BWWriteResGroup20], (instrs JCXZ, JECXZ, JRCXZ)>; def: InstRW<[BWWriteResGroup20], (instregex "SBB8i8")>; def: InstRW<[BWWriteResGroup20], (instregex "SBB8ri")>; def: InstRW<[BWWriteResGroup20], (instregex "SET(A|BE)r")>; diff --git a/llvm/lib/Target/X86/X86SchedHaswell.td b/llvm/lib/Target/X86/X86SchedHaswell.td index cac3a3b8368..acac5293d4e 100644 --- a/llvm/lib/Target/X86/X86SchedHaswell.td +++ b/llvm/lib/Target/X86/X86SchedHaswell.td @@ -2036,7 +2036,7 @@ def: InstRW<[HWWriteResGroup35], (instregex "ADC(8|16|32|64)rr")>; def: InstRW<[HWWriteResGroup35], (instregex "ADC(8|16|32|64)i")>; def: InstRW<[HWWriteResGroup35], (instregex "CMOV(AE|B|E|G|GE|L|LE|NE|NO|NP|NS|O|P|S)(16|32|64)rr")>; def: InstRW<[HWWriteResGroup35], (instrs CWD)>; -def: InstRW<[HWWriteResGroup35], (instregex "JRCXZ")>; +def: InstRW<[HWWriteResGroup35], (instrs JCXZ, JECXZ, JRCXZ)>; def: InstRW<[HWWriteResGroup35], (instregex "SBB(8|16|32|64)ri")>; def: InstRW<[HWWriteResGroup35], (instregex "SBB(8|16|32|64)rr")>; def: InstRW<[HWWriteResGroup35], (instregex "SBB(8|16|32|64)i")>; diff --git a/llvm/lib/Target/X86/X86SchedSandyBridge.td b/llvm/lib/Target/X86/X86SchedSandyBridge.td index e8b259cc42e..d1b58a8106d 100644 --- a/llvm/lib/Target/X86/X86SchedSandyBridge.td +++ b/llvm/lib/Target/X86/X86SchedSandyBridge.td @@ -792,7 +792,7 @@ def SBWriteResGroup18 : SchedWriteRes<[SBPort5,SBPort015]> { let NumMicroOps = 2; let ResourceCycles = [1,1]; } -def: InstRW<[SBWriteResGroup18], (instregex "JRCXZ")>; +def: InstRW<[SBWriteResGroup18], (instrs JCXZ, JECXZ, JRCXZ)>; def: InstRW<[SBWriteResGroup18], (instregex "MMX_MOVDQ2Qrr")>; def SBWriteResGroup19 : SchedWriteRes<[SBPort05,SBPort015]> { diff --git a/llvm/lib/Target/X86/X86SchedSkylakeClient.td b/llvm/lib/Target/X86/X86SchedSkylakeClient.td index 01b87bc1230..55fe3892b41 100644 --- a/llvm/lib/Target/X86/X86SchedSkylakeClient.td +++ b/llvm/lib/Target/X86/X86SchedSkylakeClient.td @@ -1079,7 +1079,7 @@ def SKLWriteResGroup23 : SchedWriteRes<[SKLPort06,SKLPort0156]> { def: InstRW<[SKLWriteResGroup23], (instregex "ADC8i8")>; def: InstRW<[SKLWriteResGroup23], (instregex "ADC8ri")>; def: InstRW<[SKLWriteResGroup23], (instrs CWD)>; -def: InstRW<[SKLWriteResGroup23], (instregex "JRCXZ")>; +def: InstRW<[SKLWriteResGroup23], (instrs JCXZ, JECXZ, JRCXZ)>; def: InstRW<[SKLWriteResGroup23], (instregex "SBB8i8")>; def: InstRW<[SKLWriteResGroup23], (instregex "SBB8ri")>; diff --git a/llvm/lib/Target/X86/X86SchedSkylakeServer.td b/llvm/lib/Target/X86/X86SchedSkylakeServer.td index 72fff2d0f1d..3461dd1a289 100755 --- a/llvm/lib/Target/X86/X86SchedSkylakeServer.td +++ b/llvm/lib/Target/X86/X86SchedSkylakeServer.td @@ -1590,7 +1590,7 @@ def SKXWriteResGroup23 : SchedWriteRes<[SKXPort06,SKXPort0156]> { def: InstRW<[SKXWriteResGroup23], (instregex "ADC8i8")>; def: InstRW<[SKXWriteResGroup23], (instregex "ADC8ri")>; def: InstRW<[SKXWriteResGroup23], (instrs CWD)>; -def: InstRW<[SKXWriteResGroup23], (instregex "JRCXZ")>; +def: InstRW<[SKXWriteResGroup23], (instrs JCXZ, JECXZ, JRCXZ)>; def: InstRW<[SKXWriteResGroup23], (instregex "SBB8i8")>; def: InstRW<[SKXWriteResGroup23], (instregex "SBB8ri")>; diff --git a/llvm/test/CodeGen/X86/schedule-x86_32.ll b/llvm/test/CodeGen/X86/schedule-x86_32.ll index 601b4234ad2..8f31501bfd5 100644 --- a/llvm/test/CodeGen/X86/schedule-x86_32.ll +++ b/llvm/test/CodeGen/X86/schedule-x86_32.ll @@ -1293,8 +1293,8 @@ define void @test_jcxz_jecxz() optsize { ; SANDY: # %bb.0: ; SANDY-NEXT: #APP ; SANDY-NEXT: JXTGT: -; SANDY-NEXT: jcxz JXTGT # sched: [1:1.00] -; SANDY-NEXT: jecxz JXTGT # sched: [1:1.00] +; SANDY-NEXT: jcxz JXTGT # sched: [2:1.00] +; SANDY-NEXT: jecxz JXTGT # sched: [2:1.00] ; SANDY-NEXT: #NO_APP ; SANDY-NEXT: retl # sched: [5:1.00] ; @@ -1302,8 +1302,8 @@ define void @test_jcxz_jecxz() optsize { ; HASWELL: # %bb.0: ; HASWELL-NEXT: #APP ; HASWELL-NEXT: JXTGT: -; HASWELL-NEXT: jcxz JXTGT # sched: [1:0.50] -; HASWELL-NEXT: jecxz JXTGT # sched: [1:0.50] +; HASWELL-NEXT: jcxz JXTGT # sched: [2:0.50] +; HASWELL-NEXT: jecxz JXTGT # sched: [2:0.50] ; HASWELL-NEXT: #NO_APP ; HASWELL-NEXT: retl # sched: [7:1.00] ; @@ -1311,8 +1311,8 @@ define void @test_jcxz_jecxz() optsize { ; BROADWELL: # %bb.0: ; BROADWELL-NEXT: #APP ; BROADWELL-NEXT: JXTGT: -; BROADWELL-NEXT: jcxz JXTGT # sched: [1:0.50] -; BROADWELL-NEXT: jecxz JXTGT # sched: [1:0.50] +; BROADWELL-NEXT: jcxz JXTGT # sched: [2:0.50] +; BROADWELL-NEXT: jecxz JXTGT # sched: [2:0.50] ; BROADWELL-NEXT: #NO_APP ; BROADWELL-NEXT: retl # sched: [6:0.50] ; @@ -1320,8 +1320,8 @@ define void @test_jcxz_jecxz() optsize { ; SKYLAKE: # %bb.0: ; SKYLAKE-NEXT: #APP ; SKYLAKE-NEXT: JXTGT: -; SKYLAKE-NEXT: jcxz JXTGT # sched: [1:0.50] -; SKYLAKE-NEXT: jecxz JXTGT # sched: [1:0.50] +; SKYLAKE-NEXT: jcxz JXTGT # sched: [2:0.50] +; SKYLAKE-NEXT: jecxz JXTGT # sched: [2:0.50] ; SKYLAKE-NEXT: #NO_APP ; SKYLAKE-NEXT: retl # sched: [6:0.50] ; @@ -1329,8 +1329,8 @@ define void @test_jcxz_jecxz() optsize { ; SKX: # %bb.0: ; SKX-NEXT: #APP ; SKX-NEXT: JXTGT: -; SKX-NEXT: jcxz JXTGT # sched: [1:0.50] -; SKX-NEXT: jecxz JXTGT # sched: [1:0.50] +; SKX-NEXT: jcxz JXTGT # sched: [2:0.50] +; SKX-NEXT: jecxz JXTGT # sched: [2:0.50] ; SKX-NEXT: #NO_APP ; SKX-NEXT: retl # sched: [6:0.50] ; diff --git a/llvm/test/CodeGen/X86/schedule-x86_64.ll b/llvm/test/CodeGen/X86/schedule-x86_64.ll index 01972522571..1a801951583 100644 --- a/llvm/test/CodeGen/X86/schedule-x86_64.ll +++ b/llvm/test/CodeGen/X86/schedule-x86_64.ll @@ -7198,7 +7198,7 @@ define void @test_jecxz_jrcxz() optsize { ; GENERIC: # %bb.0: ; GENERIC-NEXT: #APP ; GENERIC-NEXT: JXTGT: -; GENERIC-NEXT: jecxz JXTGT # sched: [1:1.00] +; GENERIC-NEXT: jecxz JXTGT # sched: [2:1.00] ; GENERIC-NEXT: jrcxz JXTGT # sched: [2:1.00] ; GENERIC-NEXT: #NO_APP ; GENERIC-NEXT: retq # sched: [1:1.00] @@ -7225,7 +7225,7 @@ define void @test_jecxz_jrcxz() optsize { ; SANDY: # %bb.0: ; SANDY-NEXT: #APP ; SANDY-NEXT: JXTGT: -; SANDY-NEXT: jecxz JXTGT # sched: [1:1.00] +; SANDY-NEXT: jecxz JXTGT # sched: [2:1.00] ; SANDY-NEXT: jrcxz JXTGT # sched: [2:1.00] ; SANDY-NEXT: #NO_APP ; SANDY-NEXT: retq # sched: [1:1.00] @@ -7234,7 +7234,7 @@ define void @test_jecxz_jrcxz() optsize { ; HASWELL: # %bb.0: ; HASWELL-NEXT: #APP ; HASWELL-NEXT: JXTGT: -; HASWELL-NEXT: jecxz JXTGT # sched: [1:0.50] +; HASWELL-NEXT: jecxz JXTGT # sched: [2:0.50] ; HASWELL-NEXT: jrcxz JXTGT # sched: [2:0.50] ; HASWELL-NEXT: #NO_APP ; HASWELL-NEXT: retq # sched: [7:1.00] @@ -7243,7 +7243,7 @@ define void @test_jecxz_jrcxz() optsize { ; BROADWELL: # %bb.0: ; BROADWELL-NEXT: #APP ; BROADWELL-NEXT: JXTGT: -; BROADWELL-NEXT: jecxz JXTGT # sched: [1:0.50] +; BROADWELL-NEXT: jecxz JXTGT # sched: [2:0.50] ; BROADWELL-NEXT: jrcxz JXTGT # sched: [2:0.50] ; BROADWELL-NEXT: #NO_APP ; BROADWELL-NEXT: retq # sched: [7:1.00] @@ -7252,7 +7252,7 @@ define void @test_jecxz_jrcxz() optsize { ; SKYLAKE: # %bb.0: ; SKYLAKE-NEXT: #APP ; SKYLAKE-NEXT: JXTGT: -; SKYLAKE-NEXT: jecxz JXTGT # sched: [1:0.50] +; SKYLAKE-NEXT: jecxz JXTGT # sched: [2:0.50] ; SKYLAKE-NEXT: jrcxz JXTGT # sched: [2:0.50] ; SKYLAKE-NEXT: #NO_APP ; SKYLAKE-NEXT: retq # sched: [7:1.00] @@ -7261,7 +7261,7 @@ define void @test_jecxz_jrcxz() optsize { ; SKX: # %bb.0: ; SKX-NEXT: #APP ; SKX-NEXT: JXTGT: -; SKX-NEXT: jecxz JXTGT # sched: [1:0.50] +; SKX-NEXT: jecxz JXTGT # sched: [2:0.50] ; SKX-NEXT: jrcxz JXTGT # sched: [2:0.50] ; SKX-NEXT: #NO_APP ; SKX-NEXT: retq # sched: [7:1.00] |

