updates bsp

CMakeLists.txt

@@ -0,0 +1,14 @@
+if (NOT DEFINED BOARD)
+	set(BOARD iss)
+endif()
+if (NOT DEFINED ISA)
+	set(ISA imc)
+endif()
+if(DEFINED LINK_TARGET)
+    set(LNK LINK_TARGET=${LINK_TARGET})
+endif()
+message(STATUS "Building firmware using ${BOARD} board configuration and isa ${ISA}")
+add_custom_target(fw-common ALL 
+	COMMAND make -C hello-world BOARD=${BOARD} ISA=${ISA} ${LNK} && make -C benchmarks/dhrystone BOARD=${BOARD} ISA=${ISA} ${LNK} && make -C benchmarks/coremark BOARD=${BOARD} ISA=${ISA} ${LNK}
+    USES_TERMINAL
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

benchmarks/coremark/CMakeLists.txt

@@ -1,15 +1,7 @@
 cmake_minimum_required(VERSION 3.21)
 project(coremark C)
 set(TARGET coremark)
-#set(CMAKE_BUILD_TYPE Release)
-
-option(HAVE_NO_INIT_FINI "Enable NO_INIT_FINI" OFF)
-
-if(HAVE_NO_INIT_FINI)
-  #if HAVE_NO_INIT_FINI is ON
-  add_definitions(-DHAVE_NO_INIT_FINI)
-endif()
-
+set(CMAKE_BUILD_TYPE Release)
 
 # Source files
 set(SOURCES
@@ -23,7 +15,6 @@ set(SOURCES
     cm/core_util.c
 )
 
-
 # Create executable
 add_executable(coremark ${SOURCES})
 target_include_directories(${TARGET} PRIVATE ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}/cm)
@@ -33,13 +24,7 @@ target_compile_definitions(${TARGET} PRIVATE PERFORMANCE_RUN=1 CLOCKS_PER_SEC=10
 set(BOARD "iss" CACHE STRING "Target board")
 add_subdirectory(../../bare-metal-bsp bsp)
 target_link_libraries(${TARGET} PRIVATE bsp)
-target_link_options(${TARGET} PRIVATE -Wl,-Map=${TARGET}.map)  
-
-include(CMakePrintHelpers)
-cmake_print_properties(TARGETS ${TARGET} PROPERTIES COMPILE_DEFINITIONS COMPILE_OPTIONS LINK_OPTIONS INTERFACE_LINK_OPTIONS)
-
-#message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}")
-#message(STATUS "CMAKE_C_FLAGS = ${CMAKE_C_FLAGS}")
+target_link_options(${TARGET} PRIVATE LINKER:-Map=${TARGET}.map)  
 
 add_custom_command(TARGET ${TARGET} POST_BUILD
         COMMAND ${CMAKE_OBJDUMP} -S  ${TARGET}.elf > ${TARGET}.dis

benchmarks/coremark/CMakePresets.json

@@ -10,61 +10,100 @@
     },
     "configurePresets": [
         {
-            "name": "debug",
+            "name": "ISS_Debug",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",
+                "BOARD": "iss",  
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
             }
         },
         {
-            "name": "debug_moon",
+            "name": "Moonlight_Debug",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",  
                 "BOARD": "moonlight",
-                "HAVE_NO_INIT_FINI": "ON",   
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
             }
         },
         {
-            "name": "debug_tgc",
+            "name": "TGC_Debug",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",  
                 "BOARD": "tgc_vp",   
-                "HAVE_NO_INIT_FINI": "ON",
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
             }
         },
         {
-            "name": "debug_64",
+            "name": "ISS_Debug_64",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",
+                "BOARD": "iss",
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
             }
         },
         {
-            "name": "debug_64_moon",
+            "name": "Moonlight_Debug_64",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",  
                 "BOARD": "moonlight",
-                "HAVE_NO_INIT_FINI": "ON",   
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
             }
         },
         {
-            "name": "debug_64_tgc",
+            "name": "TGC_Debug_64",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",  
                 "BOARD": "tgc_vp",   
-                "HAVE_NO_INIT_FINI": "ON",
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
             }
         },
         {
-            "name": "release",
+            "name": "ISS_Release",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Release",
+                "BOARD": "iss",  
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
             }
+        },
+        {
+            "name": "Moonlight_Release",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Release",  
+                "BOARD": "moonlight",
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        },
+        {
+            "name": "TGC_Release",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Release",  
+                "BOARD": "tgc_vp",   
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        },
+        {
+            "name": "ISS_Release_64",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Release",
+                "BOARD": "iss",
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
+            }
+        },
+        {
+            "name": "Moonlight_Release_64",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Release",  
+                "BOARD": "moonlight",
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
+            }
+        },
+        {
+            "name": "TGC_Release_64",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Release",  
+                "BOARD": "tgc_vp",   
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
+            }
         }
     ]
 }

benchmarks/coremark/ee_printf.c

@@ -571,33 +571,7 @@ static int ee_vsprintf(char *buf, const char *fmt, va_list args) {
 
 #include <platform.h>
 
-void uart_send_char(char c) {
-  write(STDOUT_FILENO, &c, 1); // write or puts ??
-  /*
-#if defined(BOARD_ehrenberg)
-while (get_uart_rx_tx_reg_tx_free(uart) == 0)
-;
-uart_write(uart, c);
-if (c == '\n') {
-while (get_uart_rx_tx_reg_tx_free(uart) == 0)
-  ;
-uart_write(uart, '\r');
-}
-#elif defined(BOARD_iss)
-*((uint32_t *)0xFFFF0000) = c;
-#else
-while (UART0_REG(UART_REG_TXFIFO) & 0x80000000)
-;
-UART0_REG(UART_REG_TXFIFO) = c;
-if (c == '\n') {
-while (UART0_REG(UART_REG_TXFIFO) & 0x80000000)
-  ;
-UART0_REG(UART_REG_TXFIFO) = '\r';
-}
-#endif
-
-*/
-}
+void uart_send_char(char c) { write(STDOUT_FILENO, &c, 1); }
 
 int ee_printf(const char *fmt, ...) {
   char buf[1024], *p;

benchmarks/dhrystone/CMakeLists.txt

@@ -2,14 +2,7 @@ cmake_minimum_required(VERSION 3.21)
 project(dhrystone C)
 set(TARGET dhrystone)
 
-option(HAVE_NO_INIT_FINI "Enable NO_INIT_FINI" OFF)
-
-if(HAVE_NO_INIT_FINI)
-  #if HAVE_NO_INIT_FINI is ON
-  add_definitions(-DHAVE_NO_INIT_FINI)
-endif()
-
-set(ITERATIONS 50000) # 20000 for TGC
+set(ITERATIONS 50000)
 
 add_executable(${TARGET} dhry_1.c dhry_2.c dhry_stubs.c)
 target_include_directories(${TARGET} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
@@ -19,12 +12,7 @@ target_compile_definitions(${TARGET} PRIVATE ITERATIONS=${ITERATIONS} HZ=32768 T
 set(BOARD "iss" CACHE STRING "Target board")
 add_subdirectory(../../bare-metal-bsp bsp)
 target_link_libraries(${TARGET} PRIVATE bsp)
-target_link_options(${TARGET} PRIVATE LINKER:--wrap=scanf)
-#target_link_options(${TARGET} PRIVATE LINKER:--wrap=scanf -Wl,--no-gc-sections)
-
-target_link_options(${TARGET} PRIVATE -Wl,-Map=${TARGET}.map)  
-include(CMakePrintHelpers)
-cmake_print_properties(TARGETS ${TARGET} PROPERTIES COMPILE_DEFINITIONS COMPILE_OPTIONS LINK_OPTIONS INTERFACE_LINK_OPTIONS)
+target_link_options(${TARGET} PRIVATE LINKER:-Map=${TARGET}.map)  
 
 add_custom_command(TARGET ${TARGET} POST_BUILD
         COMMAND ${CMAKE_OBJDUMP} -S  ${TARGET}.elf > ${TARGET}.dis

benchmarks/dhrystone/CMakePresets.json

@@ -10,61 +10,100 @@
     },
     "configurePresets": [
         {
-            "name": "debug",
+            "name": "ISS_Debug",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",
+                "BOARD": "iss",  
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
             }
         },
         {
-            "name": "debug_moon",
+            "name": "Moonlight_Debug",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",  
                 "BOARD": "moonlight",
-                "HAVE_NO_INIT_FINI": "ON",   
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
             }
         },
         {
-            "name": "debug_tgc",
+            "name": "TGC_Debug",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",  
                 "BOARD": "tgc_vp",   
-                "HAVE_NO_INIT_FINI": "ON",
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
             }
         },
         {
-            "name": "debug_64",
+            "name": "ISS_Debug_64",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",
+                "BOARD": "iss",
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
             }
         },
         {
-            "name": "debug_64_moon",
+            "name": "Moonlight_Debug_64",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",  
                 "BOARD": "moonlight",
-                "HAVE_NO_INIT_FINI": "ON",   
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
             }
         },
         {
-            "name": "debug_64_tgc",
+            "name": "TGC_Debug_64",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",  
                 "BOARD": "tgc_vp",   
-                "HAVE_NO_INIT_FINI": "ON",
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
             }
         },
         {
-            "name": "release",
+            "name": "ISS_Release",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Release",
+                "BOARD": "iss",  
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
             }
+        },
+        {
+            "name": "Moonlight_Release",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Release",  
+                "BOARD": "moonlight",
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        },
+        {
+            "name": "TGC_Release",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Release",  
+                "BOARD": "tgc_vp",   
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        },
+        {
+            "name": "ISS_Release_64",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Release",
+                "BOARD": "iss",
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
+            }
+        },
+        {
+            "name": "Moonlight_Release_64",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Release",  
+                "BOARD": "moonlight",
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
+            }
+        },
+        {
+            "name": "TGC_Release_64",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Release",  
+                "BOARD": "tgc_vp",   
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
+            }
         }
     ]
 }

benchmarks/dhrystone/Makefile

@@ -9,7 +9,7 @@ HEADERS := dhry.h
 BOARD?=iss
 LINK_TARGET=link
 RISCV_ARCH:=rv32$(ISA)
-ifeq ($(ISA),e)
+ifneq (,$(findstring e,$(ISA)))
     RISCV_ABI:=ilp32e
 else
     RISCV_ABI:=ilp32
@@ -18,7 +18,6 @@ endif
 CFLAGS  := -g -O3 -DITERATIONS=$(ITERATIONS) -DHZ=32768 -DTIME -DNO_INIT -fno-inline -fno-builtin-printf -fno-common -Wno-implicit \
  -funroll-loops -fpeel-loops -fgcse-sm -fgcse-las
 LDFLAGS := -Wl,--wrap=scanf
-
 TOOL_DIR=$(dir $(compiler))
 
 BSP_BASE = ../../bare-metal-bsp

hello-world/CMakeLists.txt

@@ -1,22 +1,12 @@
 cmake_minimum_required(VERSION 3.21)
 project(hello-world C)
 set(TARGET hello)
-option(HAVE_NO_INIT_FINI "Enable NO_INIT_FINI" OFF)
-
-if(HAVE_NO_INIT_FINI)
-  #if HAVE_NO_INIT_FINI is ON
-  add_definitions(-DHAVE_NO_INIT_FINI)
-endif()
-
 add_executable(${TARGET} hello.c)
 
-
-
 set(BOARD "iss" CACHE STRING "Target board")
-message(" BOARD = ${BOARD}")
-add_subdirectory(../bare-metal-bsp bsp)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../bare-metal-bsp bsp)
 target_link_libraries(${TARGET} PRIVATE bsp)
-target_link_options(${TARGET} PRIVATE -Wl,-Map=${TARGET}.map)  
+target_link_options(${TARGET} PRIVATE LINKER:-Map=${TARGET}.map)  
 
 add_custom_command(TARGET ${TARGET} POST_BUILD
         COMMAND ${CMAKE_OBJDUMP} -S  ${TARGET}.elf > ${TARGET}.dis

hello-world/CMakePresets.json

@@ -10,61 +10,100 @@
     },
     "configurePresets": [
         {
-            "name": "debug",
+            "name": "ISS_Debug",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",
+                "BOARD": "iss",  
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
             }
         },
         {
-            "name": "debug_moon",
+            "name": "Moonlight_Debug",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",  
                 "BOARD": "moonlight",
-                "HAVE_NO_INIT_FINI": "ON",   
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
             }
         },
         {
-            "name": "debug_tgc",
+            "name": "TGC_Debug",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",  
                 "BOARD": "tgc_vp",   
-                "HAVE_NO_INIT_FINI": "ON",
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
             }
         },
         {
-            "name": "debug_64",
+            "name": "ISS_Debug_64",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",
+                "BOARD": "iss",
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
             }
         },
         {
-            "name": "debug_64_moon",
+            "name": "Moonlight_Debug_64",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",  
                 "BOARD": "moonlight",
-                "HAVE_NO_INIT_FINI": "ON",   
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
             }
         },
         {
-            "name": "debug_64_tgc",
+            "name": "TGC_Debug_64",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Debug",  
                 "BOARD": "tgc_vp",   
-                "HAVE_NO_INIT_FINI": "ON",
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
             }
         },
         {
-            "name": "release",
+            "name": "ISS_Release",
             "cacheVariables": {    
                 "CMAKE_BUILD_TYPE": "Release",
+                "BOARD": "iss",  
                 "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
             }
+        },
+        {
+            "name": "Moonlight_Release",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Release",  
+                "BOARD": "moonlight",
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        },
+        {
+            "name": "TGC_Release",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Release",  
+                "BOARD": "tgc_vp",   
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        },
+        {
+            "name": "ISS_Release_64",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Release",
+                "BOARD": "iss",
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
+            }
+        },
+        {
+            "name": "Moonlight_Release_64",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Release",  
+                "BOARD": "moonlight",
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
+            }
+        },
+        {
+            "name": "TGC_Release_64",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Release",  
+                "BOARD": "tgc_vp",   
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
+            }
         }
     ]
 }

hello-world/Makefile

@@ -1,4 +1,3 @@
-
 TARGET  = hello
 ISA?=imc
 

hello-world/hello.c

@@ -3,35 +3,19 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "encoding.h"
 #include "platform.h"
 #include <string.h>
 
 int factorial(int i) {
-
   volatile int result = 1;
   for (int ii = 1; ii <= i; ii++) {
     result = result * ii;
   }
   return result;
 }
-extern volatile uintptr_t tohost;
-
-void write_tohost(char *string) {
-  volatile uint64_t payload[4] = {64, 0, (uintptr_t)string,
-                                  (strlen(string) + 1)};
-  tohost = (uintptr_t)payload;
-}
 
 int main() {
-  char string[] = "hello world with write in hello";
-
-  write_tohost(string);
-
-  write(STDOUT_FILENO, string, sizeof(string));
-
   int result = factorial(10);
   printf("Factorial is %d", result);
-
   return 0;
 }