address comments

Author: zhaoqi5

llvm/lib/Target/LoongArch/LoongArchExpandPseudoInsts.cpp

@@ -196,14 +196,12 @@ bool LoongArchPreRAExpandPseudo::expandPcalau12iInstPair(
   MachineOperand &Symbol = MI.getOperand(1);
 
   BuildMI(MBB, MBBI, DL, TII->get(LoongArch::PCALAU12I), ScratchReg)
-      .addDisp(Symbol, 0,
-               EnableRelax ? LoongArchII::addRelaxFlag(FlagsHi) : FlagsHi);
+      .addDisp(Symbol, 0, LoongArchII::encodeFlags(FlagsHi, EnableRelax));
 
   MachineInstr *SecondMI =
       BuildMI(MBB, MBBI, DL, TII->get(SecondOpcode), DestReg)
           .addReg(ScratchReg)
-          .addDisp(Symbol, 0,
-                   EnableRelax ? LoongArchII::addRelaxFlag(FlagsLo) : FlagsLo);
+          .addDisp(Symbol, 0, LoongArchII::encodeFlags(FlagsLo, EnableRelax));
 
   if (MI.hasOneMemOperand())
     SecondMI->addMemOperand(*MF, *MI.memoperands_begin());
@@ -495,9 +493,8 @@ bool LoongArchPreRAExpandPseudo::expandLoadAddressTLSDesc(
 
   BuildMI(MBB, MBBI, DL, TII->get(LoongArch::PCALAU12I), Tmp1Reg)
       .addDisp(Symbol, 0,
-               (EnableRelax && !Large)
-                   ? LoongArchII::addRelaxFlag(LoongArchII::MO_DESC_PC_HI)
-                   : LoongArchII::MO_DESC_PC_HI);
+               LoongArchII::encodeFlags(LoongArchII::MO_DESC_PC_HI,
+                                        EnableRelax && !Large));
 
   if (Large) {
     // Code Sequence:
@@ -539,24 +536,21 @@ bool LoongArchPreRAExpandPseudo::expandLoadAddressTLSDesc(
     // add.w/d   $dst, $a0, $tp
     BuildMI(MBB, MBBI, DL, TII->get(ADDI), LoongArch::R4)
         .addReg(Tmp1Reg)
-        .addDisp(Symbol, 0,
-                 EnableRelax
-                     ? LoongArchII::addRelaxFlag(LoongArchII::MO_DESC_PC_LO)
-                     : LoongArchII::MO_DESC_PC_LO);
+        .addDisp(
+            Symbol, 0,
+            LoongArchII::encodeFlags(LoongArchII::MO_DESC_PC_LO, EnableRelax));
   }
 
   BuildMI(MBB, MBBI, DL, TII->get(LD), LoongArch::R1)
       .addReg(LoongArch::R4)
       .addDisp(Symbol, 0,
-               (EnableRelax && !Large)
-                   ? LoongArchII::addRelaxFlag(LoongArchII::MO_DESC_LD)
-                   : LoongArchII::MO_DESC_LD);
+               LoongArchII::encodeFlags(LoongArchII::MO_DESC_LD,
+                                        EnableRelax && !Large));
   BuildMI(MBB, MBBI, DL, TII->get(LoongArch::PseudoDESC_CALL), LoongArch::R1)
       .addReg(LoongArch::R1)
       .addDisp(Symbol, 0,
-               (EnableRelax && !Large)
-                   ? LoongArchII::addRelaxFlag(LoongArchII::MO_DESC_CALL)
-                   : LoongArchII::MO_DESC_CALL);
+               LoongArchII::encodeFlags(LoongArchII::MO_DESC_CALL,
+                                        EnableRelax && !Large));
   BuildMI(MBB, MBBI, DL, TII->get(ADD), DestReg)
       .addReg(LoongArch::R4)
       .addReg(LoongArch::R2);

llvm/lib/Target/LoongArch/LoongArchInstrInfo.cpp

@@ -454,9 +454,6 @@ bool LoongArchInstrInfo::isSchedulingBoundary(const MachineInstr &MI,
     // * pcalau12i $a0, %got_pc_hi20(s)
     //   ld.w/d $a0, $a0, %got_pc_lo12(s)
     //
-    // * pcalau12i $a0, %ie_pc_hi20(s)
-    //   ld.w/d $a0, $a0, %ie_pc_lo12(s)
-    //
     // * pcalau12i $a0, %ld_pc_hi20(s) | %gd_pc_hi20(s)
     //   addi.w/d $a0, $a0, %got_pc_lo12(s)
     //
@@ -492,9 +489,6 @@ bool LoongArchInstrInfo::isSchedulingBoundary(const MachineInstr &MI,
       if (MO0 == LoongArchII::MO_GOT_PC_HI && SecondOp->getOpcode() == LdOp &&
           MO1 == LoongArchII::MO_GOT_PC_LO)
         return true;
-      if (MO0 == LoongArchII::MO_IE_PC_HI && SecondOp->getOpcode() == LdOp &&
-          MO1 == LoongArchII::MO_IE_PC_LO)
-        return true;
       if ((MO0 == LoongArchII::MO_LD_PC_HI ||
            MO0 == LoongArchII::MO_GD_PC_HI) &&
           SecondOp->getOpcode() == AddiOp && MO1 == LoongArchII::MO_GOT_PC_LO)
@@ -511,7 +505,7 @@ bool LoongArchInstrInfo::isSchedulingBoundary(const MachineInstr &MI,
     case LoongArch::LD_W:
     case LoongArch::LD_D: {
       auto MO = LoongArchII::getDirectFlags(MI.getOperand(2));
-      if (MO == LoongArchII::MO_GOT_PC_LO || MO == LoongArchII::MO_IE_PC_LO)
+      if (MO == LoongArchII::MO_GOT_PC_LO)
         return true;
       break;
     }

llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchBaseInfo.h

@@ -75,7 +75,9 @@ static inline unsigned getDirectFlags(const MachineOperand &MO) {
 }
 
 // Add MO_RELAX "bitmask" flag when FeatureRelax is enabled.
-static inline unsigned addRelaxFlag(unsigned Flags) { return Flags | MO_RELAX; }
+static inline unsigned encodeFlags(unsigned Flags, bool Relax) {
+  return Flags | (Relax ? MO_RELAX : 0);
+}
 
 // \returns true if the given MachineOperand has MO_RELAX "bitmask" flag.
 static inline bool hasRelaxFlag(const MachineOperand &MO) {