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

[AMDGPU] Simplify exp target parsing 

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

Differential Revision: https://reviews.llvm.org/D90947
This commit is contained in:
Jay Foad 2020-11-06 15:25:43 +00:00
parent aa0dc1c3b8
commit d61f2cfb9f
3 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5854,10 +5854,8 @@ OperandMatchResultTy AMDGPUAsmParser::parseExpTgtImpl(StringRef Str,
if (Str.getAsInteger(10, Val))
return MatchOperand_ParseFail;
if (Val > 7) {
Error(getLoc(), "invalid exp target");
if (Val > 7)
return MatchOperand_ParseFail;
}
return MatchOperand_Success;
}
@ -5867,10 +5865,8 @@ OperandMatchResultTy AMDGPUAsmParser::parseExpTgtImpl(StringRef Str,
if (Str.getAsInteger(10, Val))
return MatchOperand_ParseFail;
if (Val > 4 || (Val == 4 && !isGFX10())) {
Error(getLoc(), "invalid exp target");
if (Val > 4 || (Val == 4 && !isGFX10()))
return MatchOperand_ParseFail;
}
Val += 12;
return MatchOperand_Success;
@ -5886,38 +5882,30 @@ OperandMatchResultTy AMDGPUAsmParser::parseExpTgtImpl(StringRef Str,
if (Str.getAsInteger(10, Val))
return MatchOperand_ParseFail;
if (Val >= 32) {
Error(getLoc(), "invalid exp target");
if (Val >= 32)
return MatchOperand_ParseFail;
}
Val += 32;
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_NoMatch;
return MatchOperand_ParseFail;
}
OperandMatchResultTy AMDGPUAsmParser::parseExpTgt(OperandVector &Operands) {
if (!isToken(AsmToken::Identifier))
return MatchOperand_NoMatch;
SMLoc S = getLoc();
uint8_t Val;
StringRef Str = Parser.getTok().getString();
auto Res = parseExpTgtImpl(Str, Val);
if (Res != MatchOperand_Success)
auto Res = parseExpTgtImpl(getTokenStr(), Val);
if (Res != MatchOperand_Success) {
Error(S, "invalid exp target");
return Res;
}
SMLoc S = Parser.getTok().getLoc();
Parser.Lex();
Operands.push_back(AMDGPUOperand::CreateImm(this, Val, S,
AMDGPUOperand::ImmTyExpTgt));
return MatchOperand_Success;

25
llvm/test/MC/AMDGPU/exp-err.s
View File

@ -23,28 +23,37 @@ exp invalid_target_11 v3, v2, v1, v0 done
// GCN: :5: error: invalid exp target
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
// GCN: :5: error: failed parsing operand
// GCN: :5: error: invalid exp target
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
// GCN: :5: error: failed parsing operand
// GCN: :5: error: invalid exp target
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
// GCN: :5: error: failed parsing operand
// GCN: :5: error: invalid exp target
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
// 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
// GCN: 10: error: invalid operand for instruction

13
llvm/test/MC/AMDGPU/exp-gfx10.s
View File

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