maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[AMDGPU] Allow no-modifier operands in cvtDPP 

NFC, since no instructions have their AsmMatchConverter
changed, but prepares for that to happen.

Reviewed By: rampitec

Differential Revision: https://reviews.llvm.org/D103046

Change-Id: I6afefad899076de7b9a412374d09b95b29e012fa
This commit is contained in:
Joe Nash 2021-05-24 16:36:45 -04:00
parent c909ddddda
commit b67ea3d0c9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp
View File

@ -7950,6 +7950,9 @@ AMDGPUOperand::Ptr AMDGPUAsmParser::defaultFI() const {
void AMDGPUAsmParser::cvtDPP(MCInst &Inst, const OperandVector &Operands, bool IsDPP8) { void AMDGPUAsmParser::cvtDPP(MCInst &Inst, const OperandVector &Operands, bool IsDPP8) {
OptionalImmIndexMap OptionalIdx; OptionalImmIndexMap OptionalIdx;
unsigned Opc = Inst.getOpcode();
bool HasModifiers =
AMDGPU::getNamedOperandIdx(Opc, AMDGPU::OpName::src0_modifiers) != -1;
unsigned I = 1; unsigned I = 1;
const MCInstrDesc &Desc = MII.get(Inst.getOpcode()); const MCInstrDesc &Desc = MII.get(Inst.getOpcode());
for (unsigned J = 0; J < Desc.getNumDefs(); ++J) { for (unsigned J = 0; J < Desc.getNumDefs(); ++J) {
@ -7976,7 +7979,8 @@ void AMDGPUAsmParser::cvtDPP(MCInst &Inst, const OperandVector &Operands, bool I
if (IsDPP8) { if (IsDPP8) {
if (Op.isDPP8()) { if (Op.isDPP8()) {
Op.addImmOperands(Inst, 1); Op.addImmOperands(Inst, 1);
} else if (isRegOrImmWithInputMods(Desc, Inst.getNumOperands())) { } else if (HasModifiers &&
isRegOrImmWithInputMods(Desc, Inst.getNumOperands())) {
Op.addRegWithFPInputModsOperands(Inst, 2); Op.addRegWithFPInputModsOperands(Inst, 2);
} else if (Op.isFI()) { } else if (Op.isFI()) {
Fi = Op.getImm(); Fi = Op.getImm();
@ -7986,8 +7990,11 @@ void AMDGPUAsmParser::cvtDPP(MCInst &Inst, const OperandVector &Operands, bool I
llvm_unreachable("Invalid operand type"); llvm_unreachable("Invalid operand type");
} }
} else { } else {
if (isRegOrImmWithInputMods(Desc, Inst.getNumOperands())) { if (HasModifiers &&
isRegOrImmWithInputMods(Desc, Inst.getNumOperands())) {
Op.addRegWithFPInputModsOperands(Inst, 2); Op.addRegWithFPInputModsOperands(Inst, 2);
} else if (Op.isReg()) {
Op.addRegOperands(Inst, 1);
} else if (Op.isDPPCtrl()) { } else if (Op.isDPPCtrl()) {
Op.addImmOperands(Inst, 1); Op.addImmOperands(Inst, 1);
} else if (Op.isImm()) { } else if (Op.isImm()) {