code clean up

Author: YixingZhang007

llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.cpp

@@ -73,7 +73,7 @@ void SPIRVInstPrinter::printOpConstantVarOps(const MCInst *MI,
   // Handle float constants (OpConstantF)
   uint64_t Imm = MI->getOperand(StartIndex).getImm();
   if (NumVarOps == 2) {
-    Imm |= (MI->getOperand(StartIndex + 1).getImm() << 32);
+    Imm |= (MI->getOperand(StartIndex + 1).getImm()) << 32;
   }
 
   // For 16-bit floats, print as integer

llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp

@@ -343,35 +343,33 @@ Register SPIRVGlobalRegistry::createConstFP(const ConstantFP *CF,
   return Res;
 }
 
-Register SPIRVGlobalRegistry::getOrCreateConstInt(APInt Val, MachineInstr &I,
+Register SPIRVGlobalRegistry::getOrCreateConstInt(const APInt Val, MachineInstr &I,
                                                   SPIRVType *SpvType,
                                                   const SPIRVInstrInfo &TII,
                                                   bool ZeroAsNull) {
   const IntegerType *Ty = cast<IntegerType>(getTypeForSPIRVType(SpvType));
-  auto *const CI = ConstantInt::get(const_cast<IntegerType *>(Ty), Val);
-  const MachineInstr *MI = findMI(CI, CurMF);
+  Constant *const CA = ConstantInt::get(const_cast<IntegerType *>(Ty), Val);
+  const MachineInstr *MI = findMI(CA, CurMF);
   if (MI && (MI->getOpcode() == SPIRV::OpConstantNull ||
              MI->getOpcode() == SPIRV::OpConstantI))
     return MI->getOperand(0).getReg();
-  return createConstInt(CI, I, SpvType, TII, ZeroAsNull);
-  LLVMContext &Ctx = CurMF->getFunction().getContext();
+  return createConstInt(CA, I, SpvType, TII, ZeroAsNull);
 }
 
 Register SPIRVGlobalRegistry::getOrCreateConstInt(uint64_t Val, MachineInstr &I,
                                                   SPIRVType *SpvType,
                                                   const SPIRVInstrInfo &TII,
                                                   bool ZeroAsNull) {
   const IntegerType *Ty = cast<IntegerType>(getTypeForSPIRVType(SpvType));
-  auto *const CI = ConstantInt::get(const_cast<IntegerType *>(Ty), Val);
+  ConstantInt *const CI = ConstantInt::get(const_cast<IntegerType *>(Ty), Val);
   const MachineInstr *MI = findMI(CI, CurMF);
   if (MI && (MI->getOpcode() == SPIRV::OpConstantNull ||
              MI->getOpcode() == SPIRV::OpConstantI))
     return MI->getOperand(0).getReg();
   return createConstInt(CI, I, SpvType, TII, ZeroAsNull);
-  LLVMContext &Ctx = CurMF->getFunction().getContext();
 }
 
-Register SPIRVGlobalRegistry::createConstInt(const Constant *CI,
+Register SPIRVGlobalRegistry::createConstInt(const Constant *CA,
                                              MachineInstr &I,
                                              SPIRVType *SpvType,
                                              const SPIRVInstrInfo &TII,
@@ -389,19 +387,19 @@ Register SPIRVGlobalRegistry::createConstInt(const Constant *CI,
         MachineInstrBuilder MIB;
         if (BitWidth == 1) {
           MIB = MIRBuilder
-                    .buildInstr(CI->isZeroValue() ? SPIRV::OpConstantFalse
+                    .buildInstr(CA->isZeroValue() ? SPIRV::OpConstantFalse
                                              : SPIRV::OpConstantTrue)
                     .addDef(Res)
                     .addUse(getSPIRVTypeID(SpvType));
-        } else if (!CI->isZeroValue() || !ZeroAsNull) {
+        } else if (!CA->isZeroValue() || !ZeroAsNull) {
           MIB = MIRBuilder.buildInstr(SPIRV::OpConstantI)
                     .addDef(Res)
                     .addUse(getSPIRVTypeID(SpvType));
           if (BitWidth <= 64) {
-            const ConstantInt *CII = dyn_cast<ConstantInt>(CI);
-            addNumImm(APInt(BitWidth, CII->getZExtValue()), MIB);
+            const ConstantInt *CI = dyn_cast<ConstantInt>(CA);
+            addNumImm(APInt(BitWidth, CI->getZExtValue()), MIB);
           } else {
-            addNumImm(CI->getUniqueInteger(), MIB);
+            addNumImm(CA->getUniqueInteger(), MIB);
           }
         } else {
           MIB = MIRBuilder.buildInstr(SPIRV::OpConstantNull)
@@ -414,7 +412,7 @@ Register SPIRVGlobalRegistry::createConstInt(const Constant *CI,
                                          *ST.getRegBankInfo());
         return MIB;
       });
-  add(CI, NewType);
+  add(CA, NewType);
   return Res;
 }