[GVSOC] Updated to latest version

CMakeLists.txt

@@ -14,7 +14,7 @@ if(CCACHE_FOUND)
  set(CMAKE_CXX_COMPILER_LAUNCHER ccache)
 endif()
 
-add_subdirectory(tools/gvsoc)
+add_subdirectory(tools/gvsoc/common)
 
 ## Install pip requirements, note: does not install nntool reqs as building
 ## will do that

Makefile

@@ -24,9 +24,10 @@ CMAKE ?= cmake
 
 build:
  $(CMAKE) -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DTARGET=$(GAPY_V2_TARGET) \
- -DTARGET_OPT="$(GAPY_NEW_TARGET_OPT)" \
- -DCMAKE_INSTALL_PREFIX=$(PULP_SDK_HOME)/install/workstation
+ -DCMAKE_INSTALL_PREFIX=$(PULP_SDK_HOME)/install/workstation \
+ -DGVSOC_MODULES="$(GVSOC_MODULES)" \
+ -DGVSOC_TARGETS=${GVSOC_TARGETS}
+
  $(CMAKE) --build build $(CMAKE_FLAGS)
  $(CMAKE) --install build
 

configs/common.sh

@@ -28,21 +28,16 @@ export PYTHONPATH=$INSTALL_DIR/python:$PYTHONPATH
 
 
 # Gapy
-export PATH=$PULP_SDK_HOME/tools/gapy:$PATH
 export PYTHONPATH=$PULP_SDK_HOME/tools/gapy:$PYTHONPATH
 export PULP_CONFIGS_PATH=$PULP_SDK_HOME/tools/gap-configs/configs:$PULP_CONFIGS_PATH
 
+# Gapy v2 (for gvsoc)
+export PATH=$PULP_SDK_HOME/tools/gapy_v2/bin:$PATH
+
 # GVSOC
-export PULP_SDK_INSTALL=$INSTALL_DIR
-export GVSOC_PATH=$INSTALL_DIR/python
-export XTENSOR_INCLUDE_DIR=$PULP_SDK_HOME/ext/xtensor/include
-export GVSOC_INC_PATHS="$PULP_SDK_HOME/rtos/pulpos/gap_archi/include/archi/chips/$TARGET_NAME $PULP_SDK_HOME/rtos/pulpos/gap_archi/include $PULP_SDK_HOME/rtos/pulpos/pulp_archi/include"
-export GVSOC_ISS_PATH=$PULP_SDK_HOME/tools/gvsoc/common/models/cpu/iss
-export GVSOC_SRC_PATH=$PULP_SDK_HOME/tools/gvsoc/common
-export GVSOC_PULP_SRC_PATH=$PULP_SDK_HOME/tools/gvsoc/pulp
-export PYTHONPATH=$PULP_SDK_HOME/tools/gvsoc/common/models:$PYTHONPATH
-export PYTHONPATH=$PULP_SDK_HOME/tools/gvsoc/pulp/models:$PYTHONPATH
-export PYTHONPATH=$PULP_SDK_HOME/tools/gvsoc/common/engine:$PYTHONPATH
+export GVSOC_MODULES="${GAP_SDK_HOME}/tools/gvsoc/common;${GAP_SDK_HOME}/tools/gvsoc/pulp"
+export GVSOC_TARGETS="$GAPY_V2_TARGET"
+
 
 # FPGA
 #export PULP_

rtos/pulpos/common/rules/pulpos/default_rules.mk

@@ -306,10 +306,11 @@ use_gvsoc_target = 1
 endif
 
 ifeq '$(use_gvsoc_target)' '1'
-GAPY_TARGET_OPT += --target-dir=$(GVSOC_PULP_SRC_PATH)/targets
-endif
-
+GAPY_TARGET_OPT += $(foreach module,$(subst ;, , $(GVSOC_MODULES)),--target-dir=$(module)/models)
+GAPY_TARGET_OPT += --install-dir=$(INSTALL_DIR)/python
+else
 GAPY_TARGET_OPT += --target-dir=$(PULP_SDK_HOME)/tools/gapy/targets
+endif
 
 override runner_args += --flash-property=boot@flash:rom:boot \
  --flash-property=$(TARGETS)@flash:rom:binary
@@ -343,22 +344,22 @@ gvsoc.run_debug:
 
 else
 
-GAPY = gapy
+GAPY = $(PULP_SDK_HOME)/tools/gapy/gapy
 
 image:
- gapy $(GAPY_TARGET_OPT) --platform=$(platform) --work-dir=$(TARGET_BUILD_DIR) $(config_args) $(gapy_args) run --image --binary=$(TARGETS) $(runner_args)
+ $(GAPY) $(GAPY_TARGET_OPT) --platform=$(platform) --work-dir=$(TARGET_BUILD_DIR) $(config_args) $(gapy_args) run --image --binary=$(TARGETS) $(runner_args)
 
 flash:
- gapy $(GAPY_TARGET_OPT) --platform=$(platform) --work-dir=$(TARGET_BUILD_DIR) $(config_args) $(gapy_args) run --flash --binary=$(TARGETS) $(runner_args)
+ $(GAPY) $(GAPY_TARGET_OPT) --platform=$(platform) --work-dir=$(TARGET_BUILD_DIR) $(config_args) $(gapy_args) run --flash --binary=$(TARGETS) $(runner_args)
 
 run.prepare:
- gapy $(GAPY_TARGET_OPT) --platform=$(platform) --work-dir=$(TARGET_BUILD_DIR) $(config_args) $(gapy_args) run --exec-prepare --binary=$(TARGETS) $(runner_args)
+ $(GAPY) $(GAPY_TARGET_OPT) --platform=$(platform) --work-dir=$(TARGET_BUILD_DIR) $(config_args) $(gapy_args) run --exec-prepare --binary=$(TARGETS) $(runner_args)
 
 run.exec:
- gapy $(GAPY_TARGET_OPT) --platform=$(platform) --work-dir=$(TARGET_BUILD_DIR) $(config_args) $(gapy_args) run --exec --binary=$(TARGETS) $(runner_args)
+ $(GAPY) $(GAPY_TARGET_OPT) --platform=$(platform) --work-dir=$(TARGET_BUILD_DIR) $(config_args) $(gapy_args) run --exec --binary=$(TARGETS) $(runner_args)
 
 run:
- gapy $(GAPY_TARGET_OPT) --platform=$(platform) --work-dir=$(TARGET_BUILD_DIR) $(config_args) $(gapy_args) run --exec-prepare --exec --binary=$(TARGETS) $(runner_args)
+ $(GAPY) $(GAPY_TARGET_OPT) --platform=$(platform) --work-dir=$(TARGET_BUILD_DIR) $(config_args) $(gapy_args) run --exec-prepare --exec --binary=$(TARGETS) $(runner_args)
 
 endif