Merge setDefMI into setReg

Author: BeMg

llvm/lib/Target/RISCV/RISCVInsertVSETVLI.cpp

@@ -452,7 +452,7 @@ class VSETVLIInfo {
 
   enum : uint8_t {
     Uninitialized,
-    AVLIsReg,
+    AVLIsDefMI,
     AVLIsImm,
     AVLIsVLMAX,
     AVLIsIgnored,
@@ -481,10 +481,11 @@ class VSETVLIInfo {
   void setUnknown() { State = Unknown; }
   bool isUnknown() const { return State == Unknown; }
 
-  void setAVLReg(Register Reg) {
+  void setAVLReg(Register Reg, const MachineInstr *DefMI) {
     assert(Reg.isVirtual());
     AVLReg = Reg;
-    State = AVLIsReg;
+    AVLDefMI = DefMI;
+    State = AVLIsDefMI;
   }
 
   void setAVLImm(unsigned Imm) {
@@ -498,7 +499,7 @@ class VSETVLIInfo {
   void setAVLDefMI(const MachineInstr *DefMI) { AVLDefMI = DefMI; }
 
   bool hasAVLImm() const { return State == AVLIsImm; }
-  bool hasAVLReg() const { return State == AVLIsReg; }
+  bool hasAVLReg() const { return State == AVLIsDefMI; }
   bool hasAVLVLMAX() const { return State == AVLIsVLMAX; }
   bool hasAVLIgnored() const { return State == AVLIsIgnored; }
   Register getAVLReg() const {
@@ -516,10 +517,8 @@ class VSETVLIInfo {
     assert(Info.isValid());
     if (Info.isUnknown())
       setUnknown();
-    else if (Info.hasAVLReg()) {
-      setAVLReg(Info.getAVLReg());
-      setAVLDefMI(Info.getAVLDefMI());
-    }
+    else if (Info.hasAVLReg())
+      setAVLReg(Info.getAVLReg(), Info.getAVLDefMI());
     else if (Info.hasAVLVLMAX())
       setAVLVLMAX();
     else if (Info.hasAVLIgnored())
@@ -879,7 +878,7 @@ static VSETVLIInfo getInfoForVSETVLI(const MachineInstr &MI,
     if (AVLReg == RISCV::X0)
       NewInfo.setAVLVLMAX();
     else
-      NewInfo.setAVLDefMI(MRI.getVRegDef(AVLReg));
+      NewInfo.setAVLReg(AVLReg, MRI.getVRegDef(AVLReg));
   }
   NewInfo.setVTYPE(MI.getOperand(2).getImm());
 
@@ -951,9 +950,9 @@ static VSETVLIInfo computeInfoForInstr(const MachineInstr &MI, uint64_t TSFlags,
       else
         InstrInfo.setAVLImm(Imm);
     } else {
-      InstrInfo.setAVLReg(VLOp.getReg());
-      if (VLOp.getReg().isVirtual())
-        InstrInfo.setAVLDefMI(MRI->getVRegDef(VLOp.getReg()));
+      InstrInfo.setAVLReg(VLOp.getReg(), VLOp.getReg().isVirtual()
+                                             ? MRI->getVRegDef(VLOp.getReg())
+                                             : nullptr);
     }
   } else {
     assert(isScalarExtractInstr(MI));
@@ -1228,9 +1227,10 @@ void RISCVInsertVSETVLI::transferAfter(VSETVLIInfo &Info,
 
   if (RISCV::isFaultFirstLoad(MI)) {
     // Update AVL to vl-output of the fault first load.
-    Info.setAVLReg(MI.getOperand(1).getReg());
-    if (MI.getOperand(1).getReg().isVirtual())
-      Info.setAVLDefMI(MRI->getVRegDef(MI.getOperand(1).getReg()));
+    Info.setAVLReg(MI.getOperand(1).getReg(),
+                   MI.getOperand(1).getReg().isVirtual()
+                       ? MRI->getVRegDef(MI.getOperand(1).getReg())
+                       : nullptr);
     return;
   }