From 683e35527b7a8bce38eb248e355c6557b68354af Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Mon, 1 Oct 2018 16:12:44 +0000 Subject: [PATCH] [X86] Create schedule classes for BT(C|R|S)mi and BT(C|R|S)mr instructions llvm-svn: 343490 --- llvm/lib/Target/X86/X86InstrInfo.td | 12 ++++++------ llvm/lib/Target/X86/X86SchedBroadwell.td | 12 +++++++----- llvm/lib/Target/X86/X86SchedHaswell.td | 12 +++++++----- llvm/lib/Target/X86/X86SchedSandyBridge.td | 12 +++++++----- llvm/lib/Target/X86/X86SchedSkylakeClient.td | 12 +++++++----- llvm/lib/Target/X86/X86SchedSkylakeServer.td | 12 +++++++----- llvm/lib/Target/X86/X86Schedule.td | 6 +++++- llvm/lib/Target/X86/X86ScheduleAtom.td | 10 ++++++---- llvm/lib/Target/X86/X86ScheduleBtVer2.td | 10 ++++++---- llvm/lib/Target/X86/X86ScheduleSLM.td | 12 +++++++----- llvm/lib/Target/X86/X86ScheduleZnver1.td | 10 ++++++---- 11 files changed, 71 insertions(+), 49 deletions(-) diff --git a/llvm/lib/Target/X86/X86InstrInfo.td b/llvm/lib/Target/X86/X86InstrInfo.td index 673d95b..160401c 100644 --- a/llvm/lib/Target/X86/X86InstrInfo.td +++ b/llvm/lib/Target/X86/X86InstrInfo.td @@ -1830,7 +1830,7 @@ def BTC64rr : RI<0xBB, MRMDestReg, (outs GR64:$dst), (ins GR64:$src1, GR64:$src2 NotMemoryFoldable; } // SchedRW -let mayLoad = 1, mayStore = 1, SchedRW = [WriteALULd, WriteRMW] in { +let mayLoad = 1, mayStore = 1, SchedRW = [WriteBitTestSetRegRMW] in { def BTC16mr : I<0xBB, MRMDestMem, (outs), (ins i16mem:$src1, GR16:$src2), "btc{w}\t{$src2, $src1|$src1, $src2}", []>, OpSize16, TB, NotMemoryFoldable; @@ -1851,7 +1851,7 @@ def BTC64ri8 : RIi8<0xBA, MRM7r, (outs GR64:$dst), (ins GR64:$src1, i64i8imm:$sr "btc{q}\t{$src2, $src1|$src1, $src2}", []>, TB; } // SchedRW -let mayLoad = 1, mayStore = 1, SchedRW = [WriteALULd, WriteRMW] in { +let mayLoad = 1, mayStore = 1, SchedRW = [WriteBitTestSetImmRMW] in { def BTC16mi8 : Ii8<0xBA, MRM7m, (outs), (ins i16mem:$src1, i16i8imm:$src2), "btc{w}\t{$src2, $src1|$src1, $src2}", []>, OpSize16, TB; def BTC32mi8 : Ii8<0xBA, MRM7m, (outs), (ins i32mem:$src1, i32i8imm:$src2), @@ -1873,7 +1873,7 @@ def BTR64rr : RI<0xB3, MRMDestReg, (outs GR64:$dst), (ins GR64:$src1, GR64:$src2 NotMemoryFoldable; } // SchedRW -let mayLoad = 1, mayStore = 1, SchedRW = [WriteALULd, WriteRMW] in { +let mayLoad = 1, mayStore = 1, SchedRW = [WriteBitTestSetRegRMW] in { def BTR16mr : I<0xB3, MRMDestMem, (outs), (ins i16mem:$src1, GR16:$src2), "btr{w}\t{$src2, $src1|$src1, $src2}", []>, OpSize16, TB, NotMemoryFoldable; @@ -1896,7 +1896,7 @@ def BTR64ri8 : RIi8<0xBA, MRM6r, (outs GR64:$dst), (ins GR64:$src1, i64i8imm:$sr "btr{q}\t{$src2, $src1|$src1, $src2}", []>, TB; } // SchedRW -let mayLoad = 1, mayStore = 1, SchedRW = [WriteALULd, WriteRMW] in { +let mayLoad = 1, mayStore = 1, SchedRW = [WriteBitTestSetImmRMW] in { def BTR16mi8 : Ii8<0xBA, MRM6m, (outs), (ins i16mem:$src1, i16i8imm:$src2), "btr{w}\t{$src2, $src1|$src1, $src2}", []>, OpSize16, TB; @@ -1920,7 +1920,7 @@ def BTS64rr : RI<0xAB, MRMDestReg, (outs GR64:$dst), (ins GR64:$src1, GR64:$src2 NotMemoryFoldable; } // SchedRW -let mayLoad = 1, mayStore = 1, SchedRW = [WriteALULd, WriteRMW] in { +let mayLoad = 1, mayStore = 1, SchedRW = [WriteBitTestSetRegRMW] in { def BTS16mr : I<0xAB, MRMDestMem, (outs), (ins i16mem:$src1, GR16:$src2), "bts{w}\t{$src2, $src1|$src1, $src2}", []>, OpSize16, TB, NotMemoryFoldable; @@ -1941,7 +1941,7 @@ def BTS64ri8 : RIi8<0xBA, MRM5r, (outs GR64:$dst), (ins GR64:$src1, i64i8imm:$sr "bts{q}\t{$src2, $src1|$src1, $src2}", []>, TB; } // SchedRW -let mayLoad = 1, mayStore = 1, SchedRW = [WriteALULd, WriteRMW] in { +let mayLoad = 1, mayStore = 1, SchedRW = [WriteBitTestSetImmRMW] in { def BTS16mi8 : Ii8<0xBA, MRM5m, (outs), (ins i16mem:$src1, i16i8imm:$src2), "bts{w}\t{$src2, $src1|$src1, $src2}", []>, OpSize16, TB; def BTS32mi8 : Ii8<0xBA, MRM5m, (outs), (ins i32mem:$src1, i32i8imm:$src2), diff --git a/llvm/lib/Target/X86/X86SchedBroadwell.td b/llvm/lib/Target/X86/X86SchedBroadwell.td index 94711c9..c24afea 100644 --- a/llvm/lib/Target/X86/X86SchedBroadwell.td +++ b/llvm/lib/Target/X86/X86SchedBroadwell.td @@ -162,11 +162,13 @@ def : WriteRes { let NumMicroOps = 3; } -defm : X86WriteRes; -defm : X86WriteRes; // Bit Test instrs -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; // Bit Test + Set instrs +defm : X86WriteRes; +defm : X86WriteRes; // Bit Test instrs +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; // Bit Test + Set instrs +defm : X86WriteRes; +defm : X86WriteRes; // Bit counts. defm : BWWriteResPair; diff --git a/llvm/lib/Target/X86/X86SchedHaswell.td b/llvm/lib/Target/X86/X86SchedHaswell.td index 1714acb..325ed7f 100644 --- a/llvm/lib/Target/X86/X86SchedHaswell.td +++ b/llvm/lib/Target/X86/X86SchedHaswell.td @@ -166,11 +166,13 @@ def : WriteRes { let NumMicroOps = 3; } -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; // This is for simple LEAs with one or two input operands. // The complex ones can only execute on port 1, and they require two cycles on diff --git a/llvm/lib/Target/X86/X86SchedSandyBridge.td b/llvm/lib/Target/X86/X86SchedSandyBridge.td index 8e09c01..3286b8f 100644 --- a/llvm/lib/Target/X86/X86SchedSandyBridge.td +++ b/llvm/lib/Target/X86/X86SchedSandyBridge.td @@ -161,11 +161,13 @@ def : WriteRes { let NumMicroOps = 3; } -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; // This is for simple LEAs with one or two input operands. // The complex ones can only execute on port 1, and they require two cycles on diff --git a/llvm/lib/Target/X86/X86SchedSkylakeClient.td b/llvm/lib/Target/X86/X86SchedSkylakeClient.td index 59f29e4..b525948 100644 --- a/llvm/lib/Target/X86/X86SchedSkylakeClient.td +++ b/llvm/lib/Target/X86/X86SchedSkylakeClient.td @@ -159,11 +159,13 @@ def : WriteRes { let NumMicroOps = 3; } -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; // Bit counts. defm : SKLWriteResPair; diff --git a/llvm/lib/Target/X86/X86SchedSkylakeServer.td b/llvm/lib/Target/X86/X86SchedSkylakeServer.td index 8a3a959..77de215 100644 --- a/llvm/lib/Target/X86/X86SchedSkylakeServer.td +++ b/llvm/lib/Target/X86/X86SchedSkylakeServer.td @@ -159,11 +159,13 @@ def : WriteRes { let Latency = 2; let NumMicroOps = 3; } -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; // Integer shifts and rotates. defm : SKXWriteResPair; diff --git a/llvm/lib/Target/X86/X86Schedule.td b/llvm/lib/Target/X86/X86Schedule.td index cf6ffc3..d226d44 100644 --- a/llvm/lib/Target/X86/X86Schedule.td +++ b/llvm/lib/Target/X86/X86Schedule.td @@ -160,7 +160,11 @@ def WriteBitTest : SchedWrite; // Bit Test def WriteBitTestImmLd : SchedWrite; def WriteBitTestRegLd : SchedWrite; -def WriteBitTestSet : SchedWrite; // Bit Test + Set - TODO add memory folding support +def WriteBitTestSet : SchedWrite; // Bit Test + Set +def WriteBitTestSetImmLd : SchedWrite; +def WriteBitTestSetRegLd : SchedWrite; +def WriteBitTestSetImmRMW : WriteSequence<[WriteBitTestSetImmLd, WriteRMW]>; +def WriteBitTestSetRegRMW : WriteSequence<[WriteBitTestSetRegLd, WriteRMW]>; // Integer shifts and rotates. defm WriteShift : X86SchedWritePair; diff --git a/llvm/lib/Target/X86/X86ScheduleAtom.td b/llvm/lib/Target/X86/X86ScheduleAtom.td index 1034101..dd9bd92 100644 --- a/llvm/lib/Target/X86/X86ScheduleAtom.td +++ b/llvm/lib/Target/X86/X86ScheduleAtom.td @@ -121,10 +121,12 @@ def : WriteRes { let Latency = 2; let ResourceCycles = [2]; } -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; // This is for simple LEAs with one or two input operands. def : WriteRes; diff --git a/llvm/lib/Target/X86/X86ScheduleBtVer2.td b/llvm/lib/Target/X86/X86ScheduleBtVer2.td index 7871a5e..8ac12c0 100644 --- a/llvm/lib/Target/X86/X86ScheduleBtVer2.td +++ b/llvm/lib/Target/X86/X86ScheduleBtVer2.td @@ -204,10 +204,12 @@ def : WriteRes; // Setcc. def : WriteRes; def : WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; // This is for simple LEAs with one or two input operands. def : WriteRes; diff --git a/llvm/lib/Target/X86/X86ScheduleSLM.td b/llvm/lib/Target/X86/X86ScheduleSLM.td index 372cc86..b1a10c4 100644 --- a/llvm/lib/Target/X86/X86ScheduleSLM.td +++ b/llvm/lib/Target/X86/X86ScheduleSLM.td @@ -134,11 +134,13 @@ def : WriteRes { // FIXME Latency and NumMicrOps? let ResourceCycles = [2,1]; } -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; // This is for simple LEAs with one or two input operands. // The complex ones can only execute on port 1, and they require two cycles on diff --git a/llvm/lib/Target/X86/X86ScheduleZnver1.td b/llvm/lib/Target/X86/X86ScheduleZnver1.td index f97d99e..d8bf7e7 100644 --- a/llvm/lib/Target/X86/X86ScheduleZnver1.td +++ b/llvm/lib/Target/X86/X86ScheduleZnver1.td @@ -214,10 +214,12 @@ def : WriteRes; def : WriteRes; defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; -defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; +defm : X86WriteRes; // Bit counts. defm : ZnWriteResPair; -- 2.7.4