address comment

Author: diggerlin

llvm/include/llvm/MC/MCSubtargetInfo.h

@@ -15,7 +15,6 @@
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/MC/MCInstrItineraries.h"
 #include "llvm/MC/MCSchedule.h"
@@ -33,55 +32,43 @@ class MCInst;
 //===----------------------------------------------------------------------===//
 
 /// Used to provide key value pairs for feature and CPU bit flags.
-struct BasicSubtargetFeatureKV {
-  const char *Key;         ///< K-V key string
-  unsigned Value;          ///< K-V integer value
-  FeatureBitArray Implies; ///< K-V bit mask
+struct SubtargetFeatureKV {
+  const char *Key;                      ///< K-V key string
+  const char *Desc;                     ///< Help descriptor
+  unsigned Value;                       ///< K-V integer value
+  FeatureBitArray Implies;              ///< K-V bit mask
 
   /// Compare routine for std::lower_bound
   bool operator<(StringRef S) const {
     return StringRef(Key) < S;
   }
 
   /// Compare routine for std::is_sorted.
-  bool operator<(const BasicSubtargetFeatureKV &Other) const {
+  bool operator<(const SubtargetFeatureKV &Other) const {
     return StringRef(Key) < StringRef(Other.Key);
   }
-  constexpr BasicSubtargetFeatureKV(const char *Key, unsigned Value,
-                                    FeatureBitArray Implies)
-      : Key(Key), Value(Value), Implies(Implies) {}
-};
-
-struct SubtargetFeatureKV : BasicSubtargetFeatureKV {
-  const char *Desc; ///< Help descriptor
-  SubtargetFeatureKV(const char *Key, const char *Desc, unsigned Value,
-                     FeatureBitArray Implies)
-      : BasicSubtargetFeatureKV(Key, Value, Implies), Desc(Desc) {}
 };
 
 //===----------------------------------------------------------------------===//
 
 /// Used to provide key value pairs for feature and CPU bit flags.
-struct BasicSubtargetSubTypeKV {
-  const char *Key;         ///< K-V key string
-  FeatureBitArray Implies; ///< K-V bit mask
+struct SubtargetSubTypeKV {
+  const char *Key;                      ///< K-V key string
+  FeatureBitArray Implies;              ///< K-V bit mask
+  FeatureBitArray TuneImplies;          ///< K-V bit mask
+  const MCSchedModel *SchedModel;
 
   /// Compare routine for std::lower_bound
   bool operator<(StringRef S) const {
     return StringRef(Key) < S;
   }
 
   /// Compare routine for std::is_sorted.
-  bool operator<(const BasicSubtargetSubTypeKV &Other) const {
+  bool operator<(const SubtargetSubTypeKV &Other) const {
     return StringRef(Key) < StringRef(Other.Key);
   }
 };
 
-struct SubtargetSubTypeKV : BasicSubtargetSubTypeKV {
-  FeatureBitArray TuneImplies; ///< K-V bit mask
-  const MCSchedModel *SchedModel;
-};
-
 //===----------------------------------------------------------------------===//
 ///
 /// Generic base class for all target subtargets.

llvm/include/llvm/TargetParser/TargetParser.h

@@ -14,9 +14,10 @@
 #ifndef LLVM_TARGETPARSER_TARGETPARSER_H
 #define LLVM_TARGETPARSER_TARGETPARSER_H
 
+#include "SubtargetFeature.h"
+#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/MC/MCSubtargetInfo.h"
 
 namespace llvm {
 
@@ -191,6 +192,26 @@ insertWaveSizeFeature(StringRef GPU, const Triple &T,
 
 } // namespace AMDGPU
 
+struct BasicSubtargetFeatureKV {
+  const char *Key;         ///< K-V key string
+  unsigned Value;          ///< K-V integer value
+  FeatureBitArray Implies; ///< K-V bit mask
+};
+
+/// Used to provide key value pairs for feature and CPU bit flags.
+struct BasicSubtargetSubTypeKV {
+  const char *Key;         ///< K-V key string
+  FeatureBitArray Implies; ///< K-V bit mask
+
+  /// Compare routine for std::lower_bound
+  bool operator<(StringRef S) const { return StringRef(Key) < S; }
+
+  /// Compare routine for std::is_sorted.
+  bool operator<(const BasicSubtargetSubTypeKV &Other) const {
+    return StringRef(Key) < StringRef(Other.Key);
+  }
+};
+
 std::optional<llvm::StringMap<bool>>
 getCPUDefaultTargetFeatures(StringRef CPU,
                             ArrayRef<BasicSubtargetSubTypeKV> ProcDesc,

llvm/lib/MC/MCSubtargetInfo.cpp

@@ -33,13 +33,13 @@ static const T *Find(StringRef S, ArrayRef<T> A) {
 }
 
 /// For each feature that is (transitively) implied by this feature, set it.
-template <typename FeatureKVType>
-static void SetImpliedBits(FeatureBitset &Bits, const FeatureBitset &Implies,
-                           ArrayRef<FeatureKVType> FeatureTable) {
+static
+void SetImpliedBits(FeatureBitset &Bits, const FeatureBitset &Implies,
+                    ArrayRef<SubtargetFeatureKV> FeatureTable) {
   // OR the Implies bits in outside the loop. This allows the Implies for CPUs
   // which might imply features not in FeatureTable to use this.
   Bits |= Implies;
-  for (const FeatureKVType &FE : FeatureTable)
+  for (const SubtargetFeatureKV &FE : FeatureTable)
     if (Implies.test(FE.Value))
       SetImpliedBits(Bits, FE.Implies.getAsBitset(), FeatureTable);
 }