RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

[RISCV] Add a table showing the layout of the fields in VTYPE. Rename MaskedOffAgnostic->MaskAgnostic. NFC

Browse Source
This commit is contained in:
Craig Topper 2020-12-08 20:40:15 -08:00
parent e974df0b6f
commit dfde01efb0
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
View File

@ -279,7 +279,7 @@ struct RISCVOperand : public MCParsedAsmOperand {
RISCVVSEW Sew; RISCVVSEW Sew;
RISCVVLMUL Lmul; RISCVVLMUL Lmul;
bool TailAgnostic; bool TailAgnostic;
bool MaskedoffAgnostic; bool MaskAgnostic;
}; };
SMLoc StartLoc, EndLoc; SMLoc StartLoc, EndLoc;
@ -846,7 +846,7 @@ public:
static std::unique_ptr<RISCVOperand> static std::unique_ptr<RISCVOperand>
createVType(unsigned Sew, unsigned Lmul, bool Fractional, bool TailAgnostic, createVType(unsigned Sew, unsigned Lmul, bool Fractional, bool TailAgnostic,
bool MaskedoffAgnostic, SMLoc S, bool IsRV64) { bool MaskAgnostic, SMLoc S, bool IsRV64) {
auto Op = std::make_unique<RISCVOperand>(KindTy::VType); auto Op = std::make_unique<RISCVOperand>(KindTy::VType);
unsigned SewLog2 = Log2_32(Sew / 8); unsigned SewLog2 = Log2_32(Sew / 8);
unsigned LmulLog2 = Log2_32(Lmul); unsigned LmulLog2 = Log2_32(Lmul);
@ -858,7 +858,7 @@ public:
Op->VType.Lmul = static_cast<RISCVVLMUL>(LmulLog2); Op->VType.Lmul = static_cast<RISCVVLMUL>(LmulLog2);
} }
Op->VType.TailAgnostic = TailAgnostic; Op->VType.TailAgnostic = TailAgnostic;
Op->VType.MaskedoffAgnostic = MaskedoffAgnostic; Op->VType.MaskAgnostic = MaskAgnostic;
Op->StartLoc = S; Op->StartLoc = S;
Op->IsRV64 = IsRV64; Op->IsRV64 = IsRV64;
return Op; return Op;
@ -924,7 +924,7 @@ public:
void addVTypeIOperands(MCInst &Inst, unsigned N) const { void addVTypeIOperands(MCInst &Inst, unsigned N) const {
assert(N == 1 && "Invalid number of operands!"); assert(N == 1 && "Invalid number of operands!");
unsigned VTypeI = RISCVVType::encodeVTYPE( unsigned VTypeI = RISCVVType::encodeVTYPE(
VType.Lmul, VType.Sew, VType.TailAgnostic, VType.MaskedoffAgnostic); VType.Lmul, VType.Sew, VType.TailAgnostic, VType.MaskAgnostic);
Inst.addOperand(MCOperand::createImm(VTypeI)); Inst.addOperand(MCOperand::createImm(VTypeI));
} }
@ -1612,11 +1612,11 @@ OperandMatchResultTy RISCVAsmParser::parseVTypeI(OperandVector &Operands) {
Name = getLexer().getTok().getIdentifier(); Name = getLexer().getTok().getIdentifier();
// ma or mu // ma or mu
bool MaskedoffAgnostic; bool MaskAgnostic;
if (Name == "ma") if (Name == "ma")
MaskedoffAgnostic = true; MaskAgnostic = true;
else if (Name == "mu") else if (Name == "mu")
MaskedoffAgnostic = false; MaskAgnostic = false;
else else
return MatchOperand_NoMatch; return MatchOperand_NoMatch;
getLexer().Lex(); getLexer().Lex();
@ -1625,7 +1625,7 @@ OperandMatchResultTy RISCVAsmParser::parseVTypeI(OperandVector &Operands) {
return MatchOperand_NoMatch; return MatchOperand_NoMatch;
Operands.push_back(RISCVOperand::createVType( Operands.push_back(RISCVOperand::createVType(
Sew, Lmul, Fractional, TailAgnostic, MaskedoffAgnostic, S, isRV64())); Sew, Lmul, Fractional, TailAgnostic, MaskAgnostic, S, isRV64()));
return MatchOperand_Success; return MatchOperand_Success;
} }

2
lib/Target/RISCV/RISCVISelLowering.cpp
View File

@ -1953,7 +1953,7 @@ static MachineBasicBlock *addVSetVL(MachineInstr &MI, MachineBasicBlock *BB,
// For simplicity we reuse the vtype representation here. // For simplicity we reuse the vtype representation here.
MIB.addImm(RISCVVType::encodeVTYPE(Multiplier, ElementWidth, MIB.addImm(RISCVVType::encodeVTYPE(Multiplier, ElementWidth,
/*TailAgnostic*/ false, /*TailAgnostic*/ false,
/*MaskedOffAgnostic*/ false)); /*MaskAgnostic*/ false));
// Remove (now) redundant operands from pseudo // Remove (now) redundant operands from pseudo
MI.getOperand(SEWIndex).setImm(-1); MI.getOperand(SEWIndex).setImm(-1);

14
lib/Target/RISCV/Utils/RISCVBaseInfo.h
View File

@ -364,15 +364,25 @@ inline static bool isValidLMUL(unsigned LMUL, bool Fractional) {
// Encode VTYPE into the binary format used by the the VSETVLI instruction which // Encode VTYPE into the binary format used by the the VSETVLI instruction which
// is used by our MC layer representation. // is used by our MC layer representation.
//
// Bits | Name | Description
// -----+------------+------------------------------------------------
// 7 | vma | Vector mask agnostic
// 6 | vta | Vector tail agnostic
// 5 | vlmul[2] | Fractional lmul?
// 4:2 | vsew[2:0] | Standard element width (SEW) setting
// 1:0 | vlmul[1:0] | Vector register group multiplier (LMUL) setting
//
// TODO: This format will change for the V extensions spec v1.0.
inline static unsigned encodeVTYPE(RISCVVLMUL VLMUL, RISCVVSEW VSEW, inline static unsigned encodeVTYPE(RISCVVLMUL VLMUL, RISCVVSEW VSEW,
bool TailAgnostic, bool MaskedoffAgnostic) { bool TailAgnostic, bool MaskAgnostic) {
unsigned VLMULBits = static_cast<unsigned>(VLMUL); unsigned VLMULBits = static_cast<unsigned>(VLMUL);
unsigned VSEWBits = static_cast<unsigned>(VSEW); unsigned VSEWBits = static_cast<unsigned>(VSEW);
unsigned VTypeI = unsigned VTypeI =
((VLMULBits & 0x4) << 3) | (VSEWBits << 2) | (VLMULBits & 0x3); ((VLMULBits & 0x4) << 3) | (VSEWBits << 2) | (VLMULBits & 0x3);
if (TailAgnostic) if (TailAgnostic)
VTypeI |= 0x40; VTypeI |= 0x40;
if (MaskedoffAgnostic) if (MaskAgnostic)
VTypeI |= 0x80; VTypeI |= 0x80;
return VTypeI; return VTypeI;