This is an archive of the discontinued LLVM Phabricator instance.

Differential D92805

[RISCV] Detect more errors when parsing vsetvli in the assembler
ClosedPublic

Authored by craig.topper on Dec 7 2020, 6:35 PM.

Details

Reviewers
HsiangKai
evandro
asb
lenary
luismarques
frasercrmck
Commits
rGfb5b611af917: [RISCV] Detect more errors when parsing vsetvli in the assembler
Summary

-Reject an "mf1" lmul
-Make sure tail agnostic is exactly "tu" or "ta" not just that it starts with "tu" or "ta"
-Make sure mask agnostic is exactly "mu" or "ma" not just that it starts with "mu" or "ma"

Diff Detail

Revision Contents

PathSize
llvm/
lib/
Target/
RISCV/
AsmParser/
10 lines
test/
MC/
RISCV/
rvv/
9 lines

Diff 310069

llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp

Show First 20 Lines • Show All 1,616 Lines • ▼ Show 20 LinesOperandMatchResultTy RISCVAsmParser::parseVTypeI(OperandVector &Operands) {
if (Name.consume_front("f")) { if (Name.consume_front("f")) {
Fractional = true; Fractional = true;
} }
unsigned Lmul; unsigned Lmul;
if (Name.getAsInteger(10, Lmul)) if (Name.getAsInteger(10, Lmul))
return MatchOperand_NoMatch; return MatchOperand_NoMatch;
if (Lmul != 1 && Lmul != 2 && Lmul != 4 && Lmul != 8) if (Lmul != 1 && Lmul != 2 && Lmul != 4 && Lmul != 8)
return MatchOperand_NoMatch; return MatchOperand_NoMatch;
if (Fractional && Lmul == 1)
return MatchOperand_NoMatch;
getLexer().Lex(); getLexer().Lex();
if (!getLexer().is(AsmToken::Comma)) if (!getLexer().is(AsmToken::Comma))
return MatchOperand_NoMatch; return MatchOperand_NoMatch;
getLexer().Lex(); getLexer().Lex();
Name = getLexer().getTok().getIdentifier(); Name = getLexer().getTok().getIdentifier();
// ta or tu // ta or tu
bool TailAgnostic; bool TailAgnostic;
if (Name.consume_front("ta")) if (Name == "ta")
TailAgnostic = true; TailAgnostic = true;
else if (Name.consume_front("tu")) else if (Name == "tu")
TailAgnostic = false; TailAgnostic = false;
else else
return MatchOperand_NoMatch; return MatchOperand_NoMatch;
getLexer().Lex(); getLexer().Lex();
if (!getLexer().is(AsmToken::Comma)) if (!getLexer().is(AsmToken::Comma))
return MatchOperand_NoMatch; return MatchOperand_NoMatch;
getLexer().Lex(); getLexer().Lex();
Name = getLexer().getTok().getIdentifier(); Name = getLexer().getTok().getIdentifier();
// ma or mu // ma or mu
bool MaskedoffAgnostic; bool MaskedoffAgnostic;
if (Name.consume_front("ma")) if (Name == "ma")
MaskedoffAgnostic = true; MaskedoffAgnostic = true;
else if (Name.consume_front("mu")) else if (Name == "mu")
MaskedoffAgnostic = false; MaskedoffAgnostic = false;
else else
return MatchOperand_NoMatch; return MatchOperand_NoMatch;
getLexer().Lex(); getLexer().Lex();
if (getLexer().getKind() != AsmToken::EndOfStatement) if (getLexer().getKind() != AsmToken::EndOfStatement)
return MatchOperand_NoMatch; return MatchOperand_NoMatch;
▲ Show 20 Lines • Show All 817 Lines • Show Last 20 Lines

llvm/test/MC/RISCV/rvv/invalid.s

Show All 31 Lines
# CHECK-ERROR: operand must be e[8|16|32|64|128|256|512|1024],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu] # CHECK-ERROR: operand must be e[8|16|32|64|128|256|512|1024],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]
vsetvli a2, a0, e8x,m1,tu,mu vsetvli a2, a0, e8x,m1,tu,mu
# CHECK-ERROR: operand must be e[8|16|32|64|128|256|512|1024],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu] # CHECK-ERROR: operand must be e[8|16|32|64|128|256|512|1024],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]
vsetvli a2, a0, e8,m1z,tu,mu vsetvli a2, a0, e8,m1z,tu,mu
# CHECK-ERROR: operand must be e[8|16|32|64|128|256|512|1024],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu] # CHECK-ERROR: operand must be e[8|16|32|64|128|256|512|1024],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]
vsetvli a2, a0, e8,mf1,tu,mu
# CHECK-ERROR: operand must be e[8|16|32|64|128|256|512|1024],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]
vsetvli a2, a0, e8,m1,tu,mut
# CHECK-ERROR: operand must be e[8|16|32|64|128|256|512|1024],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]
vsetvli a2, a0, e8,m1,tut,mu
# CHECK-ERROR: operand must be e[8|16|32|64|128|256|512|1024],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]
vadd.vv v1, v3, v2, v4.t vadd.vv v1, v3, v2, v4.t
# CHECK-ERROR: operand must be v0.t # CHECK-ERROR: operand must be v0.t
vadd.vv v1, v3, v2, v0 vadd.vv v1, v3, v2, v0
# CHECK-ERROR: expected '.t' suffix # CHECK-ERROR: expected '.t' suffix
vadd.vv v1, v3, a0 vadd.vv v1, v3, a0
# CHECK-ERROR: invalid operand for instruction # CHECK-ERROR: invalid operand for instruction
▲ Show 20 Lines • Show All 562 Lines • Show Last 20 Lines