Remove enableMacroFusion

wangpc-pp · Jan 19, 2024 · e74662e · e74662e
1 parent 6640323
commit e74662e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 30 deletions.
diff --git a/llvm/include/llvm/CodeGen/TargetSubtargetInfo.h b/llvm/include/llvm/CodeGen/TargetSubtargetInfo.h
@@ -325,9 +325,6 @@ class TargetSubtargetInfo : public MCSubtargetInfo {
   /// handling complex eviction chains.
   virtual bool enableSpillageCopyElimination() const { return false; }
 
-  /// Enable macro fusion for this subtarget.
-  virtual bool enableMacroFusion() const { return false; }
-
   /// Get the list of MacroFusion predicates.
   virtual std::vector<MacroFusionPredTy> getMacroFusions() const { return {}; };
 };

diff --git a/llvm/test/TableGen/MacroFusion.td b/llvm/test/TableGen/MacroFusion.td
@@ -101,15 +101,9 @@ def TestFusion: SimpleFusion<"test-fusion", "HasTestFusion", "Test Fusion",
 // Check that we have generated target subfeature.
 // CHECK-SUBTARGET: { "test-fusion", "Test Fusion", Test::TestFusion
 
-// Check that we have generated `enableMacroFusion()` and `getMacroFusions()` function.
-// CHECK-SUBTARGET:      bool enableMacroFusion() const override;
+// Check that we have generated `getMacroFusions()` function.
 // CHECK-SUBTARGET:      std::vector<MacroFusionPredTy> getMacroFusions() const override;
 
-// CHECK-SUBTARGET:      bool TestGenSubtargetInfo::enableMacroFusion() const {
-// CHECK-SUBTARGET-NEXT:   if (hasFeature(Test::TestFusion)) return true;
-// CHECK-SUBTARGET-NEXT:   return false;
-// CHECK-SUBTARGET-NEXT: }
-
 // CHECK-SUBTARGET:      std::vector<MacroFusionPredTy> TestGenSubtargetInfo::getMacroFusions() const {
 // CHECK-SUBTARGET-NEXT:   std::vector<MacroFusionPredTy> Fusions;
 // CHECK-SUBTARGET-NEXT:   if (hasFeature(Test::TestFusion)) Fusions.push_back(llvm::isTestFusion);

diff --git a/llvm/utils/TableGen/SubtargetEmitter.cpp b/llvm/utils/TableGen/SubtargetEmitter.cpp
@@ -134,7 +134,6 @@ class SubtargetEmitter {
 
   void EmitSchedModel(raw_ostream &OS);
   void emitGetMacroFusions(const std::string &ClassName, raw_ostream &OS);
-  void emitEnableMacroFusion(const std::string &ClassName, raw_ostream &OS);
   void EmitHwModeCheck(const std::string &ClassName, raw_ostream &OS);
   void ParseFeaturesFunction(raw_ostream &OS);
 
@@ -1788,21 +1787,6 @@ void SubtargetEmitter::EmitHwModeCheck(const std::string &ClassName,
   OS << "  return 0;\n}\n";
 }
 
-void SubtargetEmitter::emitEnableMacroFusion(const std::string &ClassName,
-                                             raw_ostream &OS) {
-  if (!TGT.hasMacroFusion())
-    return;
-
-  OS << "bool " << ClassName << "::enableMacroFusion() const {\n";
-  for (auto *Fusion : TGT.getMacroFusions())
-    OS.indent(2) << "if (hasFeature(" << Target
-                 << "::" << Fusion->getNameInitAsString()
-                 << ")) return true;\n";
-
-  OS.indent(2) << "return false;\n";
-  OS << "}\n";
-}
-
 void SubtargetEmitter::emitGetMacroFusions(const std::string &ClassName,
                                            raw_ostream &OS) {
   if (!TGT.hasMacroFusion())
@@ -2022,11 +2006,9 @@ void SubtargetEmitter::run(raw_ostream &OS) {
      << " const;\n";
   if (TGT.getHwModes().getNumModeIds() > 1)
     OS << "  unsigned getHwMode() const override;\n";
-  if (TGT.hasMacroFusion()) {
-    OS << "  bool enableMacroFusion() const override;\n";
+  if (TGT.hasMacroFusion())
     OS << "  std::vector<MacroFusionPredTy> getMacroFusions() const "
           "override;\n";
-  }
 
   STIPredicateExpander PE(Target);
   PE.setByRef(false);
@@ -2084,7 +2066,6 @@ void SubtargetEmitter::run(raw_ostream &OS) {
 
   EmitSchedModelHelpers(ClassName, OS);
   EmitHwModeCheck(ClassName, OS);
-  emitEnableMacroFusion(ClassName, OS);
   emitGetMacroFusions(ClassName, OS);
 
   OS << "} // end namespace llvm\n\n";