Skip to content

Commit 9884fd3

Browse files
asi-scdnpetrov-scaaa-sc
authored
[RISCV] Add Syntacore SCR4 RV32/64 processors definition (#101321)
Syntacore SCR4 is a microcontroller-class processor core that has much in common with SCR3. The most significant difference for compilers is F and D extensions support. Overview: https://syntacore.com/products/scr4 Two CPUs are added: * 'syntacore-scr4-rv32' -- rv32imfdc * 'syntacore-scr4-rv64' -- rv64imafdc Scheduling model will be added in a separate PR. Co-authored-by: Dmitrii Petrov <[email protected]> Co-authored-by: Anton Afanasyev <[email protected]>
1 parent 3364284 commit 9884fd3

File tree

4 files changed

+57
-4
lines changed

4 files changed

+57
-4
lines changed

‎clang/test/Driver/riscv-cpus.c

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,3 +381,30 @@
381381

382382
// RUN: %clang --target=riscv64 -### -c %s 2>&1 -mtune=syntacore-scr3-rv64 | FileCheck -check-prefix=MTUNE-SYNTACORE-SCR3-RV64 %s
383383
// MTUNE-SYNTACORE-SCR3-RV64: "-tune-cpu" "syntacore-scr3-rv64"
384+
385+
// RUN: %clang --target=riscv32 -### -c %s 2>&1 -mcpu=syntacore-scr4-rv32 | FileCheck -check-prefix=MCPU-SYNTACORE-SCR4-RV32 %s
386+
// MCPU-SYNTACORE-SCR4-RV32: "-target-cpu" "syntacore-scr4-rv32"
387+
// MCPU-SYNTACORE-SCR4-RV32-SAME: "-target-feature" "+m"
388+
// MCPU-SYNTACORE-SCR4-RV32-SAME: "-target-feature" "+f"
389+
// MCPU-SYNTACORE-SCR4-RV32-SAME: "-target-feature" "+d"
390+
// MCPU-SYNTACORE-SCR4-RV32-SAME: "-target-feature" "+c"
391+
// MCPU-SYNTACORE-SCR4-RV32-SAME: "-target-feature" "+zicsr"
392+
// MCPU-SYNTACORE-SCR4-RV32-SAME: "-target-feature" "+zifencei"
393+
// MCPU-SYNTACORE-SCR4-RV32-SAME: "-target-abi" "ilp32d"
394+
395+
// RUN: %clang --target=riscv32 -### -c %s 2>&1 -mtune=syntacore-scr4-rv32 | FileCheck -check-prefix=MTUNE-SYNTACORE-SCR4-RV32 %s
396+
// MTUNE-SYNTACORE-SCR4-RV32: "-tune-cpu" "syntacore-scr4-rv32"
397+
398+
// RUN: %clang --target=riscv64 -### -c %s 2>&1 -mcpu=syntacore-scr4-rv64 | FileCheck -check-prefix=MCPU-SYNTACORE-SCR4-RV64 %s
399+
// MCPU-SYNTACORE-SCR4-RV64: "-target-cpu" "syntacore-scr4-rv64"
400+
// MCPU-SYNTACORE-SCR4-RV64-SAME: "-target-feature" "+m"
401+
// MCPU-SYNTACORE-SCR4-RV64-SAME: "-target-feature" "+a"
402+
// MCPU-SYNTACORE-SCR4-RV64-SAME: "-target-feature" "+f"
403+
// MCPU-SYNTACORE-SCR4-RV64-SAME: "-target-feature" "+d"
404+
// MCPU-SYNTACORE-SCR4-RV64-SAME: "-target-feature" "+c"
405+
// MCPU-SYNTACORE-SCR4-RV64-SAME: "-target-feature" "+zicsr"
406+
// MCPU-SYNTACORE-SCR4-RV64-SAME: "-target-feature" "+zifencei"
407+
// MCPU-SYNTACORE-SCR4-RV64-SAME: "-target-abi" "lp64d"
408+
409+
// RUN: %clang --target=riscv64 -### -c %s 2>&1 -mtune=syntacore-scr4-rv64 | FileCheck -check-prefix=MTUNE-SYNTACORE-SCR4-RV64 %s
410+
// MTUNE-SYNTACORE-SCR4-RV64: "-tune-cpu" "syntacore-scr4-rv64"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,16 @@
8181

8282
// RUN: not %clang_cc1 -triple riscv32 -target-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix RISCV32
8383
// RISCV32: error: unknown target CPU 'not-a-cpu'
84-
// RISCV32-NEXT: note: valid target CPU values are: generic-rv32, rocket-rv32, sifive-e20, sifive-e21, sifive-e24, sifive-e31, sifive-e34, sifive-e76, syntacore-scr1-base, syntacore-scr1-max, syntacore-scr3-rv32{{$}}
84+
// RISCV32-NEXT: note: valid target CPU values are: generic-rv32, rocket-rv32, sifive-e20, sifive-e21, sifive-e24, sifive-e31, sifive-e34, sifive-e76, syntacore-scr1-base, syntacore-scr1-max, syntacore-scr3-rv32, syntacore-scr4-rv32{{$}}
8585

8686
// RUN: not %clang_cc1 -triple riscv64 -target-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix RISCV64
8787
// RISCV64: error: unknown target CPU 'not-a-cpu'
88-
// RISCV64-NEXT: note: valid target CPU values are: generic-rv64, rocket-rv64, sifive-p450, sifive-p670, sifive-s21, sifive-s51, sifive-s54, sifive-s76, sifive-u54, sifive-u74, sifive-x280, spacemit-x60, syntacore-scr3-rv64, veyron-v1, xiangshan-nanhu{{$}}
88+
// RISCV64-NEXT: note: valid target CPU values are: generic-rv64, rocket-rv64, sifive-p450, sifive-p670, sifive-s21, sifive-s51, sifive-s54, sifive-s76, sifive-u54, sifive-u74, sifive-x280, spacemit-x60, syntacore-scr3-rv64, syntacore-scr4-rv64, veyron-v1, xiangshan-nanhu{{$}}
8989

9090
// RUN: not %clang_cc1 -triple riscv32 -tune-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix TUNE-RISCV32
9191
// TUNE-RISCV32: error: unknown target CPU 'not-a-cpu'
92-
// TUNE-RISCV32-NEXT: note: valid target CPU values are: generic-rv32, rocket-rv32, sifive-e20, sifive-e21, sifive-e24, sifive-e31, sifive-e34, sifive-e76, syntacore-scr1-base, syntacore-scr1-max, syntacore-scr3-rv32, generic, rocket, sifive-7-series{{$}}
92+
// TUNE-RISCV32-NEXT: note: valid target CPU values are: generic-rv32, rocket-rv32, sifive-e20, sifive-e21, sifive-e24, sifive-e31, sifive-e34, sifive-e76, syntacore-scr1-base, syntacore-scr1-max, syntacore-scr3-rv32, syntacore-scr4-rv32, generic, rocket, sifive-7-series{{$}}
9393

9494
// RUN: not %clang_cc1 -triple riscv64 -tune-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix TUNE-RISCV64
9595
// TUNE-RISCV64: error: unknown target CPU 'not-a-cpu'
96-
// TUNE-RISCV64-NEXT: note: valid target CPU values are: generic-rv64, rocket-rv64, sifive-p450, sifive-p670, sifive-s21, sifive-s51, sifive-s54, sifive-s76, sifive-u54, sifive-u74, sifive-x280, spacemit-x60, syntacore-scr3-rv64, veyron-v1, xiangshan-nanhu, generic, rocket, sifive-7-series{{$}}
96+
// TUNE-RISCV64-NEXT: note: valid target CPU values are: generic-rv64, rocket-rv64, sifive-p450, sifive-p670, sifive-s21, sifive-s51, sifive-s54, sifive-s76, sifive-u54, sifive-u74, sifive-x280, spacemit-x60, syntacore-scr3-rv64, syntacore-scr4-rv64, veyron-v1, xiangshan-nanhu, generic, rocket, sifive-7-series{{$}}

‎llvm/docs/ReleaseNotes.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ Changes to the RISC-V Backend
106106
* `.balign N, 0`, `.p2align N, 0`, `.align N, 0` in code sections will now fill
107107
the required alignment space with a sequence of `0x0` bytes (the requested
108108
fill value) rather than NOPs.
109+
* Added Syntacore SCR4 CPUs: ``-mcpu=syntacore-scr4-rv32/64``
109110

110111
Changes to the WebAssembly Backend
111112
----------------------------------

‎llvm/lib/Target/RISCV/RISCVProcessors.td

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,31 @@ def SYNTACORE_SCR3_RV64 : RISCVProcessorModel<"syntacore-scr3-rv64",
353353
FeatureStdExtC],
354354
[TuneNoDefaultUnroll, FeaturePostRAScheduler]>;
355355

356+
def SYNTACORE_SCR4_RV32 : RISCVProcessorModel<"syntacore-scr4-rv32",
357+
NoSchedModel,
358+
[Feature32Bit,
359+
FeatureStdExtI,
360+
FeatureStdExtZicsr,
361+
FeatureStdExtZifencei,
362+
FeatureStdExtM,
363+
FeatureStdExtF,
364+
FeatureStdExtD,
365+
FeatureStdExtC],
366+
[TuneNoDefaultUnroll, FeaturePostRAScheduler]>;
367+
368+
def SYNTACORE_SCR4_RV64 : RISCVProcessorModel<"syntacore-scr4-rv64",
369+
NoSchedModel,
370+
[Feature64Bit,
371+
FeatureStdExtI,
372+
FeatureStdExtZicsr,
373+
FeatureStdExtZifencei,
374+
FeatureStdExtM,
375+
FeatureStdExtA,
376+
FeatureStdExtF,
377+
FeatureStdExtD,
378+
FeatureStdExtC],
379+
[TuneNoDefaultUnroll, FeaturePostRAScheduler]>;
380+
356381
def VENTANA_VEYRON_V1 : RISCVProcessorModel<"veyron-v1",
357382
NoSchedModel,
358383
[Feature64Bit,

0 commit comments

Comments
 (0)