Merge branch 'main' of https://github.com/FrancescoPoluzzi/x-heep

esl-epfl · Dec 18, 2024 · 77a8e10 · 77a8e10
2 parents b4cbbe4 + 0ea9faf
commit 77a8e10
Show file tree

Hide file tree

Showing 91 changed files with 10,024 additions and 2,531 deletions.
diff --git a/.github/workflows/sim-apps-job/test_apps.py b/.github/workflows/sim-apps-job/test_apps.py
@@ -24,7 +24,7 @@ class BColors:
 
 # Define parameters for the test_apps.py script
 SIMULATOR = "verilator"
-SIM_TIMEOUT_S = 120
+SIM_TIMEOUT_S = 600
 LINKER = "on_chip"
 COMPILER = "gcc"
 

diff --git a/.github/workflows/simulate.yml b/.github/workflows/simulate.yml
@@ -18,5 +18,6 @@ jobs:
           make clean-all
           sed 's/is_included: "no",/is_included: "yes",/' -i mcu_cfg.hjson
           sed 's/num_channels:   0x1,/num_channels:   0x4,/' -i mcu_cfg.hjson
+          sed 's/num_channels_per_master_port: 0x1,/num_channels_per_master_port: 0x4,/' -i mcu_cfg.hjson
           make mcu-gen MEMORY_BANKS=6
           python3 .github/workflows/sim-apps-job/test_apps.py
diff --git a/Makefile b/Makefile
@@ -150,13 +150,13 @@ verible:
 ## @param COMPILER_PREFIX=riscv32-unknown-(default)
 ## @param ARCH=rv32imc(default), <any RISC-V ISA string supported by the CPU>
 app: clean-app
-	$(MAKE) -C sw PROJECT=$(PROJECT) TARGET=$(TARGET) LINKER=$(LINKER) LINK_FOLDER=$(LINK_FOLDER) COMPILER=$(COMPILER) COMPILER_PREFIX=$(COMPILER_PREFIX) ARCH=$(ARCH) SOURCE=$(SOURCE) \
+	@$(MAKE) -C sw PROJECT=$(PROJECT) TARGET=$(TARGET) LINKER=$(LINKER) LINK_FOLDER=$(LINK_FOLDER) COMPILER=$(COMPILER) COMPILER_PREFIX=$(COMPILER_PREFIX) ARCH=$(ARCH) SOURCE=$(SOURCE) \
 	|| { \
-	echo "\033[0;31mHmmm... seems like the compilation failed...\033[0m"; \
-	echo "\033[0;31mIf you do not understand why, it is likely that you either:\033[0m"; \
-	echo "\033[0;31m  a) offended the Leprechaun of Electronics\033[0m"; \
-	echo "\033[0;31m  b) forgot to run make mcu-gen\033[0m"; \
-	echo "\033[0;31mI would start by checking b) if I were you!\033[0m"; \
+	@echo "\033[0;31mHmmm... seems like the compilation failed...\033[0m"; \
+	@echo "\033[0;31mIf you do not understand why, it is likely that you either:\033[0m"; \
+	@echo "\033[0;31m  a) offended the Leprechaun of Electronics\033[0m"; \
+	@echo "\033[0;31m  b) forgot to run make mcu-gen\033[0m"; \
+	@echo "\033[0;31mI would start by checking b) if I were you!\033[0m"; \
 	exit 1; \
 	}
 

diff --git a/configs/ci.hjson b/configs/ci.hjson
@@ -13,11 +13,11 @@
             name: code
             start: 0
             #minimum size for freeRTOS and clang
-            size: 0x00000D800
+            size: 0x00000E800
         },
         {
             name: data
-            start: 0x00000D800
+            start: 0x00000E800
         }
     ]
 }
diff --git a/configs/example_interleaved.hjson b/configs/example_interleaved.hjson
@@ -30,11 +30,11 @@
             name: code
             start: 0
             // minimum size for freeRTOS and clang
-            size: 0x00000D800
+            size: 0x00000E800
         },
         {
             name: data
-            start: 0x00000D800
+            start: 0x00000E800
         }
     ]
 }
diff --git a/configs/general.hjson b/configs/general.hjson
@@ -14,11 +14,11 @@
             name: code
             start: 0
             #minimum size for freeRTOS and clang
-            size: 0x00000D800
+            size: 0x00000E800
         },
         {
             name: data
-            start: 0x00000D800
+            start: 0x00000E800
         }
     ]
 }
diff --git a/configs/testall.hjson b/configs/testall.hjson
@@ -13,11 +13,11 @@
             name: code
             start: 0
             #minimum size for freeRTOS and clang
-            size: 0x00000D800
+            size: 0x00000E800
         },
         {
             name: data
-            start: 0x00000D800
+            start: 0x00000E800
         }
     ]
 }
diff --git a/docs/source/How_to/CompileMakefile.md b/docs/source/How_to/CompileMakefile.md
@@ -72,12 +72,12 @@ compiled and linked are under `sw\build`
 
 ## FreeROTS based applications
 
-'X-HEEP' supports 'FreeRTOS' based applications. Please see `sw\applications\blinky_freertos`.
+'X-HEEP' supports 'FreeRTOS' based applications. Please see `sw\applications\example_freertos_blinky`.
 
 After that, you can run the command to compile and link the FreeRTOS based application. Please also set 'LINKER' and 'TARGET' parameters if needed.
 
 ```
-make app PROJECT=blinky_freertos
+make app PROJECT=example_freertos_blinky
 ```
 
 The main FreeRTOS configuration is allocated under `sw\freertos`, in `FreeRTOSConfig.h`. Please, change this file based on your application requirements.