Commit 2eb30faf authored by Hiroshi Yamauchi's avatar Hiroshi Yamauchi
Browse files

Revert "[PGO][PGSO] Instrument the code gen / target passes." 

This reverts commit 9a0b5e14.

This seems to break buildbots.
parent 779a180d

llvm/include/llvm/CodeGen/AsmPrinter.h

+0 −6
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ class GlobalObject; 
class GlobalValue;

class GlobalVariable;

class MachineBasicBlock;

class MachineBlockFrequencyInfo;

class MachineConstantPoolValue;

class MachineDominatorTree;

class MachineFunction;
@@ -70,7 +69,6 @@ class MCSymbol; 
class MCTargetOptions;

class MDNode;

class Module;

class ProfileSummaryInfo;

class raw_ostream;

class RemarkStreamer;

class StackMaps;
@@ -110,10 +108,6 @@ public: 
  /// Optimization remark emitter.

  MachineOptimizationRemarkEmitter *ORE;



  MachineBlockFrequencyInfo *MBFI;



  ProfileSummaryInfo *PSI;



  /// The symbol for the current function. This is recalculated at the beginning

  /// of each call to runOnMachineFunction().

  MCSymbol *CurrentFnSym = nullptr;

llvm/include/llvm/CodeGen/TailDuplicator.h

+0 −6
Original line number Diff line number Diff line
@@ -25,13 +25,11 @@ 
namespace llvm {



class MachineBasicBlock;

class MachineBlockFrequencyInfo;

class MachineBranchProbabilityInfo;

class MachineFunction;

class MachineInstr;

class MachineModuleInfo;

class MachineRegisterInfo;

class ProfileSummaryInfo;

class TargetRegisterInfo;



/// Utility class to perform tail duplication.
@@ -42,8 +40,6 @@ class TailDuplicator { 
  const MachineModuleInfo *MMI;

  MachineRegisterInfo *MRI;

  MachineFunction *MF;

  const MachineBlockFrequencyInfo *MBFI;

  ProfileSummaryInfo *PSI;

  bool PreRegAlloc;

  bool LayoutMode;

  unsigned TailDupSize;
@@ -69,8 +65,6 @@ public: 
  ///     default implies using the command line value TailDupSize.

  void initMF(MachineFunction &MF, bool PreRegAlloc,

              const MachineBranchProbabilityInfo *MBPI,

              const MachineBlockFrequencyInfo *MBFI,

              ProfileSummaryInfo *PSI,

              bool LayoutMode, unsigned TailDupSize = 0);



  bool tailDuplicateBlocks();

llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp

+1 −13
Original line number Diff line number Diff line
@@ -31,16 +31,13 @@ 
#include "llvm/Analysis/ConstantFolding.h"

#include "llvm/Analysis/EHPersonalities.h"

#include "llvm/Analysis/OptimizationRemarkEmitter.h"

#include "llvm/Analysis/ProfileSummaryInfo.h"

#include "llvm/BinaryFormat/COFF.h"

#include "llvm/BinaryFormat/Dwarf.h"

#include "llvm/BinaryFormat/ELF.h"

#include "llvm/CodeGen/GCMetadata.h"

#include "llvm/CodeGen/GCMetadataPrinter.h"

#include "llvm/CodeGen/GCStrategy.h"

#include "llvm/CodeGen/LazyMachineBlockFrequencyInfo.h"

#include "llvm/CodeGen/MachineBasicBlock.h"

#include "llvm/CodeGen/MachineBlockFrequencyInfo.h"

#include "llvm/CodeGen/MachineConstantPool.h"

#include "llvm/CodeGen/MachineDominators.h"

#include "llvm/CodeGen/MachineFrameInfo.h"
@@ -55,7 +52,6 @@ 
#include "llvm/CodeGen/MachineModuleInfoImpls.h"

#include "llvm/CodeGen/MachineOperand.h"

#include "llvm/CodeGen/MachineOptimizationRemarkEmitter.h"

#include "llvm/CodeGen/MachineSizeOpts.h"

#include "llvm/CodeGen/StackMaps.h"

#include "llvm/CodeGen/TargetFrameLowering.h"

#include "llvm/CodeGen/TargetInstrInfo.h"
@@ -252,8 +248,6 @@ void AsmPrinter::getAnalysisUsage(AnalysisUsage &AU) const { 
  AU.addRequired<MachineModuleInfoWrapperPass>();

  AU.addRequired<MachineOptimizationRemarkEmitterPass>();

  AU.addRequired<GCModuleInfo>();

  AU.addRequired<LazyMachineBlockFrequencyInfoPass>();

  AU.addRequired<ProfileSummaryInfoWrapperPass>();

}



bool AsmPrinter::doInitialization(Module &M) {
@@ -1690,10 +1684,6 @@ void AsmPrinter::SetupMachineFunction(MachineFunction &MF) { 
  }



  ORE = &getAnalysis<MachineOptimizationRemarkEmitterPass>().getORE();

  PSI = &getAnalysis<ProfileSummaryInfoWrapperPass>().getPSI();

  MBFI = (PSI && PSI->hasProfileSummary()) ?

         &getAnalysis<LazyMachineBlockFrequencyInfoPass>().getBFI() :

         nullptr;

}



namespace {
@@ -2923,10 +2913,8 @@ static void emitBasicBlockLoopComments(const MachineBasicBlock &MBB, 
void AsmPrinter::setupCodePaddingContext(const MachineBasicBlock &MBB,

                                         MCCodePaddingContext &Context) const {

  assert(MF != nullptr && "Machine function must be valid");

  bool OptForSize = MF->getFunction().hasOptSize() ||

                    llvm::shouldOptimizeForSize(&MBB, PSI, MBFI);

  Context.IsPaddingActive = !MF->hasInlineAsm() &&

                            !OptForSize &&

                            !MF->getFunction().hasOptSize() &&

                            TM.getOptLevel() != CodeGenOpt::None;

  Context.IsBasicBlockReachableViaFallthrough =

      std::find(MBB.pred_begin(), MBB.pred_end(), MBB.getPrevNode()) !=

llvm/lib/CodeGen/BranchFolding.cpp

+7 −20
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include "llvm/ADT/SmallSet.h"

#include "llvm/ADT/SmallVector.h"

#include "llvm/ADT/Statistic.h"

#include "llvm/Analysis/ProfileSummaryInfo.h"

#include "llvm/CodeGen/Analysis.h"

#include "llvm/CodeGen/LivePhysRegs.h"

#include "llvm/CodeGen/MachineBasicBlock.h"
@@ -39,7 +38,6 @@ 
#include "llvm/CodeGen/MachineModuleInfo.h"

#include "llvm/CodeGen/MachineOperand.h"

#include "llvm/CodeGen/MachineRegisterInfo.h"

#include "llvm/CodeGen/MachineSizeOpts.h"

#include "llvm/CodeGen/TargetInstrInfo.h"

#include "llvm/CodeGen/TargetOpcodes.h"

#include "llvm/CodeGen/TargetPassConfig.h"
@@ -105,7 +103,6 @@ namespace { 
    void getAnalysisUsage(AnalysisUsage &AU) const override {

      AU.addRequired<MachineBlockFrequencyInfo>();

      AU.addRequired<MachineBranchProbabilityInfo>();

      AU.addRequired<ProfileSummaryInfoWrapperPass>();

      AU.addRequired<TargetPassConfig>();

      MachineFunctionPass::getAnalysisUsage(AU);

    }
@@ -132,8 +129,7 @@ bool BranchFolderPass::runOnMachineFunction(MachineFunction &MF) { 
  BranchFolder::MBFIWrapper MBBFreqInfo(

      getAnalysis<MachineBlockFrequencyInfo>());

  BranchFolder Folder(EnableTailMerge, /*CommonHoist=*/true, MBBFreqInfo,

                      getAnalysis<MachineBranchProbabilityInfo>(),

                      &getAnalysis<ProfileSummaryInfoWrapperPass>().getPSI());

                      getAnalysis<MachineBranchProbabilityInfo>());

  auto *MMIWP = getAnalysisIfAvailable<MachineModuleInfoWrapperPass>();

  return Folder.OptimizeFunction(

      MF, MF.getSubtarget().getInstrInfo(), MF.getSubtarget().getRegisterInfo(),
@@ -143,10 +139,9 @@ bool BranchFolderPass::runOnMachineFunction(MachineFunction &MF) { 
BranchFolder::BranchFolder(bool defaultEnableTailMerge, bool CommonHoist,

                           MBFIWrapper &FreqInfo,

                           const MachineBranchProbabilityInfo &ProbInfo,

                           ProfileSummaryInfo *PSI,

                           unsigned MinTailLength)

    : EnableHoistCommonCode(CommonHoist), MinCommonTailLength(MinTailLength),

      MBBFreqInfo(FreqInfo), MBPI(ProbInfo), PSI(PSI) {

      MBBFreqInfo(FreqInfo), MBPI(ProbInfo) {

  if (MinCommonTailLength == 0)

    MinCommonTailLength = TailMergeSize;

  switch (FlagEnableTailMerge) {
@@ -590,9 +585,7 @@ ProfitableToMerge(MachineBasicBlock *MBB1, MachineBasicBlock *MBB2, 
                  MachineBasicBlock::iterator &I2, MachineBasicBlock *SuccBB,

                  MachineBasicBlock *PredBB,

                  DenseMap<const MachineBasicBlock *, int> &EHScopeMembership,

                  bool AfterPlacement,

                  BranchFolder::MBFIWrapper &MBBFreqInfo,

                  ProfileSummaryInfo *PSI) {

                  bool AfterPlacement) {

  // It is never profitable to tail-merge blocks from two different EH scopes.

  if (!EHScopeMembership.empty()) {

    auto EHScope1 = EHScopeMembership.find(MBB1);
@@ -689,11 +682,7 @@ ProfitableToMerge(MachineBasicBlock *MBB1, MachineBasicBlock *MBB2, 
  // branch instruction, which is likely to be smaller than the 2

  // instructions that would be deleted in the merge.

  MachineFunction *MF = MBB1->getParent();

  bool OptForSize =

      MF->getFunction().hasOptSize() ||

      (llvm::shouldOptimizeForSize(MBB1, PSI, &MBBFreqInfo.getMBFI()) &&

       llvm::shouldOptimizeForSize(MBB2, PSI, &MBBFreqInfo.getMBFI()));

  return EffectiveTailLen >= 2 && OptForSize &&

  return EffectiveTailLen >= 2 && MF->getFunction().hasOptSize() &&

         (FullBlockTail1 || FullBlockTail2);

}
@@ -715,7 +704,7 @@ unsigned BranchFolder::ComputeSameTails(unsigned CurHash, 
                            CommonTailLen, TrialBBI1, TrialBBI2,

                            SuccBB, PredBB,

                            EHScopeMembership,

                            AfterBlockPlacement, MBBFreqInfo, PSI)) {

                            AfterBlockPlacement)) {

        if (CommonTailLen > maxCommonTailLength) {

          SameTails.clear();

          maxCommonTailLength = CommonTailLen;
@@ -1545,10 +1534,8 @@ ReoptimizeBlock: 
    }

  }



  bool OptForSize =

      MF.getFunction().hasOptSize() ||

      llvm::shouldOptimizeForSize(MBB, PSI, &MBBFreqInfo.getMBFI());

  if (!IsEmptyBlock(MBB) && MBB->pred_size() == 1 && OptForSize) {

  if (!IsEmptyBlock(MBB) && MBB->pred_size() == 1 &&

      MF.getFunction().hasOptSize()) {

    // Changing "Jcc foo; foo: jmp bar;" into "Jcc bar;" might change the branch

    // direction, thereby defeating careful block placement and regressing

    // performance. Therefore, only consider this for optsize functions.

llvm/lib/CodeGen/BranchFolding.h

+0 −4
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ class MachineFunction; 
class MachineLoopInfo;

class MachineModuleInfo;

class MachineRegisterInfo;

class ProfileSummaryInfo;

class raw_ostream;

class TargetInstrInfo;

class TargetRegisterInfo;
@@ -40,7 +39,6 @@ class TargetRegisterInfo; 
                          bool CommonHoist,

                          MBFIWrapper &FreqInfo,

                          const MachineBranchProbabilityInfo &ProbInfo,

                          ProfileSummaryInfo *PSI,

                          // Min tail length to merge. Defaults to commandline

                          // flag. Ignored for optsize.

                          unsigned MinTailLength = 0);
@@ -147,7 +145,6 @@ class TargetRegisterInfo; 
                                  const BlockFrequency Freq) const;

      void view(const Twine &Name, bool isSimple = true);

      uint64_t getEntryFreq() const;

      const MachineBlockFrequencyInfo &getMBFI() { return MBFI; }



    private:

      const MachineBlockFrequencyInfo &MBFI;
@@ -157,7 +154,6 @@ class TargetRegisterInfo; 
  private:

    MBFIWrapper &MBBFreqInfo;

    const MachineBranchProbabilityInfo &MBPI;

    ProfileSummaryInfo *PSI;



    bool TailMergeBlocks(MachineFunction &MF);

    bool TryTailMergeBlocks(MachineBasicBlock* SuccBB,