[AIEX] NFC: Share more common code in AIEBaseInst

Author: gbossu

llvm/lib/Target/AIE/AIE2InstrFormats.td

@@ -16,11 +16,7 @@ include "AIE2GenInstrFormats.td"
 // Pseudo instructions
 class Pseudo<dag outs, dag ins, string opcodestr = "",
              string argstr = "">
-    : AIE2Inst<outs, ins, opcodestr, argstr> {
-  let isPseudo = 1;
-  let isCodeGenOnly = 1;
-  let isComposite = 0;
-}
+    : AIE2Inst<outs, ins, opcodestr, argstr>, AIEPseudoInstrAttributes {}
 
 // MultiSlot Pseudo instruction: Use this to define Pseudo for multi slot instructions
 // This instruction could be materialized to different VLIW slots.

llvm/lib/Target/AIE/AIE2Slots.td

@@ -66,11 +66,7 @@ let Namespace = "AIE2" in
 
 
 class AIE2Inst<dag outs, dag ins, string opcodestr, string argstr>
-    : AIEBaseInst <outs, ins, []> {
-  field bits<32> dontcare = 0;
-  let Namespace = "AIE2";
-  let AsmString = opcodestr # "\t" # argstr;
-}
+    : AIEBaseInst <outs, ins, [], opcodestr, argstr, "AIE2"> {}
 
 class AIE2SlotInst<InstSlot slot,
       dag outs, dag ins, string opcodestr, string argstr>

llvm/lib/Target/AIE/AIEBaseInstrFormats.td

@@ -12,11 +12,25 @@
 //
 //===----------------------------------------------------------------------===//
 
-class AIEBaseInst<dag outs, dag ins, list<dag> pattern>
+class AIEBaseInst<dag outs, dag ins, list<dag> pattern, string opcodestr, string argstr, string namespace>
     : Instruction, InstFormat {
   let Size = 4;
   dag OutOperandList = outs;
   dag InOperandList = ins;
   let Pattern = pattern;
-  let isComposite = 0;
+  let isComposite = false;
+  let Namespace = namespace;
+  let AsmString = opcodestr # "\t" # argstr;
+
+  // A scratchpad of bits that is used in the encoding to say "these bits do not
+  // matter for encoding or decoding".
+  field bits<32> dontcare = 0;
+}
+
+// Attributes for Pseudo instructions
+class AIEPseudoInstrAttributes {
+  field bit isPseudo;
+  field bit isCodeGenOnly;
+  let isPseudo = true;
+  let isCodeGenOnly = true;
 }

llvm/lib/Target/AIE/AIEInstrFormats.td

@@ -138,22 +138,14 @@ def OPC_ALU_R_R_ABS      : AIEOpcode_ALU_R_R<0b1000>;
 
 class AIEInst<dag outs, dag ins, string opcodestr, string argstr,
               list<dag> pattern>
-    : AIEBaseInst<outs, ins, pattern>
-{
-  let Namespace = "AIE";
-
-  let AsmString = opcodestr # "\t" # argstr;
-
+    : AIEBaseInst<outs, ins, pattern, opcodestr, argstr, "AIE"> {
   // Default value of the slot
   let Slot = unknown_slot;
 }
 
 // Pseudo instructions
 class Pseudo<dag outs, dag ins, list<dag> pattern, string opcodestr = "", string argstr = "">
-    : AIEInst<outs, ins, opcodestr, argstr, pattern> {
-  let isPseudo = 1;
-  let isCodeGenOnly = 1;
-}
+    : AIEInst<outs, ins, opcodestr, argstr, pattern>, AIEPseudoInstrAttributes {}
 
 //////////////////////////
 // Instruction classes