treewide: Improve integration in systems (#227)

Co-authored-by: Tim Fischer <fischeti@iis.ee.ethz.ch>

Author: colluca

.github/workflows/ci.yml

@@ -124,10 +124,10 @@ jobs:
           submodules: 'recursive'
       - name: Hash Verilator prerequisites
         id: verilator-hash
-        uses: colluca/list-make-prerequisites@v1.0.2
+        uses: colluca/list-make-prerequisites@v1.0.3
         with:
           working-directory: target/snitch_cluster
-          target: bin/snitch_cluster.vlt
+          target: verilator
           flags: --recursive
       - name: Set up cache for Verilator build
         id: verilator-cache
@@ -141,7 +141,7 @@ jobs:
         if: steps.verilator-cache.outputs.cache-hit != 'true'
         working-directory: target/snitch_cluster
         run: |
-          make CFG_OVERRIDE=cfg/github-ci.json VLT_JOBS=1 bin/snitch_cluster.vlt
+          make CFG_OVERRIDE=cfg/github-ci.json VLT_JOBS=1 verilator
       - name: Build Software
         working-directory: target/snitch_cluster
         run: |

.gitlab-ci.yml

@@ -106,23 +106,23 @@ snitch-cluster-vlt:
   needs: [setup, snitch-cluster-sw]
   script:
     - cd target/snitch_cluster
-    - make bin/snitch_cluster.vlt
+    - make verilator
     - ./util/run.py sw/run.yaml --simulator verilator -j --run-dir runs/vlt
 
 # VCS
 snitch-cluster-vcs:
   needs: [setup, snitch-cluster-sw]
   script:
     - cd target/snitch_cluster
-    - make bin/snitch_cluster.vcs
+    - make vcs
     - ./util/run.py sw/run.yaml --simulator vcs -j --run-dir runs/vcs
 
 # Questa
 snitch-cluster-vsim:
   needs: [setup, snitch-cluster-sw]
   script:
     - cd target/snitch_cluster
-    - make bin/snitch_cluster.vsim
+    - make vsim
     - ./util/run.py sw/run.yaml --simulator vsim -j --run-dir runs/vsim
     - ./util/run.py sw/riscv_tests_isa.yaml --simulator vsim -j --run-dir runs/vsim
     # Test trace annotation
@@ -138,7 +138,7 @@ snitch-cluster-omega-vsim:
   script:
     - cd target/snitch_cluster
     - make CFG_OVERRIDE=cfg/omega.json sw
-    - make bin/snitch_cluster.vsim
+    - make vsim
     - ./util/run.py sw/run.yaml --simulator vsim -j --run-dir runs/vsim
 
 # Test Multi-channel DMA
@@ -147,7 +147,7 @@ snitch-cluster-mchan-vsim:
   script:
     - cd target/snitch_cluster
     - make CFG_OVERRIDE=cfg/dma_mchan.json sw
-    - make bin/snitch_cluster.vsim
+    - make vsim
     - ./util/run.py sw/dma_mchan.yaml --simulator vsim -j --run-dir runs/vsim
 
 # Tests requiring a larger FREP sequencer
@@ -156,15 +156,15 @@ snitch-cluster-frep-xl-vsim:
   script:
     - cd target/snitch_cluster
     - make CFG_OVERRIDE=cfg/frep_xl.json sw
-    - make bin/snitch_cluster.vsim
+    - make vsim
     - ./util/run.py sw/frep_xl.yaml --simulator vsim -j --run-dir runs/vsim
 
 # COPIFT and scalar chaining experiments
 snitch-cluster-copift-sc-vsim:
   needs: [setup]
   script:
     - cd target/snitch_cluster
-    - make CFG_OVERRIDE=experiments/copift/cfg.json bin/snitch_cluster.vsim
+    - make CFG_OVERRIDE=experiments/copift/cfg.json vsim
     - cd experiments/copift
     - ./experiments.py experiments.yaml sw run perf -j
     - cd ../../experiments/chaining

Bender.yml

@@ -188,10 +188,10 @@ sources:
   # target/snitch_cluster
   - target: snitch_cluster_wrapper
     files:
-      - target/snitch_cluster/generated/snitch_cluster_pkg.sv
+      - target/snitch_cluster/.generated/snitch_cluster_pkg.sv
   - target: all(snitch_cluster_wrapper, not(postlayout))
     files:
-      - target/snitch_cluster/generated/snitch_cluster_wrapper.sv
+      - target/snitch_cluster/.generated/snitch_cluster_wrapper.sv
   - target: all(snitch_cluster_wrapper, postlayout)
     files:
       - nonfree/gf12/fusion/runs/0/out/15/snitch_cluster_wrapper.v

docs/ug/tutorial.md

@@ -27,17 +27,17 @@ To run software on Snitch without a physical chip, you will need a simulation mo
 
 === "Verilator"
     ```shell
-    make bin/snitch_cluster.vlt
+    make verilator
     ```
 
 === "Questa"
     ```shell
-    make DEBUG=ON bin/snitch_cluster.vsim
+    make DEBUG=ON vsim
     ```
 
 === "VCS"
     ```shell
-    make bin/snitch_cluster.vcs
+    make vcs
     ```
 
 These commands compile the RTL sources respectively in `work-vlt`, `work-vsim` and `work-vcs`. Additionally, common C++ testbench sources (e.g. the [frontend server (fesvr)](https://github.com/riscv-software-src/riscv-isa-sim)) are compiled under `work`. Each command will also generate a script or an executable (e.g. `bin/snitch_cluster.vsim`) which we can use to simulate software on Snitch, as we will see in section [Running a simulation](#running-a-simulation).
@@ -54,7 +54,7 @@ In the [`cfg`](https://github.com/pulp-platform/{{ repo }}/blob/{{ branch }}/tar
 The command you previously executed automatically generated the RTL sources from the templates, and it implicitly used the default configuration file. In this configuration the FPU is not equipped with a floating-point divide and square-root unit.
 To override the default configuration file, e.g. to use the omega TCDM interconnect, define the following variable when you invoke `make`:
 ```shell
-make CFG_OVERRIDE=cfg/omega.json bin/snitch_cluster.vlt
+make CFG_OVERRIDE=cfg/omega.json verilator
 ```
 
 If you want to use a custom configuration, just point `CFG_OVERRIDE` to the path of your configuration file.
@@ -268,11 +268,11 @@ In your `tutorial` folder, create a new file named `app.mk` with the following c
 
 ```make
 APP              := tutorial
-$(APP)_BUILD_DIR := $(ROOT)/target/snitch_cluster/sw/apps/$(APP)/build
-SRCS             := $(ROOT)/target/snitch_cluster/sw/apps/$(APP)/src/$(APP).c
-$(APP)_INCDIRS   := $(ROOT)/target/snitch_cluster/sw/apps/$(APP)/data
+$(APP)_BUILD_DIR := $(SN_ROOT)/target/snitch_cluster/sw/apps/$(APP)/build
+SRCS             := $(SN_ROOT)/target/snitch_cluster/sw/apps/$(APP)/src/$(APP).c
+$(APP)_INCDIRS   := $(SN_ROOT)/target/snitch_cluster/sw/apps/$(APP)/data
 
-include $(ROOT)/target/snitch_cluster/sw/apps/common.mk
+include $(SN_ROOT)/target/snitch_cluster/sw/apps/common.mk
 ```
 
 This file will be included in the top-level Makefile, compiling your source code into an executable with the name provided in the `APP` variable.

sw/dnn/common.mk

@@ -4,6 +4,6 @@
 #
 # Luca Colagrande <colluca@iis.ee.ethz.ch>
 
-include $(ROOT)/sw/apps/common.mk
-$(APP)_INCDIRS += $(ROOT)/sw/dnn/src
-$(APP)_INCDIRS += $(ROOT)/sw/blas
+include $(SN_ROOT)/sw/apps/common.mk
+$(APP)_INCDIRS += $(SN_ROOT)/sw/dnn/src
+$(APP)_INCDIRS += $(SN_ROOT)/sw/blas

target/common/common.mk

@@ -8,143 +8,53 @@ PL_SIM   ?= 0    # 1 for post-layout simulation
 VCD_DUMP ?= 0    # 1 to dump VCD traces
 
 # Directories
-SIM_DIR  ?= $(shell pwd)
-TB_DIR   ?= $(SNITCH_ROOT)/target/common/test
-UTIL_DIR ?= $(SNITCH_ROOT)/util
-LOGS_DIR  = $(SIM_DIR)/logs
-
-# Files
-BENDER_LOCK = $(ROOT)/Bender.lock
-BENDER_YML  = $(ROOT)/Bender.yml
-
-# SEPP packages
-QUESTA_SEPP    ?=
-VCS_SEPP       ?=
-VERILATOR_SEPP ?=
+SIM_DIR      ?= $(shell pwd)
+TB_DIR       ?= $(SN_ROOT)/target/common/test
+UTIL_DIR     ?= $(SN_ROOT)/util
+LOGS_DIR      = $(SIM_DIR)/logs
+SN_PERIPH_DIR = $(SN_ROOT)/hw/snitch_cluster/src/snitch_cluster_peripheral
+SN_TARGET_DIR = $(SN_ROOT)/target/snitch_cluster
+SN_GEN_DIR   ?= $(SN_TARGET_DIR)/.generated
+SN_HW_DIR     = $(SN_ROOT)/hw
+SN_BIN_DIR    = $(SN_TARGET_DIR)/bin
 
 # External executables
-BENDER       ?= bender
-VLT          ?= $(VERILATOR_SEPP) verilator
-VCS          ?= $(VCS_SEPP) vcs
+BENDER	     ?= bender
+REGGEN       ?= $(shell $(BENDER) path register_interface)/vendor/lowrisc_opentitan/util/regtool.py
+VERIBLE_FMT  ?= verible-verilog-format
 CLANG_FORMAT ?= clang-format
-VSIM         ?= $(QUESTA_SEPP) vsim
-VOPT         ?= $(QUESTA_SEPP) vopt
-VLOG         ?= $(QUESTA_SEPP) vlog
-VLIB         ?= $(QUESTA_SEPP) vlib
 RISCV_MC     ?= $(LLVM_BINROOT)/llvm-mc
 ADDR2LINE    ?= $(LLVM_BINROOT)/llvm-addr2line
 # tail is required for nonsense oseda output
 VLT_BIN       = $(shell $(VERILATOR_SEPP) which verilator_bin | tail -n1 | $(VERILATOR_SEPP) xargs realpath | tail -n1)
 
 # Internal executables
-GENTRACE_PY      ?= $(UTIL_DIR)/trace/gen_trace.py
-ANNOTATE_PY      ?= $(UTIL_DIR)/trace/annotate.py
-EVENTS_PY        ?= $(UTIL_DIR)/trace/events.py
-JOIN_PY          ?= $(UTIL_DIR)/bench/join.py
-ROI_PY           ?= $(UTIL_DIR)/bench/roi.py
-VISUALIZE_PY     ?= $(UTIL_DIR)/bench/visualize.py
-
-VLT_JOBS        ?= $(shell nproc)
-VLT_NUM_THREADS ?= 1
-
-COMMON_BENDER_FLAGS += -t rtl -t snitch_cluster
-ifeq ($(PL_SIM), 1)
-COMMON_BENDER_FLAGS += -t postlayout
-endif
-
-VSIM_BENDER   += $(COMMON_BENDER_FLAGS) -t test -t simulation -t vsim
-VSIM_BUILDDIR ?= work-vsim
-VSIM_FLAGS    += -t 1ps
-VOPT_FLAGS     = 
-ifeq ($(DEBUG), ON)
-VSIM_FLAGS    += -do "log -r /*"
-VOPT_FLAGS    += +acc
-endif
-
-ifeq ($(PL_SIM), 1)
-include $(ROOT)/nonfree/gf12/modelsim/Makefrag
-VOPT_FLAGS 	+= -modelsimini $(ROOT)/nonfree/gf12/modelsim/modelsim.ini
-VOPT_FLAGS  += +nospecify
-VOPT_FLAGS  += $(GATE_LIBS)
-VSIM_FLAGS 	+= -modelsimini $(ROOT)/nonfree/gf12/modelsim/modelsim.ini
-VSIM_FLAGS  += +nospecify
-endif
-
-ifeq ($(VCD_DUMP), 1)
-VSIM_FLAGS += -do "source $(ROOT)/nonfree/gf12/modelsim/vcd.tcl"
-else
-VSIM_FLAGS += -do "run -a"
-endif
-
-# VCS_BUILDDIR should to be the same as the `DEFAULT : ./work-vcs`
-# in target/snitch_cluster/synopsys_sim.setup
-VCS_BENDER   += $(COMMON_BENDER_FLAGS) -t test -t simulation -t vcs
-VCS_BUILDDIR := work-vcs
+GENTRACE_PY       ?= $(UTIL_DIR)/trace/gen_trace.py
+ANNOTATE_PY       ?= $(UTIL_DIR)/trace/annotate.py
+EVENTS_PY         ?= $(UTIL_DIR)/trace/events.py
+JOIN_PY           ?= $(UTIL_DIR)/bench/join.py
+ROI_PY            ?= $(UTIL_DIR)/bench/roi.py
+VISUALIZE_PY      ?= $(UTIL_DIR)/bench/visualize.py
+SN_BOOTROM_GEN     = $(SN_ROOT)/util/gen_bootrom.py
+SN_CLUSTER_GEN     = $(SN_ROOT)/util/clustergen.py
+
+# Clustergen prerequisites
+SN_CLUSTER_GEN_SRC = $(wildcard $(SN_ROOT)/util/clustergen/*.py)
+
+# Bender prerequisites
+SN_BENDER_LOCK = $(SN_ROOT)/Bender.lock
+SN_BENDER_YML  = $(SN_ROOT)/Bender.yml
 
 # fesvr is being installed here
 FESVR         ?= ${MKFILE_DIR}work
 FESVR_VERSION ?= 35d50bc40e59ea1d5566fbd3d9226023821b1bb6
 
-VLT_BENDER   += $(COMMON_BENDER_FLAGS) -t verilator -DASSERTS_OFF 
-VLT_BUILDDIR := $(abspath work-vlt)
-VLT_FESVR     = $(VLT_BUILDDIR)/riscv-isa-sim
-VLT_FLAGS    += --timing
-VLT_FLAGS    += --timescale 1ns/1ps
-VLT_FLAGS    += --trace
-VLT_FLAGS    += -Wno-BLKANDNBLK
-VLT_FLAGS    += -Wno-LITENDIAN
-VLT_FLAGS    += -Wno-CASEINCOMPLETE
-VLT_FLAGS    += -Wno-CMPCONST
-VLT_FLAGS    += -Wno-WIDTH
-VLT_FLAGS    += -Wno-WIDTHCONCAT
-VLT_FLAGS    += -Wno-UNSIGNED
-VLT_FLAGS    += -Wno-UNOPTFLAT
-VLT_FLAGS    += -Wno-fatal
-VLT_FLAGS    += --unroll-count 1024
-VLT_FLAGS    += --threads $(VLT_NUM_THREADS)
-
-RISCV_MC_FLAGS      ?= -disassemble -mcpu=snitch
-ANNOTATE_FLAGS      ?= -q --keep-time --addr2line=$(ADDR2LINE)
-LAYOUT_EVENTS_FLAGS ?= --cfg=$(CFG)
-
-# We need a recent LLVM installation (>11) to compile Verilator.
-# We also need to link the binaries with LLVM's libc++.
-# Define CLANG_PATH to be the path of your Clang installation.
-
-ifneq (${CLANG_PATH},)
-    CLANG_CC       := $(CLANG_PATH)/bin/clang
-    CLANG_CXX      := $(CLANG_PATH)/bin/clang++
-    CLANG_CXXFLAGS := -nostdinc++ -isystem $(CLANG_PATH)/include/c++/v1
-    CLANG_LDFLAGS  := -nostdlib++ -fuse-ld=lld -L ${CLANG_PATH}/lib -Wl,-rpath,${CLANG_PATH}/lib -lc++
-else
-    CLANG_CC       ?= clang
-    CLANG_CXX      ?= clang++
-    CLANG_CXXFLAGS := ""
-    CLANG_LDFLAGS  := ""
-endif
-
-# If requested, build verilator with LLVM and add llvm c/ld flags
-ifeq ($(VLT_USE_LLVM),ON)
-    CC         = $(CLANG_CC)
-    CXX        = $(CLANG_CXX)
-    CFLAGS     = $(CLANG_CXXFLAGS)
-    CXXFLAGS   = $(CLANG_CXXFLAGS)
-    LDFLAGS    = $(CLANG_LDFLAGS)
-    VLT_FLAGS += --compiler clang
-    VLT_FLAGS += -CFLAGS "${CLANG_CXXFLAGS}"
-    VLT_FLAGS += -LDFLAGS "${CLANG_LDFLAGS}"
-endif
-
-VLOGAN_FLAGS := -assert svaext
-VLOGAN_FLAGS += -assert disable_cover
-VLOGAN_FLAGS += -full64
-VLOGAN_FLAGS += -kdb
-VLOGAN_FLAGS += -timescale=1ns/1ps
-VHDLAN_FLAGS := -full64
-VHDLAN_FLAGS += -kdb
-
-# default on target `all`
-all:
+# Flags
+COMMON_BENDER_FLAGS     += -t rtl -t snitch_cluster
+COMMON_BENDER_SIM_FLAGS += -t simulation -t test
+RISCV_MC_FLAGS          ?= -disassemble -mcpu=snitch
+ANNOTATE_FLAGS          ?= -q --keep-time --addr2line=$(ADDR2LINE)
+LAYOUT_EVENTS_FLAGS     ?= --cfg=$(CFG)
 
 #################
 # Prerequisites #
@@ -162,21 +72,8 @@ work/lib/libfesvr.a: work/${FESVR_VERSION}_unzip
 	mkdir -p $(dir $@)
 	cp $(dir $<)libfesvr.a $@
 
-# Build fesvr seperately for verilator since this might use different compilers
-# and libraries than modelsim/vcs and
-$(VLT_FESVR)/${FESVR_VERSION}_unzip:
-	mkdir -p $(dir $@)
-	wget -O $(dir $@)/${FESVR_VERSION} https://github.com/riscv/riscv-isa-sim/tarball/${FESVR_VERSION}
-	tar xfm $(dir $@)${FESVR_VERSION} --strip-components=1 -C $(dir $@)
-	patch $(VLT_FESVR)/fesvr/context.h < patches/context.h.diff
-	touch $@
-
-$(VLT_BUILDDIR)/lib/libfesvr.a: $(VLT_FESVR)/${FESVR_VERSION}_unzip
-	cd $(dir $<)/ && ./configure --prefix `pwd` \
-        CC=${CC} CXX=${CXX} CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
-	$(MAKE) -C $(dir $<) install-config-hdrs install-hdrs libfesvr.a
-	mkdir -p $(dir $@)
-	cp $(dir $<)libfesvr.a $@
+$(SN_GEN_DIR) $(SN_BIN_DIR):
+	mkdir -p $@
 
 ########
 # Util #
@@ -200,10 +97,10 @@ endef
 # Common rule to fill a template file with clustergen
 # Arg 1: path for the generated file
 # Arg 2: path of the template file
-define cluster_gen_rule
-$(1): $(CFG) $(CLUSTER_GEN_PREREQ) $(2) | $(GENERATED_DIR)
+define sn_cluster_gen_rule
+$(1): $(SN_CFG) $(SN_CLUSTER_GEN) $(SN_CLUSTER_GEN_SRC) $(2) | $(SN_GEN_DIR)
 	@echo "[CLUSTERGEN] Generate $$@"
-	$(CLUSTER_GEN) -c $$< -o $$@ --template $(2)
+	$(SN_CLUSTER_GEN) -c $$< -o $$@ --template $(2)
 endef
 
 # Common rule to generate a Makefile with RTL source and header
@@ -216,10 +113,10 @@ endef
 # Arg 4: top module name
 # Arg 5: name of target for which prerequisites are generated
 define gen_rtl_prerequisites
-$(2)/$(4).f: $(BENDER_YML) $(BENDER_LOCK) | $(2)
+$(2)/$(4).f: $(SN_BENDER_YML) $(SN_BENDER_LOCK) | $(2)
 	$(BENDER) script verilator $(3) > $$@
 
-$(1): $(2)/$(4).f $(GENERATED_RTL_SOURCES) | $(2)
+$(1): $(2)/$(4).f $(SN_GEN_RTL_SRCS) | $(2)
 	$(VLT) -f $$< --Mdir $(2) --MMD -E --top-module $(4) > /dev/null
 	mv $(2)/V$(4)__ver.d $$@
 	sed -E -i -e 's|^[^:]*:|$(5):|' \