fixup! resolve comment

Author: 4vtomat

llvm/lib/Target/RISCV/MCTargetDesc/RISCVMatInt.cpp

@@ -82,11 +82,11 @@ static void generateInstSeqImpl(int64_t Val, const MCSubtargetInfo &STI,
   if (STI.hasFeature(RISCV::FeatureStdExtP)) {
     // Check if the immediate is packed i8 or i10
     int32_t Bit63To32 = Val >> 32;
-    int32_t Bit31To0 = Val & 0xFFFFFFFF;
+    int32_t Bit31To0 = Val;
     int16_t Bit31To16 = Bit31To0 >> 16;
-    int16_t Bit15To0 = Bit31To0 & 0xFFFF;
+    int16_t Bit15To0 = Bit31To0;
     int8_t Bit15To8 = Bit15To0 >> 8;
-    int8_t Bit7To0 = Bit15To0 & 0xFF;
+    int8_t Bit7To0 = Bit15To0;
     if (Bit63To32 == Bit31To0) {
       if (IsRV64 && isInt<10>(Bit63To32)) {
         Res.emplace_back(RISCV::PLI_W, Bit63To32);

llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp

@@ -991,6 +991,18 @@ static unsigned getSegInstNF(unsigned Intrinsic) {
   }
 }
 
+static bool isApplicableToPLI(int Val) {
+  // Check if the immediate is packed i8 or i10
+  int16_t Bit31To16 = Val >> 16;
+  int16_t Bit15To0 = Val;
+  int8_t Bit15To8 = Bit15To0 >> 8;
+  int8_t Bit7To0 = Val;
+  if (Bit31To16 != Bit15To0)
+    return false;
+
+  return isInt<10>(Bit31To16) || Bit15To8 == Bit7To0;
+}
+
 void RISCVDAGToDAGISel::Select(SDNode *Node) {
   // If we have a custom node, we have already selected.
   if (Node->isMachineOpcode()) {
@@ -1034,12 +1046,12 @@ void RISCVDAGToDAGISel::Select(SDNode *Node) {
     if (!isInt<32>(Imm) && isUInt<32>(Imm) && hasAllWUsers(Node))
       Imm = SignExtend64<32>(Imm);
 
-    if (hasAllWUsers(Node) && Subtarget->hasStdExtP() &&
-        Subtarget->enablePExtCodeGen()) {
+    if (hasAllWUsers(Node) && isApplicableToPLI(Imm) &&
+        Subtarget->hasStdExtP() && Subtarget->enablePExtCodeGen()) {
       // If its 4 packed 8 bit integer or 2 packed signed integer, we can simply
       // copy lower 32 bits to higher 32 bits to make it able to rematerialize
       // to PLI_B or PLI_H
-      Imm = (Imm << 32) | (Imm & 0xFFFFFFFF);
+      Imm = ((uint64_t)Imm << 32) | (Imm & 0xFFFFFFFF);
     }
 
     ReplaceNode(Node, selectImm(CurDAG, DL, VT, Imm, *Subtarget).getNode());