Skip to content

Commit a3ed355

Browse files
committed
[RISCV] Add MIPS p8700 scheduler and target cpu
Add support for MIPS's p8700 CPU. co-authored by Nemanja Rakovic <nemanja.rakovic@htecgroup.com>
1 parent e874c8f commit a3ed355

File tree

6 files changed

+300
-1
lines changed

6 files changed

+300
-1
lines changed

clang/test/Misc/target-invalid-cpu-note/riscv.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
// RISCV64: error: unknown target CPU 'not-a-cpu'
2626
// RISCV64-NEXT: note: valid target CPU values are:
2727
// RISCV64-SAME: {{^}} generic-rv64
28+
// RISCV64-SAME: {{^}}, mips-p8700
2829
// RISCV64-SAME: {{^}}, rocket-rv64
2930
// RISCV64-SAME: {{^}}, sifive-p450
3031
// RISCV64-SAME: {{^}}, sifive-p470
@@ -72,6 +73,7 @@
7273
// TUNE-RISCV64: error: unknown target CPU 'not-a-cpu'
7374
// TUNE-RISCV64-NEXT: note: valid target CPU values are:
7475
// TUNE-RISCV64-SAME: {{^}} generic-rv64
76+
// TUNE-RISCV64-SAME: {{^}}, mips-p8700
7577
// TUNE-RISCV64-SAME: {{^}}, rocket-rv64
7678
// TUNE-RISCV64-SAME: {{^}}, sifive-p450
7779
// TUNE-RISCV64-SAME: {{^}}, sifive-p470

llvm/lib/Target/RISCV/RISCV.td

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ include "RISCVMacroFusion.td"
4646
// RISC-V Scheduling Models
4747
//===----------------------------------------------------------------------===//
4848

49+
include "RISCVSchedMIPSP8700.td"
4950
include "RISCVSchedRocket.td"
5051
include "RISCVSchedSiFive7.td"
5152
include "RISCVSchedSiFiveP400.td"

llvm/lib/Target/RISCV/RISCVFeatures.td

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1447,6 +1447,10 @@ def TuneConditionalCompressedMoveFusion
14471447
def HasConditionalMoveFusion : Predicate<"Subtarget->hasConditionalMoveFusion()">;
14481448
def NoConditionalMoveFusion : Predicate<"!Subtarget->hasConditionalMoveFusion()">;
14491449

1450+
def TuneMIPSP8700
1451+
: SubtargetFeature<"mips-p8700", "RISCVProcFamily", "Others",
1452+
"MIPS p8700 processor">;
1453+
14501454
def TuneSiFive7 : SubtargetFeature<"sifive7", "RISCVProcFamily", "SiFive7",
14511455
"SiFive 7-Series processors">;
14521456

llvm/lib/Target/RISCV/RISCVProcessors.td

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,19 @@ def GENERIC_RV64 : RISCVProcessorModel<"generic-rv64",
7878
// to change to the appropriate rv32/rv64 version.
7979
def GENERIC : RISCVTuneProcessorModel<"generic", NoSchedModel>, GenericTuneInfo;
8080

81+
def MIPS_P8700 : RISCVProcessorModel<"mips-p8700",
82+
MIPSP8700Model,
83+
[Feature64Bit,
84+
FeatureStdExtI,
85+
FeatureStdExtM,
86+
FeatureStdExtA,
87+
FeatureStdExtF,
88+
FeatureStdExtD,
89+
FeatureStdExtC,
90+
FeatureStdExtZba,
91+
FeatureStdExtZbb],
92+
[TuneMIPSP8700]>;
93+
8194
def ROCKET_RV32 : RISCVProcessorModel<"rocket-rv32",
8295
RocketModel,
8396
[Feature32Bit,
@@ -279,7 +292,6 @@ def SIFIVE_P470 : RISCVProcessorModel<"sifive-p470", SiFiveP400Model,
279292
!listconcat(SiFiveP400TuneFeatures,
280293
[TuneNoSinkSplatOperands])>;
281294

282-
283295
def SIFIVE_P670 : RISCVProcessorModel<"sifive-p670", SiFiveP600Model,
284296
!listconcat(RVA22U64Features,
285297
[FeatureStdExtV,
Lines changed: 279 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,279 @@
1+
//===-- RISCVSchedMIPSP8700.td - MIPS RISC-V Processor -----*- tablegen -*-===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
//===----------------------------------------------------------------------===//
10+
// RISC-V processor by MIPS.
11+
//===----------------------------------------------------------------------===//
12+
13+
def MIPSP8700Model : SchedMachineModel {
14+
int IssueWidth = 4;
15+
int MicroOpBufferSize = 96; // as per the specification
16+
int LoadLatency = 4;
17+
int MispredictPenalty = 8; // TODO: Estimated
18+
let CompleteModel = 0;
19+
}
20+
21+
let SchedModel = MIPSP8700Model in {
22+
23+
// Handle ALQ Pipelines.
24+
def p8700ALQ : ProcResource<1> { let BufferSize = 16; }
25+
def p8700IssueALU : ProcResource<1> { let Super = p8700ALQ; }
26+
27+
28+
// Handle AGQ Pipelines.
29+
def p8700AGQ : ProcResource<3> { let BufferSize = 16; }
30+
def p8700IssueAL2 : ProcResource<1> { let Super = p8700AGQ; }
31+
def p8700IssueCTISTD : ProcResource<1> { let Super = p8700AGQ; }
32+
def p8700IssueLDST : ProcResource<1> { let Super = p8700AGQ; }
33+
def p8700GpDiv : ProcResource<1>;
34+
def p8700GpMul : ProcResource<1>;
35+
def p8700WriteEitherALU : ProcResGroup<[p8700IssueALU, p8700IssueAL2]>;
36+
37+
let Latency = 1 in {
38+
def : WriteRes<WriteIALU, [p8700WriteEitherALU]>;
39+
def : WriteRes<WriteIALU32, [p8700WriteEitherALU]>;
40+
def : WriteRes<WriteShiftImm, [p8700WriteEitherALU]>;
41+
def : WriteRes<WriteShiftImm32, [p8700WriteEitherALU]>;
42+
def : WriteRes<WriteShiftReg, [p8700WriteEitherALU]>;
43+
def : WriteRes<WriteShiftReg32, [p8700WriteEitherALU]>;
44+
45+
// Handle zba.
46+
def : WriteRes<WriteSHXADD, [p8700WriteEitherALU]>;
47+
def : WriteRes<WriteSHXADD32, [p8700WriteEitherALU]>;
48+
49+
// Handle zbb.
50+
def : WriteRes<WriteRotateReg, [p8700WriteEitherALU]>;
51+
def : WriteRes<WriteRotateImm, [p8700WriteEitherALU]>;
52+
def : WriteRes<WriteCLZ, [p8700WriteEitherALU]>;
53+
def : WriteRes<WriteCTZ, [p8700WriteEitherALU]>;
54+
def : WriteRes<WriteCPOP, [p8700WriteEitherALU]>;
55+
def : WriteRes<WriteRotateReg32, [p8700WriteEitherALU]>;
56+
def : WriteRes<WriteRotateImm32, [p8700WriteEitherALU]>;
57+
def : WriteRes<WriteCLZ32, [p8700WriteEitherALU]>;
58+
def : WriteRes<WriteCTZ32, [p8700WriteEitherALU]>;
59+
def : WriteRes<WriteCPOP32, [p8700WriteEitherALU]>;
60+
def : WriteRes<WriteREV8, [p8700WriteEitherALU]>;
61+
def : WriteRes<WriteORCB, [p8700WriteEitherALU]>;
62+
def : WriteRes<WriteIMinMax, []>;
63+
}
64+
65+
let Latency = 0 in {
66+
def : WriteRes<WriteNop, [p8700WriteEitherALU]>;
67+
}
68+
69+
let Latency = 4 in {
70+
def : WriteRes<WriteLDB, [p8700IssueLDST]>;
71+
def : WriteRes<WriteLDH, [p8700IssueLDST]>;
72+
def : WriteRes<WriteLDW, [p8700IssueLDST]>;
73+
def : WriteRes<WriteLDD, [p8700IssueLDST]>;
74+
75+
def : WriteRes<WriteAtomicW, [p8700IssueLDST]>;
76+
def : WriteRes<WriteAtomicD, [p8700IssueLDST]>;
77+
def : WriteRes<WriteAtomicLDW, [p8700IssueLDST]>;
78+
def : WriteRes<WriteAtomicLDD, [p8700IssueLDST]>;
79+
}
80+
81+
let Latency = 8 in {
82+
def : WriteRes<WriteFLD32, [p8700IssueLDST]>;
83+
def : WriteRes<WriteFLD64, [p8700IssueLDST]>;
84+
}
85+
86+
let Latency = 3 in {
87+
def : WriteRes<WriteSTB, [p8700IssueLDST]>;
88+
def : WriteRes<WriteSTH, [p8700IssueLDST]>;
89+
def : WriteRes<WriteSTW, [p8700IssueLDST]>;
90+
def : WriteRes<WriteSTD, [p8700IssueLDST]>;
91+
92+
def : WriteRes<WriteAtomicSTW, [p8700IssueLDST]>;
93+
def : WriteRes<WriteAtomicSTD, [p8700IssueLDST]>;
94+
}
95+
96+
let Latency = 1 in {
97+
def : WriteRes<WriteFST32, [p8700IssueLDST]>;
98+
def : WriteRes<WriteFST64, [p8700IssueLDST]>;
99+
}
100+
101+
let Latency = 7 in {
102+
def : WriteRes<WriteFMovI32ToF32, [p8700IssueLDST]>;
103+
def : WriteRes<WriteFMovF32ToI32, [p8700IssueLDST]>;
104+
def : WriteRes<WriteFMovI64ToF64, [p8700IssueLDST]>;
105+
def : WriteRes<WriteFMovF64ToI64, [p8700IssueLDST]>;
106+
}
107+
108+
let Latency = 4 in {
109+
def : WriteRes<WriteIMul, [p8700GpMul]>;
110+
def : WriteRes<WriteIMul32, [p8700GpMul]>;
111+
}
112+
113+
let Latency = 8, ReleaseAtCycles = [5] in {
114+
def : WriteRes<WriteIDiv, [p8700GpDiv]>;
115+
def : WriteRes<WriteIDiv32, [p8700GpDiv]>;
116+
}
117+
118+
def : WriteRes<WriteIRem, []>;
119+
def : WriteRes<WriteIRem32, []>;
120+
121+
// Handle CTISTD Pipeline.
122+
let Latency = 1 in {
123+
def : WriteRes<WriteJmp, [p8700IssueCTISTD]>;
124+
def : WriteRes<WriteJmpReg, [p8700IssueCTISTD]>;
125+
}
126+
127+
let Latency = 2 in {
128+
def : WriteRes<WriteJal, [p8700IssueCTISTD]>;
129+
def : WriteRes<WriteJalr, [p8700IssueCTISTD]>;
130+
}
131+
132+
// Handle FPU Pipelines.
133+
def p8700FPQ : ProcResource<3> { let BufferSize = 16; }
134+
def p8700IssueFPUS : ProcResource<1> { let Super = p8700FPQ; }
135+
def p8700IssueFPUL : ProcResource<1> { let Super = p8700FPQ; }
136+
def p8700IssueFPULoad : ProcResource<1> { let Super = p8700FPQ; }
137+
def p8700FpuApu : ProcResource<1>;
138+
def p8700FpuLong : ProcResource<1>;
139+
140+
let Latency = 4, ReleaseAtCycles = [1, 1] in {
141+
def : WriteRes<WriteFCvtI32ToF32, [p8700IssueFPUL, p8700FpuApu]>;
142+
def : WriteRes<WriteFCvtI32ToF64, [p8700IssueFPUL, p8700FpuApu]>;
143+
def : WriteRes<WriteFCvtI64ToF32, [p8700IssueFPUL, p8700FpuApu]>;
144+
def : WriteRes<WriteFCvtI64ToF64, [p8700IssueFPUL, p8700FpuApu]>;
145+
def : WriteRes<WriteFCvtF32ToI32, [p8700IssueFPUL, p8700FpuApu]>;
146+
def : WriteRes<WriteFCvtF32ToI64, [p8700IssueFPUL, p8700FpuApu]>;
147+
def : WriteRes<WriteFCvtF32ToF64, [p8700IssueFPUL, p8700FpuApu]>;
148+
def : WriteRes<WriteFCvtF64ToI32, [p8700IssueFPUL, p8700FpuApu]>;
149+
def : WriteRes<WriteFCvtF64ToI64, [p8700IssueFPUL, p8700FpuApu]>;
150+
def : WriteRes<WriteFCvtF64ToF32, [p8700IssueFPUL, p8700FpuApu]>;
151+
152+
def : WriteRes<WriteFAdd32, [p8700IssueFPUL, p8700FpuApu]>;
153+
def : WriteRes<WriteFAdd64, [p8700IssueFPUL, p8700FpuApu]>;
154+
}
155+
156+
let Latency = 2, ReleaseAtCycles = [1, 1] in {
157+
def : WriteRes<WriteFSGNJ32, [p8700IssueFPUS, p8700FpuApu]>;
158+
def : WriteRes<WriteFMinMax32, [p8700IssueFPUS, p8700FpuApu]>;
159+
def : WriteRes<WriteFSGNJ64, [p8700IssueFPUS, p8700FpuApu]>;
160+
def : WriteRes<WriteFMinMax64, [p8700IssueFPUS, p8700FpuApu]>;
161+
162+
def : WriteRes<WriteFCmp32, [p8700IssueFPUS, p8700FpuApu]>;
163+
def : WriteRes<WriteFCmp64, [p8700IssueFPUS, p8700FpuApu]>;
164+
def : WriteRes<WriteFClass32, [p8700IssueFPUS, p8700FpuApu]>;
165+
def : WriteRes<WriteFClass64, [p8700IssueFPUS, p8700FpuApu]>;
166+
}
167+
168+
let Latency = 8, ReleaseAtCycles = [1, 1] in {
169+
def : WriteRes<WriteFMA32, [p8700FpuLong, p8700FpuApu]>;
170+
def : WriteRes<WriteFMA64, [p8700FpuLong, p8700FpuApu]>;
171+
}
172+
173+
let Latency = 5, ReleaseAtCycles = [1, 1] in {
174+
def : WriteRes<WriteFMul32, [p8700FpuLong, p8700FpuApu]>;
175+
def : WriteRes<WriteFMul64, [p8700FpuLong, p8700FpuApu]>;
176+
}
177+
178+
let Latency = 17, ReleaseAtCycles = [1, 17] in {
179+
def : WriteRes<WriteFDiv32, [p8700FpuLong, p8700FpuApu]>;
180+
def : WriteRes<WriteFSqrt32, [p8700FpuLong, p8700FpuApu]>;
181+
182+
def : WriteRes<WriteFDiv64, [p8700IssueFPUL, p8700FpuApu]>;
183+
def : WriteRes<WriteFSqrt64, [p8700IssueFPUL, p8700FpuApu]>;
184+
}
185+
186+
def : WriteRes<WriteCSR, [p8700ALQ]>;
187+
188+
// Bypass and advance.
189+
def : ReadAdvance<ReadIALU, 0>;
190+
def : ReadAdvance<ReadIALU32, 0>;
191+
def : ReadAdvance<ReadShiftImm, 0>;
192+
def : ReadAdvance<ReadShiftImm32, 0>;
193+
def : ReadAdvance<ReadShiftReg, 0>;
194+
def : ReadAdvance<ReadShiftReg32, 0>;
195+
def : ReadAdvance<ReadSHXADD, 0>;
196+
def : ReadAdvance<ReadSHXADD32, 0>;
197+
def : ReadAdvance<ReadRotateReg, 0>;
198+
def : ReadAdvance<ReadRotateImm, 0>;
199+
def : ReadAdvance<ReadCLZ, 0>;
200+
def : ReadAdvance<ReadCTZ, 0>;
201+
def : ReadAdvance<ReadCPOP, 0>;
202+
def : ReadAdvance<ReadRotateReg32, 0>;
203+
def : ReadAdvance<ReadRotateImm32, 0>;
204+
def : ReadAdvance<ReadCLZ32, 0>;
205+
def : ReadAdvance<ReadCTZ32, 0>;
206+
def : ReadAdvance<ReadCPOP32, 0>;
207+
def : ReadAdvance<ReadREV8, 0>;
208+
def : ReadAdvance<ReadORCB, 0>;
209+
def : ReadAdvance<ReadIMul, 0>;
210+
def : ReadAdvance<ReadIMul32, 0>;
211+
def : ReadAdvance<ReadIDiv, 0>;
212+
def : ReadAdvance<ReadIDiv32, 0>;
213+
def : ReadAdvance<ReadJmp, 0>;
214+
def : ReadAdvance<ReadJalr, 0>;
215+
def : ReadAdvance<ReadFMovI32ToF32, 0>;
216+
def : ReadAdvance<ReadFMovF32ToI32, 0>;
217+
def : ReadAdvance<ReadFMovI64ToF64, 0>;
218+
def : ReadAdvance<ReadFMovF64ToI64, 0>;
219+
def : ReadAdvance<ReadFSGNJ32, 0>;
220+
def : ReadAdvance<ReadFMinMax32, 0>;
221+
def : ReadAdvance<ReadFSGNJ64, 0>;
222+
def : ReadAdvance<ReadFMinMax64, 0>;
223+
def : ReadAdvance<ReadFCmp32, 0>;
224+
def : ReadAdvance<ReadFCmp64, 0>;
225+
def : ReadAdvance<ReadFCvtI32ToF32, 0>;
226+
def : ReadAdvance<ReadFCvtI32ToF64, 0>;
227+
def : ReadAdvance<ReadFCvtI64ToF32, 0>;
228+
def : ReadAdvance<ReadFCvtI64ToF64, 0>;
229+
def : ReadAdvance<ReadFCvtF32ToI32, 0>;
230+
def : ReadAdvance<ReadFCvtF32ToI64, 0>;
231+
def : ReadAdvance<ReadFCvtF32ToF64, 0>;
232+
def : ReadAdvance<ReadFCvtF64ToI32, 0>;
233+
def : ReadAdvance<ReadFCvtF64ToI64, 0>;
234+
def : ReadAdvance<ReadFCvtF64ToF32, 0>;
235+
def : ReadAdvance<ReadFAdd32, 0>;
236+
def : ReadAdvance<ReadFAdd64, 0>;
237+
def : ReadAdvance<ReadFMul32, 0>;
238+
def : ReadAdvance<ReadFMul64, 0>;
239+
def : ReadAdvance<ReadFMA32, 0>;
240+
def : ReadAdvance<ReadFMA32Addend, 0>;
241+
def : ReadAdvance<ReadFMA64, 0>;
242+
def : ReadAdvance<ReadFMA64Addend, 0>;
243+
def : ReadAdvance<ReadFDiv32, 0>;
244+
def : ReadAdvance<ReadFSqrt32, 0>;
245+
def : ReadAdvance<ReadFDiv64, 0>;
246+
def : ReadAdvance<ReadFSqrt64, 0>;
247+
def : ReadAdvance<ReadAtomicWA, 0>;
248+
def : ReadAdvance<ReadAtomicWD, 0>;
249+
def : ReadAdvance<ReadAtomicDA, 0>;
250+
def : ReadAdvance<ReadAtomicDD, 0>;
251+
def : ReadAdvance<ReadAtomicLDW, 0>;
252+
def : ReadAdvance<ReadAtomicLDD, 0>;
253+
def : ReadAdvance<ReadAtomicSTW, 0>;
254+
def : ReadAdvance<ReadAtomicSTD, 0>;
255+
def : ReadAdvance<ReadFStoreData, 0>;
256+
def : ReadAdvance<ReadCSR, 0>;
257+
def : ReadAdvance<ReadMemBase, 0>;
258+
def : ReadAdvance<ReadStoreData, 0>;
259+
def : ReadAdvance<ReadFMemBase, 0>;
260+
def : ReadAdvance<ReadFClass32, 0>;
261+
def : ReadAdvance<ReadFClass64, 0>;
262+
def : ReadAdvance<ReadIMinMax, 0>;
263+
def : ReadAdvance<ReadIRem, 0>;
264+
def : ReadAdvance<ReadIRem32, 0>;
265+
266+
// Unsupported extensions.
267+
defm : UnsupportedSchedV;
268+
defm : UnsupportedSchedZbc;
269+
defm : UnsupportedSchedZbs;
270+
defm : UnsupportedSchedZbkb;
271+
defm : UnsupportedSchedZbkx;
272+
defm : UnsupportedSchedZfa;
273+
defm : UnsupportedSchedZfh;
274+
defm : UnsupportedSchedSFB;
275+
defm : UnsupportedSchedZabha;
276+
defm : UnsupportedSchedXsfvcp;
277+
defm : UnsupportedSchedZvk;
278+
defm : UnsupportedSchedZvkned;
279+
}

llvm/lib/Target/RISCV/RISCVSchedule.td

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ def WriteIMul32 : SchedWrite; // 32-bit multiply on RV64I
2222
def WriteJmp : SchedWrite; // Jump
2323
def WriteJal : SchedWrite; // Jump and link
2424
def WriteJalr : SchedWrite; // Jump and link register
25+
def WriteJmpReg : SchedWrite; // Jump register
2526
def WriteNop : SchedWrite;
2627
def WriteLDB : SchedWrite; // Load byte
2728
def WriteLDH : SchedWrite; // Load half-word

0 commit comments

Comments
 (0)