@@ -9117,53 +9117,55 @@ void SIInstrInfo::movePackToVALU(SIInstrWorklist &Worklist,
91179117
91189118 if (ST.useRealTrue16Insts ()) {
91199119 Register SrcReg0, SrcReg1;
9120- if (!Src0.isReg () || (Src0. isReg () && !RI.isVGPR (MRI, Src0.getReg () ))) {
9120+ if (!Src0.isReg () || !RI.isVGPR (MRI, Src0.getReg ())) {
91219121 SrcReg0 = MRI.createVirtualRegister (&AMDGPU::VGPR_32RegClass);
91229122 BuildMI (*MBB, Inst, DL, get (AMDGPU::V_MOV_B32_e32), SrcReg0).add (Src0);
9123- } else
9123+ } else {
91249124 SrcReg0 = Src0.getReg ();
9125+ }
91259126
9126- if (!Src1.isReg () || (Src1. isReg () && !RI.isVGPR (MRI, Src1.getReg () ))) {
9127+ if (!Src1.isReg () || !RI.isVGPR (MRI, Src1.getReg ())) {
91279128 SrcReg1 = MRI.createVirtualRegister (&AMDGPU::VGPR_32RegClass);
91289129 BuildMI (*MBB, Inst, DL, get (AMDGPU::V_MOV_B32_e32), SrcReg1).add (Src1);
9129- } else
9130+ } else {
91309131 SrcReg1 = Src1.getReg ();
9132+ }
91319133
91329134 bool isSrc0Reg16 = MRI.constrainRegClass (SrcReg0, &AMDGPU::VGPR_16RegClass);
91339135 bool isSrc1Reg16 = MRI.constrainRegClass (SrcReg1, &AMDGPU::VGPR_16RegClass);
91349136
91359137 auto NewMI = BuildMI (*MBB, Inst, DL, get (AMDGPU::REG_SEQUENCE), ResultReg);
91369138 switch (Inst.getOpcode ()) {
9137- case AMDGPU::S_PACK_LL_B32_B16: {
9139+ case AMDGPU::S_PACK_LL_B32_B16:
91389140 NewMI
91399141 .addReg (SrcReg0, 0 ,
91409142 isSrc0Reg16 ? AMDGPU::NoSubRegister : AMDGPU::lo16)
91419143 .addImm (AMDGPU::lo16)
91429144 .addReg (SrcReg1, 0 ,
91439145 isSrc1Reg16 ? AMDGPU::NoSubRegister : AMDGPU::lo16)
91449146 .addImm (AMDGPU::hi16);
9145- } break ;
9146- case AMDGPU::S_PACK_LH_B32_B16: {
9147+ break ;
9148+ case AMDGPU::S_PACK_LH_B32_B16:
91479149 NewMI
91489150 .addReg (SrcReg0, 0 ,
91499151 isSrc0Reg16 ? AMDGPU::NoSubRegister : AMDGPU::lo16)
91509152 .addImm (AMDGPU::lo16)
91519153 .addReg (SrcReg1, 0 , AMDGPU::hi16)
91529154 .addImm (AMDGPU::hi16);
9153- } break ;
9154- case AMDGPU::S_PACK_HL_B32_B16: {
9155+ break ;
9156+ case AMDGPU::S_PACK_HL_B32_B16:
91559157 NewMI.addReg (SrcReg0, 0 , AMDGPU::hi16)
91569158 .addImm (AMDGPU::lo16)
91579159 .addReg (SrcReg1, 0 ,
91589160 isSrc1Reg16 ? AMDGPU::NoSubRegister : AMDGPU::lo16)
91599161 .addImm (AMDGPU::hi16);
9160- } break ;
9161- case AMDGPU::S_PACK_HH_B32_B16: {
9162+ break ;
9163+ case AMDGPU::S_PACK_HH_B32_B16:
91629164 NewMI.addReg (SrcReg0, 0 , AMDGPU::hi16)
91639165 .addImm (AMDGPU::lo16)
91649166 .addReg (SrcReg1, 0 , AMDGPU::hi16)
91659167 .addImm (AMDGPU::hi16);
9166- } break ;
9168+ break ;
91679169 default :
91689170 llvm_unreachable (" unhandled s_pack_* instruction" );
91699171 }
0 commit comments