Skip to content

Commit 0c6651f

Browse files
committed
Revert "[RISCV] Relax the dependency of shadow stack instrs to Zimop"
This reverts commit 700c43aeded6f853ed4bd701cca0b84fdffca7b7.
1 parent 1c2f629 commit 0c6651f

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

llvm/lib/Target/RISCV/RISCVInstrInfoZicfiss.td

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class RVC_SSInst<bits<5> rs1val, RegisterClass reg_class, string opcodestr> :
2424
// Instructions
2525
//===----------------------------------------------------------------------===//
2626

27-
let Predicates = [HasStdExtZimop] in {
27+
let Predicates = [HasStdExtZicfiss] in {
2828
let Uses = [SSP], Defs = [SSP], hasSideEffects = 0, mayLoad = 1, mayStore = 0 in
2929
def SSPOPCHK : RVInstI<0b100, OPC_SYSTEM, (outs), (ins GPRX1X5:$rs1), "sspopchk",
3030
"$rs1"> {
@@ -45,28 +45,28 @@ def SSPUSH : RVInstR<0b1100111, 0b100, OPC_SYSTEM, (outs), (ins GPRX1X5:$rs2),
4545
let rd = 0b00000;
4646
let rs1 = 0b00000;
4747
}
48-
} // Predicates = [HasStdExtZimop]
48+
} // Predicates = [HasStdExtZicfiss]
4949

50-
let Predicates = [HasStdExtZimop, HasStdExtZcmop],
50+
let Predicates = [HasStdExtZicfiss, HasStdExtZcmop],
5151
DecoderNamespace = "Zicfiss" in {
5252
let Uses = [SSP], Defs = [SSP], hasSideEffects = 0, mayLoad = 0, mayStore = 1 in
5353
def C_SSPUSH : RVC_SSInst<0b00001, GPRX1, "c.sspush">;
5454

5555
let Uses = [SSP], Defs = [SSP], hasSideEffects = 0, mayLoad = 1, mayStore = 0 in
5656
def C_SSPOPCHK : RVC_SSInst<0b00101, GPRX5, "c.sspopchk">;
57-
} // Predicates = [HasStdExtZimop, HasStdExtZcmop]
57+
} // Predicates = [HasStdExtZicfiss, HasStdExtZcmop]
5858

59-
let Predicates = [HasStdExtZimop] in
59+
let Predicates = [HasStdExtZicfiss] in
6060
defm SSAMOSWAP_W : AMO_rr_aq_rl<0b01001, 0b010, "ssamoswap.w">;
6161

62-
let Predicates = [HasStdExtZimop, IsRV64] in
62+
let Predicates = [HasStdExtZicfiss, IsRV64] in
6363
defm SSAMOSWAP_D : AMO_rr_aq_rl<0b01001, 0b011, "ssamoswap.d">;
6464

6565
//===----------------------------------------------------------------------===/
6666
// Compress Instruction tablegen backend.
6767
//===----------------------------------------------------------------------===//
6868

69-
let Predicates = [HasStdExtZimop, HasStdExtZcmop] in {
69+
let Predicates = [HasStdExtZicfiss, HasStdExtZcmop] in {
7070
def : CompressPat<(SSPUSH X1), (C_SSPUSH X1)>;
7171
def : CompressPat<(SSPOPCHK X5), (C_SSPOPCHK X5)>;
72-
} // Predicates = [HasStdExtZimop, HasStdExtZcmop]
72+
} // Predicates = [HasStdExtZicfiss, HasStdExtZcmop]

0 commit comments

Comments
 (0)