Revert r300964 + r300970 - [globalisel][tablegen] Import SelectionDAG's rule predicates and support the equivalent in GIRule.

It's causing llvm-clang-x86_64-expensive-checks-win to fail to compile and I
haven't worked out why. Reverting to make it green while I figure it out.

llvm-svn: 300978

1 files changed, 0 insertions, 40 deletions

diff --git a/llvm/utils/TableGen/SubtargetFeatureInfo.h b/llvm/utils/TableGen/SubtargetFeatureInfo.h
index bbaf4525960..99f380f2a1d 100644
--- a/llvm/utils/TableGen/SubtargetFeatureInfo.h
+++ b/llvm/utils/TableGen/SubtargetFeatureInfo.h
@@ -37,34 +37,16 @@ struct SubtargetFeatureInfo {
     return "Feature_" + TheDef->getName().str();
   }
 
-  /// \brief The name of the enumerated constant identifying the bitnumber for
-  /// this feature.
-  std::string getEnumBitName() const {
-    return "Feature_" + TheDef->getName().str() + "Bit";
-  }
-
   void dump() const;
   static std::vector<std::pair<Record *, SubtargetFeatureInfo>>
   getAll(const RecordKeeper &Records);
 
   /// Emit the subtarget feature flag definitions.
-  ///
-  /// This version emits the bit value for the feature and is therefore limited
-  /// to 64 feature bits.
   static void emitSubtargetFeatureFlagEnumeration(
       std::map<Record *, SubtargetFeatureInfo, LessRecordByID>
           &SubtargetFeatures,
       raw_ostream &OS);
 
-  /// Emit the subtarget feature flag definitions.
-  ///
-  /// This version emits the bit index for the feature and can therefore support
-  /// more than 64 feature bits.
-  static void emitSubtargetFeatureBitEnumeration(
-      std::map<Record *, SubtargetFeatureInfo, LessRecordByID>
-          &SubtargetFeatures,
-      raw_ostream &OS);
-
   static void emitNameTable(std::map<Record *, SubtargetFeatureInfo,
                                      LessRecordByID> &SubtargetFeatures,
                             raw_ostream &OS);
@@ -72,9 +54,6 @@ struct SubtargetFeatureInfo {
   /// Emit the function to compute the list of available features given a
   /// subtarget.
   ///
-  /// This version is used for subtarget features defined using Predicate<>
-  /// and supports more than 64 feature bits.
-  ///
   /// \param TargetName The name of the target as used in class prefixes (e.g.
   ///                   <TargetName>Subtarget)
   /// \param ClassName  The name of the class (without the <Target> prefix)
@@ -87,25 +66,6 @@ struct SubtargetFeatureInfo {
       std::map<Record *, SubtargetFeatureInfo, LessRecordByID>
           &SubtargetFeatures,
       raw_ostream &OS);
-
-  /// Emit the function to compute the list of available features given a
-  /// subtarget.
-  ///
-  /// This version is used for subtarget features defined using
-  /// AssemblerPredicate<> and supports up to 64 feature bits.
-  ///
-  /// \param TargetName The name of the target as used in class prefixes (e.g.
-  ///                   <TargetName>Subtarget)
-  /// \param ClassName  The name of the class (without the <Target> prefix)
-  ///                   that will contain the generated functions.
-  /// \param FuncName   The name of the function to emit.
-  /// \param SubtargetFeatures A map of TableGen records to the
-  ///                          SubtargetFeatureInfo equivalent.
-  static void emitComputeAssemblerAvailableFeatures(
-      StringRef TargetName, StringRef ClassName, StringRef FuncName,
-      std::map<Record *, SubtargetFeatureInfo, LessRecordByID>
-          &SubtargetFeatures,
-      raw_ostream &OS);
 };
 } // end namespace llvm