Revert "Adding Matching and Inference Functionality to Propeller-PR4: Implement matching and inference and create clusters" (#167559)

Reverts #165868 due to buildbot failures

Co-authored-by: spupyrev <[email protected]>

Author: spupyrev

llvm/include/llvm/CodeGen/BasicBlockMatchingAndInference.h

@@ -86,10 +86,6 @@ class BasicBlockSectionsProfileReader {
   uint64_t getEdgeCount(StringRef FuncName, const UniqueBBID &SrcBBID,
                         const UniqueBBID &SinkBBID) const;
 
-  // Return the complete function path and cluster info for the given function.
-  std::pair<bool, FunctionPathAndClusterInfo>
-  getFunctionPathAndClusterInfo(StringRef FuncName) const;
-
 private:
   StringRef getAliasName(StringRef FuncName) const {
     auto R = FuncAliasMap.find(FuncName);
@@ -199,9 +195,6 @@ class BasicBlockSectionsProfileReaderWrapperPass : public ImmutablePass {
   uint64_t getEdgeCount(StringRef FuncName, const UniqueBBID &SrcBBID,
                         const UniqueBBID &DestBBID) const;
 
-  std::pair<bool, FunctionPathAndClusterInfo>
-  getFunctionPathAndClusterInfo(StringRef FuncName) const;
-
   // Initializes the FunctionNameToDIFilename map for the current module and
   // then reads the profile for the matching functions.
   bool doInitialization(Module &M) override;

llvm/include/llvm/CodeGen/BasicBlockSectionsProfileReader.h

@@ -80,8 +80,6 @@ struct BlendedBlockHash {
     return Dist;
   }
 
-  uint16_t getOpcodeHash() const { return OpcodeHash; }
-
 private:
   /// The offset of the basic block from the function start.
   uint16_t Offset{0};

llvm/include/llvm/CodeGen/MachineBlockHashInfo.h

@@ -69,10 +69,6 @@ LLVM_ABI MachineFunctionPass *createBasicBlockSectionsPass();
 
 LLVM_ABI MachineFunctionPass *createBasicBlockPathCloningPass();
 
-/// createBasicBlockMatchingAndInferencePass - This pass enables matching
-/// and inference when using propeller.
-LLVM_ABI MachineFunctionPass *createBasicBlockMatchingAndInferencePass();
-
 /// createMachineBlockHashInfoPass - This pass computes basic block hashes.
 LLVM_ABI MachineFunctionPass *createMachineBlockHashInfoPass();
 

llvm/include/llvm/CodeGen/Passes.h

@@ -55,7 +55,6 @@ LLVM_ABI void initializeAlwaysInlinerLegacyPassPass(PassRegistry &);
 LLVM_ABI void initializeAssignmentTrackingAnalysisPass(PassRegistry &);
 LLVM_ABI void initializeAssumptionCacheTrackerPass(PassRegistry &);
 LLVM_ABI void initializeAtomicExpandLegacyPass(PassRegistry &);
-LLVM_ABI void initializeBasicBlockMatchingAndInferencePass(PassRegistry &);
 LLVM_ABI void initializeBasicBlockPathCloningPass(PassRegistry &);
 LLVM_ABI void
 initializeBasicBlockSectionsProfileReaderWrapperPassPass(PassRegistry &);

llvm/include/llvm/InitializePasses.h

@@ -130,11 +130,6 @@ template <typename FT> class SampleProfileInference {
   SampleProfileInference(FunctionT &F, BlockEdgeMap &Successors,
                          BlockWeightMap &SampleBlockWeights)
       : F(F), Successors(Successors), SampleBlockWeights(SampleBlockWeights) {}
-  SampleProfileInference(FunctionT &F, BlockEdgeMap &Successors,
-                         BlockWeightMap &SampleBlockWeights,
-                         EdgeWeightMap &SampleEdgeWeights)
-      : F(F), Successors(Successors), SampleBlockWeights(SampleBlockWeights),
-        SampleEdgeWeights(SampleEdgeWeights) {}
 
   /// Apply the profile inference algorithm for a given function
   void apply(BlockWeightMap &BlockWeights, EdgeWeightMap &EdgeWeights);
@@ -162,9 +157,6 @@ template <typename FT> class SampleProfileInference {
 
   /// Map basic blocks to their sampled weights.
   BlockWeightMap &SampleBlockWeights;
-
-  /// Map edges to their sampled weights.
-  EdgeWeightMap SampleEdgeWeights;
 };
 
 template <typename BT>
@@ -274,14 +266,6 @@ FlowFunction SampleProfileInference<BT>::createFlowFunction(
       FlowJump Jump;
       Jump.Source = BlockIndex[BB];
       Jump.Target = BlockIndex[Succ];
-      auto It = SampleEdgeWeights.find(std::make_pair(BB, Succ));
-      if (It != SampleEdgeWeights.end()) {
-        Jump.HasUnknownWeight = false;
-        Jump.Weight = It->second;
-      } else {
-        Jump.HasUnknownWeight = true;
-        Jump.Weight = 0;
-      }
       Func.Jumps.push_back(Jump);
     }
   }