Skip to content

Commit 5462725

Browse files
authored
[RISCV] Rename rs1_wb to rd in some C instructions. NFC (#112269)
The spec refers to the field as rd'/rs1' so we might as well name the destination rd.
1 parent b373278 commit 5462725

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

llvm/lib/Target/RISCV/RISCVInstrInfoC.td

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,9 @@ class Bcz<bits<3> funct3, string OpcodeStr,
279279
let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
280280
class Shift_right<bits<2> funct2, string OpcodeStr, RegisterClass cls,
281281
Operand ImmOpnd>
282-
: RVInst16CB<0b100, 0b01, (outs cls:$rs1_wb), (ins cls:$rs1, ImmOpnd:$imm),
282+
: RVInst16CB<0b100, 0b01, (outs cls:$rd), (ins cls:$rs1, ImmOpnd:$imm),
283283
OpcodeStr, "$rs1, $imm"> {
284-
let Constraints = "$rs1 = $rs1_wb";
284+
let Constraints = "$rs1 = $rd";
285285
let Inst{12} = imm{5};
286286
let Inst{11-10} = funct2;
287287
let Inst{6-2} = imm{4-0};
@@ -479,10 +479,10 @@ def C_SRAI : Shift_right<0b01, "c.srai", GPRC, uimmlog2xlennonzero>,
479479
Sched<[WriteShiftImm, ReadShiftImm]>;
480480

481481
let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
482-
def C_ANDI : RVInst16CB<0b100, 0b01, (outs GPRC:$rs1_wb), (ins GPRC:$rs1, simm6:$imm),
482+
def C_ANDI : RVInst16CB<0b100, 0b01, (outs GPRC:$rd), (ins GPRC:$rs1, simm6:$imm),
483483
"c.andi", "$rs1, $imm">,
484484
Sched<[WriteIALU, ReadIALU]> {
485-
let Constraints = "$rs1 = $rs1_wb";
485+
let Constraints = "$rs1 = $rd";
486486
let Inst{12} = imm{5};
487487
let Inst{11-10} = 0b10;
488488
let Inst{6-2} = imm{4-0};
@@ -582,11 +582,11 @@ def C_JALR : RVInst16CR<0b1001, 0b10, (outs), (ins GPRNoX0:$rs1),
582582
"c.jalr", "$rs1">, Sched<[WriteJalr, ReadJalr]>;
583583

584584
let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
585-
def C_ADD : RVInst16CR<0b1001, 0b10, (outs GPRNoX0:$rs1_wb),
585+
def C_ADD : RVInst16CR<0b1001, 0b10, (outs GPRNoX0:$rd),
586586
(ins GPRNoX0:$rs1, GPRNoX0:$rs2),
587587
"c.add", "$rs1, $rs2">,
588588
Sched<[WriteIALU, ReadIALU, ReadIALU]> {
589-
let Constraints = "$rs1 = $rs1_wb";
589+
let Constraints = "$rs1 = $rd";
590590
}
591591

592592
let Predicates = [HasStdExtCOrZcd, HasStdExtD] in
@@ -680,11 +680,11 @@ def C_MV_HINT : RVInst16CR<0b1000, 0b10, (outs GPRX0:$rs1), (ins GPRNoX0:$rs2),
680680
let DecoderMethod = "decodeRVCInstrRdRs2";
681681
}
682682

683-
def C_ADD_HINT : RVInst16CR<0b1001, 0b10, (outs GPRX0:$rs1_wb),
683+
def C_ADD_HINT : RVInst16CR<0b1001, 0b10, (outs GPRX0:$rd),
684684
(ins GPRX0:$rs1, GPRNoX0:$rs2),
685685
"c.add", "$rs1, $rs2">,
686686
Sched<[WriteIALU, ReadIALU, ReadIALU]> {
687-
let Constraints = "$rs1 = $rs1_wb";
687+
let Constraints = "$rs1 = $rd";
688688
let Inst{11-7} = 0;
689689
let DecoderMethod = "decodeRVCInstrRdRs1Rs2";
690690
}
@@ -707,21 +707,21 @@ def C_SLLI64_HINT : RVInst16CI<0b000, 0b10, (outs GPR:$rd_wb), (ins GPR:$rd),
707707
let Inst{12} = 0;
708708
}
709709

710-
def C_SRLI64_HINT : RVInst16CB<0b100, 0b01, (outs GPRC:$rs1_wb),
710+
def C_SRLI64_HINT : RVInst16CB<0b100, 0b01, (outs GPRC:$rd),
711711
(ins GPRC:$rs1),
712712
"c.srli64", "$rs1">,
713713
Sched<[WriteShiftImm, ReadShiftImm]> {
714-
let Constraints = "$rs1 = $rs1_wb";
714+
let Constraints = "$rs1 = $rd";
715715
let Inst{6-2} = 0;
716716
let Inst{11-10} = 0b00;
717717
let Inst{12} = 0;
718718
}
719719

720-
def C_SRAI64_HINT : RVInst16CB<0b100, 0b01, (outs GPRC:$rs1_wb),
720+
def C_SRAI64_HINT : RVInst16CB<0b100, 0b01, (outs GPRC:$rd),
721721
(ins GPRC:$rs1),
722722
"c.srai64", "$rs1">,
723723
Sched<[WriteShiftImm, ReadShiftImm]> {
724-
let Constraints = "$rs1 = $rs1_wb";
724+
let Constraints = "$rs1 = $rd";
725725
let Inst{6-2} = 0;
726726
let Inst{11-10} = 0b01;
727727
let Inst{12} = 0;

0 commit comments

Comments
 (0)