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

Reverts llvm/llvm-project#165868 due to buildbot failures

Co-authored-by: spupyrev <spupyrev@users.noreply.github.com>

1 files changed, 2 insertions, 11 deletions

diff --git a/llvm/lib/CodeGen/TargetPassConfig.cpp b/llvm/lib/CodeGen/TargetPassConfig.cpp
index d94cc70da0ef..10b723887b21 100644
--- a/llvm/lib/CodeGen/TargetPassConfig.cpp
+++ b/llvm/lib/CodeGen/TargetPassConfig.cpp
@@ -272,12 +272,6 @@ static cl::opt<bool>
                     cl::desc("Split static data sections into hot and cold "
                              "sections using profile information"));
 
-/// Enable matching and inference when using propeller.
-static cl::opt<bool> PropellerMatchInfer(
-    "propeller-match-infer",
-    cl::desc("Enable matching and inference when using propeller"),
-    cl::init(false), cl::Optional);
-
 cl::opt<bool> EmitBBHash(
     "emit-bb-hash",
     cl::desc(
@@ -1293,15 +1287,12 @@ void TargetPassConfig::addMachinePasses() {
   // address map (or both).
   if (TM->getBBSectionsType() != llvm::BasicBlockSection::None ||
       TM->Options.BBAddrMap) {
-    if (EmitBBHash || PropellerMatchInfer)
+    if (EmitBBHash)
       addPass(llvm::createMachineBlockHashInfoPass());
     if (TM->getBBSectionsType() == llvm::BasicBlockSection::List) {
       addPass(llvm::createBasicBlockSectionsProfileReaderWrapperPass(
           TM->getBBSectionsFuncListBuf()));
-      if (PropellerMatchInfer)
-        addPass(llvm::createBasicBlockMatchingAndInferencePass());
-      else
-        addPass(llvm::createBasicBlockPathCloningPass());
+      addPass(llvm::createBasicBlockPathCloningPass());
     }
     addPass(llvm::createBasicBlockSectionsPass());
   }