Skip to content

[RISCV] Use MnemonicAlias instead of InstAlias for some vector instructions. NFC #131732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 18, 2025
Merged

[RISCV] Use MnemonicAlias instead of InstAlias for some vector instructions. NFC #131732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7229721
[RISCV] Use MnemonicAlias instead of InstAlias for some vector instru…
topperc Mar 18, 2025
8938117
fixup! Pass 0 for the VariantID.
topperc Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2881,6 +2881,13 @@ bool RISCVAsmParser::parseInstruction(ParseInstructionInfo &Info,
}
}

// Apply mnemonic aliases because the destination mnemonic may have require
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you looked at whether we can switch the order in the generic generated code? (non blocking, just a cleanup item)

Copy link
Collaborator Author

@topperc topperc Mar 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are two generated functions involved here, MatchOperandParserImpl and MatchInstructionImpl. They are called separately by RISCVAsmParser.cpp. I could add a a call to applyMnemonicAliases inside MatchOperandParserImpl, but I wouldn't be able to remove the call inside ``MatchInstructionImpl`

// custom operand parsing. The generic tblgen'erated code does this later, at
// the start of MatchInstructionImpl(), but that's too late for custom
// operand parsing.
const FeatureBitset &AvailableFeatures = getAvailableFeatures();
applyMnemonicAliases(Name, AvailableFeatures, 0);

// First operand is token for instruction
Operands.push_back(RISCVOperand::createToken(Name, NameLoc));

Expand Down
21 changes: 7 additions & 14 deletions llvm/lib/Target/RISCV/RISCVInstrInfoV.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,10 +1111,8 @@ def VLM_V : VUnitStrideLoadMask<"vlm.v">,
Sched<[WriteVLDM_WorstCase, ReadVLDX]>;
def VSM_V : VUnitStrideStoreMask<"vsm.v">,
Sched<[WriteVSTM_WorstCase, ReadVSTM_WorstCase, ReadVSTX]>;
def : InstAlias<"vle1.v $vd,$rs1",
(VLM_V VR:$vd, GPRMemZeroOffset:$rs1), 0>;
def : InstAlias<"vse1.v $vs3, $rs1",
(VSM_V VR:$vs3, GPRMemZeroOffset:$rs1), 0>;
def : MnemonicAlias<"vle1.v", "vlm.v">;
def : MnemonicAlias<"vse1.v", "vsm.v">;

def VS1R_V : VWholeStore<0, "vs1r.v", VR>,
Sched<[WriteVST1R, ReadVST1R, ReadVSTX]>;
Expand Down Expand Up @@ -1582,8 +1580,7 @@ defm VFREDMIN : VREDMINMAX_FV_V<"vfredmin", 0b000101>;
}
} // RVVConstraint = NoConstraint, ElementsDependOn = EltDepsVLMask

def : InstAlias<"vfredsum.vs $vd, $vs2, $vs1$vm",
(VFREDUSUM_VS VR:$vd, VR:$vs2, VR:$vs1, VMaskOp:$vm), 0>;
def : MnemonicAlias<"vfredsum.vs", "vfredusum.vs">;

// Vector Widening Floating-Point Reduction Instructions
let Constraints = "@earlyclobber $vd", RVVConstraint = NoConstraint, ElementsDependOn = EltDepsVLMask, DestEEW = EEWSEWx2 in {
Expand All @@ -1597,8 +1594,7 @@ defm VFWREDUSUM : VWRED_FV_V<"vfwredusum", 0b110001>;
}
} // Constraints = "@earlyclobber $vd", RVVConstraint = NoConstraint, ElementsDependOn = EltDepsVLMask, DestEEW = EEWSEWx2

def : InstAlias<"vfwredsum.vs $vd, $vs2, $vs1$vm",
(VFWREDUSUM_VS VR:$vd, VR:$vs2, VR:$vs1, VMaskOp:$vm), 0>;
def : MnemonicAlias<"vfwredsum.vs", "vfwredusum.vs">;
} // Predicates = [HasVInstructionsAnyF]

let Predicates = [HasVInstructions] in {
Expand All @@ -1623,10 +1619,8 @@ def : InstAlias<"vmset.m $vd",
def : InstAlias<"vmnot.m $vd, $vs",
(VMNAND_MM VR:$vd, VR:$vs, VR:$vs)>;

def : InstAlias<"vmandnot.mm $vd, $vs2, $vs1",
(VMANDN_MM VR:$vd, VR:$vs2, VR:$vs1), 0>;
def : InstAlias<"vmornot.mm $vd, $vs2, $vs1",
(VMORN_MM VR:$vd, VR:$vs2, VR:$vs1), 0>;
def : MnemonicAlias<"vmandnot.mm", "vmandn.mm">;
def : MnemonicAlias<"vmornot.mm", "vmorn.mm">;

let hasSideEffects = 0, mayLoad = 0, mayStore = 0,
RVVConstraint = NoConstraint, ElementsDependOn = EltDepsVLMask in {
Expand All @@ -1645,8 +1639,7 @@ def VFIRST_M : RVInstV<0b010000, 0b10001, OPMVV, (outs GPR:$vd),

} // hasSideEffects = 0, mayLoad = 0, mayStore = 0, RVVConstraint = NoConstraint, ElementsDependOn = EltDepsVLMask

def : InstAlias<"vpopc.m $vd, $vs2$vm",
(VCPOP_M GPR:$vd, VR:$vs2, VMaskOp:$vm), 0>;
def : MnemonicAlias<"vpopc.m", "vcpop.m">;

let Constraints = "@earlyclobber $vd", RVVConstraint = Iota, ElementsDependOn = EltDepsVLMask in {

Expand Down
Loading