Skip to content

Commit e9255bd

Browse files
committed
[RISCV] Rename rs1_wb to rd in some C instructions. NFC
The spec refers to the field as rd'/rs1' so we might as well name the destination rd.
1 parent 9cc6e6f commit e9255bd

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

llvm/lib/Target/RISCV/RISCVInstrInfoC.td

Lines changed: 8 additions & 8 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};
@@ -477,10 +477,10 @@ def C_SRAI : Shift_right<0b01, "c.srai", GPRC, uimmlog2xlennonzero>,
477477
Sched<[WriteShiftImm, ReadShiftImm]>;
478478

479479
let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
480-
def C_ANDI : RVInst16CB<0b100, 0b01, (outs GPRC:$rs1_wb), (ins GPRC:$rs1, simm6:$imm),
480+
def C_ANDI : RVInst16CB<0b100, 0b01, (outs GPRC:$rd), (ins GPRC:$rs1, simm6:$imm),
481481
"c.andi", "$rs1, $imm">,
482482
Sched<[WriteIALU, ReadIALU]> {
483-
let Constraints = "$rs1 = $rs1_wb";
483+
let Constraints = "$rs1 = $rd";
484484
let Inst{12} = imm{5};
485485
let Inst{11-10} = 0b10;
486486
let Inst{6-2} = imm{4-0};
@@ -580,11 +580,11 @@ def C_JALR : RVInst16CR<0b1001, 0b10, (outs), (ins GPRNoX0:$rs1),
580580
"c.jalr", "$rs1">, Sched<[WriteJalr, ReadJalr]>;
581581

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

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

681-
def C_ADD_HINT : RVInst16CR<0b1001, 0b10, (outs GPRX0:$rs1_wb),
681+
def C_ADD_HINT : RVInst16CR<0b1001, 0b10, (outs GPRX0:$rd),
682682
(ins GPRX0:$rs1, GPRNoX0:$rs2),
683683
"c.add", "$rs1, $rs2">,
684684
Sched<[WriteIALU, ReadIALU, ReadIALU]> {
685-
let Constraints = "$rs1 = $rs1_wb";
685+
let Constraints = "$rs1 = $rd";
686686
let Inst{11-7} = 0;
687687
let DecoderMethod = "decodeRVCInstrRdRs1Rs2";
688688
}

0 commit comments

Comments
 (0)