routine maintenance for SystemC/Catapult flow (#271)

Author: gabriele-tombesi

.gitmodules

@@ -50,6 +50,7 @@
 [submodule "accelerators/catapult_hls/common/matchlib_toolkit"]
 	path = accelerators/catapult_hls/common/matchlib_toolkit
 	url = https://github.com/hlslibs/matchlib_toolkit.git
+	branch = main
 [submodule "soft/common/drivers/common/utils/eigen"]
 	path = soft/common/drivers/common/utils/eigen
 	url = https://gitlab.com/libeigen/eigen.git

accelerators/catapult_hls/common/systemc.mk

@@ -27,7 +27,7 @@ INCDIR += -I../../../common/matchlib_toolkit/examples/systemc-2.3.3/include
 INCDIR += -I../../../common/matchlib_toolkit/examples/systemc-2.3.3/src
 INCDIR += -I../../../common/matchlib_toolkit/examples/matchlib_connections/include
 INCDIR += -I../../../common/matchlib_toolkit/examples/matchlib/cmod/include
-INCDIR += -I../../../common/matchlib_toolkit/examples/preprocessor/include
+INCDIR += -I../../../common/matchlib_toolkit/examples/boost_home/include
 INCDIR += -I../../../common/matchlib_toolkit/examples/rapidjson/include
 INCDIR += -I../../../common/matchlib_toolkit/examples/ac_types/include
 INCDIR += -I../../../common/matchlib_toolkit/examples/ac_math/include

accelerators/catapult_hls/mac_sysc_catapult/hw/hls/build_prj.tcl

@@ -43,8 +43,8 @@ solution file add "../../../common/inc/esp_dma_info_sysc.hpp"
 solution file add "../inc/mac_conf_info.hpp"
 solution file add "../inc/mac.hpp"
 solution file add "../src/mac.cpp"
-solution file add "../inc/mac_specs.hpp"
 solution file add "../inc/mem_wrap.hpp"
+solution file add "../inc/mac_specs.hpp"
 
 solution file set ../inc/mac_specs.hpp -args -DDMA_WIDTH=$DMA_WIDTH
 

tools/accgen/templates/catapult_hls/scratchpad/hls/build_prj.tcl

@@ -51,8 +51,8 @@ solution file add "../../../common/inc/esp_dma_info_sysc.hpp"
 solution file add "../inc/accelerator_name_conf_info.hpp"
 solution file add "../inc/accelerator_name.hpp"
 solution file add "../src/accelerator_name.cpp"
-solution file add "../inc/accelerator_name_specs.hpp"
 solution file add "../inc/mem_wrap.hpp"
+solution file add "../inc/accelerator_name_specs.hpp"
 
 solution file set ../inc/accelerator_name_specs.hpp -args -DDMA_WIDTH=$DMA_WIDTH
 

utils/scripts/submodule_init.sh

@@ -107,7 +107,7 @@ if [ ${INSTALL_STRATUS_INC} == 1 ]; then
 fi
 
 if [ ${INSTALL_MATCHLIB} == 1 ]; then
-    git submodule update --init --recursive accelerators/catapult_hls/common/matchlib_toolkit
+    git submodule update --init --recursive --remote accelerators/catapult_hls/common/matchlib_toolkit
 fi
 
 if [ ${INSTALL_CHISEL} == 1 ]; then