3.3.3 Release

Makefile

@@ -44,7 +44,7 @@ PULP_BRIDGE_PATH = $(GAP_SDK_HOME)/tools/pulp_tools/pulp-debug-bridge
 
 ifeq ($(TARGET_CHIP_FAMILY), GAP8)
 sdk: all autotiler nntool
-all: pulp-os tools gvsoc flasher docs littlefs openocd
+all: pulp-os tools gvsoc flasher docs littlefs.build openocd
 
 clean:
 	$(RM) $(TARGET_INSTALL_DIR)
@@ -58,7 +58,7 @@ clean:
 
 else
 sdk: all autotiler
-all: pulp-os gvsoc littlefs
+all: pulp-os gvsoc littlefs.build
 
 clean:
 	$(RM) $(TARGET_INSTALL_DIR)
@@ -137,7 +137,7 @@ LFS_MAKEFILE = $(LFS_BUILD_DIR)/Makefile
 
 #include $(LFS_MAKEFILE)
 
-littlefs: $(LFS_MAKEFILE)
+littlefs.build: $(LFS_MAKEFILE)
 	make -C $(LFS_BUILD_DIR) all install
 
 $(LFS_MAKEFILE): $(LFS_DIR)/CMakeLists.txt | $(LFS_BUILD_DIR)
@@ -146,6 +146,11 @@ $(LFS_MAKEFILE): $(LFS_DIR)/CMakeLists.txt | $(LFS_BUILD_DIR)
 $(LFS_BUILD_DIR):
 	$(MKDIR) -p $@
 
+littlefs.checkout:
+	git submodule update --init tools/littlefs
+
+littlefs.all: littlefs.checkout littlefs.build
+
 
 
 plptest.checkout:
@@ -207,6 +212,9 @@ gvsoc.checkout:
 gvsoc.build:
 	make -C gvsoc/gvsoc build BUILD_DIR=$(BUILD_DIR)/gvsoc INSTALL_DIR=$(INSTALL_DIR) TARGET_INSTALL_DIR=$(GAP_SDK_HOME)/install
 
+gvsoc.clean:
+	make -C gvsoc/gvsoc clean BUILD_DIR=$(BUILD_DIR)/gvsoc INSTALL_DIR=$(INSTALL_DIR) TARGET_INSTALL_DIR=$(GAP_SDK_HOME)/install
+
 gvsoc.all: gvsoc.checkout gvsoc.build
 
 

applications/CannyEdgeDetection/CannyDetect.c

@@ -15,12 +15,16 @@
  */
 
 
+#include <stdio.h>
+
 /* PMSIS includes. */
 #include "pmsis.h"
 
-#include <stdio.h>
+/* Autotiler includes. */
 #include "Gap.h"
-#include "ImgIO.h"
+
+/* Gap_lib includes. */
+#include "gaplib/ImgIO.h"
 
 #define STACK_SIZE      2048
 #define MOUNT           1
@@ -48,7 +52,7 @@ PI_L2 unsigned char *ImageIn_L2;
 #else
 #include "Mills.h"
 #endif
-unsigned char RT_L2_DATA *ImageOut_L2;
+unsigned char PI_L2 *ImageOut_L2;
 
 
 typedef struct ArgImage {
@@ -103,7 +107,7 @@ static inline unsigned int ChunkSize(unsigned int X)
     unsigned int Log2Core;
     unsigned int Chunk;
 
-    if (CoreCountDynamic) NCore = ActiveCore; else NCore = rt_nb_pe();
+    if (CoreCountDynamic) NCore = ActiveCore; else NCore = gap_ncore();
     Log2Core = gap_fl1(NCore);
     Chunk = (X>>Log2Core) + ((X&(NCore-1))!=0);
     return Chunk;
@@ -177,7 +181,7 @@ void MasterRGBConvert(unsigned int W, unsigned int H)
                     3*W*(NextLast-NextFirst), PI_CL_DMA_DIR_EXT2LOC, &dmaCpIn);
         }
         ArgC.In = InImage + (Toggle&h)*3*W; ArgC.Out = OutImage + (Toggle&h)*W; ArgC.H = Last-First;
-        rt_team_fork(ActiveCore, (void *) RGBConvert, (void *) &ArgC);
+        pi_cl_team_fork(ActiveCore, (void *) RGBConvert, (void *) &ArgC);
 
         // If not the first iteration wait for previous copy to L2 to finish
         if (i!=0) pi_cl_dma_cmd_wait(&dmaCpOut);
@@ -639,8 +643,8 @@ static void cluster_main()
         }
     } else {
         /* Here the canny edge would be executed only on all the cores of cluster*/
-        printf("Canny Edge Detector running on %d cores, Source %s image[W=%d, H=%d]\n", rt_nb_pe(), ISRGB?"RGB":"Mono", W, H);
-        ActiveCore = rt_nb_pe();
+        printf("Canny Edge Detector running on %d cores, Source %s image[W=%d, H=%d]\n", gap_ncore(), ISRGB?"RGB":"Mono", W, H);
+        ActiveCore = gap_ncore();
         if (ISRGB) {
             MasterRGBConvert(W, H);
         }
@@ -707,7 +711,7 @@ void canny_edge_detector()
     char imgName[50];
     sprintf(imgName, "../../../img_OUT.ppm");
     printf("imgName: %s\n", imgName);
-    WriteImageToFile(imgName, COL, LINE, (ImageOut_L2));
+    WriteImageToFile(imgName, COL, LINE, (ImageOut_L2), sizeof(unsigned char));
 
     pi_cluster_close(&cluster_dev);
 

applications/CannyEdgeDetection/Makefile

@@ -14,7 +14,8 @@
 
 
 APP = cannyEdge
-APP_SRCS = CannyDetect.c ImgIO.c
+APP_SRCS = CannyDetect.c $(GAP_LIB_PATH)/img_io/ImgIO.c
+APP_INC  = $(GAP_LIB_PATH)/include
 APP_CFLAGS += -O3 -g -DFROM_FILE
 
 APP_CFLAGS += -mno-memcpy -fno-tree-loop-distribute-patterns
@@ -23,7 +24,7 @@ APP_LDFLAGS +=  -flto -Wl,--gc-sections
 
 # The generated code outputs a maybe-uninitialized error which is rather difficult to suppress
 # in a clean way.
-APP_CFLAGS += -Wall -Werror -Wno-maybe-uninitialized -Wno-unused-but-set-variable -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function -Wundef 
+APP_CFLAGS += -Wall -Werror -Wno-maybe-uninitialized -Wno-unused-but-set-variable -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function -Wundef
 
 # Should be removed once openocd is the default bridge
 export GAP_USE_OPENOCD=1

applications/CannyEdgeDetection/Mills.h

@@ -26,7 +26,7 @@ BiCubic = 0
 #define ISRGB 0
 #define LINE 202
 #define COL 360
-unsigned char RT_L2_DATA ImageIn_L2[360*202*1] = {
+unsigned char PI_L2 ImageIn_L2[360*202*1] = {
 127,78,62,66,66,65,88,112,128,17,12,26,30,28,35,33,36,30,18,23,94,115,114,101,122,122,105,89,80,84,97,105,103,99,96,93,102,104,99,97,99,103,95,91,91,95,101,97,79,93,129,155,170,160,107,51,9,19,55,81,100,81,82,57,26,8,9,19,19,16,16,23,23,22,18,18,10,10,14,12,1,2,5,3,5,6,3,9,10,12,7,9,10,31,45,54,64,68,57,56,59,60,58,57,59,60,61,63,64,60,55,57,58,54,50,42,27,10,2,4,9,9,4,9,14,14,12,5,26,79,47,40,33,44,30,28,29,37,31,8,34,28,5,8,13,14,17,18,22,23,19,28,67,79,81,79,91,76,80,77,93,96,72,87,84,77,74,72,63,56,62,67,72,73,71,80,91,89,74,70,77,80,74,60,50,49,50,48,45,48,68,69,44,29,37,47,51,51,41,48,54,40,37,38,51,57,101,146,112,91,90,73,39,0,15,27,27,27,59,120,81,75,30,40,71,70,69,71,62,79,79,44,9,71,118,125,122,126,115,122,135,121,105,117,118,119,122,112,98,91,53,34,63,72,50,24,16,21,22,17,20,55,99,100,72,48,91,100,97,103,104,99,91,89,96,87,95,99,91,82,81,82,80,82,78,88,87,87,91,84,88,77,84,103,127,100,95,70,18,25,27,27,18,22,19,4,70,119,119,99,82,88,83,93,90,79,77,70,67,76,60,52,79,47,10,34,45,45,48,43,65,131,168,139,117,124,124,122,119,128,114,83,28,4,18,19,8,3,7,42,81,73,67,63,67,63,43,64,57,98,
 70,64,70,64,56,88,98,103,167,144,30,23,30,20,10,5,7,32,64,34,91,109,106,104,109,101,92,94,111,106,99,100,90,95,106,104,93,91,100,108,108,93,88,95,98,95,93,104,92,85,85,84,100,129,162,179,146,80,62,102,101,94,82,51,18,16,19,25,21,18,5,2,2,21,28,26,42,30,22,20,10,6,9,7,1,3,3,2,3,8,24,26,29,37,43,55,69,67,58,60,65,66,63,67,74,69,62,66,67,53,41,26,6,2,2,5,15,32,44,39,57,80,42,22,0,0,1,22,96,100,72,61,31,33,42,39,33,30,11,16,16,23,6,0,10,11,16,26,36,22,93,111,88,77,73,73,69,82,84,80,88,91,86,79,76,80,67,63,58,64,68,68,70,60,39,54,79,80,77,74,71,82,93,81,53,34,36,44,63,106,123,128,87,49,45,43,36,14,2,9,36,37,43,69,72,83,137,131,90,80,78,57,1,17,36,39,37,34,83,109,66,66,9,38,57,57,52,58,69,72,76,64,45,77,100,112,122,123,109,121,134,115,108,125,121,109,108,116,104,92,82,51,41,67,74,55,32,18,17,24,34,47,79,98,90,66,70,95,89,99,102,100,90,93,95,98,91,96,105,85,92,93,76,88,84,90,90,88,91,86,88,89,89,132,105,96,88,22,24,41,42,73,71,50,41,20,40,78,77,73,71,75,72,81,84,70,70,66,67,78,82,48,65,97,69,46,58,73,87,124,159,164,144,124,123,124,122,131,131,131,83,3,12,37,44,58,69,72,63,34,69,86,82,74,82,63,52,53,58,119,
 70,62,54,58,46,28,76,100,107,162,143,26,21,14,2,13,65,99,124,99,101,93,109,116,104,105,110,105,98,87,96,100,94,99,101,104,102,96,100,98,91,93,96,94,91,97,100,90,86,89,86,85,97,100,96,119,147,122,82,102,103,89,65,77,83,42,26,23,21,11,2,4,5,2,23,22,35,68,58,27,16,13,13,4,2,2,5,3,9,13,23,43,42,41,54,58,56,64,67,70,72,63,54,58,56,62,64,45,17,2,9,11,9,7,16,40,43,55,65,46,52,98,101,92,85,79,98,126,113,88,76,70,53,28,18,28,24,9,12,21,24,26,14,6,2,6,8,30,34,61,146,128,54,71,73,73,65,82,75,65,76,79,79,76,70,81,80,90,71,67,75,78,54,18,4,8,40,75,79,72,71,76,81,86,89,80,58,46,52,104,178,155,91,55,45,51,61,57,61,56,58,63,62,76,110,119,131,97,88,77,69,21,3,37,43,47,33,34,95,115,76,69,5,44,59,77,64,69,62,55,61,63,72,87,100,107,102,111,115,122,122,120,111,123,127,119,120,118,99,92,91,79,45,54,83,67,58,48,40,50,52,42,48,90,95,80,59,83,92,93,94,96,98,97,100,94,91,95,101,92,87,88,78,80,80,79,95,89,91,86,84,67,132,122,87,94,49,16,35,37,54,55,109,118,81,46,32,62,78,74,64,61,44,28,16,23,48,61,76,76,78,65,51,85,117,119,121,130,145,158,152,128,125,131,128,122,125,126,114,105,39,7,30,37,44,56,68,82,98,99,52,80,76,66,64,61,48,50,92,119,

examples/autotiler/IntegralImage/Makefile

@@ -9,12 +9,13 @@ PULP_APP = IntegralImage
 GEN_KER_PATH = $(TILER_GENERATOR_PATH)/IntegralImg
 
 MODEL_SRC = IntegralImgModel.c
-MODEL_GEN = IntegralImgKernels 
+MODEL_GEN = IntegralImgKernels
 MODEL_GEN_C = $(addsuffix .c, $(MODEL_GEN))
 MODEL_GEN_CLEAN = $(MODEL_GEN_C) $(addsuffix .h, $(MODEL_GEN))
 RM=rm -f
 
 APP_SRCS   += main.c $(GAP_LIB_PATH)/img_io/ImgIO.c $(MODEL_GEN_C) $(GEN_KER_PATH)/IntegralImgBasicKernels.c
+APP_INC     = $(GAP_LIB_PATH)/include
 
 APP_CFLAGS += -DNO_BRIDGE -O3 -mno-memcpy -fno-tree-loop-distribute-patterns $(JENKINS_FLAGS)
 APP_CFLAGS += -I$(TILER_EMU_INC) -I$(TILER_INC) -I$(GEN_KER_PATH)
@@ -31,7 +32,7 @@ GenTile:
 
 # Run the code generator
 $(MODEL_GEN_C): GenTile
-	./GenTile 
+	./GenTile
 
 model: $(MODEL_GEN_C)
 
@@ -41,4 +42,3 @@ clean::
 .PHONY: model clean
 
 include $(GAP_SDK_HOME)/tools/rules/pmsis_rules.mk
-

examples/autotiler/IntegralImage/main.c

@@ -45,7 +45,7 @@ static void cluster_main(ArgCluster_T *ArgC)
 	printf ("cluster master start\n");
 
 	int W=ArgC->W, H=ArgC->H;
-	unsigned int i, MaxCore = rt_nb_pe();
+	unsigned int i, MaxCore = gap_ncore();
 
     pi_perf_conf(1 << PI_PERF_ACTIVE_CYCLES);
 

examples/pmsis/test_features/filesystem/testset.cfg

@@ -2,14 +2,20 @@ from plptest import *
 
 TestConfig = c = {}
 
-test = Test(
-  name = 'filesystem',
-  commands = [
-    Shell('clean', 'make clean'),
-    Shell('build', 'make all'),
-    Shell('run',   'make run')
-  ],
+def get_test(name, flags, restrict=None):
+  return Test(
+    name = 'filesystem_%s' % name,
+    commands = [
+             Shell('clean', 'make %s clean build_dir_ext=%s' % (flags, name)),
+             Shell('build', 'make %s all build_dir_ext=%s' % (flags, name)),
+             Shell('run',   'make %s run build_dir_ext=%s' % (flags, name))
+    ],
   timeout=1000000,
+  restrict=restrict
 )
 
-c['tests'] = [ test ]
+c['tests'] = [ ]
+
+c['tests'].append(get_test('fc', ''))
+
+c['tests'].append(get_test('cluster', 'CLUSTER=1'))

examples/pmsis/test_periph/test_camera_stream/test.c

@@ -28,7 +28,7 @@
 PI_L2 unsigned char *buff;
 
 static struct pi_device camera;
-static pi_task_t tasks[2];
+static pi_task_t rx_tasks[2];
 static int remaining_size;
 static volatile int done;
 static int nb_transfers;
@@ -43,7 +43,7 @@ static void handle_transfer_end(void *arg);
 // This is called to enqueue new transfers
 static void enqueue_transfer()
 {
-  // We can enqueue new transfers if there are still a part of the image to 
+  // We can enqueue new transfers if there are still a part of the image to
   // capture and less than 2 transfers are pending (the dma supports up to 2 transfers
   // at the same time)
   while (remaining_size > 0 && nb_transfers < 2)
@@ -52,12 +52,12 @@ static void enqueue_transfer()
     if (remaining_size < iter_size)
       iter_size = remaining_size;
 
-    pi_task_t *task = &tasks[current_task];
+    pi_task_t *task = &rx_tasks[current_task];
 
     // Enqueue a transfer. The callback will be called once the transfer is finished
     // so that  a new one is enqueued while another one is already running
     pi_camera_capture_async(&camera, current_buff, iter_size, pi_task_callback(task, handle_transfer_end, NULL));
-    
+
     remaining_size -= iter_size;
     nb_transfers++;
     current_buff += iter_size;
@@ -129,7 +129,7 @@ static int test_entry()
   pi_hostfs_conf_init(&conf);
 
   struct pi_device fs;
-  
+
   pi_open_from_conf(&fs, &conf);
 
   if (pi_fs_mount(&fs))

gvsoc/gvsoc/dpi-wrapper/src/dpi.cpp

@@ -25,17 +25,26 @@
 
 using namespace std;
 
-extern "C" void dpi_external_edge(int handle, int value);
-
 extern "C" void *dpi_open(char *config_path)
 {
-  void *handle = gv_open(config_path, 0, NULL, 0, 0);
+  void *handle = gv_create(config_path);
   return handle;
 }
 
+extern "C" void dpi_start(void *instance)
+{
+  gv_start(instance, 0, NULL, 0, 0);
+}
+
+extern "C" void dpi_start_task(void *arg0, void *arg1)
+{
+    void (*callback)(void *) = (void (*)(void *))arg0;
+    callback(arg1);
+}
+
 extern "C" void *dpi_bind(void *handle, char *name, int sv_handle)
 {
-  void *result = gv_chip_pad_bind(handle, name);
+  void *result = gv_chip_pad_bind(handle, name, sv_handle);
   return result;
 }
 

gvsoc/gvsoc/engine/Makefile

@@ -23,10 +23,12 @@ LDFLAGS += -L$(SYSTEMC_HOME)/lib-linux64 -lsystemc
 endif
 
 CFLAGS_DBG += -DVP_TRACE_ACTIVE=1
+CFLAGS_SV += -DVP_TRACE_ACTIVE=1 -D__VP_USE_SYSTEMV=1
 
 VP_SRCS = src/vp.cpp src/trace/trace.cpp src/clock/clock.cpp src/trace/event.cpp src/trace/vcd.cpp src/trace/lxt2.cpp src/power/power.cpp src/trace/lxt2_write.c src/trace/fst/fastlz.c  src/trace/fst/lz4.c src/trace/fst/fstapi.c src/trace/fst.cpp src/trace/raw.cpp src/trace/raw/trace_dumper.cpp
 VP_OBJS = $(patsubst src/%.cpp,$(ENGINE_BUILD_DIR)/%.o,$(patsubst src/%.c,$(ENGINE_BUILD_DIR)/%.o,$(VP_SRCS)))
 VP_DBG_OBJS = $(patsubst src/%.cpp,$(ENGINE_BUILD_DIR)/dbg/%.o,$(patsubst src/%.c,$(ENGINE_BUILD_DIR)/dbg/%.o,$(VP_SRCS)))
+VP_SV_OBJS = $(patsubst src/%.cpp,$(ENGINE_BUILD_DIR)/sv/%.o,$(patsubst src/%.c,$(ENGINE_BUILD_DIR)/sv/%.o,$(VP_SRCS)))
 
 VP_HEADERS += $(shell find include -name *.hpp)
 VP_HEADERS += $(shell find include -name *.h)
@@ -68,6 +70,16 @@ $(ENGINE_BUILD_DIR)/dbg/%.o: src/%.cpp
 	@mkdir -p $(basename $@)
 	$(V)$(CC) $(CFLAGS) $(CFLAGS_DBG) -o $@ -c $<
 
+$(ENGINE_BUILD_DIR)/sv/%.o: src/%.c
+	@echo "CXX SV $<"
+	@mkdir -p $(basename $@)
+	$(V)$(CC) $(CFLAGS) $(CFLAGS_SV) -o $@ -c $<
+
+$(ENGINE_BUILD_DIR)/sv/%.o: src/%.cpp
+	@echo "CXX SV $<"
+	@mkdir -p $(basename $@)
+	$(V)$(CC) $(CFLAGS) $(CFLAGS_SV) -o $@ -c $<
+
 $(ENGINE_BUILD_DIR)/libpulpvp.so: $(VP_OBJS)
 	@echo "CXX $<"
 	@mkdir -p $(basename $@)
@@ -79,6 +91,11 @@ $(ENGINE_BUILD_DIR)/libpulpvp-debug.so: $(VP_DBG_OBJS)
 	@mkdir -p $(basename $@)
 	$(V)$(CC) $^ -o $@ $(LDFLAGS) -shared  -ldl -lpthread
 
+$(ENGINE_BUILD_DIR)/libpulpvp-sv.so: $(VP_SV_OBJS)
+	@echo "CXX SV $<"
+	@mkdir -p $(basename $@)
+	$(V)$(CC) $^ -o $@ $(LDFLAGS) -shared  -ldl -lpthread
+
 $(ENGINE_BUILD_DIR)/gvsoc_launcher: $(ENGINE_BUILD_DIR)/main.o $(INSTALL_DIR)/lib/libpulpvp.so
 	@echo "CXX $<"
 	@mkdir -p `dirname $@`
@@ -110,6 +127,10 @@ $(INSTALL_DIR)/lib/libpulpvp-debug.so: $(ENGINE_BUILD_DIR)/libpulpvp-debug.so
 	@echo "CP DBG $<"
 	$(V)install -D $^ $@
 
+$(INSTALL_DIR)/lib/libpulpvp-sv.so: $(ENGINE_BUILD_DIR)/libpulpvp-sv.so
+	@echo "CP SV $<"
+	$(V)install -D $^ $@
+
 $(INSTALL_DIR)/python/libpulpvp.so: $(ENGINE_BUILD_DIR)/libpulpvp.so
 	@echo "CP $<"
 	$(V)install -D $^ $@
@@ -118,10 +139,14 @@ $(INSTALL_DIR)/python/libpulpvp-debug.so: $(ENGINE_BUILD_DIR)/libpulpvp-debug.so
 	@echo "CP DBG $<"
 	$(V)install -D $^ $@
 
+$(INSTALL_DIR)/python/libpulpvp-sv.so: $(ENGINE_BUILD_DIR)/libpulpvp-sv.so
+	@echo "CP SV $<"
+	$(V)install -D $^ $@
+
 
 headers: $(INSTALL_FILES)
 
-build: $(INSTALL_DIR)/lib/libpulpvp.so $(INSTALL_DIR)/lib/libpulpvp-debug.so $(INSTALL_DIR)/python/libpulpvp.so $(INSTALL_DIR)/python/libpulpvp-debug.so $(INSTALL_DIR)/bin/gvsoc_launcher $(INSTALL_DIR)/bin/gvsoc_launcher_debug
+build: $(INSTALL_DIR)/lib/libpulpvp.so $(INSTALL_DIR)/lib/libpulpvp-debug.so $(INSTALL_DIR)/lib/libpulpvp-sv.so $(INSTALL_DIR)/python/libpulpvp.so $(INSTALL_DIR)/python/libpulpvp-debug.so $(INSTALL_DIR)/python/libpulpvp-sv.so $(INSTALL_DIR)/bin/gvsoc_launcher $(INSTALL_DIR)/bin/gvsoc_launcher_debug
 
 clean: vp_clean
 	rm -rf $(ENGINE_BUILD_DIR)

gvsoc/gvsoc/engine/include/gv/dpi_chip_wrapper.hpp

@@ -35,6 +35,7 @@ class Dpi_chip_wrapper_callback
     bool is_sck;
     void *group;
     int cs_id;
+    int handle;
 };
 
 #endif

gvsoc/gvsoc/engine/include/gv/gvsoc.h

@@ -27,11 +27,15 @@ extern "C" {
 
 void *gv_open(const char *config_path, bool open_proxy, int *proxy_socket, int req_pipe, int reply_pipe);
 
+void *gv_create(const char *config_path);
+
+void gv_start(void *instance, bool open_proxy, int *proxy_socket, int req_pipe, int reply_pipe);
+
 int gv_run(void *_instance);
 
 void gv_stop(void *_instance);
 
-void *gv_chip_pad_bind(void *handle, char *name);
+void *gv_chip_pad_bind(void *handle, char *name, int ext_handle);
 
 #ifdef __cplusplus
 }

gvsoc/gvsoc/engine/include/vp/component.hpp

@@ -454,7 +454,7 @@ namespace vp {
 
     void final_bind();
 
-    virtual void *external_bind(std::string name);
+    virtual void *external_bind(std::string name, int handle);
 
     void reset_all(bool active, bool from_itf=false);
 

gvsoc/gvsoc/engine/python/gv/gvsoc.py

@@ -91,7 +91,6 @@ def gen_config(args, config):
 
     gvsoc_config.set("debug-mode", debug_mode)
 
-
     if debug_mode:
         debug_binaries = []