bump submodules (#49)

OpenXiangShan · Aug 26, 2024 · 2bb84ce · 2bb84ce
1 parent 9561d52
commit 2bb84ce
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ jobs:
   # This workflow contains a single job called "build"
   setup-develop-env:
     # The type of runner that the job will run on
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

diff --git a/DRAMsim3 b/DRAMsim3
diff --git a/NEMU b/NEMU
diff --git a/NutShell b/NutShell
diff --git a/XiangShan b/XiangShan
diff --git a/env-test.sh b/env-test.sh
@@ -9,7 +9,21 @@ source env.sh
 export NOOP_HOME=$(pwd)/NutShell
 
 cd ${NEMU_HOME}
-make riscv64-nutshell-ref_defconfig
+
+# CPT_restorer need -march=rv64gcbkvh support. Test here.
+CPT_CROSS_COMPILE_LIST='riscv64-linux-gnu- riscv64-unknown-linux-gnu-'
+for COMPILE in $CPT_CROSS_COMPILE_LIST; do
+  echo | ${COMPILE}gcc -S -march=rv64gcbkvh -o /dev/null -x c -
+  if [ $? -eq 0 ]; then
+    CPT_CROSS_COMPILE=$COMPILE
+	break
+  fi
+done
+if [ -z $CPT_CROSS_COMPILE ]; then
+  echo 'No supported RISC-V compiler found! riscv64[-unknown]-linux-gnu-gcc with -march=rv64gcbkvh support needed.'
+  exit 1
+fi
+make riscv64-nutshell-ref_defconfig CPT_CROSS_COMPILE=${CPT_CROSS_COMPILE}
 make
 
 # Compile processor project

diff --git a/install-verilator.sh b/install-verilator.sh
@@ -12,8 +12,8 @@ git clone https://github.com/verilator/verilator
 unset VERILATOR_ROOT  # For bash
 cd verilator
 
-# XiangShan uses Verilator v5.020
-git checkout v5.020
+# XiangShan uses Verilator v5.028
+git checkout v5.028
 
 autoconf        # Create ./configure script
 # Configure and create Makefile

diff --git a/nexus-am b/nexus-am
diff --git a/setup-tools.sh b/setup-tools.sh
@@ -3,7 +3,7 @@
 
 apt update
 apt install proxychains4 shadowsocks-libev vim wget git tmux make gcc clang llvm time curl libreadline6-dev libsdl2-dev gcc-riscv64-linux-gnu openjdk-11-jre zlib1g-dev device-tree-compiler flex autoconf bison sqlite3 libsqlite3-dev zstd libzstd-dev
-sh -c "curl -L https://github.com/com-lihaoyi/mill/releases/download/0.11.6/0.11.6 > /usr/local/bin/mill && chmod +x /usr/local/bin/mill"
+sh -c "curl -L https://github.com/com-lihaoyi/mill/releases/download/0.11.12/0.11.12 > /usr/local/bin/mill && chmod +x /usr/local/bin/mill"
 
 # We need to use Verilator 4.204+, so we install Verilator manually
 source ./install-verilator.sh