diff options
| -rw-r--r-- | llvm/tools/llvm-exegesis/lib/SnippetRepetitor.cpp | 3 | ||||
| -rw-r--r-- | llvm/tools/llvm-exegesis/lib/Target.h | 3 | ||||
| -rw-r--r-- | llvm/tools/llvm-exegesis/lib/X86/Target.cpp | 10 |
3 files changed, 10 insertions, 6 deletions
diff --git a/llvm/tools/llvm-exegesis/lib/SnippetRepetitor.cpp b/llvm/tools/llvm-exegesis/lib/SnippetRepetitor.cpp index 954471659e5..860db92a81d 100644 --- a/llvm/tools/llvm-exegesis/lib/SnippetRepetitor.cpp +++ b/llvm/tools/llvm-exegesis/lib/SnippetRepetitor.cpp @@ -79,7 +79,8 @@ public: for (const auto &LiveIn : Entry.MBB->liveins()) Loop.MBB->addLiveIn(LiveIn); Loop.addInstructions(Instructions); - ET.decrementLoopCounterAndLoop(*Loop.MBB, State.getInstrInfo()); + ET.decrementLoopCounterAndJump(*Loop.MBB, *Loop.MBB, + State.getInstrInfo()); // Set up the exit basic block. Loop.MBB->addSuccessor(Exit.MBB, llvm::BranchProbability::getZero()); diff --git a/llvm/tools/llvm-exegesis/lib/Target.h b/llvm/tools/llvm-exegesis/lib/Target.h index 4b0c9d17dd7..70313a7a2f7 100644 --- a/llvm/tools/llvm-exegesis/lib/Target.h +++ b/llvm/tools/llvm-exegesis/lib/Target.h @@ -95,7 +95,8 @@ public: } // Adds the code to decrement the loop counter and - virtual void decrementLoopCounterAndLoop(MachineBasicBlock &MBB, + virtual void decrementLoopCounterAndJump(MachineBasicBlock &MBB, + MachineBasicBlock &TargetMBB, const llvm::MCInstrInfo &MII) const { llvm_unreachable("decrementLoopCounterAndBranch() requires " "getLoopCounterRegister() > 0"); diff --git a/llvm/tools/llvm-exegesis/lib/X86/Target.cpp b/llvm/tools/llvm-exegesis/lib/X86/Target.cpp index bf008e8bbc7..ce66610891d 100644 --- a/llvm/tools/llvm-exegesis/lib/X86/Target.cpp +++ b/llvm/tools/llvm-exegesis/lib/X86/Target.cpp @@ -448,7 +448,8 @@ private: void fillMemoryOperands(InstructionTemplate &IT, unsigned Reg, unsigned Offset) const override; - void decrementLoopCounterAndLoop(MachineBasicBlock &MBB, + void decrementLoopCounterAndJump(MachineBasicBlock &MBB, + MachineBasicBlock &TargetMBB, const llvm::MCInstrInfo &MII) const override; std::vector<llvm::MCInst> setRegTo(const llvm::MCSubtargetInfo &STI, @@ -558,14 +559,15 @@ void ExegesisX86Target::fillMemoryOperands(InstructionTemplate &IT, SetOp(MemOpIdx + 4, MCOperand::createReg(0)); // Segment } -void ExegesisX86Target::decrementLoopCounterAndLoop( - MachineBasicBlock &MBB, const llvm::MCInstrInfo &MII) const { +void ExegesisX86Target::decrementLoopCounterAndJump( + MachineBasicBlock &MBB, MachineBasicBlock &TargetMBB, + const llvm::MCInstrInfo &MII) const { BuildMI(&MBB, DebugLoc(), MII.get(X86::ADD64ri8)) .addDef(kLoopCounterReg) .addUse(kLoopCounterReg) .addImm(-1); BuildMI(&MBB, DebugLoc(), MII.get(X86::JCC_1)) - .addMBB(&MBB) + .addMBB(&TargetMBB) .addImm(X86::COND_NE); } |
