Skip to content

Commit 016ce9e

Browse files
authored
[RISCV] Rename FeatureRVE to FeatureStdExtE. NFC (#89174)
Planning to declare all extensions in tablegen so we can generate the tables for RISCVISAInfo.cpp. This requires making "e" consistent with other extensions.
1 parent ce48f43 commit 016ce9e

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class RISCVAsmParser : public MCTargetAsmParser {
8383

8484
SMLoc getLoc() const { return getParser().getTok().getLoc(); }
8585
bool isRV64() const { return getSTI().hasFeature(RISCV::Feature64Bit); }
86-
bool isRVE() const { return getSTI().hasFeature(RISCV::FeatureRVE); }
86+
bool isRVE() const { return getSTI().hasFeature(RISCV::FeatureStdExtE); }
8787

8888
RISCVTargetStreamer &getTargetStreamer() {
8989
assert(getParser().getStreamer().getTargetStreamer() &&

llvm/lib/Target/RISCV/Disassembler/RISCVDisassembler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeRISCVDisassembler() {
6464
static DecodeStatus DecodeGPRRegisterClass(MCInst &Inst, uint32_t RegNo,
6565
uint64_t Address,
6666
const MCDisassembler *Decoder) {
67-
bool IsRVE = Decoder->getSubtargetInfo().hasFeature(RISCV::FeatureRVE);
67+
bool IsRVE = Decoder->getSubtargetInfo().hasFeature(RISCV::FeatureStdExtE);
6868

6969
if (RegNo >= 32 || (IsRVE && RegNo >= 16))
7070
return MCDisassembler::Fail;

llvm/lib/Target/RISCV/MCTargetDesc/RISCVBaseInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ABI computeTargetABI(const Triple &TT, const FeatureBitset &FeatureBits,
4040
StringRef ABIName) {
4141
auto TargetABI = getTargetABI(ABIName);
4242
bool IsRV64 = TT.isArch64Bit();
43-
bool IsRVE = FeatureBits[RISCV::FeatureRVE];
43+
bool IsRVE = FeatureBits[RISCV::FeatureStdExtE];
4444

4545
if (!ABIName.empty() && TargetABI == ABI_Unknown) {
4646
errs()

llvm/lib/Target/RISCV/RISCVFeatures.td

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ def FeatureStdExtI
1616
: SubtargetFeature<"i", "HasStdExtI", "true",
1717
"'I' (Base Integer Instruction Set)">;
1818

19+
def FeatureStdExtE
20+
: SubtargetFeature<"e", "HasStdExtE", "true",
21+
"Implements RV{32,64}E (provides 16 rather than 32 GPRs)">;
22+
1923
def FeatureStdExtZic64b
2024
: SubtargetFeature<"zic64b", "HasStdExtZic64b", "true",
2125
"'Zic64b' (Cache Block Size Is 64 Bytes)">;
@@ -1162,10 +1166,6 @@ def IsRV32 : Predicate<"!Subtarget->is64Bit()">,
11621166
defvar RV32 = DefaultMode;
11631167
def RV64 : HwMode<"+64bit", [IsRV64]>;
11641168

1165-
def FeatureRVE
1166-
: SubtargetFeature<"e", "IsRVE", "true",
1167-
"Implements RV{32,64}E (provides 16 rather than 32 GPRs)">;
1168-
11691169
def FeatureRelax
11701170
: SubtargetFeature<"relax", "EnableLinkerRelax", "true",
11711171
"Enable Linker relaxation.">;

llvm/lib/Target/RISCV/RISCVISelLowering.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18951,7 +18951,7 @@ SDValue RISCVTargetLowering::LowerFormalArguments(
1895118951
case CallingConv::RISCV_VectorCall:
1895218952
break;
1895318953
case CallingConv::GHC:
18954-
if (Subtarget.isRVE())
18954+
if (Subtarget.hasStdExtE())
1895518955
report_fatal_error("GHC calling convention is not supported on RVE!");
1895618956
if (!Subtarget.hasStdExtFOrZfinx() || !Subtarget.hasStdExtDOrZdinx())
1895718957
report_fatal_error("GHC calling convention requires the (Zfinx/F) and "
@@ -19189,7 +19189,7 @@ SDValue RISCVTargetLowering::LowerCall(CallLoweringInfo &CLI,
1918919189
CCState ArgCCInfo(CallConv, IsVarArg, MF, ArgLocs, *DAG.getContext());
1919019190

1919119191
if (CallConv == CallingConv::GHC) {
19192-
if (Subtarget.isRVE())
19192+
if (Subtarget.hasStdExtE())
1919319193
report_fatal_error("GHC calling convention is not supported on RVE!");
1919419194
ArgCCInfo.AnalyzeCallOperands(Outs, RISCV::CC_RISCV_GHC);
1919519195
} else

llvm/lib/Target/RISCV/RISCVRegisterInfo.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ RISCVRegisterInfo::getCalleeSavedRegs(const MachineFunction *MF) const {
6565
if (Subtarget.hasStdExtD())
6666
return CSR_XLEN_F64_Interrupt_SaveList;
6767
if (Subtarget.hasStdExtF())
68-
return Subtarget.isRVE() ? CSR_XLEN_F32_Interrupt_RVE_SaveList
69-
: CSR_XLEN_F32_Interrupt_SaveList;
70-
return Subtarget.isRVE() ? CSR_Interrupt_RVE_SaveList
71-
: CSR_Interrupt_SaveList;
68+
return Subtarget.hasStdExtE() ? CSR_XLEN_F32_Interrupt_RVE_SaveList
69+
: CSR_XLEN_F32_Interrupt_SaveList;
70+
return Subtarget.hasStdExtE() ? CSR_Interrupt_RVE_SaveList
71+
: CSR_Interrupt_SaveList;
7272
}
7373

7474
bool HasVectorCSR =
@@ -126,7 +126,7 @@ BitVector RISCVRegisterInfo::getReservedRegs(const MachineFunction &MF) const {
126126
markSuperRegs(Reserved, RISCV::DUMMY_REG_PAIR_WITH_X0);
127127

128128
// There are only 16 GPRs for RVE.
129-
if (Subtarget.isRVE())
129+
if (Subtarget.hasStdExtE())
130130
for (MCPhysReg Reg = RISCV::X16; Reg <= RISCV::X31; Reg++)
131131
markSuperRegs(Reserved, Reg);
132132

@@ -145,7 +145,7 @@ BitVector RISCVRegisterInfo::getReservedRegs(const MachineFunction &MF) const {
145145
markSuperRegs(Reserved, RISCV::VCIX_STATE);
146146

147147
if (MF.getFunction().getCallingConv() == CallingConv::GRAAL) {
148-
if (Subtarget.isRVE())
148+
if (Subtarget.hasStdExtE())
149149
report_fatal_error("Graal reserved registers do not exist in RVE");
150150
markSuperRegs(Reserved, RISCV::X23);
151151
markSuperRegs(Reserved, RISCV::X27);

0 commit comments

Comments
 (0)