Review comments

Author: arsenm

llvm/include/llvm/CodeGen/TargetInstrInfo.h

@@ -113,9 +113,9 @@ struct ExtAddrMode {
 ///
 class LLVM_ABI TargetInstrInfo : public MCInstrInfo {
 protected:
-  /// Subtarget specific sub-array of MCInstrInfo's RegClassByHwModeTables.
-  /// This should be indexed by MCOperandInfo's RegClass field for
-  /// LookupRegClassByHwMode operands.
+  /// Subtarget specific sub-array of MCInstrInfo's RegClassByHwModeTables
+  /// (i.e. the table for the active HwMode). This should be indexed by
+  /// MCOperandInfo's RegClass field for LookupRegClassByHwMode operands.
   const int16_t *const RegClassByHwMode;
 
 public:
@@ -141,7 +141,7 @@ class LLVM_ABI TargetInstrInfo : public MCInstrInfo {
            Opc <= TargetOpcode::GENERIC_ATOMICRMW_OP_END;
   }
 
-  /// Return the subtarget appropripate RegClassID for \p OpInfo
+  /// \returns the subtarget appropriate RegClassID for \p OpInfo
   ///
   /// Note this shadows a version of getOpRegClassID in MCInstrInfo which takes
   /// an additional argument for the subtarget's HwMode, since TargetInstrInfo

llvm/include/llvm/MC/MCInstrDesc.h

@@ -91,9 +91,8 @@ class MCOperandInfo {
   /// index into a table in TargetInstrInfo or MCInstrInfo which contains the
   /// real register class ID.
   ///
-  /// If isLookupPtrRegClass is set, then this is / an index that is passed to
-  /// TargetRegisterInfo::getPointerRegClass(x) to / get a dynamic register
-  /// class.
+  /// If isLookupPtrRegClass is set, then this is an index that is passed to
+  /// TargetRegisterInfo::getPointerRegClass(x) to get a dynamic register class.
   int16_t RegClass;
 
   /// These are flags from the MCOI::OperandFlags enum.

llvm/include/llvm/MC/MCInstrInfo.h

@@ -44,7 +44,7 @@ class MCInstrInfo {
   unsigned NumOpcodes;              // Number of entries in the desc array
 
 protected:
-  // Pointer to 2d array [NumHwModess][NumRegClassByHwModes]
+  // Pointer to 2d array [NumHwModes][NumRegClassByHwModes]
   const int16_t *RegClassByHwModeTables;
   int16_t NumRegClassByHwModes;
 

llvm/include/llvm/Target/Target.td

@@ -271,7 +271,7 @@ class RegisterClassLike : DAGOperand;
 //
 class RegisterClass<string namespace, list<ValueType> regTypes, int alignment,
                     dag regList, RegAltNameIndex idx = NoRegAltName>
-  : DAGOperand, RegisterClassLike {
+  : RegisterClassLike {
   string Namespace = namespace;
 
   // The register size/alignment information, parameterized by a HW mode.
@@ -923,7 +923,7 @@ def decoder;
 /// type that it doesn't know, and resolves the actual regclass to use by using
 /// the TargetRegisterInfo::getPointerRegClass() hook at codegen time.
 ///
-/// This is deprecated in favor of RegClassByHwMode
+/// This is deprecated in favor of RegClassByHwMode.
 class PointerLikeRegClass<int Kind> {
   int RegClassKind = Kind;
 }
@@ -936,8 +936,8 @@ class PointerLikeRegClass<int Kind> {
 /// define operands which swap the register class with the pointer
 /// type.
 class RegClassByHwMode<list<HwMode> Modes,
-                       list<RegisterClass> RegClasses> :
-  HwModeSelect<Modes, !size(RegClasses)>, RegisterClassLike {
+                       list<RegisterClass> RegClasses>
+  : HwModeSelect<Modes, !size(RegClasses)>, RegisterClassLike {
   list<RegisterClass> Objects = RegClasses;
 }
 

llvm/utils/TableGen/AsmMatcherEmitter.cpp

@@ -167,8 +167,7 @@ struct ClassInfo {
     RegisterClass0,
 
     /// The (first) register class by hwmode, subsequent register classes by
-    /// hwmode are
-    /// RegisterClassByHwMode0+1, and so on.
+    /// hwmode are RegisterClassByHwMode0+1, and so on.
     RegisterClassByHwMode0 = 1 << 12,
 
     /// The (first) user defined class, subsequent user defined classes are
@@ -178,7 +177,7 @@ struct ClassInfo {
 
   /// Kind - The class kind, which is either a predefined kind, or (UserClass0 +
   /// N) for the Nth user defined class.
-  unsigned Kind;
+  unsigned Kind = 0;
 
   /// SuperClasses - The super classes of this class. Note that for simplicities
   /// sake user operands only record their immediate super class, while register
@@ -220,7 +219,7 @@ struct ClassInfo {
   std::string DiagnosticString;
 
   /// Is this operand optional and not always required.
-  bool IsOptional;
+  bool IsOptional = false;
 
   /// DefaultMethod - The name of the method that returns the default operand
   /// for optional operand
@@ -1394,15 +1393,8 @@ void AsmMatcherInfo::buildRegisterClasses(
     CI->ClassName = "RegByHwMode_" + ClassByHwMode->getName().str();
     CI->Name = "MCK_" + CI->ClassName;
     CI->ValueName = ClassByHwMode->getName();
-    CI->PredicateMethod = ""; // unused
     CI->RenderMethod = "addRegOperands";
-    // CI->Registers = RS;
-    //  FIXME: diagnostic type.
-    CI->DiagnosticType = "";
-    CI->IsOptional = false;
-    CI->DefaultMethod = ""; // unused
-    // RegisterSetClasses.try_emplace(RS, CI);
-
+    //  FIXME: Set diagnostic type.
     ++RegClassByHwModeIndex;
 
     assert(CI->isRegisterClassByHwMode());