[llvm] r285202 - AMDGPU: Fix counting si_mask_branch as 4 bytes

[Matt Arsenault via llvm-commits]

Author: arsenm
Date: Wed Oct 26 09:53:54 2016
New Revision: 285202

URL: http://llvm.org/viewvc/llvm-project?rev=285202&view=rev
Log:
AMDGPU: Fix counting si_mask_branch as 4 bytes

Modified:
    llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.cpp
    llvm/trunk/lib/Target/AMDGPU/SIInstructions.td

Modified: llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.cpp?rev=285202&r1=285201&r2=285202&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.cpp Wed Oct 26 09:53:54 2016
@@ -3504,6 +3504,7 @@ unsigned SIInstrInfo::getInstSizeInBytes
   }
 
   switch (Opc) {
+  case AMDGPU::SI_MASK_BRANCH:
   case TargetOpcode::IMPLICIT_DEF:
   case TargetOpcode::KILL:
   case TargetOpcode::DBG_VALUE:

Modified: llvm/trunk/lib/Target/AMDGPU/SIInstructions.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/SIInstructions.td?rev=285202&r1=285201&r2=285202&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/SIInstructions.td (original)
+++ llvm/trunk/lib/Target/AMDGPU/SIInstructions.td Wed Oct 26 09:53:54 2016
@@ -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;