Author: tstellar Date: Tue Apr 28 14:12:12 2015 New Revision: 236018 URL: http://llvm.org/viewvc/llvm-project?rev=236018&view=rev Log: Merging r229750:
------------------------------------------------------------------------ r229750 | marek.olsak | 2015-02-18 17:12:37 -0500 (Wed, 18 Feb 2015) | 4 lines R600/SI: Remove explicit VOP operand checking This should be handled by the OperandType checking. ------------------------------------------------------------------------ Modified: llvm/branches/release_36/lib/Target/R600/SIInstrInfo.cpp Modified: llvm/branches/release_36/lib/Target/R600/SIInstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/lib/Target/R600/SIInstrInfo.cpp?rev=236018&r1=236017&r2=236018&view=diff ============================================================================== --- llvm/branches/release_36/lib/Target/R600/SIInstrInfo.cpp (original) +++ llvm/branches/release_36/lib/Target/R600/SIInstrInfo.cpp Tue Apr 28 14:12:12 2015 @@ -1216,31 +1216,6 @@ bool SIInstrInfo::verifyInstruction(cons } } - // Verify SRC1 for VOP2 and VOPC - if (Src1Idx != -1 && (isVOP2(Opcode) || isVOPC(Opcode))) { - const MachineOperand &Src1 = MI->getOperand(Src1Idx); - if (Src1.isImm()) { - ErrInfo = "VOP[2C] src1 cannot be an immediate."; - return false; - } - } - - // Verify VOP3 - if (isVOP3(Opcode)) { - if (Src0Idx != -1 && isLiteralConstant(MI->getOperand(Src0Idx))) { - ErrInfo = "VOP3 src0 cannot be a literal constant."; - return false; - } - if (Src1Idx != -1 && isLiteralConstant(MI->getOperand(Src1Idx))) { - ErrInfo = "VOP3 src1 cannot be a literal constant."; - return false; - } - if (Src2Idx != -1 && isLiteralConstant(MI->getOperand(Src2Idx))) { - ErrInfo = "VOP3 src2 cannot be a literal constant."; - return false; - } - } - // Verify misc. restrictions on specific instructions. if (Desc.getOpcode() == AMDGPU::V_DIV_SCALE_F32 || Desc.getOpcode() == AMDGPU::V_DIV_SCALE_F64) { _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-branch-commits