adds map generation and updates bsp

CMakeLists.txt

@@ -1,11 +1,172 @@
+cmake_minimum_required(VERSION 3.12)
+
+# Set default RISC-V toolchain if not specified
+if(NOT DEFINED RISCV_TOOLCHAIN_PATH)
+    set(RISCV_TOOLCHAIN_PATH "/opt/shared/cross-toolchains/gcc13/CentOS/riscv64-unknown-elf/bin" CACHE STRING "Path to RISC-V toolchain")
+endif()
+
+# Allow override of compiler executables
+if(NOT DEFINED RISCV_GCC)
+    set(RISCV_GCC "/opt/shared/cross-toolchains/gcc13/CentOS/riscv64-unknown-elf/bin/riscv64-unknown-elf-gcc" CACHE STRING "RISC-V GCC compiler")
+endif()
+
+if(NOT DEFINED RISCV_GXX)
+    set(RISCV_GXX "${RISCV_TOOLCHAIN_PATH}/riscv64-unknown-elf-g++" CACHE STRING "RISC-V G++ compiler")
+endif()
+
+if(NOT DEFINED RISCV_OBJCOPY)
+    set(RISCV_OBJCOPY "${RISCV_TOOLCHAIN_PATH}/riscv64-unknown-elf-objcopy" CACHE STRING "RISC-V objcopy")
+endif()
+
+if(NOT DEFINED RISCV_OBJDUMP)
+    set(RISCV_OBJDUMP "${RISCV_TOOLCHAIN_PATH}/riscv64-unknown-elf-objdump" CACHE STRING "RISC-V objdump")
+endif()
+
+# Set the compilers
+set(CMAKE_C_COMPILER ${RISCV_GCC})
+set(CMAKE_CXX_COMPILER ${RISCV_GXX})
+
+project(Firmware)
+
+# Define supported configurations
+set(SUPPORTED_BOARDS iss)
+set(SUPPORTED_ISAS "rv32i;rv32im;rv32imc;rv64i;rv64im;rv64imc;imc")
+set(SUPPORTED_ABIS "ilp32;ilp32f;lp64;lp64f")
+
+# Build target options
+option(BUILD_HELLO_WORLD "Build hello-world example" ON)
+option(BUILD_DHRYSTONE "Build dhrystone benchmark" OFF)
+option(BUILD_COREMARK "Build coremark benchmark" OFF)
+option(BUILD_ALL "Build all targets" OFF)
+
+# If BUILD_ALL is ON, enable all targets
+if(BUILD_ALL)
+    set(BUILD_HELLO_WORLD ON)
+    set(BUILD_DHRYSTONE ON)
+    set(BUILD_COREMARK ON)
+endif()
+
+# Set default values and validate configurations
 if(NOT DEFINED BOARD)
-	set(BOARD iss)
+    set(BOARD iss CACHE STRING "Target board")
 endif()
+
 if(NOT DEFINED ISA)
-	set(ISA imc)
+    set(ISA rv32imc CACHE STRING "Target ISA")
 endif()
-message(STATUS "Building firmware using ${BOARD} board configuration and isa ${ISA}")
+
+if(NOT DEFINED RISCV_ABI)
+    if(ISA MATCHES "^rv64")
+        set(RISCV_ABI "lp64" CACHE STRING "RISC-V ABI")
+    else()
+        set(RISCV_ABI "ilp32" CACHE STRING "RISC-V ABI")
+    endif()
+endif()
+
+# Validate configurations
+if(NOT BOARD IN_LIST SUPPORTED_BOARDS)
+    message(FATAL_ERROR "Invalid BOARD specified. Supported boards: ${SUPPORTED_BOARDS}")
+endif()
+
+if(NOT ISA IN_LIST SUPPORTED_ISAS)
+    message(FATAL_ERROR "Invalid ISA specified(${ISA}). Supported ISAs: ${SUPPORTED_ISAS}")
+endif()
+
+if(NOT RISCV_ABI IN_LIST SUPPORTED_ABIS)
+    message(FATAL_ERROR "Invalid ABI specified. Supported ABIs: ${SUPPORTED_ABIS}")
+endif()
+
+# Set RISC-V architecture based on ISA
+if(ISA MATCHES "^rv")
+    set(RISCV_ARCH ${ISA})
+else()
+    # Default to rv32 for backward compatibility
+    set(RISCV_ARCH "rv32${ISA}")
+endif()
+
+# Set BSP base directory
+set(BSP_BASE "${CMAKE_CURRENT_SOURCE_DIR}/bare-metal-bsp")
+
+# Global compile definitions
+add_compile_definitions(BOARD_${BOARD})
+
+# RISC-V specific compiler flags
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -g -march=${RISCV_ARCH}_zicsr_zifencei -mabi=${RISCV_ABI} -mcmodel=medany")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -g -march=${RISCV_ARCH}_zicsr_zifencei -mabi=${RISCV_ABI} -mcmodel=medany")
+#set(CMAKE_ASM_COMPILER riscv64-unknown-elf-as)
+set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -O2 -g -march=${RISCV_ARCH}_zicsr_zifencei -mabi=${RISCV_ABI} -mcmodel=medany")
+
+# Optional: Enable semihosting support
+option(SEMIHOSTING "Enable semihosting support" OFF)
+if(SEMIHOSTING)
+    add_compile_definitions(SEMIHOSTING)
+endif()
+
+#create interface library for propagating compile options
+#add_library(global_compile_options INTERFACE)
+
+# Compile options
+#target_compile_options(global_compile_options INTERFACE
+#    -march=${RISCV_ARCH}_zicsr_zifencei
+ #   -mabi=${RISCV_ABI}
+ #   -mcmodel=medany
+ #   -O2
+ #   -g
+  #  -ffunction-sections
+  #  -fdata-sections
+#)
+
+
+
+message(STATUS "Building firmware with configuration:")
+message(STATUS "  Board: ${BOARD}")
+message(STATUS "  ISA: ${ISA} (Architecture: ${RISCV_ARCH})")
+message(STATUS "  ABI: ${RISCV_ABI}")
+message(STATUS "  Semihosting: ${SEMIHOSTING}")
+message(STATUS "  Toolchain:")
+message(STATUS "    Path: ${RISCV_TOOLCHAIN_PATH}")
+message(STATUS "    C Compiler: ${CMAKE_C_COMPILER}")
+message(STATUS "    C++ Compiler: ${CMAKE_CXX_COMPILER}")
+message(STATUS "Targets to build:")
+message(STATUS "  hello-world: ${BUILD_HELLO_WORLD}")
+message(STATUS "  dhrystone: ${BUILD_DHRYSTONE}")
+message(STATUS "  coremark: ${BUILD_COREMARK}")
+
+
+add_subdirectory(bare-metal-bsp)
+
+# Add subdirectories based on build options
+if(BUILD_HELLO_WORLD)
+    add_subdirectory(hello-world)
+endif()
+
+
+if(BUILD_DHRYSTONE)
+    add_subdirectory(benchmarks/dhrystone)
+endif()
+
+if(BUILD_COREMARK)
+    add_subdirectory(benchmarks/coremark)
+endif()
+
+# Create an all-inclusive target only if BUILD_ALL is ON
+if(BUILD_ALL)
     add_custom_target(fw-common ALL
-	COMMAND make -C hello-world BOARD=${BOARD} ISA=${ISA} && make -C benchmarks/dhrystone BOARD=${BOARD} ISA=${ISA} && make -C benchmarks/coremark BOARD=${BOARD} ISA=${ISA}
+        DEPENDS 
-    USES_TERMINAL
+            hello-world
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+            dhrystone
+            coremark
+    )
+endif()
+
+# Print build instructions
+message(STATUS "")
+message(STATUS "Build instructions:")
+message(STATUS "  Build all targets:           cmake -DBUILD_ALL=ON ..")
+message(STATUS "  Build specific target:       cmake -DBUILD_HELLO_WORLD=ON -DBUILD_DHRYSTONE=OFF -DBUILD_COREMARK=OFF ..")
+message(STATUS "  Configure board:             cmake -DBOARD=iss ..")
+message(STATUS "  Configure ISA:               cmake -DISA=rv32imc ..")
+message(STATUS "  Configure ABI:               cmake -DRISCV_ABI=ilp32 ..")
+message(STATUS "  Enable semihosting:          cmake -DSEMIHOSTING=ON ..")
+message(STATUS "  Set toolchain path:          cmake -DRISCV_TOOLCHAIN_PATH=/path/to/toolchain ..")
+message(STATUS "  Set specific compiler:       cmake -DRISCV_GCC=/path/to/riscv-gcc -DRISCV_GXX=/path/to/riscv-g++ ..")

bare-metal-bsp

@@ -1 +1 @@
-Subproject commit 87dc0ec2304adcb94a25b397a357aadae1304867
+Subproject commit 7d55172d51290ab1e9d36d40c600da0d7a386b69

benchmarks/coremark/CMakeLists.txt

@@ -0,0 +1,40 @@
+cmake_minimum_required(VERSION 3.21)
+project(coremark C)
+set(TARGET coremark)
+#set(CMAKE_BUILD_TYPE Release)
+
+
+
+# Source files
+set(SOURCES
+    core_portme.c
+    cvt.c
+    ee_printf.c
+    cm/core_list_join.c
+    cm/core_main.c
+    cm/core_matrix.c
+    cm/core_state.c
+    cm/core_util.c
+)
+
+
+# Create executable
+add_executable(coremark ${SOURCES})
+target_include_directories(${TARGET} PRIVATE ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}/cm)
+target_compile_options(${TARGET} PRIVATE  -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -fno-common -funroll-loops -finline-functions -falign-functions=16 -falign-jumps=4 -falign-loops=4 -finline-limit=1000 -fno-if-conversion2 -fselective-scheduling -fno-crossjumping -freorder-blocks-and-partition -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -fno-common -funroll-loops -finline-functions -falign-functions=16 -falign-jumps=4 -falign-loops=4 -finline-limit=1000 -fno-if-conversion2 -fselective-scheduling -fno-crossjumping -freorder-blocks-and-partition )
+target_compile_definitions(${TARGET} PRIVATE PERFORMANCE_RUN=1 CLOCKS_PER_SEC=10000000 FLAGS_STR="" PERFORMANCE_RUN=1 CLOCKS_PER_SEC=10000000 ITERATIONS=600)
+
+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}")
+
+add_custom_command(TARGET ${TARGET} POST_BUILD
+        COMMAND ${CMAKE_OBJDUMP} -S  ${TARGET}.elf > ${TARGET}.dis
+        COMMENT "Creating disassembly for ${TARGET}")

benchmarks/coremark/CMakePresets.json

@@ -0,0 +1,27 @@
+{
+    "version": 3,
+    "vendor": {
+        "conan": {}
+    },
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 24,
+        "patch": 0
+    },
+    "configurePresets": [
+        {
+            "name": "dbg",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Debug",       
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        },
+        {
+            "name": "rel",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",    
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        }
+    ]
+}

benchmarks/coremark/core_portme.c

@@ -15,37 +15,36 @@ limitations under the License.
 
 Original Author: Shay Gal-on
 */
-#include "coremark.h"
 #include "core_portme.h"
+#include "coremark.h"
 // Read cycle CSR
-unsigned long long _read_cycle()
+unsigned long long _read_cycle() {
-{
   unsigned long long result;
   unsigned long lower;
   unsigned long upper1;
   unsigned long upper2;
 
-    asm volatile (
+  asm volatile("repeat_cycle_%=: csrr %0, cycleh;\n"
-        "repeat_cycle_%=: csrr %0, cycleh;\n"
                "        csrr %1, cycle;\n"
                "        csrr %2, cycleh;\n"
                "        bne %0, %2, repeat_cycle_%=;\n"
-        : "=r" (upper1),"=r" (lower),"=r" (upper2)    // Outputs   : temp variable for load result
+               : "=r"(upper1), "=r"(lower),
+                 "=r"(upper2) // Outputs   : temp variable for load result
                :
-        :
+               :);
-    );
   *(unsigned long *)(&result) = lower;
   *((unsigned long *)(&result) + 1) = upper1;
 
   return result;
 }
 
-volatile int tohost;
+extern volatile int tohost;
-volatile int fromhost;
+extern volatile int fromhost;
 
 void exit(int n) {
   tohost = 0x1;
-      for (;;);
+  for (;;)
+    ;
 }
 
 void __libc_init_array(void) {
@@ -89,10 +88,7 @@ volatile ee_s32 seed5_volatile = 0;
    time.h and windows.h definitions included.
 */
 CORETIMETYPE
-barebones_clock()
+barebones_clock() { return (CORETIMETYPE)_read_cycle(); }
-{
-    return (CORETIMETYPE)_read_cycle();
-}
 /* Define : TIMER_RES_DIVIDER
         Divider to trade off timer resolution and total time that can be
    measured.
@@ -118,11 +114,7 @@ static CORETIMETYPE start_time_val, stop_time_val;
    example code) or zeroing some system parameters - e.g. setting the cpu clocks
    cycles to 0.
 */
-void
+void start_time(void) { GETMYTIME(&start_time_val); }
-start_time(void)
-{
-    GETMYTIME(&start_time_val);
-}
 /* Function : stop_time
         This function will be called right after ending the timed portion of the
    benchmark.
@@ -131,11 +123,7 @@ start_time(void)
    example code) or other system parameters - e.g. reading the current value of
    cpu cycles counter.
 */
-void
+void stop_time(void) { GETMYTIME(&stop_time_val); }
-stop_time(void)
-{
-    GETMYTIME(&stop_time_val);
-}
 /* Function : get_time
         Return an abstract "ticks" number that signifies time on the system.
 
@@ -146,10 +134,8 @@ stop_time(void)
    controlled by <TIMER_RES_DIVIDER>
 */
 CORE_TICKS
-get_time(void)
+get_time(void) {
-{
+  CORE_TICKS elapsed = (CORE_TICKS)(MYTIMEDIFF(stop_time_val, start_time_val));
-    CORE_TICKS elapsed
-        = (CORE_TICKS)(MYTIMEDIFF(stop_time_val, start_time_val));
   return elapsed;
 }
 /* Function : time_in_secs
@@ -159,9 +145,7 @@ get_time(void)
    floating point. Default implementation implemented by the EE_TICKS_PER_SEC
    macro above.
 */
-secs_ret
+secs_ret time_in_secs(CORE_TICKS ticks) {
-time_in_secs(CORE_TICKS ticks)
-{
   secs_ret retval = ((secs_ret)ticks) / (secs_ret)EE_TICKS_PER_SEC;
   return retval;
 }
@@ -172,17 +156,12 @@ ee_u32 default_num_contexts = 1;
         Target specific initialization code
         Test for some common mistakes.
 */
-void
+void portable_init(core_portable *p, int *argc, char *argv[]) {
-portable_init(core_portable *p, int *argc, char *argv[])
+  if (sizeof(ee_ptr_int) != sizeof(ee_u8 *)) {
-{
+    ee_printf("ERROR! Please define ee_ptr_int to a type that holds a "
-    if (sizeof(ee_ptr_int) != sizeof(ee_u8 *))
-    {
-        ee_printf(
-            "ERROR! Please define ee_ptr_int to a type that holds a "
               "pointer!\n");
   }
-    if (sizeof(ee_u32) != 4)
+  if (sizeof(ee_u32) != 4) {
-    {
     ee_printf("ERROR! Please define ee_u32 to a 32b unsigned type!\n");
   }
   p->portable_id = 1;
@@ -191,8 +170,4 @@ portable_init(core_portable *p, int *argc, char *argv[])
 /* Function : portable_fini
         Target specific final code
 */
-void
+void portable_fini(core_portable *p) { p->portable_id = 0; }
-portable_fini(core_portable *p)
-{
-    p->portable_id = 0;
-}

benchmarks/coremark/ee_printf.c

@@ -16,6 +16,7 @@ limitations under the License.
 
 #include <coremark.h>
 #include <stdarg.h>
+#include <unistd.h>
 
 #define ZEROPAD (1 << 0)   /* Pad with zero */
 #define SIGN (1 << 1)      /* Unsigned/signed long */
@@ -31,27 +32,22 @@ static char *    digits       = "0123456789abcdefghijklmnopqrstuvwxyz";
 static char *upper_digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 static ee_size_t strnlen(const char *s, ee_size_t count);
 
-static ee_size_t
+static ee_size_t strnlen(const char *s, ee_size_t count) {
-strnlen(const char *s, ee_size_t count)
-{
   const char *sc;
   for (sc = s; *sc != '\0' && count--; ++sc)
     ;
   return sc - s;
 }
 
-static int
+static int skip_atoi(const char **s) {
-skip_atoi(const char **s)
-{
   int i = 0;
   while (is_digit(**s))
     i = i * 10 + *((*s)++) - '0';
   return i;
 }
 
-static char *
+static char *number(char *str, long num, int base, int size, int precision,
-number(char *str, long num, int base, int size, int precision, int type)
+                    int type) {
-{
   char c, sign, tmp[66];
   char *dig = digits;
   int i;
@@ -65,28 +61,21 @@ number(char *str, long num, int base, int size, int precision, int type)
 
   c = (type & ZEROPAD) ? '0' : ' ';
   sign = 0;
-    if (type & SIGN)
+  if (type & SIGN) {
-    {
+    if (num < 0) {
-        if (num < 0)
-        {
       sign = '-';
       num = -num;
       size--;
-        }
+    } else if (type & PLUS) {
-        else if (type & PLUS)
-        {
       sign = '+';
       size--;
-        }
+    } else if (type & SPACE) {
-        else if (type & SPACE)
-        {
       sign = ' ';
       size--;
     }
   }
 
-    if (type & HEX_PREP)
+  if (type & HEX_PREP) {
-    {
     if (base == 16)
       size -= 2;
     else if (base == 8)
@@ -97,10 +86,8 @@ number(char *str, long num, int base, int size, int precision, int type)
 
   if (num == 0)
     tmp[i++] = '0';
-    else
+  else {
-    {
+    while (num != 0) {
-        while (num != 0)
-        {
       tmp[i++] = dig[((unsigned long)num) % (unsigned)base];
       num = ((unsigned long)num) / (unsigned)base;
     }
@@ -115,12 +102,10 @@ number(char *str, long num, int base, int size, int precision, int type)
   if (sign)
     *str++ = sign;
 
-    if (type & HEX_PREP)
+  if (type & HEX_PREP) {
-    {
     if (base == 8)
       *str++ = '0';
-        else if (base == 16)
+    else if (base == 16) {
-        {
       *str++ = '0';
       *str++ = digits[33];
     }
@@ -139,9 +124,8 @@ number(char *str, long num, int base, int size, int precision, int type)
   return str;
 }
 
-static char *
+static char *eaddr(char *str, unsigned char *addr, int size, int precision,
-eaddr(char *str, unsigned char *addr, int size, int precision, int type)
+                   int type) {
-{
   char tmp[24];
   char *dig = digits;
   int i, len;
@@ -149,8 +133,7 @@ eaddr(char *str, unsigned char *addr, int size, int precision, int type)
   if (type & UPPERCASE)
     dig = upper_digits;
   len = 0;
-    for (i = 0; i < 6; i++)
+  for (i = 0; i < 6; i++) {
-    {
     if (i != 0)
       tmp[len++] = ':';
     tmp[len++] = dig[addr[i] >> 4];
@@ -168,32 +151,26 @@ eaddr(char *str, unsigned char *addr, int size, int precision, int type)
   return str;
 }
 
-static char *
+static char *iaddr(char *str, unsigned char *addr, int size, int precision,
-iaddr(char *str, unsigned char *addr, int size, int precision, int type)
+                   int type) {
-{
   char tmp[24];
   int i, n, len;
 
   len = 0;
-    for (i = 0; i < 4; i++)
+  for (i = 0; i < 4; i++) {
-    {
     if (i != 0)
       tmp[len++] = '.';
     n = addr[i];
 
     if (n == 0)
       tmp[len++] = digits[0];
-        else
+    else {
-        {
+      if (n >= 100) {
-            if (n >= 100)
-            {
         tmp[len++] = digits[n / 100];
         n = n % 100;
         tmp[len++] = digits[n / 10];
         n = n % 10;
-            }
+      } else if (n >= 10) {
-            else if (n >= 10)
-            {
         tmp[len++] = digits[n / 10];
         n = n % 10;
       }
@@ -219,47 +196,37 @@ char *      ecvtbuf(double arg, int ndigits, int *decpt, int *sign, char *buf);
 char *fcvtbuf(double arg, int ndigits, int *decpt, int *sign, char *buf);
 static void ee_bufcpy(char *d, char *s, int count);
 
-void
+void ee_bufcpy(char *pd, char *ps, int count) {
-ee_bufcpy(char *pd, char *ps, int count)
-{
   char *pe = ps + count;
   while (ps != pe)
     *pd++ = *ps++;
 }
 
-static void
+static void parse_float(double value, char *buffer, char fmt, int precision) {
-parse_float(double value, char *buffer, char fmt, int precision)
-{
   int decpt, sign, exp, pos;
   char *digits = NULL;
   char cvtbuf[80];
   int capexp = 0;
   int magnitude;
 
-    if (fmt == 'G' || fmt == 'E')
+  if (fmt == 'G' || fmt == 'E') {
-    {
     capexp = 1;
     fmt += 'a' - 'A';
   }
 
-    if (fmt == 'g')
+  if (fmt == 'g') {
-    {
     digits = ecvtbuf(value, precision, &decpt, &sign, cvtbuf);
     magnitude = decpt - 1;
-        if (magnitude < -4 || magnitude > precision - 1)
+    if (magnitude < -4 || magnitude > precision - 1) {
-        {
       fmt = 'e';
       precision -= 1;
-        }
+    } else {
-        else
-        {
       fmt = 'f';
       precision -= decpt;
     }
   }
 
-    if (fmt == 'e')
+  if (fmt == 'e') {
-    {
     digits = ecvtbuf(value, precision + 1, &decpt, &sign, cvtbuf);
 
     if (sign)
@@ -271,22 +238,18 @@ parse_float(double value, char *buffer, char fmt, int precision)
     buffer += precision;
     *buffer++ = capexp ? 'E' : 'e';
 
-        if (decpt == 0)
+    if (decpt == 0) {
-        {
       if (value == 0.0)
         exp = 0;
       else
         exp = -1;
-        }
+    } else
-        else
       exp = decpt - 1;
 
-        if (exp < 0)
+    if (exp < 0) {
-        {
       *buffer++ = '-';
       exp = -exp;
-        }
+    } else
-        else
       *buffer++ = '+';
 
     buffer[2] = (exp % 10) + '0';
@@ -295,39 +258,29 @@ parse_float(double value, char *buffer, char fmt, int precision)
     exp = exp / 10;
     buffer[0] = (exp % 10) + '0';
     buffer += 3;
-    }
+  } else if (fmt == 'f') {
-    else if (fmt == 'f')
-    {
     digits = fcvtbuf(value, precision, &decpt, &sign, cvtbuf);
     if (sign)
       *buffer++ = '-';
-        if (*digits)
+    if (*digits) {
-        {
+      if (decpt <= 0) {
-            if (decpt <= 0)
-            {
         *buffer++ = '0';
         *buffer++ = '.';
         for (pos = 0; pos < -decpt; pos++)
           *buffer++ = '0';
         while (*digits)
           *buffer++ = *digits++;
-            }
+      } else {
-            else
-            {
         pos = 0;
-                while (*digits)
+        while (*digits) {
-                {
           if (pos++ == decpt)
             *buffer++ = '.';
           *buffer++ = *digits++;
         }
       }
-        }
+    } else {
-        else
-        {
       *buffer++ = '0';
-            if (precision > 0)
+      if (precision > 0) {
-            {
         *buffer++ = '.';
         for (pos = 0; pos < precision; pos++)
           *buffer++ = '0';
@@ -338,11 +291,8 @@ parse_float(double value, char *buffer, char fmt, int precision)
   *buffer = '\0';
 }
 
-static void
+static void decimal_point(char *buffer) {
-decimal_point(char *buffer)
+  while (*buffer) {
-{
-    while (*buffer)
-    {
     if (*buffer == '.')
       return;
     if (*buffer == 'e' || *buffer == 'E')
@@ -350,33 +300,26 @@ decimal_point(char *buffer)
     buffer++;
   }
 
-    if (*buffer)
+  if (*buffer) {
-    {
     int n = strnlen(buffer, 256);
-        while (n > 0)
+    while (n > 0) {
-        {
       buffer[n + 1] = buffer[n];
       n--;
     }
 
     *buffer = '.';
-    }
+  } else {
-    else
-    {
     *buffer++ = '.';
     *buffer = '\0';
   }
 }
 
-static void
+static void cropzeros(char *buffer) {
-cropzeros(char *buffer)
-{
   char *stop;
 
   while (*buffer && *buffer != '.')
     buffer++;
-    if (*buffer++)
+  if (*buffer++) {
-    {
     while (*buffer && *buffer != 'e' && *buffer != 'E')
       buffer++;
     stop = buffer--;
@@ -389,9 +332,8 @@ cropzeros(char *buffer)
   }
 }
 
-static char *
+static char *flt(char *str, double num, int size, int precision, char fmt,
-flt(char *str, double num, int size, int precision, char fmt, int flags)
+                 int flags) {
-{
   char tmp[80];
   char c, sign;
   int n, i;
@@ -403,21 +345,15 @@ flt(char *str, double num, int size, int precision, char fmt, int flags)
   // Determine padding and sign char
   c = (flags & ZEROPAD) ? '0' : ' ';
   sign = 0;
-    if (flags & SIGN)
+  if (flags & SIGN) {
-    {
+    if (num < 0.0) {
-        if (num < 0.0)
-        {
       sign = '-';
       num = -num;
       size--;
-        }
+    } else if (flags & PLUS) {
-        else if (flags & PLUS)
-        {
       sign = '+';
       size--;
-        }
+    } else if (flags & SPACE) {
-        else if (flags & SPACE)
-        {
       sign = ' ';
       size--;
     }
@@ -457,9 +393,7 @@ flt(char *str, double num, int size, int precision, char fmt, int flags)
 
 #endif
 
-static int
+static int ee_vsprintf(char *buf, const char *fmt, va_list args) {
-ee_vsprintf(char *buf, const char *fmt, va_list args)
-{
   int len;
   unsigned long num;
   int i, base;
@@ -473,10 +407,8 @@ ee_vsprintf(char *buf, const char *fmt, va_list args)
                    // from string
   int qualifier;   // 'h', 'l', or 'L' for integer fields
 
-    for (str = buf; *fmt; fmt++)
+  for (str = buf; *fmt; fmt++) {
-    {
+    if (*fmt != '%') {
-        if (*fmt != '%')
-        {
       *str++ = *fmt;
       continue;
     }
@@ -485,8 +417,7 @@ ee_vsprintf(char *buf, const char *fmt, va_list args)
     flags = 0;
   repeat:
     fmt++; // This also skips first '%'
-        switch (*fmt)
+    switch (*fmt) {
-        {
     case '-':
       flags |= LEFT;
       goto repeat;
@@ -508,12 +439,10 @@ ee_vsprintf(char *buf, const char *fmt, va_list args)
     field_width = -1;
     if (is_digit(*fmt))
       field_width = skip_atoi(&fmt);
-        else if (*fmt == '*')
+    else if (*fmt == '*') {
-        {
       fmt++;
       field_width = va_arg(args, int);
-            if (field_width < 0)
+      if (field_width < 0) {
-            {
         field_width = -field_width;
         flags |= LEFT;
       }
@@ -521,13 +450,11 @@ ee_vsprintf(char *buf, const char *fmt, va_list args)
 
     // Get the precision
     precision = -1;
-        if (*fmt == '.')
+    if (*fmt == '.') {
-        {
       ++fmt;
       if (is_digit(*fmt))
         precision = skip_atoi(&fmt);
-            else if (*fmt == '*')
+      else if (*fmt == '*') {
-            {
         ++fmt;
         precision = va_arg(args, int);
       }
@@ -537,8 +464,7 @@ ee_vsprintf(char *buf, const char *fmt, va_list args)
 
     // Get the conversion qualifier
     qualifier = -1;
-        if (*fmt == 'l' || *fmt == 'L')
+    if (*fmt == 'l' || *fmt == 'L') {
-        {
       qualifier = *fmt;
       fmt++;
     }
@@ -546,8 +472,7 @@ ee_vsprintf(char *buf, const char *fmt, va_list args)
     // Default base
     base = 10;
 
-        switch (*fmt)
+    switch (*fmt) {
-        {
     case 'c':
       if (!(flags & LEFT))
         while (--field_width > 0)
@@ -572,17 +497,12 @@ ee_vsprintf(char *buf, const char *fmt, va_list args)
       continue;
 
     case 'p':
-                if (field_width == -1)
+      if (field_width == -1) {
-                {
         field_width = 2 * sizeof(void *);
         flags |= ZEROPAD;
       }
-                str = number(str,
+      str = number(str, (unsigned long)va_arg(args, void *), 16, field_width,
-                             (unsigned long)va_arg(args, void *),
+                   precision, flags);
-                             16,
-                             field_width,
-                             precision,
-                             flags);
       continue;
 
     case 'A':
@@ -590,16 +510,10 @@ ee_vsprintf(char *buf, const char *fmt, va_list args)
 
     case 'a':
       if (qualifier == 'l')
-                    str = eaddr(str,
+        str = eaddr(str, va_arg(args, unsigned char *), field_width, precision,
-                                va_arg(args, unsigned char *),
-                                field_width,
-                                precision,
                     flags);
       else
-                    str = iaddr(str,
+        str = iaddr(str, va_arg(args, unsigned char *), field_width, precision,
-                                va_arg(args, unsigned char *),
-                                field_width,
-                                precision,
                     flags);
       continue;
 
@@ -625,11 +539,7 @@ ee_vsprintf(char *buf, const char *fmt, va_list args)
 #if HAS_FLOAT
 
     case 'f':
-                str = flt(str,
+      str = flt(str, va_arg(args, double), field_width, precision, *fmt,
-                          va_arg(args, double),
-                          field_width,
-                          precision,
-                          *fmt,
                 flags | SIGN);
       continue;
 
@@ -661,31 +571,35 @@ ee_vsprintf(char *buf, const char *fmt, va_list args)
 
 #include <platform.h>
 
-void
+void uart_send_char(char c) {
-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) ;
+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) ;
+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) ;
+while (UART0_REG(UART_REG_TXFIFO) & 0x80000000)
+;
 UART0_REG(UART_REG_TXFIFO) = c;
 if (c == '\n') {
-                while (UART0_REG(UART_REG_TXFIFO) & 0x80000000) ;
+while (UART0_REG(UART_REG_TXFIFO) & 0x80000000)
+  ;
 UART0_REG(UART_REG_TXFIFO) = '\r';
 }
 #endif
+
+*/
 }
 
-int
+int ee_printf(const char *fmt, ...) {
-ee_printf(const char *fmt, ...)
-{
   char buf[1024], *p;
   va_list args;
   int n = 0;
@@ -694,8 +608,7 @@ ee_printf(const char *fmt, ...)
   ee_vsprintf(buf, fmt, args);
   va_end(args);
   p = buf;
-    while (*p)
+  while (*p) {
-    {
     uart_send_char(*p);
     n++;
     p++;

benchmarks/dhrystone/.gitignore

@@ -1,2 +1,3 @@
 dhrystone
 /dhrystone.dis
+build/

benchmarks/dhrystone/CMakeLists.txt

@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 3.21)
+project(dhrystone C)
+set(TARGET dhrystone)
+
+set(ITERATIONS 50000) # 20000 for TGC
+
+add_executable(${TARGET} dhry_1.c dhry_2.c dhry_stubs.c)
+target_include_directories(${TARGET} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
+target_compile_options(${TARGET} PRIVATE -fno-inline -fno-builtin-printf -fno-common -Wno-implicit -funroll-loops -fpeel-loops -fgcse-sm -fgcse-las)
+target_compile_definitions(${TARGET} PRIVATE ITERATIONS=${ITERATIONS} HZ=32768 TIME NO_INIT)
+
+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 -Wl,-Map=${TARGET}.map)  
+include(CMakePrintHelpers)
+cmake_print_properties(TARGETS ${TARGET} PROPERTIES COMPILE_DEFINITIONS COMPILE_OPTIONS LINK_OPTIONS INTERFACE_LINK_OPTIONS)
+
+add_custom_command(TARGET ${TARGET} POST_BUILD
+        COMMAND ${CMAKE_OBJDUMP} -S  ${TARGET}.elf > ${TARGET}.dis
+        COMMENT "Creating disassembly for ${TARGET}")

benchmarks/dhrystone/CMakePresets.json

@@ -0,0 +1,27 @@
+{
+    "version": 3,
+    "vendor": {
+        "conan": {}
+    },
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 24,
+        "patch": 0
+    },
+    "configurePresets": [
+        {
+            "name": "dbg",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Debug",       
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        },
+        {
+            "name": "rel",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",    
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        }
+    ]
+}

benchmarks/dhrystone/Makefile

@@ -17,6 +17,7 @@ endif
 # '-lgcc -lm' are needed to add softfloat routines
 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))
 

hello-world/.gitignore

@@ -1,2 +1,3 @@
 /hello
 /hello.dis
+build/

hello-world/CMakeLists.txt

@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.21)
+project(hello-world C)
+set(TARGET hello)
+add_executable(${TARGET} hello.c)
+
+set(BOARD "iss" CACHE STRING "Target board")
+add_subdirectory(../bare-metal-bsp bsp)
+target_link_libraries(${TARGET} PRIVATE bsp)
+
+add_custom_command(TARGET ${TARGET} POST_BUILD
+        COMMAND ${CMAKE_OBJDUMP} -S  ${TARGET}.elf > ${TARGET}.dis
+        COMMENT "Creating disassembly for ${TARGET}")

hello-world/CMakePresets.json

@@ -0,0 +1,27 @@
+{
+    "version": 3,
+    "vendor": {
+        "conan": {}
+    },
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 24,
+        "patch": 0
+    },
+    "configurePresets": [
+        {
+            "name": "dbg",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Debug",       
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        },
+        {
+            "name": "rel",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",    
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        }
+    ]
+}

hello-world/hello.c

@@ -1,9 +1,11 @@
 #include <stdint.h>
 #include <stdio.h>
+#include <sys/types.h>
 #include <unistd.h>
 
-#include "platform.h"
 #include "encoding.h"
+#include "platform.h"
+#include <string.h>
 
 int factorial(int i) {
 
@@ -12,13 +14,20 @@ int factorial(int i){
     result = result * ii;
   }
   return result;
-
 }
-
+extern volatile uint32_t tohost;
-int main()
+extern volatile uint32_t fromhost;
-{
+int main() {
   volatile int result = factorial(10);
-	printf("Factorial is %d\n", result);
+  volatile char string[] = "hello world with write in hello";
-	printf("End of execution");
+
+  volatile uint64_t payload[4] = {64, 0, (uintptr_t)string,
+                                  (strlen(string) + 1)};
+  tohost = (uint32_t)payload;
+
+  write(STDOUT_FILENO, string, sizeof(string));
+
+  printf("Factorial is %d", result);
+  // printf("End of execution");
   return 0;
 }