This is an archive of the discontinued LLVM Phabricator instance.

Differential D90947

[AMDGPU] Simplify exp target parsing
ClosedPublic

Authored by foad on Nov 6 2020, 7:35 AM.

Details

Reviewers
arsenm
rampitec
Commits
rGd61f2cfb9fc3: [AMDGPU] Simplify exp target parsing
Summary

Treat any identifier as a potential exp target and diagnose them all the
same way as "invalid exp target"s.

Diff Detail

Event Timeline

foad created this revision.Nov 6 2020, 7:35 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 6 2020, 7:35 AM
Herald added subscribers: llvm-commits, kerbowa, hiraditya and 7 others. · View Herald Transcript
foad requested review of this revision.Nov 6 2020, 7:35 AM
Herald added a subscriber: wdng. · View Herald TranscriptNov 6 2020, 7:35 AM
rampitec accepted this revision.Nov 6 2020, 7:44 AM
This revision is now accepted and ready to land.Nov 6 2020, 7:44 AM
This revision was landed with ongoing or failed builds.Nov 6 2020, 8:10 AM
Closed by commit rGd61f2cfb9fc3: [AMDGPU] Simplify exp target parsing (authored by foad). · Explain Why
This revision was automatically updated to reflect the committed changes.
foad added a commit: rGd61f2cfb9fc3: [AMDGPU] Simplify exp target parsing.
Harbormaster completed remote builds in B77892: Diff 303456.Nov 6 2020, 8:18 AM

Revision Contents

PathSize
llvm/
lib/
Target/
AMDGPU/
AsmParser/
38 lines
test/
MC/
AMDGPU/
25 lines
13 lines

Diff 303463

llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp

Show First 20 Lines • Show All 5,848 Lines • ▼ Show 20 Lines if (Str.startswith("mrt")) {
if (Str == "z") { // == mrtz if (Str == "z") { // == mrtz
Val = 8; Val = 8;
return MatchOperand_Success; return MatchOperand_Success;
} }
if (Str.getAsInteger(10, Val)) if (Str.getAsInteger(10, Val))
return MatchOperand_ParseFail; return MatchOperand_ParseFail;
if (Val > 7) { if (Val > 7)
Error(getLoc(), "invalid exp target");
return MatchOperand_ParseFail; return MatchOperand_ParseFail;
}
return MatchOperand_Success; return MatchOperand_Success;
} }
if (Str.startswith("pos")) { if (Str.startswith("pos")) {
Str = Str.drop_front(3); Str = Str.drop_front(3);
if (Str.getAsInteger(10, Val)) if (Str.getAsInteger(10, Val))
return MatchOperand_ParseFail; return MatchOperand_ParseFail;
if (Val > 4 || (Val == 4 && !isGFX10())) { if (Val > 4 || (Val == 4 && !isGFX10()))
Error(getLoc(), "invalid exp target");
return MatchOperand_ParseFail; return MatchOperand_ParseFail;
}
Val += 12; Val += 12;
return MatchOperand_Success; return MatchOperand_Success;
} }
if (isGFX10() && Str == "prim") { if (isGFX10() && Str == "prim") {
Val = 20; Val = 20;
return MatchOperand_Success; return MatchOperand_Success;
} }
if (Str.startswith("param")) { if (Str.startswith("param")) {
Str = Str.drop_front(5); Str = Str.drop_front(5);
if (Str.getAsInteger(10, Val)) if (Str.getAsInteger(10, Val))
return MatchOperand_ParseFail; return MatchOperand_ParseFail;
if (Val >= 32) { if (Val >= 32)
Error(getLoc(), "invalid exp target");
return MatchOperand_ParseFail; return MatchOperand_ParseFail;
}
Val += 32; Val += 32;
return MatchOperand_Success; return MatchOperand_Success;
} }
if (Str.startswith("invalid_target_")) {
Str = Str.drop_front(15);
if (Str.getAsInteger(10, Val))
return MatchOperand_ParseFail;
Error(getLoc(), "invalid exp target");
return MatchOperand_ParseFail; return MatchOperand_ParseFail;
} }
OperandMatchResultTy AMDGPUAsmParser::parseExpTgt(OperandVector &Operands) {
if (!isToken(AsmToken::Identifier))
return MatchOperand_NoMatch; return MatchOperand_NoMatch;
}
OperandMatchResultTy AMDGPUAsmParser::parseExpTgt(OperandVector &Operands) { SMLoc S = getLoc();
uint8_t Val;
StringRef Str = Parser.getTok().getString();
auto Res = parseExpTgtImpl(Str, Val); uint8_t Val;
if (Res != MatchOperand_Success) auto Res = parseExpTgtImpl(getTokenStr(), Val);
if (Res != MatchOperand_Success) {
Error(S, "invalid exp target");
return Res; return Res;
}
SMLoc S = Parser.getTok().getLoc();
Parser.Lex(); Parser.Lex();
Operands.push_back(AMDGPUOperand::CreateImm(this, Val, S, Operands.push_back(AMDGPUOperand::CreateImm(this, Val, S,
AMDGPUOperand::ImmTyExpTgt)); AMDGPUOperand::ImmTyExpTgt));
return MatchOperand_Success; return MatchOperand_Success;
} }
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// parser helpers // parser helpers
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
▲ Show 20 Lines • Show All 1,781 Lines • Show Last 20 Lines

llvm/test/MC/AMDGPU/exp-err.s

Show All 17 Lines
exp invalid_target_11 v3, v2, v1, v0 exp invalid_target_11 v3, v2, v1, v0
// GCN: :5: error: invalid exp target // GCN: :5: error: invalid exp target
exp invalid_target_11 v3, v2, v1, v0 done exp invalid_target_11 v3, v2, v1, v0 done
// GCN: :5: error: invalid exp target // GCN: :5: error: invalid exp target
exp mrt-1 v3, v2, v1, v0 exp mrt-1 v3, v2, v1, v0
// GCN: :5: error: failed parsing operand // GCN: :5: error: invalid exp target
exp mrtX v3, v2, v1, v0 exp mrtX v3, v2, v1, v0
// GCN: :5: error: failed parsing operand // GCN: :5: error: invalid exp target
exp pos-1 v3, v2, v1, v0 exp pos-1 v3, v2, v1, v0
// GCN: :5: error: failed parsing operand // GCN: :5: error: invalid exp target
exp posX v3, v2, v1, v0 exp posX v3, v2, v1, v0
// GCN: :5: error: failed parsing operand // GCN: :5: error: invalid exp target
exp param-1 v3, v2, v1, v0 exp param-1 v3, v2, v1, v0
// GCN: :5: error: failed parsing operand // GCN: :5: error: invalid exp target
exp paramX v3, v2, v1, v0 exp paramX v3, v2, v1, v0
// GCN: :5: error: failed parsing operand // GCN: :5: error: invalid exp target
exp invalid_target_-1 v3, v2, v1, v0 exp invalid_target_-1 v3, v2, v1, v0
// GCN: :5: error: failed parsing operand // GCN: :5: error: invalid exp target
exp invalid_target_X v3, v2, v1, v0 exp invalid_target_X v3, v2, v1, v0
// GCN: :5: error: failed parsing operand // GCN: :5: error: invalid exp target
exp 0 v3, v2, v1, v0
// GCN: :5: error: invalid operand for instruction
exp , v3, v2, v1, v0
// GCN: :5: error: unknown token in expression
exp
// GCN: :1: error: too few operands for instruction
exp mrt0 s0, v0, v0, v0 exp mrt0 s0, v0, v0, v0
// GCN: 10: error: invalid operand for instruction // GCN: 10: error: invalid operand for instruction
exp mrt0 v0, s0, v0, v0 exp mrt0 v0, s0, v0, v0
// GCN: 14: error: invalid operand for instruction // GCN: 14: error: invalid operand for instruction
exp mrt0 v0, v0, s0, v0 exp mrt0 v0, v0, s0, v0
▲ Show 20 Lines • Show All 52 Lines • Show Last 20 Lines

llvm/test/MC/AMDGPU/exp-gfx10.s

// RUN: not llvm-mc -arch=amdgcn -mcpu=verde %s 2>&1 | FileCheck -check-prefix=SI --implicit-check-not=error: %s // RUN: not llvm-mc -arch=amdgcn -mcpu=verde %s 2>&1 | FileCheck -check-prefix=SIVI --implicit-check-not=error: %s
// RUN: not llvm-mc -arch=amdgcn -mcpu=tonga %s 2>&1 | FileCheck -check-prefix=VI --implicit-check-not=error: %s // RUN: not llvm-mc -arch=amdgcn -mcpu=tonga %s 2>&1 | FileCheck -check-prefix=SIVI --implicit-check-not=error: %s
// RUN: llvm-mc -arch=amdgcn -mcpu=gfx1010 -show-encoding %s | FileCheck -check-prefix=GFX10 %s // RUN: llvm-mc -arch=amdgcn -mcpu=gfx1010 -show-encoding %s | FileCheck -check-prefix=GFX10 %s
exp prim v1, off, off, off exp prim v1, off, off, off
// SI: :5: error: invalid operand for instruction // SIVI: :5: error: invalid exp target
// VI: :5: error: invalid operand for instruction
// GFX10: exp prim v1, off, off, off ; encoding: [0x41,0x01,0x00,0xf8,0x01,0x00,0x00,0x00] // GFX10: exp prim v1, off, off, off ; encoding: [0x41,0x01,0x00,0xf8,0x01,0x00,0x00,0x00]
exp prim v2, v3, off, off exp prim v2, v3, off, off
// SI: :5: error: invalid operand for instruction // SIVI: :5: error: invalid exp target
// VI: :5: error: invalid operand for instruction
// GFX10: exp prim v2, v3, off, off ; encoding: [0x43,0x01,0x00,0xf8,0x02,0x03,0x00,0x00] // GFX10: exp prim v2, v3, off, off ; encoding: [0x43,0x01,0x00,0xf8,0x02,0x03,0x00,0x00]
exp pos4 v4, v3, v2, v1 exp pos4 v4, v3, v2, v1
// SI: error: invalid exp target // SIVI: error: invalid exp target
// VI: error: invalid exp target
// GFX10: exp pos4 v4, v3, v2, v1 ; encoding: [0x0f,0x01,0x00,0xf8,0x04,0x03,0x02,0x01] // GFX10: exp pos4 v4, v3, v2, v1 ; encoding: [0x0f,0x01,0x00,0xf8,0x04,0x03,0x02,0x01]