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.

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

March 2021 Bump #29

Merged
merged 1 commit into from
Jun 9, 2021
Merged
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions isa-sim/.gitignore

This file was deleted.

30 changes: 0 additions & 30 deletions isa-sim/build.sh

This file was deleted.

1 change: 0 additions & 1 deletion isa-sim/riscv-isa-sim
Submodule riscv-isa-sim deleted from 2dbcb0
1 change: 0 additions & 1 deletion isa-sim/spike-sha3/LICENSE

This file was deleted.

1 change: 0 additions & 1 deletion isa-sim/spike-sha3/Makefile.in

This file was deleted.

1 change: 0 additions & 1 deletion isa-sim/spike-sha3/README.md

This file was deleted.

1 change: 0 additions & 1 deletion isa-sim/spike-sha3/aclocal.m4

This file was deleted.

106 changes: 0 additions & 106 deletions isa-sim/spike-sha3/config.h.in

This file was deleted.

6,217 changes: 0 additions & 6,217 deletions isa-sim/spike-sha3/configure

This file was deleted.

114 changes: 0 additions & 114 deletions isa-sim/spike-sha3/configure.ac

This file was deleted.

1 change: 0 additions & 1 deletion isa-sim/spike-sha3/debug_rom

This file was deleted.

1 change: 0 additions & 1 deletion isa-sim/spike-sha3/dummy_rocc

This file was deleted.

1 change: 0 additions & 1 deletion isa-sim/spike-sha3/riscv

This file was deleted.

1 change: 0 additions & 1 deletion isa-sim/spike-sha3/riscv-dummy_rocc.pc.in

This file was deleted.

1 change: 0 additions & 1 deletion isa-sim/spike-sha3/riscv-riscv.pc.in

This file was deleted.

11 changes: 0 additions & 11 deletions isa-sim/spike-sha3/riscv-sha3.pc.in

This file was deleted.

1 change: 0 additions & 1 deletion isa-sim/spike-sha3/riscv-softfloat.pc.in

This file was deleted.

1 change: 0 additions & 1 deletion isa-sim/spike-sha3/riscv-spike.pc.in

This file was deleted.

1 change: 0 additions & 1 deletion isa-sim/spike-sha3/riscv-spike_main.pc.in

This file was deleted.

1 change: 0 additions & 1 deletion isa-sim/spike-sha3/scripts

This file was deleted.

4 changes: 0 additions & 4 deletions isa-sim/spike-sha3/sha3/sha3.ac

This file was deleted.

157 changes: 0 additions & 157 deletions isa-sim/spike-sha3/sha3/sha3.cc

This file was deleted.

137 changes: 0 additions & 137 deletions isa-sim/spike-sha3/sha3/sha3.h

This file was deleted.

12 changes: 0 additions & 12 deletions isa-sim/spike-sha3/sha3/sha3.mk.in

This file was deleted.

1 change: 0 additions & 1 deletion isa-sim/spike-sha3/softfloat

This file was deleted.

1 change: 0 additions & 1 deletion isa-sim/spike-sha3/spike_main

This file was deleted.

1 change: 0 additions & 1 deletion isa-sim/spike-sha3/tests

This file was deleted.

11 changes: 5 additions & 6 deletions software/README.md
Original file line number Diff line number Diff line change
@@ -4,12 +4,11 @@ This is an example set of workloads that uses the SHA3 rocc accelerator.

# Getting Started

When you first clone this repository, you should first update all submodules.
If you only want to build bare-metal tests, you can skip the linux submodule
update (which is slow) by only updating spike:

cd sha3
git submodule update --init isa-sim/riscv-isa-sim
Since SHA3 accelerator uses custom instruction not supported by the vanilla toolchain,
these workloads require a modified version of Spike simulator to build, which can be found
[here](https://github.com/ucb-bar/esp-isa-sim). If you are using Chipyard, make sure to source
`env.sh` (or if you also have vanilla toolchain installed, `env-esp-tools.sh`). Otherwise, make sure
the Spike executable is in your `PATH`.

To run linux-based workloads, you'll also need to update the linux submodule:

5 changes: 0 additions & 5 deletions software/build.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
#!/bin/bash
set -e

# Build spike
pushd ../isa-sim/
./build.sh
popd

# Build bare-metal tests
echo "Building bare-metal tests"
make -C benchmarks/bare
1 change: 0 additions & 1 deletion software/marshal-configs/sha3-bare-rocc.json
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@
"base" : "bare",
"host-init" : "build.sh",
"bin" : "benchmarks/bare/sha3-rocc.riscv",
"spike" : "../isa-sim/spike-local/bin/spike",
"spike-args" : "--extension=sha3",
"testing" : {
"refDir" : "test-reference/bare-rocc"
1 change: 0 additions & 1 deletion software/marshal-configs/sha3-bare-sw.json
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@
"base" : "bare",
"host-init" : "build.sh",
"bin" : "benchmarks/bare/sha3-sw.riscv",
"spike" : "../isa-sim/spike-local/bin/spike",
"spike-args" : "--extension=sha3",
"testing" : {
"refDir" : "test-reference/bare-sw"
1 change: 0 additions & 1 deletion software/marshal-configs/sha3-linux.json
Original file line number Diff line number Diff line change
@@ -8,6 +8,5 @@
["benchmarks/linux/sha3-rocc.riscv", "/root/sha3-rocc"]
],
"linux-src" : "linux",
"spike" : "../isa-sim/spike-local/bin/spike",
"spike-args" : "--extension=sha3"
}