From 1110f14b42129973e33d3546bcd18e008eab2301 Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Wed, 26 Oct 2016 14:53:54 +0000 Subject: AMDGPU: Fix counting si_mask_branch as 4 bytes llvm-svn: 285202 --- llvm/lib/Target/AMDGPU/SIInstrInfo.cpp | 1 + llvm/lib/Target/AMDGPU/SIInstructions.td | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'llvm/lib') diff --git a/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp b/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp index fffdeb4b5e0..a7de513dc9a 100644 --- a/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp +++ b/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: diff --git a/llvm/lib/Target/AMDGPU/SIInstructions.td b/llvm/lib/Target/AMDGPU/SIInstructions.td index 3e39f86bd20..f3ccee288fd 100644 --- a/llvm/lib/Target/AMDGPU/SIInstructions.td +++ b/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; -- cgit v1.2.3