[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/5] target/riscv: FP extension requirements
From: |
Tsukasa OI |
Subject: |
[PATCH 4/5] target/riscv: FP extension requirements |
Date: |
Fri, 13 May 2022 18:45:49 +0900 |
QEMU allowed inconsistent configurations that made floating point
arithmetic effectively unusable.
This commit adds certain checks for consistent FP arithmetic:
- F requires Zicsr
- Zfinx requires Zicsr
- Zfh/Zfhmin require F
- D requires F
- V requires D
Because F/D/Zicsr are enabled by default (and an error will not occur unless
we manually disable one or more of prerequisites), this commit just enforces
the user to give consistent combinations.
Signed-off-by: Tsukasa OI <research_trasio@irq.a4lg.com>
---
target/riscv/cpu.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index 0854ca9103..5371b0fd17 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -610,6 +610,31 @@ static void riscv_cpu_realize(DeviceState *dev, Error
**errp)
cpu->cfg.ext_ifencei = true;
}
+ if (cpu->cfg.ext_f && !cpu->cfg.ext_icsr) {
+ error_setg(errp, "F extension requires Zicsr");
+ return;
+ }
+
+ if (cpu->cfg.ext_zfinx && !cpu->cfg.ext_icsr) {
+ error_setg(errp, "Zfinx extension requires Zicsr");
+ return;
+ }
+
+ if ((cpu->cfg.ext_zfh || cpu->cfg.ext_zfhmin) && !cpu->cfg.ext_f) {
+ error_setg(errp, "Zfh/Zfhmin extensions require F extension");
+ return;
+ }
+
+ if (cpu->cfg.ext_d && !cpu->cfg.ext_f) {
+ error_setg(errp, "D extension requires F extension");
+ return;
+ }
+
+ if (cpu->cfg.ext_v && !cpu->cfg.ext_d) {
+ error_setg(errp, "V extension requires D extension");
+ return;
+ }
+
if (cpu->cfg.ext_zdinx || cpu->cfg.ext_zhinx ||
cpu->cfg.ext_zhinxmin) {
cpu->cfg.ext_zfinx = true;
--
2.34.1
- [PATCH 0/5] target/riscv: Enhanced ISA extension checks, Tsukasa OI, 2022/05/13
- [PATCH 1/5] target/riscv: Fix "G" extension expansion typing, Tsukasa OI, 2022/05/13
- [PATCH 2/5] target/riscv: Disable "G" by default, Tsukasa OI, 2022/05/13
- [PATCH 3/5] target/riscv: Change "G" expansion, Tsukasa OI, 2022/05/13
- [PATCH 4/5] target/riscv: FP extension requirements,
Tsukasa OI <=
- [PATCH 5/5] target/riscv: Move/refactor ISA extension checks, Tsukasa OI, 2022/05/13
- [PATCH v2 0/5] target/riscv: Enhanced ISA extension checks, Tsukasa OI, 2022/05/14
- [PATCH v2 3/5] target/riscv: Change "G" expansion, Tsukasa OI, 2022/05/14