From 79d041a13587dae03e87f72b619eaae27c901f10 Mon Sep 17 00:00:00 2001 From: David Harris <74973295+davidharrishmc@users.noreply.github.com> Date: Mon, 23 Jan 2023 04:15:31 -0800 Subject: [PATCH 1/3] Switched to fork new cvw repo --- README.md | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 88b388350..26eb930bb 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,17 @@ New users may wish to do the following setup to access the server via a GUI and Then follow Section 2.2 to clone the repo, source setup, make the tests and run regression + If you don't already have a Github account, create one + In a web browser, visit https://github.com/openhwgroup/cvw + In the upper right part of the screen, click on Fork + Create a fork, choosing the owner as your github account and the repository as cvw. + + On the Linux computer where you will be working, log in, clone your fork of the repo, + run the setup script, and build the tests: + $ cd - $ git clone --recurse-submodules https://github.com/davidharrishmc/riscv-wally - $ cd riscv-wally + $ git clone --recurse-submodules https://github.com//cvw + $ cd cvw $ source ./setup.sh $ make $ cd pipelined/regression @@ -28,8 +36,8 @@ Then follow Section 2.2 to clone the repo, source setup, make the tests and run Add the following lines to your .bashrc or .bash_profile - if [ -f ~/riscv-wally/setup.sh ]; then - source ~/riscv-wally/setup.sh + if [ -f ~/cvw/setup.sh ]; then + source ~/cvw/setup.sh fi # Tool-chain Installation (Sys Admin) From 58a973ec97c067666b7b72d04b508c5417ac87d7 Mon Sep 17 00:00:00 2001 From: David Harris Date: Mon, 23 Jan 2023 05:00:11 -0800 Subject: [PATCH 2/3] Refactored setup QUESTA and SNPS paths, and removed troublesome bit manipulation test cases --- setup.sh | 9 +++++---- tests/riscof/spike/spike_rv32imc_isa.yaml | 3 ++- tests/riscof/spike/spike_rv64gc_isa.yaml | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/setup.sh b/setup.sh index dc1f418d5..27ed893db 100755 --- a/setup.sh +++ b/setup.sh @@ -2,7 +2,7 @@ # setup.sh # David_Harris@hmc.edu and kekim@hmc.edu 1 December 2021 -# Set up tools for riscv-wally +# Set up tools for rvw echo "Executing Wally setup.sh" @@ -15,14 +15,15 @@ echo \$WALLY set to ${WALLY} # Must edit these based on your local environment. Ask your sysadmin. export MGLS_LICENSE_FILE=1717@solidworks.eng.hmc.edu # Change this to your Siemens license server export SNPSLMD_LICENSE_FILE=27020@zircon.eng.hmc.edu # Change this to your Synopsys license server -export PATH=/cad/mentor/questa_sim-2021.2_1/questasim/bin:$PATH # Change this for your path to Questa -export PATH=/cad/synopsys/SYN/bin:$PATH # Change this for your path to Design Compiler - +export QUESTAPATH=/cad/mentor/questa_sim-2021.2_1/questasim/bin # Change this for your path to Questa +export SNPSPATH=/cad/synopsys/SYN/bin # Change this for your path to Design Compiler # 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=$QUESTAPATH:$SNPSPATH:$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 diff --git a/tests/riscof/spike/spike_rv32imc_isa.yaml b/tests/riscof/spike/spike_rv32imc_isa.yaml index 3438e17a0..478bbe56d 100644 --- a/tests/riscof/spike/spike_rv32imc_isa.yaml +++ b/tests/riscof/spike/spike_rv32imc_isa.yaml @@ -1,6 +1,7 @@ hart_ids: [0] hart0: - ISA: RV32IMAFDCZicsr_Zifencei_Zba_Zbb_Zbc_Zbs + ISA: RV32IMAFDCZicsr_Zifencei +# ISA: RV32IMAFDCZicsr_Zifencei_Zba_Zbb_Zbc_Zbs physical_addr_sz: 32 User_Spec_Version: '2.3' supported_xlen: [32] diff --git a/tests/riscof/spike/spike_rv64gc_isa.yaml b/tests/riscof/spike/spike_rv64gc_isa.yaml index a8837ac76..8037ad6f6 100644 --- a/tests/riscof/spike/spike_rv64gc_isa.yaml +++ b/tests/riscof/spike/spike_rv64gc_isa.yaml @@ -1,6 +1,7 @@ hart_ids: [0] hart0: - ISA: RV64IMAFDCSUZicsr_Zifencei_Zba_Zbb_Zbc_Zbs + ISA: RV64IMAFDCSUZicsr_Zifencei +# ISA: RV64IMAFDCSUZicsr_Zifencei_Zba_Zbb_Zbc_Zbs physical_addr_sz: 56 User_Spec_Version: '2.3' supported_xlen: [64] From 28e9ead9e8aaec94abd2708cf2c85074e3a4f5e2 Mon Sep 17 00:00:00 2001 From: David Harris Date: Mon, 23 Jan 2023 05:06:27 -0800 Subject: [PATCH 3/3] Updated README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 26eb930bb..45e503d94 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Wally is a 5-stage pipelined processor configurable to support all the standard ![Wally block diagram](wallyriscvTopAll.png) -Wally is described in a textbook, RISC-V System-on-Chip Design, by Harris, Stine, Thompson, and Harris. See Appendix D for directions installing the RISC-V tool chain needed to use Wally. +Wally is described in a textbook, RISC-V System-on-Chip Design, by Harris, Stine, Thompson, and Harris. Users should follow the setup instructions below. A system administrator must install CAD tools using the directions further down. New users may wish to do the following setup to access the server via a GUI and use a text editor.