Commit de723c05 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r263627: 



------------------------------------------------------------------------
r263627 | michel.daenzer | 2016-03-16 02:10:42 -0700 (Wed, 16 Mar 2016) | 11 lines

AMDGPU: Verify instructions in non-debug builds as well

And emit an error if it fails.

This prevents illegal instructions from getting sent to the GPU, which
would potentially result in a hang.

This is a candidate for the stable branch(es).

Reviewed-by: default avatarMarek Olšák <marek.olsak@amd.com>

------------------------------------------------------------------------

llvm-svn: 271724
parent 5fe60c09

llvm/lib/Target/AMDGPU/AMDGPUMCInstLower.cpp

+3 −3
Original line number Diff line number Diff line
@@ -88,13 +88,13 @@ void AMDGPUAsmPrinter::EmitInstruction(const MachineInstr *MI) { 
  const AMDGPUSubtarget &STI = MF->getSubtarget<AMDGPUSubtarget>();

  AMDGPUMCInstLower MCInstLowering(OutContext, STI);



#ifdef _DEBUG

  StringRef Err;

  if (!STI.getInstrInfo()->verifyInstruction(MI, Err)) {

    errs() << "Warning: Illegal instruction detected: " << Err << "\n";

    LLVMContext &C = MI->getParent()->getParent()->getFunction()->getContext();

    C.emitError("Illegal instruction detected: " + Err);

    MI->dump();

  }

#endif



  if (MI->isBundle()) {

    const MachineBasicBlock *MBB = MI->getParent();

    MachineBasicBlock::const_instr_iterator I = ++MI->getIterator();