This is an archive of the discontinued LLVM Phabricator instance.

Differential D19317

[AMDGPU] Assembler: prevent parseDPPCtrlOps from eating invalid tokens
ClosedPublic

Authored by SamWot on Apr 20 2016, 5:01 AM.

Details

Reviewers
nhaustov
• tstellarAMD
Commits
rG201398e8a308: [AMDGPU] Assembler: prevent parseDPPCtrlOps from eating invalid tokens
rL266984: [AMDGPU] Assembler: prevent parseDPPCtrlOps from eating invalid tokens

Diff Detail

Event Timeline

SamWot updated this revision to Diff 54345.Apr 20 2016, 5:01 AM
SamWot retitled this revision from to [AMDGPU] Assembler: prevent parseDPPCtrlOps from eating invalid tokens.
SamWot updated this object.
SamWot added a reviewer: nhaustov.
Herald added a reviewer: • tstellarAMD. · View Herald TranscriptApr 20 2016, 5:01 AM
Herald added a subscriber: arsenm. · View Herald Transcript
SamWot added a child revision: D19360: [AMDGPU] Assembler: basic support for SDWA instructions.Apr 21 2016, 5:17 AM
nhaustov accepted this revision.Apr 21 2016, 6:08 AM
nhaustov edited edge metadata.

LGTM

This revision is now accepted and ready to land.Apr 21 2016, 6:08 AM
Closed by commit rL266984: [AMDGPU] Assembler: prevent parseDPPCtrlOps from eating invalid tokens (authored by skolton). · Explain WhyApr 21 2016, 6:20 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Target/
AMDGPU/
AsmParser/
16 lines

Diff 54345

lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp

Show First 20 Lines • Show All 2,021 Lines • ▼ Show 20 Lines return ((Imm >= 0x000) && (Imm <= 0x0ff)) ||
(Imm == 0x142) || (Imm == 0x142) ||
(Imm == 0x143); (Imm == 0x143);
} }
return false; return false;
} }
AMDGPUAsmParser::OperandMatchResultTy AMDGPUAsmParser::OperandMatchResultTy
AMDGPUAsmParser::parseDPPCtrlOps(OperandVector &Operands) { AMDGPUAsmParser::parseDPPCtrlOps(OperandVector &Operands) {
// ToDo: use same syntax as sp3 for dpp_ctrl
SMLoc S = Parser.getTok().getLoc(); SMLoc S = Parser.getTok().getLoc();
StringRef Prefix; StringRef Prefix;
int64_t Int; int64_t Int;
if (getLexer().getKind() == AsmToken::Identifier) { if (getLexer().getKind() == AsmToken::Identifier) {
Prefix = Parser.getTok().getString(); Prefix = Parser.getTok().getString();
} else { } else {
return MatchOperand_NoMatch; return MatchOperand_NoMatch;
} }
if (Prefix == "row_mirror") { if (Prefix == "row_mirror") {
Int = 0x140; Int = 0x140;
} else if (Prefix == "row_half_mirror") { } else if (Prefix == "row_half_mirror") {
Int = 0x141; Int = 0x141;
} else { } else {
// Check to prevent parseDPPCtrlOps from eating invalid tokens
if (Prefix != "quad_perm"
&& Prefix != "row_shl"
&& Prefix != "row_shr"
&& Prefix != "row_ror"
&& Prefix != "wave_shl"
&& Prefix != "wave_rol"
&& Prefix != "wave_shr"
&& Prefix != "wave_ror"
&& Prefix != "row_bcast") {
return MatchOperand_NoMatch;
}
Parser.Lex(); Parser.Lex();
if (getLexer().isNot(AsmToken::Colon)) if (getLexer().isNot(AsmToken::Colon))
return MatchOperand_ParseFail; return MatchOperand_ParseFail;
if (Prefix == "quad_perm") { if (Prefix == "quad_perm") {
// quad_perm:[%d,%d,%d,%d] // quad_perm:[%d,%d,%d,%d]
Parser.Lex(); Parser.Lex();
if (getLexer().isNot(AsmToken::LBrac)) if (getLexer().isNot(AsmToken::LBrac))
▲ Show 20 Lines • Show All 55 Lines • ▼ Show 20 Lines if (Prefix == "quad_perm") {
Int = 0x13C; Int = 0x13C;
} else if (Prefix == "row_bcast") { } else if (Prefix == "row_bcast") {
if (Int == 15) { if (Int == 15) {
Int = 0x142; Int = 0x142;
} else if (Int == 31) { } else if (Int == 31) {
Int = 0x143; Int = 0x143;
} }
} else { } else {
return MatchOperand_NoMatch; return MatchOperand_ParseFail;
} }
} }
} }
Parser.Lex(); // eat last token Parser.Lex(); // eat last token
Operands.push_back(AMDGPUOperand::CreateImm(Int, S, Operands.push_back(AMDGPUOperand::CreateImm(Int, S,
AMDGPUOperand::ImmTyDppCtrl)); AMDGPUOperand::ImmTyDppCtrl));
return MatchOperand_Success; return MatchOperand_Success;
▲ Show 20 Lines • Show All 77 Lines • Show Last 20 Lines