fixup

Makefile

@@ -4,26 +4,18 @@
 
 ROOT_DIR = $(strip $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
 
-ifneq (,$(wildcard /etc/iis.version))
-	QUESTA ?= questa-2022.3
-	BENDER ?= bender
-else
-	QUESTA ?=
-	BENDER ?= ./bender
-endif
-GIT ?= git
+QUESTA ?=
+BENDER ?= bender
+
 VSIM ?= $(QUESTA) vsim
 VOPT ?= $(QUESTA) vopt
+VLIB ?= $(QUESTA) vlib
 top_level ?= pulp_cluster_tb
 library ?= work
 elf-bin ?= stimuli.riscv
 bwruntest = $(ROOT_DIR)/pulp-runtime/scripts/bwruntests.py
 
-REGRESSIONS := $(ROOT_DIR)/regression-tests
-
-CFLAGS ?= -I$(QUESTASIM_HOME)/include \
-					-I$(RISCV)/include/ \
-					-I/include -std=c++11 -I../tb/dpi -O3
+REGRESSIONS := $(ROOT_DIR)/regression_tests
 
 VLOG_ARGS += -suppress vlog-2583 -suppress vlog-13314 -suppress vlog-13233 -timescale \"1 ns / 1 ps\" \"+incdir+$(shell pwd)/include\"
 XVLOG_ARGS += -64bit -compile -vtimescale 1ns/1ns -quiet

README.md

@@ -30,8 +30,8 @@ Warning: requires QuestaSim 2022.3 or newer.
 
 2. We need RV64 toolchain to compile DPI libraries. To this purpose, export the
    RV64 toolchain to a `RISCV` env variable and also export your questa
-   installation path to a `QUESTA_HOME` env variable. Please refer to [RISC-V GNU
-   toolchain](https://github.com/riscv-collab/riscv-gnu-toolchain/) to use a
+   installation path to a `QUESTASIM_HOME` env variable. Please refer to [RISC-V
+   GNU toolchain](https://github.com/riscv-collab/riscv-gnu-toolchain/) to use a
    pre-built RV64 toolchain release.
 
 3. Compile the hw:
@@ -44,7 +44,7 @@ Warning: requires QuestaSim 2022.3 or newer.
 4. Download the sw stack and bare-metal tests:
 	```
 	make pulp-runtime
-	make regression-tests
+	make regression_tests
 	```
 
 5. Source the environment:

env/env.sh

@@ -8,13 +8,6 @@ ROOTD=$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")/.." && pwd)
 # If at IIS, set up appropriate questa version.
 if test -f /etc/iis.version; then
   export QUESTA=questa-2023.4-zr
-  export VLOG="$QUESTA vlog"
-  export VLIB="$QUESTA vlib"
-  export VMAP="$QUESTA vmap"
-  export VCOM="$QUESTA vcom"
-  export VOPT="$QUESTA vopt"
-  export VSIM="$QUESTA vsim"
-  export QUESTA_HOME=/usr/pack/${QUESTA}/questasim
   export QUESTASIM_HOME=/usr/pack/${QUESTA}/questasim
   export PULP_RUNTIME_GCC_TOOLCHAIN=/usr/pack/riscv-1.0-kgf/pulp-gcc-1.0.16
 fi

regression.mk

@@ -1,26 +1,23 @@
 ## Clone regression tests for bare-metal verification
 TARGET ?= pulp_cluster
 
-regression-tests:
-	git submodule update --init --recursive $@
-
 .PHONY: test-rt-par-bare
 ## Run only parallel tests on pulp-runtime
-test-rt-par-bare: pulp-runtime regression-tests
+test-rt-par-bare: pulp-runtime regression_tests
 	cd $(REGRESSIONS) && $(bwruntest) --proc-verbose -v \
 		-t 3600 --yaml --max-procs 2 \
 		-o $(REGRESSIONS)/$(TARGET)/runtime-parallel.xml $(REGRESSIONS)/parallel-bare-tests.yaml
 
 .PHONY: test-rt-mchan
 ## Run mchan tests on pulp-runtime
-test-rt-mchan: pulp-runtime regression-tests
+test-rt-mchan: pulp-runtime regression_tests
 	cd $(REGRESSIONS) && $(bwruntest) --proc-verbose -v \
 		-t 7200 --yaml --max-procs 2 \
 		-o $(REGRESSIONS)/$(TARGET)/runtime-mchan.xml $(REGRESSIONS)/pulp_cluster-mchan-tests.yaml
 
 .PHONY: test-rt-$(TARGET)
 ## Run Carfield tests on pulp-runtime
-test-rt-$(TARGET): pulp-runtime regression-tests
+test-rt-$(TARGET): pulp-runtime regression_tests
 	cd $(REGRESSIONS) && $(bwruntest) --proc-verbose -v \
 		-t 3600 --yaml --max-procs 2 \
 		-o $(REGRESSIONS)/$(TARGET)/runtime-mchan.xml $(REGRESSIONS)/$(TARGET).yaml