Commit 799e4e2b authored by Chandler Carruth's avatar Chandler Carruth
Browse files

Merge r329657. 

This is the main patch that introduced the new EFLAGS lowering infrastructure.
All the source merges were clean, but the tests required help to merge.
Specifically, I had to regenerate the CHECK lines in the tests (using the trunk
update_llc_test_checks.py script) because trunk has copy propagation that the
branch doesn't. I also had to update the MIR test to use the old MIR syntax for
physical registers (%name instead of $name).

llvm-svn: 332933
parent bd74a2ef

llvm/include/llvm/CodeGen/MachineBasicBlock.h

+7 −0
Original line number Diff line number Diff line
@@ -449,6 +449,13 @@ public: 
  /// Replace successor OLD with NEW and update probability info.

  void replaceSuccessor(MachineBasicBlock *Old, MachineBasicBlock *New);



  /// Copy a successor (and any probability info) from original block to this

  /// block's. Uses an iterator into the original blocks successors.

  ///

  /// This is useful when doing a partial clone of successors. Afterward, the

  /// probabilities may need to be normalized.

  void copySuccessor(MachineBasicBlock *Orig, succ_iterator I);



  /// Transfers all the successors from MBB to this machine basic block (i.e.,

  /// copies all the successors FromMBB and remove all the successors from

  /// FromMBB).

llvm/lib/CodeGen/MachineBasicBlock.cpp

+8 −0
Original line number Diff line number Diff line
@@ -646,6 +646,14 @@ void MachineBasicBlock::replaceSuccessor(MachineBasicBlock *Old, 
  removeSuccessor(OldI);

}



void MachineBasicBlock::copySuccessor(MachineBasicBlock *Orig,

                                      succ_iterator I) {

  if (Orig->Probs.empty())

    addSuccessor(*I, Orig->getSuccProbability(I));

  else

    addSuccessorWithoutProb(*I);

}



void MachineBasicBlock::addPredecessor(MachineBasicBlock *Pred) {

  Predecessors.push_back(Pred);

}

llvm/lib/Target/X86/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ set(sources 
  X86FixupBWInsts.cpp

  X86FixupLEAs.cpp

  X86FixupSetCC.cpp

  X86FlagsCopyLowering.cpp

  X86FloatingPoint.cpp

  X86FrameLowering.cpp

  X86InstructionSelector.cpp

llvm/lib/Target/X86/X86.h

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ FunctionPass *createX86OptimizeLEAs(); 
/// Return a pass that transforms setcc + movzx pairs into xor + setcc.

FunctionPass *createX86FixupSetCC();



/// Return a pass that lowers EFLAGS copy pseudo instructions.

FunctionPass *createX86FlagsCopyLoweringPass();



/// Return a pass that expands WinAlloca pseudo-instructions.

FunctionPass *createX86WinAllocaExpander();

llvm/lib/Target/X86/X86FlagsCopyLowering.cpp

0 → 100644
+734 −0

File added.

Preview size limit exceeded, changes collapsed.