VCS

.gitignore

@@ -42,6 +42,7 @@ tests/linux-testgen/buildroot-image-output
 tests/linux-testgen/buildroot-config-src/main.config.old
 tests/linux-testgen/buildroot-config-src/linux.config.old
 tests/linux-testgen/buildroot-config-src/busybox.config.old
+linux/buildroot
 linux/testvector-generation/boottrace.S
 linux/testvector-generation/boottrace_disasm.log
 sim/slack-notifier/slack-webhook-url.txt

Makefile

@@ -40,7 +40,7 @@ imperasdv:
 	iter-elf.bash --search ${WALLY}/tests/riscof/work/riscv-arch-test/rv64i_m
 
 coverage:
-	cd ${WALLY}/sim; ./regresssion-wally -coverage -fp
+	cd ${WALLY}/sim; ./regression-wally -coverage -fp
 
 benchmarks:
 	make coremark

README.md

@@ -128,4 +128,12 @@ If you want to implement your own version of the chip, your tool and license com
 Startups can expect to spend more than $1 million on CAD tools to get a chip to market. Commercial CAD tools are not realistically available to individuals without a university or company connection.
 
 
+## Adding Cron Job for nightly builds
+
+If you want to add a cronjob you can do the following:
+1) `crontab -e`
+2) add this code:
+```
+0 3 * * * BASH_ENV=~/.bashrc bash -l -c "PATH_TO_CVW/cvw/bin/wrapper_nightly_runs.sh > PATH_TO_LOG_FOLDER/cron.log"
+```
 

bin/wrapper_nightly_runs.sh

@@ -3,9 +3,9 @@ date
 
 
 # Variables
-LOG=$HOME/nightly_runs/logs/from_wrapper.log    # you can store your log file where you would like
-PYTHON_SCRIPT=$HOME/nightly_runs/cvw/bin/       # cvw can be anywhere you would like it. Make sure to point your variable there
-SETUP_SCRIPT=$HOME/nightly_runs/cvw/            # cvw can be anywhere you would like it. Make sure to point your variable there
+LOG=$HOME/nightly-runs/logs/from_wrapper.log    # you can store your log file where you would like
+PYTHON_SCRIPT=$HOME/nightly-runs/cvw/bin/       # cvw can be anywhere you would like it. Make sure to point your variable there
+SETUP_SCRIPT=$HOME/nightly-runs/cvw/            # cvw can be anywhere you would like it. Make sure to point your variable there
 
 
 
@@ -20,9 +20,9 @@ pwd
 
 echo "Sourcing setup_host"
 source ./setup_host.sh >> $LOG 2>&1
-echo "Sourcing setup_tools"
 
 cd $PYTHON_SCRIPT
 pwd
 echo "Running python file"
-python nightly_build.py >> $LOG 2>&1
+python nightly_build.py --path "nightly-runs" --repository "https://github.com/openhwgroup/cvw" --target "all" --send_email "yes" >> $LOG 2>&1
+echo "Finished"

config/derivlist.txt

@@ -546,6 +546,10 @@ deriv fd_rv64gc rv64gc
 MISA    (32'h00000104 |  1 << 5 | 1 << 3 | 1 << 18 | 1 << 20 | 1 << 12 | 1 << 0)
 ZFH_SUPPORTED   0
 
+deriv fdh_rv64gc rv64gc
+MISA    (32'h00000104 |  1 << 5 | 1 << 3 | 1 << 18 | 1 << 20 | 1 << 12 | 1 << 0)
+ZFH_SUPPORTED   1
+
 deriv fdq_rv64gc rv64gc
 MISA    (32'h00000104 |  1 << 5 | 1 << 3 | 1 << 16 | 1 << 18 | 1 << 20 | 1 << 12 | 1 << 0)
 ZFH_SUPPORTED   0

config/rv32e/config.vh

@@ -179,6 +179,15 @@ localparam ZCA_SUPPORTED = 0;
 localparam ZCF_SUPPORTED = 0;
 localparam ZCD_SUPPORTED = 0;
 
+// K extension instructions                                                                
+localparam ZBKB_SUPPORTED = 0;
+localparam ZBKC_SUPPORTED = 0;
+localparam ZBKX_SUPPORTED = 0;
+localparam ZKNE_SUPPORTED = 0;
+localparam ZKND_SUPPORTED = 0;
+localparam ZK_SUPPORTED = 0;
+localparam ZKNH_SUPPORTED = 0;
+
 // Memory synthesis configuration
 localparam USE_SRAM = 0;
 

config/rv32gc/config.vh

@@ -180,6 +180,15 @@ localparam ZCA_SUPPORTED = 0;
 localparam ZCF_SUPPORTED = 0;
 localparam ZCD_SUPPORTED = 0;
 
+// K extension instructions                                                                
+localparam ZBKB_SUPPORTED = 1;
+localparam ZBKC_SUPPORTED = 1;
+localparam ZBKX_SUPPORTED = 1;
+localparam ZKND_SUPPORTED = 1;
+localparam ZKNE_SUPPORTED = 1;
+localparam ZKNH_SUPPORTED = 1;
+localparam ZK_SUPPORTED = 1;
+
 // Memory synthesis configuration
 localparam USE_SRAM = 0;
 

config/rv32i/config.vh

@@ -180,6 +180,15 @@ localparam ZCA_SUPPORTED = 0;
 localparam ZCF_SUPPORTED = 0;
 localparam ZCD_SUPPORTED = 0;
 
+// K extension instructions                                                                
+localparam ZBKB_SUPPORTED = 0;
+localparam ZBKC_SUPPORTED = 0;
+localparam ZBKX_SUPPORTED = 0;
+localparam ZKNE_SUPPORTED = 0;
+localparam ZKND_SUPPORTED = 0;
+localparam ZK_SUPPORTED = 0;
+localparam ZKNH_SUPPORTED = 0;
+
 // Memory synthesis configuration
 localparam USE_SRAM = 0;
 

config/rv32imc/config.vh

@@ -178,6 +178,15 @@ localparam ZCA_SUPPORTED = 0;
 localparam ZCF_SUPPORTED = 0;
 localparam ZCD_SUPPORTED = 0;
 
+// K extension instructions                                                                
+localparam ZBKB_SUPPORTED = 0;
+localparam ZBKC_SUPPORTED = 0;
+localparam ZBKX_SUPPORTED = 0;
+localparam ZKNE_SUPPORTED = 0;
+localparam ZKND_SUPPORTED = 0;
+localparam ZK_SUPPORTED = 0;
+localparam ZKNH_SUPPORTED = 0;
+
 // Memory synthesis configuration
 localparam USE_SRAM = 0;
 

config/rv64gc/config.vh

@@ -181,6 +181,15 @@ localparam ZCA_SUPPORTED = 0;
 localparam ZCF_SUPPORTED = 0;
 localparam ZCD_SUPPORTED = 0;
 
+// K extension instructions                                                                
+localparam ZBKB_SUPPORTED = 1;
+localparam ZBKC_SUPPORTED = 1;
+localparam ZBKX_SUPPORTED = 1;
+localparam ZKND_SUPPORTED = 1;
+localparam ZKNE_SUPPORTED = 1;
+localparam ZKNH_SUPPORTED = 1;
+localparam ZK_SUPPORTED = 1;
+
 // Memory synthesis configuration
 localparam USE_SRAM = 0;
 

config/rv64i/config.vh

@@ -181,6 +181,15 @@ localparam ZCA_SUPPORTED = 0;
 localparam ZCF_SUPPORTED = 0;
 localparam ZCD_SUPPORTED = 0;
 
+// K extension instructions                                                                
+localparam ZBKB_SUPPORTED = 0;
+localparam ZBKC_SUPPORTED = 0;
+localparam ZBKX_SUPPORTED = 0;
+localparam ZKNE_SUPPORTED = 0;
+localparam ZKND_SUPPORTED = 0;
+localparam ZK_SUPPORTED = 0;
+localparam ZKNH_SUPPORTED = 0;
+
 // Memory synthesis configuration
 localparam USE_SRAM = 0;
 

config/shared/config-shared.vh

@@ -1,3 +1,6 @@
+//max function
+`define max(a,b) (((a) > (b)) ? (a) : (b))
+
 // constants defining different privilege modes
 // defined in Table 1.1 of the privileged spec
 localparam M_MODE  = (2'b11);
@@ -29,6 +32,7 @@ localparam D_SUPPORTED = ((MISA >> 3) % 2 == 1);
 localparam E_SUPPORTED = ((MISA >> 4) % 2 == 1);
 localparam F_SUPPORTED = ((MISA >> 5) % 2 == 1);
 localparam I_SUPPORTED = ((MISA >> 8) % 2 == 1);
+localparam K_SUPPORTED = ((ZBKB_SUPPORTED | ZBKC_SUPPORTED | ZBKX_SUPPORTED | ZKND_SUPPORTED | ZKNE_SUPPORTED | ZKNH_SUPPORTED));
 localparam M_SUPPORTED = ((MISA >> 12) % 2 == 1);
 localparam Q_SUPPORTED = ((MISA >> 16) % 2 == 1);
 localparam S_SUPPORTED = ((MISA >> 18) % 2 == 1);
@@ -106,12 +110,13 @@ localparam DURLEN      = $clog2(FPDUR);                             // enough bi
 localparam DIVBLEN     = $clog2(DIVb+1);                            // enough bits to count number of fractional bits + 1 integer bit
 
 // largest length in IEU/FPU
-localparam CVTLEN = ((NF<XLEN) ? (XLEN) : (NF));  // max(XLEN, NF)
-localparam LLEN = (($unsigned(FLEN)<$unsigned(XLEN)) ? ($unsigned(XLEN)) : ($unsigned(FLEN)));
+localparam BASECVTLEN = `max(XLEN, NF); // convert length excluding Zfa fcvtmod.w.d
+localparam CVTLEN = ZFA_SUPPORTED ? `max(BASECVTLEN, 32'd84) : BASECVTLEN; // fcvtmod.w.d needs at least 32+52 because a double with 52 fractional bits might be into upper bits of 32 bit word
+localparam LLEN = `max($unsigned(FLEN), $unsigned(XLEN));
 localparam LOGCVTLEN = $unsigned($clog2(CVTLEN+1));
-localparam NORMSHIFTSZ = (((CVTLEN+NF+1)>(DIVb + 1 +NF+1) & (CVTLEN+NF+1)>(3*NF+6)) ? (CVTLEN+NF+1) : ((DIVb + 1 +NF+1) > (3*NF+6) ? (DIVb + 1 +NF+1) : (3*NF+6))); // max(CVTLEN+NF+1, DIVb + 1 + NF + 1, 3*NF+6)
+localparam NORMSHIFTSZ = `max(`max((CVTLEN+NF+1), (DIVb + 1 + NF + 1)), (3*NF+6));
 localparam LOGNORMSHIFTSZ = ($clog2(NORMSHIFTSZ));
-localparam CORRSHIFTSZ = (NORMSHIFTSZ-2 > (DIVMINb + 1 + NF)) ? NORMSHIFTSZ-2 : (DIVMINb+1+NF);  // max(NORMSHIFTSZ-2, DIVMINb + 1 + NF)
+localparam CORRSHIFTSZ = `max((NORMSHIFTSZ-2), (DIVMINb + 1 + NF));
 
 
 // Disable spurious Verilator warnings

config/shared/parameter-defs.vh

@@ -113,6 +113,13 @@ localparam cvw_t P = '{
   ZCB_SUPPORTED :        ZCB_SUPPORTED,
   ZCD_SUPPORTED :        ZCD_SUPPORTED,
   ZCF_SUPPORTED :        ZCF_SUPPORTED,
+  ZBKB_SUPPORTED:        ZBKB_SUPPORTED,
+  ZBKC_SUPPORTED:        ZBKC_SUPPORTED,
+  ZBKX_SUPPORTED:        ZBKX_SUPPORTED,
+  ZKND_SUPPORTED:        ZKND_SUPPORTED,
+  ZKNE_SUPPORTED:        ZKNE_SUPPORTED,
+  ZKNH_SUPPORTED:        ZKNH_SUPPORTED,
+  ZK_SUPPORTED  :        ZK_SUPPORTED,
   USE_SRAM :        USE_SRAM,
   M_MODE  : M_MODE, 
   S_MODE  : S_MODE, 
@@ -136,6 +143,7 @@ localparam cvw_t P = '{
   E_SUPPORTED : E_SUPPORTED,
   F_SUPPORTED : F_SUPPORTED,
   I_SUPPORTED : I_SUPPORTED,
+  K_SUPPORTED : K_SUPPORTED,
   M_SUPPORTED : M_SUPPORTED,
   Q_SUPPORTED : Q_SUPPORTED,
   S_SUPPORTED : S_SUPPORTED,

setup.csh

@@ -5,48 +5,20 @@
 
 echo "Executing Wally setup.csh"
 
-# Path to Wally repository
-setenv WALLY $PWD
-echo '$WALLY set to ' ${WALLY}
 
 # Extend alias which makes extending PATH much easier.
 alias extend 'if (-d \!:2) if ("$\!:1" \!~ *"\!:2"*) setenv \!:1 ${\!:1}:\!:2;echo Added \!:2 to \!:1'
 alias prepend 'if (-d \!:2) if ("$\!:1" \!~ *"\!:2"*) setenv \!:1 "\!:2":${\!:1};echo Added \!:2 to \!:1'
 
-# License servers and commercial CAD tool paths
-# Must edit these based on your local environment.  Ask your sysadmin.
-setenv MGLS_LICENSE_FILE [email protected]                 # Change this to your Siemens license server
-setenv SNPSLMD_LICENSE_FILE [email protected]              # Change this to your Synopsys license server
-setenv QUESTAPATH /cad/mentor/questa_sim-2022.4_2/questasim/bin   # Change this for your path to Questa
-setenv SNPSPATH /cad/synopsys/SYN/bin                             # Change this for your path to Design Compiler
-
 # Path to RISC-V Tools
 setenv RISCV /opt/riscv   # change this if you installed the tools in a different location
 
-# Tools
-# Questa and Synopsys
-extend PATH $QUESTAPATH
-extend PATH $SNPSPATH 
-# GCC
-prepend LD_LIBRARY_PATH $RISCV/riscv-gnu-toolchain/lib
-prepend LD_LIBRARY_PATH $RISCV/riscv-gnu-toolchain/riscv64-unknown-elf/lib
-extend PATH $RISCV/riscv-gnu-toolchain/bin # GCC tools
-extend PATH $RISCV/riscv-gnu-toolchain/riscv64-unknown-elf/bin # GCC tools
-# Spike
-extend LD_LIBRARY_PATH $RISCV/lib
-extend PATH $RISCV/bin
+# Path to Wally repository
+setenv WALLY $PWD
+echo '$WALLY set to ' ${WALLY}
 # utility functions in Wally repository
 extend PATH $WALLY/bin
-# Verilator
-extend PATH /usr/local/bin/verilator # Change this for your path to Verilator
-# ModelSim/Questa (vsim)
-# Note: 2022.1 complains on cache/sram1p1r1w about StoredData cannot be driven by multiple always_ff blocks.  Ues 2021.2 for now
-
-# Imperas; put this in if you are using it
-#set path = ($RISCV/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64 $path)
-#setenv LD_LIBRARY_PATH $RISCV/imperas_riscv_tests/riscv-ovpsim-plus/bin/Linux64:$LD_LIBRARY_PATH # remove if no imperas
 
-# Verilator needs a larger stack to simulate CORE-V Wally
-limit stacksize unlimited
+source $RISCV/site-setup.csh
 
 echo "setup done"

setup.sh

@@ -2,58 +2,31 @@
 
 # setup.sh
 # [email protected] and [email protected] 1 December 2021
-# Set up tools for rvw
+# Set up tools for cvw
+
+# optionally have .bashrc or .bash_profile source this file with
+#if [ -f ~/cvw/setup.sh ]; then
+#	source ~/cvw/setup.sh
+#fi
+
 # SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
 
 echo "Executing Wally setup.sh"
 
+# Path to RISC-V Tools
+export RISCV=/opt/riscv   # change this if you installed the tools in a different location
+
 # Path to Wally repository
 WALLY=$(dirname ${BASH_SOURCE[0]:-$0})
 export WALLY=$(cd "$WALLY" && pwd)
 echo \$WALLY set to ${WALLY}
-
-# License servers and commercial CAD tool paths
-# Must edit these based on your local environment.  Ask your sysadmin.
-export [email protected]                   # Change this to your Siemens license server
-export [email protected]                # Change this to your Synopsys license server
-export QUESTA_HOME=/cad/mentor/questa_sim-2023.4/questasim        # Change this for your path to Questa, excluding bin
-export SNPS_HOME=/cad/synopsys/SYN                                  # Change this for your path to Design Compiler, excluding bin
-
-# Path to RISC-V Tools
-export RISCV=/opt/riscv   # change this if you installed the tools in a different location
-
-# Tools
-# Questa and Synopsys
-export PATH=$QUESTA_HOME/bin:$SNPS_HOME/bin:$PATH
-# GCC
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RISCV/riscv-gnu-toolchain/lib:$RISCV/riscv-gnu-toolchain/riscv64-unknown-elf/lib
-export PATH=$PATH:$RISCV/riscv-gnu-toolchain/bin:$RISCV/riscv-gnu-toolchain/riscv64-unknown-elf/bin      # GCC tools
-# Spike
-export LD_LIBRARY_PATH=$RISCV/lib:$LD_LIBRARY_PATH
-export PATH=$PATH:$RISCV/bin
 # utility functions in Wally repository
 export PATH=$WALLY/bin:$PATH    
-# Verilator
-export PATH=/usr/local/bin/verilator:$PATH # Change this for your path to Verilator
-# ModelSim/Questa (vsim)
-# Note: 2022.1 complains on cache/sram1p1r1w about StoredData cannot be driven by multiple always_ff blocks.  Ues 2021.2 for now
-
-# Imperas; put this in if you are using it
-#export PATH=$RISCV/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64:$PATH  
-#export LD_LIBRARY_PATH=$RISCV/imperas_riscv_tests/riscv-ovpsim-plus/bin/Linux64:$LD_LIBRARY_PATH # remove if no imperas
-
-export IDV=$RISCV/ImperasDV-OpenHW
-if [ -e "$IDV" ]; then
-#    echo "Imperas exists"
-    export IMPERAS_HOME=$IDV/Imperas
-    export IMPERAS_PERSONALITY=CPUMAN_DV_ASYNC
-    export ROOTDIR=~/
-    source ${IMPERAS_HOME}/bin/setup.sh
-    setupImperas ${IMPERAS_HOME}
-    export PATH=$IDV/scripts/cvw:$PATH
-fi
 
 # Verilator needs a larger stack to simulate CORE-V Wally
 ulimit -s 100000
 
-echo "setup done"
+# load site licenses and tool locations
+source $RISCV/site-setup.sh
+
+echo "setup done"