AMDGPU: Fix counting si_mask_branch as 4 bytes

llvm-svn: 285202

llvm/lib/Target/AMDGPU/SIInstrInfo.cpp

@@ -3504,6 +3504,7 @@ unsigned SIInstrInfo::getInstSizeInBytes(const MachineInstr &MI) const {
   }
 
   switch (Opc) {
+  case AMDGPU::SI_MASK_BRANCH:
   case TargetOpcode::IMPLICIT_DEF:
   case TargetOpcode::KILL:
   case TargetOpcode::DBG_VALUE:

llvm/lib/Target/AMDGPU/SIInstructions.td

@@ -147,7 +147,6 @@ def SI_MASK_BRANCH : PseudoInstSI <
   let isBranch = 0;
   let isTerminator = 1;
   let isBarrier = 0;
-  let SALU = 1;
   let Uses = [EXEC];
   let SchedRW = [];
   let hasNoSchedulingInfo = 1;