This is an archive of the discontinued LLVM Phabricator instance.

Differential D25507

AMDGPU: Fix counting si_mask_branch as 4 bytes
ClosedPublic

Authored by arsenm on Oct 12 2016, 2:48 AM.

Details

Reviewers
• tstellarAMD

Diff Detail

Event Timeline

arsenm updated this revision to Diff 74347.Oct 12 2016, 2:48 AM
arsenm retitled this revision from to AMDGPU: Fix counting si_mask_branch as 4 bytes.
arsenm updated this object.
arsenm added a subscriber: llvm-commits.
Herald added a reviewer: • tstellarAMD. · View Herald TranscriptOct 12 2016, 2:48 AM
Herald added subscribers: tony-tye, yaxunl, nhaehnle and 2 others. · View Herald Transcript
• tstellarAMD accepted this revision.Oct 13 2016, 2:37 PM
• tstellarAMD edited edge metadata.

LGTM.

This revision is now accepted and ready to land.Oct 13 2016, 2:37 PM
arsenm closed this revision.Oct 26 2016, 8:17 AM

r285202

Revision Contents

PathSize
lib/
Target/
AMDGPU/
1 line
1 line

Diff 74347

lib/Target/AMDGPU/SIInstrInfo.cpp

Show First 20 Lines • Show All 3,458 Lines • ▼ Show 20 Lines if (isVALU(MI) || isSALU(MI)) {
return 4; return 4;
} }
if (DescSize == 4) if (DescSize == 4)
return 4; return 4;
switch (Opc) { switch (Opc) {
case AMDGPU::SI_MASK_BRANCH:
case TargetOpcode::IMPLICIT_DEF: case TargetOpcode::IMPLICIT_DEF:
case TargetOpcode::KILL: case TargetOpcode::KILL:
case TargetOpcode::DBG_VALUE: case TargetOpcode::DBG_VALUE:
case TargetOpcode::BUNDLE: case TargetOpcode::BUNDLE:
case TargetOpcode::EH_LABEL: case TargetOpcode::EH_LABEL:
return 0; return 0;
case TargetOpcode::INLINEASM: { case TargetOpcode::INLINEASM: {
const MachineFunction *MF = MI.getParent()->getParent(); const MachineFunction *MF = MI.getParent()->getParent();
Show All 33 Lines

lib/Target/AMDGPU/SIInstructions.td

Show First 20 Lines • Show All 137 Lines • ▼ Show 20 Lines
// Dummy terminator instruction to use after control flow instructions // Dummy terminator instruction to use after control flow instructions
// replaced with exec mask operations. // replaced with exec mask operations.
def SI_MASK_BRANCH : PseudoInstSI < def SI_MASK_BRANCH : PseudoInstSI <
(outs), (ins brtarget:$target)> { (outs), (ins brtarget:$target)> {
let isBranch = 0; let isBranch = 0;
let isTerminator = 1; let isTerminator = 1;
let isBarrier = 0; let isBarrier = 0;
let SALU = 1;
let Uses = [EXEC]; let Uses = [EXEC];
let SchedRW = []; let SchedRW = [];
let hasNoSchedulingInfo = 1; let hasNoSchedulingInfo = 1;
} }
let isTerminator = 1 in { let isTerminator = 1 in {
def SI_IF: CFPseudoInstSI < def SI_IF: CFPseudoInstSI <
▲ Show 20 Lines • Show All 831 Lines • Show Last 20 Lines