From 1065b8977ad88fb37b6b668efdc0063aef421406 Mon Sep 17 00:00:00 2001 From: Jordan Carlin Date: Tue, 14 May 2024 11:49:54 -0700 Subject: [PATCH] Fix Q_SUPPORTED on derived configs --- config/derivlist.txt | 48 +++++++++++++++++++------------------- config/rv32e/config.vh | 2 +- config/rv32gc/config.vh | 2 +- config/rv32i/config.vh | 2 +- config/rv32imc/config.vh | 2 +- config/rv64gc/config.vh | 2 +- config/rv64i/config.vh | 2 +- tests/coverage/csrwrites.S | 4 ++-- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/config/derivlist.txt b/config/derivlist.txt index 074e07665..ad76d9f17 100644 --- a/config/derivlist.txt +++ b/config/derivlist.txt @@ -793,101 +793,101 @@ ZFH_SUPPORTED 1 # FDQ only , rk variable deriv fdq_div_2_1_rv32gc div_2_1_rv32gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 0 deriv fdq_div_2_2_rv32gc div_2_2_rv32gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 0 deriv fdq_div_2_4_rv32gc div_2_4_rv32gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 0 deriv fdq_div_4_1_rv32gc div_4_1_rv32gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 0 deriv fdq_div_4_2_rv32gc div_4_2_rv32gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 0 deriv fdq_div_4_4_rv32gc div_4_4_rv32gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 0 deriv fdq_div_2_1_rv64gc div_2_1_rv64gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 0 deriv fdq_div_2_2_rv64gc div_2_2_rv64gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 0 deriv fdq_div_2_4_rv64gc div_2_4_rv64gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 0 deriv fdq_div_4_1_rv64gc div_4_1_rv64gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 0 deriv fdq_div_4_2_rv64gc div_4_2_rv64gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 0 deriv fdq_div_4_4_rv64gc div_4_4_rv64gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 0 # FDQH only , rk variable deriv fdqh_div_2_1_rv32gc div_2_1_rv32gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 1 deriv fdqh_div_2_2_rv32gc div_2_2_rv32gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 1 deriv fdqh_div_2_4_rv32gc div_2_4_rv32gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 1 deriv fdqh_div_4_1_rv32gc div_4_1_rv32gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 1 deriv fdqh_div_4_2_rv32gc div_4_2_rv32gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 1 deriv fdqh_div_4_4_rv32gc div_4_4_rv32gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 1 deriv fdqh_div_2_1_rv64gc div_2_1_rv64gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 1 deriv fdqh_div_2_2_rv64gc div_2_2_rv64gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 1 deriv fdqh_div_2_4_rv64gc div_2_4_rv64gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 1 deriv fdqh_div_4_1_rv64gc div_4_1_rv64gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 1 deriv fdqh_div_4_2_rv64gc div_4_2_rv64gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 1 deriv fdqh_div_4_4_rv64gc div_4_4_rv64gc -Q_SUPPORTED 0 +Q_SUPPORTED 1 ZFH_SUPPORTED 1 #### DIVIDER VARIANTS WITH IEEE diff --git a/config/rv32e/config.vh b/config/rv32e/config.vh index 15e7b2ab8..a3dccd47b 100644 --- a/config/rv32e/config.vh +++ b/config/rv32e/config.vh @@ -83,7 +83,7 @@ localparam Q_SUPPORTED = 0; localparam ZFH_SUPPORTED = 0; localparam ZFA_SUPPORTED = 0; -// Privelege modes +// privilege modes localparam S_SUPPORTED = 0; // Supervisor mode localparam U_SUPPORTED = 0; // User mode diff --git a/config/rv32gc/config.vh b/config/rv32gc/config.vh index 0ae7dbd69..68db95cd9 100644 --- a/config/rv32gc/config.vh +++ b/config/rv32gc/config.vh @@ -85,7 +85,7 @@ localparam Q_SUPPORTED = 0; localparam ZFH_SUPPORTED = 1; localparam ZFA_SUPPORTED = 1; -// Privelege modes +// privilege modes localparam S_SUPPORTED = 1; // Supervisor mode localparam U_SUPPORTED = 1; // User mode diff --git a/config/rv32i/config.vh b/config/rv32i/config.vh index 664fc7738..fb2a5ed1c 100644 --- a/config/rv32i/config.vh +++ b/config/rv32i/config.vh @@ -83,7 +83,7 @@ localparam Q_SUPPORTED = 0; localparam ZFH_SUPPORTED = 0; localparam ZFA_SUPPORTED = 0; -// Privelege modes +// privilege modes localparam S_SUPPORTED = 0; // Supervisor mode localparam U_SUPPORTED = 0; // User mode diff --git a/config/rv32imc/config.vh b/config/rv32imc/config.vh index efef947dd..926f13118 100644 --- a/config/rv32imc/config.vh +++ b/config/rv32imc/config.vh @@ -83,7 +83,7 @@ localparam Q_SUPPORTED = 0; localparam ZFH_SUPPORTED = 0; localparam ZFA_SUPPORTED = 0; -// Privelege modes +// privilege modes localparam S_SUPPORTED = 1; // Supervisor mode localparam U_SUPPORTED = 1; // User mode diff --git a/config/rv64gc/config.vh b/config/rv64gc/config.vh index 40734c32b..6192cbd9d 100644 --- a/config/rv64gc/config.vh +++ b/config/rv64gc/config.vh @@ -83,7 +83,7 @@ localparam Q_SUPPORTED = 0; localparam ZFH_SUPPORTED = 1; localparam ZFA_SUPPORTED = 1; -// Privelege modes +// privilege modes localparam S_SUPPORTED = 1; // Supervisor mode localparam U_SUPPORTED = 1; // User mode diff --git a/config/rv64i/config.vh b/config/rv64i/config.vh index a4c381e98..98c35dee7 100644 --- a/config/rv64i/config.vh +++ b/config/rv64i/config.vh @@ -83,7 +83,7 @@ localparam Q_SUPPORTED = 0; localparam ZFH_SUPPORTED = 0; localparam ZFA_SUPPORTED = 0; -// Privelege modes +// privilege modes localparam S_SUPPORTED = 0; // Supervisor mode localparam U_SUPPORTED = 0; // User mode diff --git a/tests/coverage/csrwrites.S b/tests/coverage/csrwrites.S index 3fe499abd..aa3cc438f 100644 --- a/tests/coverage/csrwrites.S +++ b/tests/coverage/csrwrites.S @@ -38,8 +38,8 @@ main: csrrw t1, menvcfg, t0 csrrw t2, senvcfg, t0 - # testing FIOM with different privelege modes - # setting environment config (to both 1 and 0) in each privelege mode + # testing FIOM with different privilege modes + # setting environment config (to both 1 and 0) in each privilege mode csrsi menvcfg, 1 li a0, 1 ecall # enter supervisor mode