Skip to content

Commit 7e6bad1

Browse files
authored
[RISCV] Rename vcix_state register to sf_vcix_state. NFC (#106995)
Since it's SiFive VCIX specific register, it's better to have a prefix so that it's more understandable.
1 parent 00c198b commit 7e6bad1

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

llvm/lib/Target/RISCV/RISCVInstrInfoXSf.td

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ class VPseudoVC_V_XVV<Operand OpClass, VReg RDClass, VReg RS2Class,
308308
multiclass VPseudoVC_X<LMULInfo m, DAGOperand RS1Class,
309309
Operand OpClass = payload2> {
310310
let VLMul = m.value in {
311-
let Defs = [VCIX_STATE], Uses = [VCIX_STATE] in {
311+
let Defs = [SF_VCIX_STATE], Uses = [SF_VCIX_STATE] in {
312312
def "PseudoVC_" # NAME # "_SE_" # m.MX
313313
: VPseudoVC_X<OpClass, RS1Class>,
314314
Sched<[!cast<SchedWrite>("WriteVC_" # NAME # "_" # m.MX)]>;
@@ -325,7 +325,7 @@ multiclass VPseudoVC_X<LMULInfo m, DAGOperand RS1Class,
325325
multiclass VPseudoVC_XV<LMULInfo m, DAGOperand RS1Class,
326326
Operand OpClass = payload2> {
327327
let VLMul = m.value in {
328-
let Defs = [VCIX_STATE], Uses = [VCIX_STATE] in {
328+
let Defs = [SF_VCIX_STATE], Uses = [SF_VCIX_STATE] in {
329329
def "PseudoVC_" # NAME # "_SE_" # m.MX
330330
: VPseudoVC_XV<OpClass, m.vrclass, RS1Class>,
331331
Sched<[!cast<SchedWrite>("WriteVC_" # NAME # "_" # m.MX)]>;
@@ -342,7 +342,7 @@ multiclass VPseudoVC_XV<LMULInfo m, DAGOperand RS1Class,
342342
multiclass VPseudoVC_XVV<LMULInfo m, DAGOperand RS1Class,
343343
Operand OpClass = payload2> {
344344
let VLMul = m.value in {
345-
let Defs = [VCIX_STATE], Uses = [VCIX_STATE] in {
345+
let Defs = [SF_VCIX_STATE], Uses = [SF_VCIX_STATE] in {
346346
def "PseudoVC_" # NAME # "_SE_" # m.MX
347347
: VPseudoVC_XVV<OpClass, m.vrclass, m.vrclass, RS1Class>,
348348
Sched<[!cast<SchedWrite>("WriteVC_" # NAME # "_" # m.MX)]>;
@@ -359,12 +359,12 @@ multiclass VPseudoVC_XVV<LMULInfo m, DAGOperand RS1Class,
359359
multiclass VPseudoVC_XVW<LMULInfo m, DAGOperand RS1Class,
360360
Operand OpClass = payload2> {
361361
let VLMul = m.value in {
362-
let Defs = [VCIX_STATE], Uses = [VCIX_STATE] in
362+
let Defs = [SF_VCIX_STATE], Uses = [SF_VCIX_STATE] in
363363
def "PseudoVC_" # NAME # "_SE_" # m.MX
364364
: VPseudoVC_XVV<OpClass, m.wvrclass, m.vrclass, RS1Class>,
365365
Sched<[!cast<SchedWrite>("WriteVC_" # NAME # "_" # m.MX)]>;
366366
let Constraints = "@earlyclobber $rd, $rd = $rs3" in {
367-
let Defs = [VCIX_STATE], Uses = [VCIX_STATE] in
367+
let Defs = [SF_VCIX_STATE], Uses = [SF_VCIX_STATE] in
368368
def "PseudoVC_V_" # NAME # "_SE_" # m.MX
369369
: VPseudoVC_V_XVV<OpClass, m.wvrclass, m.vrclass, RS1Class>,
370370
Sched<[!cast<SchedWrite>("WriteVC_V_" # NAME # "_" # m.MX)]>;

llvm/lib/Target/RISCV/RISCVRegisterInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ BitVector RISCVRegisterInfo::getReservedRegs(const MachineFunction &MF) const {
145145
markSuperRegs(Reserved, RISCV::FFLAGS);
146146

147147
// SiFive VCIX state registers.
148-
markSuperRegs(Reserved, RISCV::VCIX_STATE);
148+
markSuperRegs(Reserved, RISCV::SF_VCIX_STATE);
149149

150150
if (MF.getFunction().getCallingConv() == CallingConv::GRAAL) {
151151
if (Subtarget.hasStdExtE())

llvm/lib/Target/RISCV/RISCVRegisterInfo.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -664,5 +664,5 @@ def FRM : RISCVReg<0, "frm">;
664664
// Shadow Stack register
665665
def SSP : RISCVReg<0, "ssp">;
666666

667-
// Dummy VCIX state register
668-
def VCIX_STATE : RISCVReg<0, "vcix_state">;
667+
// Dummy SiFive VCIX state register
668+
def SF_VCIX_STATE : RISCVReg<0, "sf_vcix_state">;

llvm/test/CodeGen/RISCV/rvv/copyprop.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ body: |
4747
%22:vr = PseudoVMSNE_VI_M1 %3, 0, 1, 6 /* e64 */
4848
$v0 = COPY %22
4949
%25:vrnov0 = PseudoVMERGE_VIM_M1 undef $noreg, %17, -1, $v0, 1, 6 /* e64 */
50-
%29:vr = PseudoVC_V_X_SE_M1 3, 31, %2, 1, 6 /* e64 */, implicit-def dead $vcix_state, implicit $vcix_state
50+
%29:vr = PseudoVC_V_X_SE_M1 3, 31, %2, 1, 6 /* e64 */, implicit-def dead $sf_vcix_state, implicit $sf_vcix_state
5151
%30:vr = PseudoVMV_V_I_M1 undef $noreg, 0, 1, 6 /* e64 */, 0
5252
BGEU %1, $x0, %bb.2
5353

0 commit comments

Comments
 (0)