Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump submodules #49

Merged
merged 1 commit into from
Aug 26, 2024
Merged

bump submodules #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion DRAMsim3
Open in desktop
Submodule DRAMsim3 updated 7 files
+1 −1 Makefile
+5 −0 README.md
+67 −0 configs/XiangShan-kmh.ini
+0 −67 configs/XiangShan.ini
+1 −0 configs/XiangShan.ini
+67 −0 configs/xiangshan_DDR4_8Gb_x8_3200_2ch.ini
+1 −0 src/cosimulation.cc
+1 −1 src/cosimulation.h
2 changes: 1 addition & 1 deletion NEMU
Open in desktop
Submodule NEMU updated 144 files
2 changes: 1 addition & 1 deletion NutShell
Open in desktop
Submodule NutShell updated 24 files
+1 −1 .mill-version
+11 −24 Makefile
+3 −3 build.sc
+1 −1 difftest
+ − ready-to-run/riscv64-nemu-interpreter-so
+1 −1 src/main/scala/bus/axi4/AXI4.scala
+1 −1 src/main/scala/bus/simplebus/ToAXI4.scala
+1 −1 src/main/scala/device/AXI4DMA.scala
+3 −7 src/main/scala/device/AXI4RAM.scala
+12 −12 src/main/scala/nutcore/Bundle.scala
+1 −1 src/main/scala/nutcore/Decode.scala
+0 −1 src/main/scala/nutcore/NutCore.scala
+1 −1 src/main/scala/nutcore/backend/fu/ALU.scala
+55 −34 src/main/scala/nutcore/backend/fu/CSR.scala
+1 −1 src/main/scala/nutcore/backend/seq/EXU.scala
+27 −28 src/main/scala/nutcore/frontend/BPU.scala
+1 −1 src/main/scala/nutcore/frontend/IDU.scala
+10 −10 src/main/scala/nutcore/isa/Privileged.scala
+4 −4 src/main/scala/nutcore/mem/EmbeddedTLB.scala
+4 −4 src/main/scala/nutcore/mem/TLB.scala
+4 −23 src/main/scala/sim/NutShellSim.scala
+9 −17 src/main/scala/utils/Debug.scala
+1 −1 src/main/scala/utils/LookupTree.scala
+5 −4 src/test/scala/TopMain.scala
2 changes: 1 addition & 1 deletion XiangShan
Open in desktop
Submodule XiangShan updated 404 files
16 changes: 15 additions & 1 deletion env-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions install-verilator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion nexus-am
Open in desktop
Submodule nexus-am updated 20 files
+35 −11 README.md
+1 −1 apps/coremark/src/core_main.c
+3 −3 libs/klib/src/string.c
+4 −0 tests/countertest/Makefile
+17 −0 tests/countertest/README.md
+68 −0 tests/countertest/include/counter.h
+15 −0 tests/countertest/include/countertest.h
+104 −0 tests/countertest/include/enable.h
+6 −0 tests/countertest/include/inhibit.h
+82 −0 tests/countertest/include/priv.h
+27 −0 tests/countertest/include/probe.h
+7 −0 tests/countertest/include/write.h
+29 −0 tests/countertest/src/counter.c
+73 −0 tests/countertest/src/countertest.c
+26 −0 tests/countertest/src/enable.c
+76 −0 tests/countertest/src/inhibit.c
+113 −0 tests/countertest/src/priv.c
+25 −0 tests/countertest/src/probe.c
+91 −0 tests/countertest/src/trap.S
+84 −0 tests/countertest/src/write.c
2 changes: 1 addition & 1 deletion setup-tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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