Skip to content

Commit 7fd3743

Browse files
authored
[RISCV] Rename Mips instruction records to start with MIPS_. NFC (llvm#125170)
This matches established conventions and avoids potential future conflicts with standard instructions.
1 parent 6414239 commit 7fd3743

File tree

1 file changed

+29
-38
lines changed

1 file changed

+29
-38
lines changed

llvm/lib/Target/RISCV/RISCVInstrInfoXMips.td

Lines changed: 29 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -109,61 +109,52 @@ class SWPFormat<dag outs, dag ins, string opcodestr, string argstr>
109109

110110
let Predicates = [HasVendorXMIPSCMove], hasSideEffects = 0, mayLoad = 0, mayStore = 0,
111111
DecoderNamespace = "Xmipscmove" in {
112-
def CCMOV : RVInstR4<0b11, 0b011, OPC_CUSTOM_0, (outs GPR:$rd),
113-
(ins GPR:$rs1, GPR:$rs2, GPR:$rs3),
114-
"mips.ccmov", "$rd, $rs2, $rs1, $rs3">,
115-
Sched<[]>;
112+
def MIPS_CCMOV : RVInstR4<0b11, 0b011, OPC_CUSTOM_0, (outs GPR:$rd),
113+
(ins GPR:$rs1, GPR:$rs2, GPR:$rs3),
114+
"mips.ccmov", "$rd, $rs2, $rs1, $rs3">,
115+
Sched<[]>;
116116
}
117117

118118
let Predicates = [UseCCMovInsn] in {
119119
def : Pat<(select (XLenVT (setne (XLenVT GPR:$rs2), (XLenVT 0))),
120120
(XLenVT GPR:$rs1), (XLenVT GPR:$rs3)),
121-
(CCMOV GPR:$rs1, GPR:$rs2, GPR:$rs3)>;
121+
(MIPS_CCMOV GPR:$rs1, GPR:$rs2, GPR:$rs3)>;
122122
def : Pat<(select (XLenVT (setne (XLenVT GPR:$x), (XLenVT simm12_plus1:$y))),
123123
(XLenVT GPR:$rs1), (XLenVT GPR:$rs3)),
124-
(CCMOV GPR:$rs1, (ADDI GPR:$x, (NegImm simm12_plus1:$y)), GPR:$rs3)>;
124+
(MIPS_CCMOV GPR:$rs1, (ADDI GPR:$x, (NegImm simm12_plus1:$y)), GPR:$rs3)>;
125125
def : Pat<(select (XLenVT (setne (XLenVT GPR:$x), (XLenVT GPR:$y))),
126126
(XLenVT GPR:$rs1), (XLenVT GPR:$rs3)),
127-
(CCMOV GPR:$rs1, (XOR GPR:$x, GPR:$y), GPR:$rs3)>;
127+
(MIPS_CCMOV GPR:$rs1, (XOR GPR:$x, GPR:$y), GPR:$rs3)>;
128128
def : Pat<(select (XLenVT (seteq (XLenVT GPR:$rs2), (XLenVT 0))),
129129
(XLenVT GPR:$rs3), (XLenVT GPR:$rs1)),
130-
(CCMOV GPR:$rs1, GPR:$rs2, GPR:$rs3)>;
130+
(MIPS_CCMOV GPR:$rs1, GPR:$rs2, GPR:$rs3)>;
131131
def : Pat<(select (XLenVT (seteq (XLenVT GPR:$x), (XLenVT simm12_plus1:$y))),
132132
(XLenVT GPR:$rs3), (XLenVT GPR:$rs1)),
133-
(CCMOV GPR:$rs1, (ADDI GPR:$x, (NegImm simm12_plus1:$y)), GPR:$rs3)>;
133+
(MIPS_CCMOV GPR:$rs1, (ADDI GPR:$x, (NegImm simm12_plus1:$y)), GPR:$rs3)>;
134134
def : Pat<(select (XLenVT (seteq (XLenVT GPR:$x), (XLenVT GPR:$y))),
135135
(XLenVT GPR:$rs3), (XLenVT GPR:$rs1)),
136-
(CCMOV GPR:$rs1, (XOR GPR:$x, GPR:$y), GPR:$rs3)>;
136+
(MIPS_CCMOV GPR:$rs1, (XOR GPR:$x, GPR:$y), GPR:$rs3)>;
137137
def : Pat<(select (XLenVT GPR:$rs2), (XLenVT GPR:$rs1), (XLenVT GPR:$rs3)),
138-
(CCMOV GPR:$rs1, GPR:$rs2, GPR:$rs3)>;
138+
(MIPS_CCMOV GPR:$rs1, GPR:$rs2, GPR:$rs3)>;
139139
}
140140

141141
let Predicates = [HasVendorXMIPSLSP], hasSideEffects = 0,
142142
DecoderNamespace = "Xmipslsp" in {
143-
144-
def LWP : LWPFormat<(outs GPR:$rd1, GPR:$rd2), (ins GPR:$rs1, uimm7_lsb00:$imm7),
145-
"mips.lwp", "$rd1, $rd2, ${imm7}(${rs1})">,
146-
Sched<[WriteLDW, WriteLDW, ReadMemBase]> {
147-
let mayLoad = 1;
148-
let mayStore = 0;
149-
}
150-
def LDP : LDPFormat<(outs GPR:$rd1, GPR:$rd2), (ins GPR:$rs1, uimm7_lsb000:$imm7),
151-
"mips.ldp", "$rd1, $rd2, ${imm7}(${rs1})">,
152-
Sched<[WriteLDD, WriteLDD, ReadMemBase]> {
153-
let mayLoad = 1;
154-
let mayStore = 0;
155-
}
156-
def SWP : SWPFormat<(outs), (ins GPR:$rs2, GPR:$rs3, GPR:$rs1, uimm7_lsb00:$imm7),
157-
"mips.swp", "$rs2, $rs3, ${imm7}(${rs1})">,
158-
Sched<[WriteSTW, ReadStoreData, ReadStoreData, ReadMemBase]> {
159-
let mayLoad = 0;
160-
let mayStore = 1;
161-
}
162-
def SDP : SDPFormat<(outs), (ins GPR:$rs2, GPR:$rs3, GPR:$rs1, uimm7_lsb000:$imm7),
163-
"mips.sdp", "$rs2, $rs3, ${imm7}(${rs1})">,
164-
Sched<[WriteSTD, ReadStoreData, ReadStoreData, ReadMemBase]> {
165-
let mayLoad = 0;
166-
let mayStore = 1;
167-
}
168-
169-
}
143+
let mayLoad = 1, mayStore = 0 in {
144+
def MIPS_LWP : LWPFormat<(outs GPR:$rd1, GPR:$rd2), (ins GPR:$rs1, uimm7_lsb00:$imm7),
145+
"mips.lwp", "$rd1, $rd2, ${imm7}(${rs1})">,
146+
Sched<[WriteLDW, WriteLDW, ReadMemBase]>;
147+
def MIPS_LDP : LDPFormat<(outs GPR:$rd1, GPR:$rd2), (ins GPR:$rs1, uimm7_lsb000:$imm7),
148+
"mips.ldp", "$rd1, $rd2, ${imm7}(${rs1})">,
149+
Sched<[WriteLDD, WriteLDD, ReadMemBase]>;
150+
} // mayLoad = 1, mayStore = 0
151+
152+
let mayLoad = 0, mayStore = 1 in {
153+
def MIPS_SWP : SWPFormat<(outs), (ins GPR:$rs2, GPR:$rs3, GPR:$rs1, uimm7_lsb00:$imm7),
154+
"mips.swp", "$rs2, $rs3, ${imm7}(${rs1})">,
155+
Sched<[WriteSTW, ReadStoreData, ReadStoreData, ReadMemBase]>;
156+
def MIPS_SDP : SDPFormat<(outs), (ins GPR:$rs2, GPR:$rs3, GPR:$rs1, uimm7_lsb000:$imm7),
157+
"mips.sdp", "$rs2, $rs3, ${imm7}(${rs1})">,
158+
Sched<[WriteSTD, ReadStoreData, ReadStoreData, ReadMemBase]>;
159+
} // mayLoad = 0, mayStore = 1
160+
} // Predicates = [HasVendorXMIPSLSP], hasSideEffects = 0, DecoderNamespace = "Xmipslsp"

0 commit comments

Comments
 (0)