Skip to content

Commit 355e892

Browse files
committed
treewide: Remove Banshee
1 parent 1366489 commit 355e892

File tree

22 files changed

+28
-390
lines changed

22 files changed

+28
-390
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -128,34 +128,6 @@ jobs:
128128
run: |
129129
make SIM_DIR=./runs/simple annotate -j
130130
131-
# #########################################
132-
# # Build SW on Snitch Cluster w/ Banshee #
133-
# #########################################
134-
135-
# sw-snitch-cluster-banshee:
136-
# name: Simulate SW on Snitch Cluster w/ Banshee
137-
# runs-on: ubuntu-22.04
138-
# needs: build-docker
139-
# if: >
140-
# github.event_name != 'pull_request' ||
141-
# github.event.pull_request.head.repo.full_name != github.repository
142-
# container:
143-
# image: ghcr.io/pulp-platform/snitch_cluster:${{ github.ref_name }}
144-
# steps:
145-
# - uses: actions/checkout@v2
146-
# with:
147-
# submodules: 'recursive'
148-
# - name: Build Software
149-
# run: |
150-
# bender vendor init
151-
# make -C target/snitch_cluster SELECT_RUNTIME=banshee sw
152-
# - name: Run Tests
153-
# env:
154-
# SNITCH_LOG: info
155-
# working-directory: target/snitch_cluster
156-
# run: |
157-
# ./util/run.py sw/run.yaml --simulator banshee -j
158-
159131
######################
160132
# Sources Up-to-Date #
161133
######################

.gitlab-ci.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,6 @@ snitch-cluster-sw:
7272
- target/snitch_cluster/sw/**/build/*.elf
7373
expire_in: 1 day
7474

75-
snitch-cluster-sw-banshee:
76-
needs: [setup]
77-
script:
78-
- cd target/snitch_cluster
79-
- make SELECT_RUNTIME=banshee sw
80-
artifacts:
81-
paths:
82-
- target/snitch_cluster/sw/**/build/*.elf
83-
expire_in: 1 day
84-
8575
#######################
8676
# Standalone IP tests #
8777
#######################
@@ -140,22 +130,6 @@ snitch-cluster-vsim:
140130
- cd sw/apps/blas/gemm/test && ./test.sh && cd -
141131
- cd sw/apps/dnn/transpose/test && ./test.sh && cd -
142132

143-
# Banshee
144-
snitch-cluster-banshee:
145-
needs: [setup, snitch-cluster-sw-banshee]
146-
variables:
147-
SNITCH_LOG: info
148-
script:
149-
- rustup install 1.63.0
150-
- rustup override set 1.63.0
151-
- rustc --version
152-
- rustup --version
153-
- git clone git@github.com:pulp-platform/banshee.git --recurse-submodules
154-
- cd banshee
155-
- cargo install --debug --path .
156-
- cd ../target/snitch_cluster
157-
- ./util/run.py sw/run.yaml --simulator banshee -j --run-dir runs/banshee
158-
159133
# Tests requiring hardware FDIV unit
160134
snitch-cluster-fdiv-vsim:
161135
needs: [setup]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ What can you expect to find in this repository?
1616
- The RISC-V [Snitch integer core](https://pulp-platform.github.io/snitch_cluster/rm/snitch.html). This can be useful stand-alone if you are just interested in re-using the core for your project, e.g., as a tiny control core or you want to make a peripheral smart. The sky is the limit.
1717
- The [Snitch cluster](https://pulp-platform.github.io/snitch_cluster/rm/snitch_cluster.html). A highly configurable cluster containing one to many integer cores with optional floating-point capabilities as well as our custom ISA extensions `Xssr`, `Xfrep`, and `Xdma`.
1818
- A runtime and example applications for the Snitch cluster.
19-
- RTL simulation environments for Verilator, Questa Advanced Simulator, and VCS, as well as configurations for our [Banshee system simulator](https://github.com/pulp-platform/banshee)
19+
- RTL simulation environments for Verilator, Questa Advanced Simulator, and VCS, as well as configurations for the [GVSoC system simulator](https://github.com/gvsoc/gvsoc)
2020

2121
This code was previously hosted in the [Snitch monorepo](https://github.com/pulp-platform/snitch) and was spun off into its own repository to simplify maintenance and dependency handling. Note that our Snitch-based manycore system [Occamy](https://github.com/pulp-platform/occamy) has also moved.
2222

docs/ug/tutorial.md

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@ These commands compile the RTL sources respectively in `work-vlt`, `work-vsim` a
4545
!!! info
4646
The variable `DEBUG=ON` is required when using QuestaSim to preserve the visibility of all internal signals. If you need to inspect the simulation waveforms, you should set this variable when building the simulation model. For faster simulations you can omit the variable assignment, allowing QuestaSim to optimize internal signals away.
4747

48-
49-
## Building the Banshee simulator
50-
51-
Instead of building a simulation model from the RTL sources, you can use our instruction-accurate simulator called `banshee`. To install the simulator, please follow the instructions provided in the [Banshee repository](https://github.com/pulp-platform/banshee).
52-
5348
## Configuring the hardware
5449

5550
The Snitch cluster RTL sources are partly automatically generated from a configuration file provided in `.hjson` format. Several RTL files are templated and use the `.hjson` configuration file as input to fill in the template. An example is [snitch_cluster_wrapper.sv.tpl](https://github.com/pulp-platform/{{ repo }}/blob/{{ branch }}/hw/snitch_cluster/src/snitch_cluster_wrapper.sv.tpl).
@@ -69,20 +64,14 @@ If you want to use a custom configuration, just point `CFG_OVERRIDE` to the path
6964

7065
## Building the software
7166

72-
To build all of the software for the Snitch cluster, run the following command. Different simulators may require different C runtime or library function implementations, so different options have to be specified to select the appropriate implementation, e.g. for Banshee simulations or OpenOCD semi-hosting:
67+
To build all of the software for the Snitch cluster, run the following command. Different simulators may require different C runtime or library function implementations, so different options have to be specified to select the appropriate implementation, e.g. for OpenOCD semi-hosting:
7368

7469
=== "RTL"
7570

7671
```bash
7772
make DEBUG=ON sw -j
7873
```
7974

80-
=== "Banshee"
81-
82-
```bash
83-
make DEBUG=ON SELECT_RUNTIME=banshee sw -j
84-
```
85-
8675
=== "OpenOCD"
8776

8877
```bash
@@ -130,12 +119,6 @@ Run one of the executables which was compiled in the previous step on your Snitc
130119
bin/snitch_cluster.vcs sw/apps/blas/axpy/build/axpy.elf
131120
```
132121

133-
=== "Banshee"
134-
135-
```shell
136-
banshee --no-opt-llvm --no-opt-jit --configuration src/banshee.yaml --trace sw/apps/blas/axpy/build/axpy.elf
137-
```
138-
139122
The simulator binaries can be invoked from any directory, just adapt the relative paths in the preceding commands accordingly, or use absolute paths. We refer to the working directory where the simulation is launched as the _simulation directory_. Within it, you will find several log files produced by the RTL simulation.
140123

141124
!!! tip

target/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ This subdirectory contains the supported systems and their simulation environmen
66
- `snitch_cluster`
77
- `cfg`: containing the configuration files `*.hsjon`.
88
- `generated`: contains the generated `bootdata.cc` and RTL wrapper for the snitch cluster `snitch_cluster_wrapper.sv`.
9-
- `src`: contains the [Banshee](https://github.com/pulp-platform/banshee) configuration for the snitch cluster.
109
- `sw`: contains all shared
1110
- `apps`: contains applications for the snitch cluster.
1211
- `runtime`: contains the HW specific runtime implementation for the snitch cluster.
1312
- `rtl`: RTL-related startup implmentations.
14-
- `banshee`: Banshee-related startup SW implmentations.
1513
- `tests`: lists of tests that can run on the snitch cluster.
1614
- `test`: contains testharness and bootrom of the snitch cluster

target/snitch_cluster/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
DEBUG ?= OFF
1414
# Override default config file
1515
CFG_OVERRIDE ?=
16-
# Select snRuntime implementation: "banshee" or "rtl" (default)
17-
SELECT_RUNTIME ?= rtl
1816

1917
.DEFAULT_GOAL := help
2018
.PHONY: all clean

target/snitch_cluster/src/banshee.yaml

Lines changed: 0 additions & 64 deletions
This file was deleted.

target/snitch_cluster/sw/apps/common.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ $(APP)_INCDIRS += $(ROOT)/sw/deps/riscv-opcodes
1515

1616
$(APP)_RISCV_CFLAGS += $(RISCV_CFLAGS)
1717
$(APP)_RISCV_CFLAGS += $(addprefix -I,$($(APP)_INCDIRS))
18-
ifeq ($(SELECT_RUNTIME), banshee)
19-
$(APP)_RISCV_CFLAGS += -DBIST
20-
endif
2118

2219
$(APP)_LIBS += $(SNRT_TARGET_DIR)/build/libsnRuntime.a
2320

target/snitch_cluster/sw/run.yaml

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,70 +4,50 @@
44

55
runs:
66
- elf: tests/build/alias.elf
7-
simulators: [vsim, vcs, verilator] # banshee does not model alias regions
7+
simulators: [vsim, vcs, verilator]
88
- elf: tests/build/atomics.elf
9-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with exit code 0x4
109
- elf: tests/build/barrier.elf
1110
- elf: tests/build/data_mover.elf
12-
simulators: [vsim, vcs, verilator, banshee]
11+
simulators: [vsim, vcs, verilator]
1312
- elf: tests/build/dma_empty_transfer.elf
1413
- elf: tests/build/dma_simple.elf
1514
- elf: tests/build/event_unit.elf
16-
simulators: [vsim, vcs, verilator, banshee]
15+
simulators: [vsim, vcs, verilator]
1716
- elf: tests/build/fence_i.elf
1817
- elf: tests/build/fp8_comparison_scalar.elf
19-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with segfault
2018
- elf: tests/build/fp8_comparison_vector.elf
21-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with segfault
2219
- elf: tests/build/fp8_computation_scalar.elf
23-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with JIT issue
2420
- elf: tests/build/fp8_computation_vector.elf
25-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with exit code 0x6
2621
- elf: tests/build/fp8alt_comparison_scalar.elf
27-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with segfault
2822
- elf: tests/build/fp8alt_comparison_vector.elf
29-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with exit code 0x10
3023
- elf: tests/build/fp8alt_computation_scalar.elf
31-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with JIT issue
3224
- elf: tests/build/fp8alt_computation_vector.elf
33-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with exit code 0x12
3425
- elf: tests/build/fp16_comparison_scalar.elf
35-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with exit code 0x10
3626
- elf: tests/build/fp16_comparison_vector.elf
37-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with exit code 0x10
3827
- elf: tests/build/fp16_computation_scalar.elf
39-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with JIT issue
4028
- elf: tests/build/fp16_computation_vector.elf
41-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with exit code 0x6
4229
- elf: tests/build/fp16alt_comparison_scalar.elf
43-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with exit code 0x10
4430
- elf: tests/build/fp16alt_comparison_vector.elf
45-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with exit code 0x10
4631
- elf: tests/build/fp16alt_computation_scalar.elf
47-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with JIT issue
4832
- elf: tests/build/fp16alt_computation_vector.elf
49-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with exit code 0x16
5033
- elf: tests/build/fp32_comparison_scalar.elf
5134
- elf: tests/build/fp32_comparison_vector.elf
5235
- elf: tests/build/fp32_computation_scalar.elf
53-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with exit code 0x2
5436
- elf: tests/build/fp32_computation_vector.elf
55-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with exit code 0x2
5637
- elf: tests/build/fp32_conversions_scalar.elf
57-
simulators: [vsim, vcs, verilator, gvsoc] # banshee fails with illegal instruction
5838
# - elf: tests/build/fp64_conversions_scalar.elf
5939
# simulators: [vsim, vcs, verilator]
6040
- elf: tests/build/interrupt_local.elf
61-
simulators: [vsim, vcs, verilator, banshee]
41+
simulators: [vsim, vcs, verilator]
6242
- elf: tests/build/multi_cluster.elf
6343
- elf: tests/build/openmp_parallel.elf
64-
simulators: [vsim, vcs, verilator, banshee]
44+
simulators: [vsim, vcs, verilator]
6545
- elf: tests/build/openmp_for_static_schedule.elf
66-
simulators: [vsim, vcs, verilator, banshee]
46+
simulators: [vsim, vcs, verilator]
6747
- elf: tests/build/openmp_double_buffering.elf
68-
simulators: [vsim, vcs, verilator, banshee]
48+
simulators: [vsim, vcs, verilator]
6949
- elf: tests/build/perf_cnt.elf
70-
simulators: [vsim, vcs, verilator] # banshee does not have HW performance counters
50+
simulators: [vsim, vcs, verilator]
7151
- elf: tests/build/printf_simple.elf
7252
- elf: tests/build/printf_fmtint.elf
7353
- elf: tests/build/simple.elf
@@ -78,9 +58,9 @@ runs:
7858
- elf: tests/build/non_null_exitcode.elf
7959
retcode: 56
8060
- elf: tests/build/caq.elf
81-
simulators: [vsim, vcs, verilator, banshee] # GVSOC does not model caq
61+
simulators: [vsim, vcs, verilator] # GVSOC does not model caq
8262
- elf: tests/build/caq_frep.elf
83-
simulators: [vsim, vcs, verilator] # banshee does not model FREP timing
63+
simulators: [vsim, vcs, verilator]
8464
- elf: apps/blas/axpy/build/axpy.elf
8565
cmd: [../../../sw/blas/axpy/scripts/verify.py, "${sim_bin}", "${elf}"]
8666
- elf: apps/blas/gemm/build/gemm.elf
@@ -100,13 +80,13 @@ runs:
10080
- elf: apps/dnn/fused_concat_linear/build/fused_concat_linear.elf
10181
cmd: [../../../sw/dnn/fused_concat_linear/scripts/verify.py, "${sim_bin}", "${elf}"]
10282
- elf: apps/dnn/transpose/build/transpose.elf
103-
simulators: [vsim, vcs, verilator, banshee]
83+
simulators: [vsim, vcs, verilator]
10484
cmd: [../../../sw/dnn/transpose/scripts/verify.py, "${sim_bin}", "${elf}"]
10585
- elf: apps/montecarlo/pi_estimation/build/pi_estimation.elf
10686
- elf: apps/atax/build/atax.elf
10787
cmd: [../../../sw/apps/atax/scripts/verify.py, "${sim_bin}", "${elf}"]
10888
- elf: apps/covariance/build/covariance.elf
109-
simulators: [vsim, vcs, verilator, banshee]
89+
simulators: [vsim, vcs, verilator]
11090
cmd: [../../../sw/apps/covariance/scripts/verify.py, "${sim_bin}", "${elf}"]
11191
- elf: apps/doitgen/build/doitgen.elf
11292
cmd: [../../../sw/apps/doitgen/scripts/verify.py, "${sim_bin}", "${elf}"]

target/snitch_cluster/sw/runtime/banshee/src/banshee_snitch_cluster_defs.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

target/snitch_cluster/sw/runtime/banshee/src/putchar.c

Lines changed: 0 additions & 8 deletions
This file was deleted.

target/snitch_cluster/sw/runtime/banshee/src/snitch_cluster_start.S

Lines changed: 0 additions & 15 deletions
This file was deleted.

target/snitch_cluster/sw/runtime/banshee/src/snitch_cluster_start.c

Lines changed: 0 additions & 6 deletions
This file was deleted.

target/snitch_cluster/sw/runtime/banshee/src/snitch_cluster_start.h

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)