appendage

.gitignore

@@ -151,4 +151,3 @@ compile_commands.json
 CTestTestfile.cmake
 *.dump
 
-build

CMakeLists.txt

@@ -4,11 +4,16 @@ endif()
 if (NOT DEFINED ISA)
 	set(ISA imc)
 endif()
-if(DEFINED LINK_TARGET)
+message(STATUS "Building firmware using ${BOARD} board configuration")
-    set(LNK LINK_TARGET=${LINK_TARGET})
+add_custom_target(fw-hello-world ALL 
-endif()
+	COMMAND make -C ${riscvfw_SOURCE_DIR}/hello-world BOARD=${BOARD} ISA=${ISA}
-message(STATUS "Building firmware using ${BOARD} board configuration and isa ${ISA}")
+	USES_TERMINAL
-add_custom_target(fw-common ALL 
+	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-	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}
+add_custom_target(fw-dhrystone ALL 
+	COMMAND make -C ${riscvfw_SOURCE_DIR}/benchmarks/dhrystone BOARD=${BOARD} ISA=${ISA}
+    USES_TERMINAL
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+add_custom_target(fw-coremark ALL 
+	COMMAND make -C ${riscvfw_SOURCE_DIR}/benchmarks/coremark BOARD=${BOARD} ISA=${ISA}
     USES_TERMINAL
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

benchmarks/coremark/CMakeLists.txt

@@ -1,31 +0,0 @@
-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-builtin-strnlen -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 LINKER:-Map=${TARGET}.map)  
-
-add_custom_command(TARGET ${TARGET} POST_BUILD
-        COMMAND ${CMAKE_OBJDUMP} -S  ${TARGET}.elf > ${TARGET}.dis
-        COMMENT "Creating disassembly for ${TARGET}")

benchmarks/coremark/CMakePresets.json

@@ -1,118 +0,0 @@
-{
-    "version": 3,
-    "vendor": {
-        "conan": {}
-    },
-    "cmakeMinimumRequired": {
-        "major": 3,
-        "minor": 24,
-        "patch": 0
-    },
-    "configurePresets": [
-        {
-            "name": "32imc",
-            "hidden": true,
-            "cacheVariables": {    
-                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
-            }  
-        },
-        {
-            "name": "64imc",
-            "hidden": true,
-            "cacheVariables": {    
-                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
-            }  
-        },
-        {
-            "name": "iss",
-            "hidden": true,
-            "cacheVariables": {    
-                "BOARD": "iss"
-            }  
-        },
-        {
-            "name": "moonlight",
-            "hidden": true,
-            "cacheVariables": {    
-                "BOARD": "moonlight"
-            }  
-        },
-        {
-            "name": "tgc_vp",
-            "hidden": true,
-            "cacheVariables": {    
-                "BOARD": "tgc_vp"
-            }  
-        },
-        {
-            "name": "rtl",
-            "hidden": true,
-            "cacheVariables": {    
-                "BOARD": "rtl"
-            }  
-        },
-        {
-            "name": "debug",
-            "hidden": true,
-            "cacheVariables": {    
-                "CMAKE_BUILD_TYPE": "Debug"
-            }  
-        },
-        {
-            "name": "release",
-            "hidden": true,
-            "cacheVariables": {    
-                "CMAKE_BUILD_TYPE": "Release"
-            }  
-        },
-        {
-            "name": "ISS_Debug",
-            "inherits": ["iss", "debug", "32imc"]
-        },
-        {
-            "name": "Moonlight_Debug",
-            "inherits": ["moonlight", "debug", "32imc"]
-        },
-        {
-            "name": "TGC_VP_Debug",
-            "inherits": ["tgc_vp", "debug", "32imc"]
-        },
-        {
-            "name": "ISS_Debug_64",
-            "inherits": ["iss", "debug", "64imc"]
-        },
-        {
-            "name": "Moonlight_Debug_64",
-            "inherits": ["moonlight", "debug", "64imc"]
-        },
-        {
-            "name": "TGC_VP_Debug_64",
-            "inherits": ["tgc_vp", "debug", "64imc"]
-        },
-        {
-            "name": "ISS_Release",
-            "inherits": ["iss", "release", "32imc"]
-        },
-        {
-            "name": "Moonlight_Release",
-            "inherits": ["moonlight", "release", "32imc"]
-        },
-        {
-            "name": "TGC_VP_Release",
-            "inherits": ["tgc_vp", "release", "32imc"]
-        },
-        {
-            "name": "ISS_Release_64",
-            "inherits": ["iss", "release", "64imc"]
-        },
-        {
-            "name": "Moonlight_Release_64",
-            "inherits": ["moonlight", "release", "64imc"]
-        },
-        {
-            "name": "TGC_VP_Release_64",
-            "inherits": ["tgc_vp", "release", "64imc"]
-        }
-                 
-    ]
-}

benchmarks/coremark/core_portme.c

@@ -15,40 +15,37 @@ limitations under the License.
 
 Original Author: Shay Gal-on
 */
-#include "core_portme.h"
 #include "coremark.h"
-#include <unistd.h>
+#include "core_portme.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("repeat_cycle_%=: csrr %0, cycleh;\n"
+    asm volatile (
+        "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" (upper1),"=r" (lower),"=r" (upper2)    // Outputs   : temp variable for load result
-                 "=r"(upper2) // Outputs   : temp variable for load result
         :
-               :);
+        :
+    );
     *(unsigned long *)(&result) = lower;
     *((unsigned long *)(&result)+1) = upper1;
 
     return result;
 }
 
-// extern volatile int tohost;
+volatile int tohost;
-// extern volatile int fromhost;
+volatile int fromhost;
-
-void write_hex(int fd, uint32_t hex);
 
 void exit(int n){
-  write_hex(STDERR_FILENO, 1);
+      tohost = 0x1;
-  // tohost = 0x1;
+      for (;;);
-  for (;;)
-    ;
 }
 
 void __libc_init_array (void) {
@@ -92,7 +89,10 @@ volatile ee_s32 seed5_volatile = 0;
    time.h and windows.h definitions included.
 */
 CORETIMETYPE
-barebones_clock() { return (CORETIMETYPE)_read_cycle(); }
+barebones_clock()
+{
+    return (CORETIMETYPE)_read_cycle();
+}
 /* Define : TIMER_RES_DIVIDER
         Divider to trade off timer resolution and total time that can be
    measured.
@@ -118,7 +118,11 @@ 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 start_time(void) { GETMYTIME(&start_time_val); }
+void
+start_time(void)
+{
+    GETMYTIME(&start_time_val);
+}
 /* Function : stop_time
         This function will be called right after ending the timed portion of the
    benchmark.
@@ -127,7 +131,11 @@ void start_time(void) { GETMYTIME(&start_time_val); }
    example code) or other system parameters - e.g. reading the current value of
    cpu cycles counter.
 */
-void stop_time(void) { GETMYTIME(&stop_time_val); }
+void
+stop_time(void)
+{
+    GETMYTIME(&stop_time_val);
+}
 /* Function : get_time
         Return an abstract "ticks" number that signifies time on the system.
 
@@ -138,8 +146,10 @@ void stop_time(void) { GETMYTIME(&stop_time_val); }
    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
@@ -149,7 +159,9 @@ get_time(void) {
    floating point. Default implementation implemented by the EE_TICKS_PER_SEC
    macro above.
 */
-secs_ret time_in_secs(CORE_TICKS ticks) {
+secs_ret
+time_in_secs(CORE_TICKS ticks)
+{
     secs_ret retval = ((secs_ret)ticks) / (secs_ret)EE_TICKS_PER_SEC;
     return retval;
 }
@@ -160,12 +172,17 @@ ee_u32 default_num_contexts = 1;
         Target specific initialization code
         Test for some common mistakes.
 */
-void portable_init(core_portable *p, int *argc, char *argv[]) {
+void
-  if (sizeof(ee_ptr_int) != sizeof(ee_u8 *)) {
+portable_init(core_portable *p, int *argc, char *argv[])
-    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;
@@ -174,4 +191,8 @@ void portable_init(core_portable *p, int *argc, char *argv[]) {
 /* Function : portable_fini
         Target specific final code
 */
-void portable_fini(core_portable *p) { p->portable_id = 0; }
+void
+portable_fini(core_portable *p)
+{
+    p->portable_id = 0;
+}

benchmarks/coremark/ee_printf.c

@@ -16,7 +16,6 @@ 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 */
@@ -32,22 +31,27 @@ 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 strnlen(const char *s, ee_size_t count) {
+static ee_size_t
+strnlen(const char *s, ee_size_t count)
+{
     const char *sc;
     for (sc = s; *sc != '\0' && count--; ++sc)
         ;
     return sc - s;
 }
 
-static int skip_atoi(const char **s) {
+static int
+skip_atoi(const char **s)
+{
     int i = 0;
     while (is_digit(**s))
         i = i * 10 + *((*s)++) - '0';
     return i;
 }
 
-static char *number(char *str, long num, int base, int size, int precision,
+static char *
-                    int type) {
+number(char *str, long num, int base, int size, int precision, int type)
+{
     char  c, sign, tmp[66];
     char *dig = digits;
     int   i;
@@ -61,21 +65,28 @@ static char *number(char *str, long num, int base, int size, int precision,
 
     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)
@@ -86,8 +97,10 @@ static char *number(char *str, long num, int base, int size, int precision,
 
     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;
         }
@@ -102,10 +115,12 @@ static char *number(char *str, long num, int base, int size, int precision,
     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];
         }
@@ -124,8 +139,9 @@ static char *number(char *str, long num, int base, int size, int precision,
     return str;
 }
 
-static char *eaddr(char *str, unsigned char *addr, int size, int precision,
+static char *
-                   int type) {
+eaddr(char *str, unsigned char *addr, int size, int precision, int type)
+{
     char  tmp[24];
     char *dig = digits;
     int   i, len;
@@ -133,7 +149,8 @@ static char *eaddr(char *str, unsigned char *addr, int size, int precision,
     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];
@@ -151,26 +168,32 @@ static char *eaddr(char *str, unsigned char *addr, int size, int precision,
     return str;
 }
 
-static char *iaddr(char *str, unsigned char *addr, int size, int precision,
+static char *
-                   int type) {
+iaddr(char *str, unsigned char *addr, int size, int precision, 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;
             }
@@ -196,37 +219,47 @@ 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 ee_bufcpy(char *pd, char *ps, int count) {
+void
+ee_bufcpy(char *pd, char *ps, int count)
+{
     char *pe = ps + count;
     while (ps != pe)
         *pd++ = *ps++;
 }
 
-static void parse_float(double value, char *buffer, char fmt, int precision) {
+static void
+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)
@@ -238,18 +271,22 @@ static void 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';
@@ -258,29 +295,39 @@ static void 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';
@@ -291,8 +338,11 @@ static void parse_float(double value, char *buffer, char fmt, int precision) {
     *buffer = '\0';
 }
 
-static void decimal_point(char *buffer) {
+static void
-  while (*buffer) {
+decimal_point(char *buffer)
+{
+    while (*buffer)
+    {
         if (*buffer == '.')
             return;
         if (*buffer == 'e' || *buffer == 'E')
@@ -300,26 +350,33 @@ static void 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 cropzeros(char *buffer) {
+static void
+cropzeros(char *buffer)
+{
     char *stop;
 
     while (*buffer && *buffer != '.')
         buffer++;
-  if (*buffer++) {
+    if (*buffer++)
+    {
         while (*buffer && *buffer != 'e' && *buffer != 'E')
             buffer++;
         stop = buffer--;
@@ -332,8 +389,9 @@ static void cropzeros(char *buffer) {
     }
 }
 
-static char *flt(char *str, double num, int size, int precision, char fmt,
+static char *
-                 int flags) {
+flt(char *str, double num, int size, int precision, char fmt, int flags)
+{
     char tmp[80];
     char c, sign;
     int  n, i;
@@ -345,15 +403,21 @@ static char *flt(char *str, double num, int size, int precision, char fmt,
     // 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--;
         }
@@ -393,7 +457,9 @@ static char *flt(char *str, double num, int size, int precision, char fmt,
 
 #endif
 
-static int ee_vsprintf(char *buf, const char *fmt, va_list args) {
+static int
+ee_vsprintf(char *buf, const char *fmt, va_list args)
+{
     int           len;
     unsigned long num;
     int           i, base;
@@ -407,8 +473,10 @@ static int 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;
         }
@@ -417,7 +485,8 @@ static int 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;
@@ -439,10 +508,12 @@ static int 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;
             }
@@ -450,11 +521,13 @@ static int 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);
             }
@@ -464,7 +537,8 @@ static int 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++;
         }
@@ -472,7 +546,8 @@ static int 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)
@@ -497,12 +572,17 @@ static int 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, (unsigned long)va_arg(args, void *), 16, field_width,
+                str = number(str,
-                   precision, flags);
+                             (unsigned long)va_arg(args, void *),
+                             16,
+                             field_width,
+                             precision,
+                             flags);
                 continue;
 
             case 'A':
@@ -510,10 +590,16 @@ static int ee_vsprintf(char *buf, const char *fmt, va_list args) {
 
             case 'a':
                 if (qualifier == 'l')
-        str = eaddr(str, va_arg(args, unsigned char *), field_width, precision,
+                    str = eaddr(str,
+                                va_arg(args, unsigned char *),
+                                field_width,
+                                precision,
                                 flags);
                 else
-        str = iaddr(str, va_arg(args, unsigned char *), field_width, precision,
+                    str = iaddr(str,
+                                va_arg(args, unsigned char *),
+                                field_width,
+                                precision,
                                 flags);
                 continue;
 
@@ -539,7 +625,11 @@ static int ee_vsprintf(char *buf, const char *fmt, va_list args) {
 #if HAS_FLOAT
 
             case 'f':
-      str = flt(str, va_arg(args, double), field_width, precision, *fmt,
+                str = flt(str,
+                          va_arg(args, double),
+                          field_width,
+                          precision,
+                          *fmt,
                           flags | SIGN);
                 continue;
 
@@ -571,9 +661,31 @@ 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); }
+void
+uart_send_char(char c)
+{
+#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
+}
 
-int ee_printf(const char *fmt, ...) {
+int
+ee_printf(const char *fmt, ...)
+{
     char    buf[1024], *p;
     va_list args;
     int     n = 0;
@@ -582,7 +694,8 @@ int 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,3 +1,2 @@
 dhrystone
 /dhrystone.dis
-build/

benchmarks/dhrystone/CMakeLists.txt

@@ -1,19 +0,0 @@
-cmake_minimum_required(VERSION 3.21)
-project(dhrystone C)
-set(TARGET dhrystone)
-
-set(ITERATIONS 50000)
-
-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:-Map=${TARGET}.map)  
-
-add_custom_command(TARGET ${TARGET} POST_BUILD
-        COMMAND ${CMAKE_OBJDUMP} -S  ${TARGET}.elf > ${TARGET}.dis
-        COMMENT "Creating disassembly for ${TARGET}")

benchmarks/dhrystone/CMakePresets.json

@@ -1,118 +0,0 @@
-{
-    "version": 3,
-    "vendor": {
-        "conan": {}
-    },
-    "cmakeMinimumRequired": {
-        "major": 3,
-        "minor": 24,
-        "patch": 0
-    },
-    "configurePresets": [
-        {
-            "name": "32imc",
-            "hidden": true,
-            "cacheVariables": {    
-                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
-            }  
-        },
-        {
-            "name": "64imc",
-            "hidden": true,
-            "cacheVariables": {    
-                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
-            }  
-        },
-        {
-            "name": "iss",
-            "hidden": true,
-            "cacheVariables": {    
-                "BOARD": "iss"
-            }  
-        },
-        {
-            "name": "moonlight",
-            "hidden": true,
-            "cacheVariables": {    
-                "BOARD": "moonlight"
-            }  
-        },
-        {
-            "name": "tgc_vp",
-            "hidden": true,
-            "cacheVariables": {    
-                "BOARD": "tgc_vp"
-            }  
-        },
-        {
-            "name": "rtl",
-            "hidden": true,
-            "cacheVariables": {    
-                "BOARD": "rtl"
-            }  
-        },
-        {
-            "name": "debug",
-            "hidden": true,
-            "cacheVariables": {    
-                "CMAKE_BUILD_TYPE": "Debug"
-            }  
-        },
-        {
-            "name": "release",
-            "hidden": true,
-            "cacheVariables": {    
-                "CMAKE_BUILD_TYPE": "Release"
-            }  
-        },
-        {
-            "name": "ISS_Debug",
-            "inherits": ["iss", "debug", "32imc"]
-        },
-        {
-            "name": "Moonlight_Debug",
-            "inherits": ["moonlight", "debug", "32imc"]
-        },
-        {
-            "name": "TGC_VP_Debug",
-            "inherits": ["tgc_vp", "debug", "32imc"]
-        },
-        {
-            "name": "ISS_Debug_64",
-            "inherits": ["iss", "debug", "64imc"]
-        },
-        {
-            "name": "Moonlight_Debug_64",
-            "inherits": ["moonlight", "debug", "64imc"]
-        },
-        {
-            "name": "TGC_VP_Debug_64",
-            "inherits": ["tgc_vp", "debug", "64imc"]
-        },
-        {
-            "name": "ISS_Release",
-            "inherits": ["iss", "release", "32imc"]
-        },
-        {
-            "name": "Moonlight_Release",
-            "inherits": ["moonlight", "release", "32imc"]
-        },
-        {
-            "name": "TGC_VP_Release",
-            "inherits": ["tgc_vp", "release", "32imc"]
-        },
-        {
-            "name": "ISS_Release_64",
-            "inherits": ["iss", "release", "64imc"]
-        },
-        {
-            "name": "Moonlight_Release_64",
-            "inherits": ["moonlight", "release", "64imc"]
-        },
-        {
-            "name": "TGC_VP_Release_64",
-            "inherits": ["tgc_vp", "release", "64imc"]
-        }
-                 
-    ]
-}

benchmarks/dhrystone/Makefile

@@ -9,15 +9,16 @@ HEADERS := dhry.h
 BOARD?=iss
 LINK_TARGET=link
 RISCV_ARCH:=rv32$(ISA)
-ifneq (,$(findstring e,$(ISA)))
+ifeq ($(ISA),e)
     RISCV_ABI:=ilp32e
 else
     RISCV_ABI:=ilp32
 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 \
+CFLAGS  := -g -march=$(RISCV_ARCH)_zicsr_zifencei -mabi=$(RISCV_ABI) -mcmodel=medlow -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
+LDFLAGS := -g -march=$(RISCV_ARCH)_zicsr_zifencei -mabi=$(RISCV_ABI) -mcmodel=medlow -Wl,--wrap=scanf -Wl,--wrap=printf -Wl,--wrap=exit -lgcc -lm
+
 TOOL_DIR=$(dir $(compiler))
 
 BSP_BASE = ../../bare-metal-bsp

benchmarks/dhrystone/dhry_1.c

@@ -212,7 +212,7 @@ main ()
   printf ("Arr_2_Glob[8][7]:    %d\n", Arr_2_Glob[8][7]);
   printf ("        should be:   Number_Of_Runs + 10\n");
   printf ("Ptr_Glob->\n");
-  printf ("  Ptr_Comp:          %d\n", (long) Ptr_Glob->Ptr_Comp);
+  printf ("  Ptr_Comp:          %d\n", (int) Ptr_Glob->Ptr_Comp);
   printf ("        should be:   (implementation-dependent)\n");
   printf ("  Discr:             %d\n", Ptr_Glob->Discr);
   printf ("        should be:   %d\n", 0);
@@ -223,7 +223,7 @@ main ()
   printf ("  Str_Comp:          %s\n", Ptr_Glob->variant.var_1.Str_Comp);
   printf ("        should be:   DHRYSTONE PROGRAM, SOME STRING\n");
   printf ("Next_Ptr_Glob->\n");
-  printf ("  Ptr_Comp:          %d\n", (long) Next_Ptr_Glob->Ptr_Comp);
+  printf ("  Ptr_Comp:          %d\n", (int) Next_Ptr_Glob->Ptr_Comp);
   printf ("        should be:   (implementation-dependent), same as above\n");
   printf ("  Discr:             %d\n", Next_Ptr_Glob->Discr);
   printf ("        should be:   %d\n", 0);

benchmarks/dhrystone/dhry_stubs.c

@@ -1,5 +1,4 @@
 #include "platform.h"
-#include <unistd.h>
 #ifndef ITERATIONS
 #define ITERATIONS 20000
 #endif
@@ -7,16 +6,20 @@
 /* The functions in this file are only meant to support Dhrystone on an
  * embedded RV32 system and are obviously incorrect in general. */
 
-long time(void) { return get_timer_value(); }
+long time(void)
+{
+  return get_timer_value();
+}
 
 // set the number of dhrystone iterations
-void __wrap_scanf(const char *fmt, int *n) { *n = ITERATIONS; }
+void __wrap_scanf(const char* fmt, int* n)
+{
+  *n = ITERATIONS;
+}
 
-// extern volatile uint64_t tohost;
+extern volatile uint32_t tohost;
 
 void exit(int n){
-  // tohost = 0x1;
+      tohost = 0x1;
-  write_hex(STDERR_FILENO, 1);
+      for (;;);
-  for (;;)
-    ;
 }

benchmarks/dhrystone_run_multiple.py

@@ -0,0 +1,108 @@
+import argparse
+import os
+import shutil
+import subprocess
+import time
+from pathlib import Path
+
+
+def run_command(command, cwd=None):
+    """Run a shell command in the specified directory and return its output."""
+    result = subprocess.run(
+        command,
+        shell=True,
+        cwd=cwd,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        check=False,
+    )
+    return result.stdout.decode("utf-8"), result.stderr.decode("utf-8")
+
+
+def build_test_cases(makefile_dir, iterations):
+    """Run the Makefile with the specified iterations."""
+    make_command = f"make clean && make ITERATIONS={iterations}"
+    stdout, stderr = run_command(make_command, cwd=makefile_dir)
+    if stderr:
+        raise RuntimeError(f"Error during make: {stderr}")
+
+
+def main(simulator_path, makefile_dir):
+    # Directory for generated test cases
+    generated_dir = makefile_dir.parent / "workspace"
+    os.makedirs(generated_dir, exist_ok=True)
+
+    # Define the iterations
+    iterations_list = [10, 20, 30]
+    # 15 value up to 6.000.000 evenly apart on a log scale
+    iterations_list = [
+        1,
+        2,
+        4,
+        8,
+        17,
+        34,
+        69,
+        141,
+        287,
+        582,
+        1182,
+        2401,
+        4878,
+        9910,
+        20133,
+        40914,
+        83103,
+        168830,
+        343042,
+        696712,
+        1414641,
+        2874878,
+        5837995,
+    ]
+
+    for iteration in iterations_list:
+        try:
+            # Update the Makefile with the current ITERATIONS value
+            build_test_cases(makefile_dir, iteration)
+        except RuntimeError as e:
+            print(f"Error during compilation with ITERATIONS={iteration}: {e}")
+            continue
+
+        # Run the simulator with the generated test case
+        exe = makefile_dir / "dhrystone.elf"
+        if not exe.is_file():
+            exit(f"{exe} does not exist")
+        verbose_exe = generated_dir / "bin" / f"dhrystone_{iteration}.elf"
+        os.makedirs(verbose_exe.parent, exist_ok=True)
+        shutil.copy(exe, verbose_exe)
+        backends = ["interp", "llvm", "tcc", "asmjit"]
+        for backend in backends:
+            log_file = os.path.join(generated_dir, f"{backend}_{iteration}.log")
+
+            sim_command = f"{simulator_path} -f {exe} --backend {backend}"
+            start_time = time.time()
+            sim_stdout, sim_stderr = run_command(sim_command)
+            end_time = time.time()
+            elapsed_time = end_time - start_time
+
+            # Save the output to the logfile
+            with open(log_file, "w", encoding="utf8") as f:
+                f.write(sim_stdout)
+                if sim_stderr:
+                    f.write(f"\nErrors:\n{sim_stderr}")
+
+            print(
+                f"Ran {backend} in {elapsed_time:.2f} s, Output saved to {backend}_{iteration}.log"
+            )
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="Run simulations with generated test cases."
+    )
+    parser.add_argument("simulator_path", help="Path to the simulator executable.")
+
+    args = parser.parse_args()
+    dhrystone_path = Path(__file__).parent / "dhrystone"
+    main(args.simulator_path, dhrystone_path)

benchmarks/visualize_runtimes.py

@@ -0,0 +1,86 @@
+import argparse
+import os
+import re
+from pathlib import Path
+
+import plotly.express as px
+import yaml
+
+
+def parse_logs(log_dir):
+    results = []
+    for filename in os.listdir(log_dir):
+        if filename.endswith(".log"):
+            filepath = os.path.join(log_dir, filename)
+            with open(filepath, "r", encoding="utf8") as file:
+                for line in file:
+                    if (
+                        "Executed" in line
+                        and "instructions" in line
+                        and "during" in line
+                        and "resulting in" in line
+                    ):
+                        parts = line.split()
+                        instructions = int(parts[3])
+                        time_idx = parts.index("during") + 1
+                        time = int(parts[time_idx].rstrip("ms"))
+                        mips_idx = parts.index("resulting") + 2
+                        mips = float(parts[mips_idx].rstrip("MIPS"))
+                        backend, iterations, _ = re.split(r"[_.]", filename)
+
+                        results.append(
+                            {
+                                "backend": backend,
+                                "run_count": int(iterations),
+                                "instructions": instructions,
+                                "time": time,
+                                "mips": mips,
+                            }
+                        )
+    return results
+
+
+def write_yaml(results, output_file):
+    with open(output_file, "w", encoding="utf8") as file:
+        yaml.dump(results, file)
+
+
+def visualize_mips_over_instructions(yaml_file):
+    # Read data from YAML file
+    with open(yaml_file, "r", encoding="utf8") as file:
+        data = yaml.safe_load(file)
+
+    # Extract instructions and MIPS values
+    run_count = [entry["run_count"] for entry in data]
+    mips = [entry["mips"] for entry in data]
+    backends = [entry["backend"] for entry in data]
+    # Create scatter plot using Plotly Express
+    fig = px.line(
+        x=run_count,
+        y=mips,
+        color=backends,
+        labels={"x": "Dhrystone Iterations", "y": "MIPS", "color": "Backend"},
+        title="MIPS over Amount of Dhrystone Iterations",
+        log_x=True,
+    )
+    fig.show()
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="""
+        Parse log files and extract relevant information. Create a 'results.yaml' file and visualize it.
+        Intended to be run after 'dhrystone_run_multiple.py'"""
+    )
+    parser.add_argument("log_dir", help="Path to the directory containing log files.")
+    args = parser.parse_args()
+
+    result_file = Path(__file__).parent / "results.yaml"
+    if not result_file.is_file():
+        results = parse_logs(args.log_dir)
+        write_yaml(results, result_file)
+    visualize_mips_over_instructions(result_file)
+
+
+if __name__ == "__main__":
+    main()

hello-world/.gitignore

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

hello-world/CMakeLists.txt

@@ -1,13 +0,0 @@
-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(${CMAKE_CURRENT_SOURCE_DIR}/../bare-metal-bsp bsp)
-target_link_libraries(${TARGET} PRIVATE bsp)
-target_link_options(${TARGET} PRIVATE LINKER:-Map=${TARGET}.map)  
-
-add_custom_command(TARGET ${TARGET} POST_BUILD
-        COMMAND ${CMAKE_OBJDUMP} -S  ${TARGET}.elf > ${TARGET}.dis
-        COMMENT "Creating disassembly for ${TARGET}")

hello-world/CMakePresets.json

@@ -1,118 +0,0 @@
-{
-    "version": 3,
-    "vendor": {
-        "conan": {}
-    },
-    "cmakeMinimumRequired": {
-        "major": 3,
-        "minor": 24,
-        "patch": 0
-    },
-    "configurePresets": [
-        {
-            "name": "32imc",
-            "hidden": true,
-            "cacheVariables": {    
-                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
-            }  
-        },
-        {
-            "name": "64imc",
-            "hidden": true,
-            "cacheVariables": {    
-                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
-            }  
-        },
-        {
-            "name": "iss",
-            "hidden": true,
-            "cacheVariables": {    
-                "BOARD": "iss"
-            }  
-        },
-        {
-            "name": "moonlight",
-            "hidden": true,
-            "cacheVariables": {    
-                "BOARD": "moonlight"
-            }  
-        },
-        {
-            "name": "tgc_vp",
-            "hidden": true,
-            "cacheVariables": {    
-                "BOARD": "tgc_vp"
-            }  
-        },
-        {
-            "name": "rtl",
-            "hidden": true,
-            "cacheVariables": {    
-                "BOARD": "rtl"
-            }  
-        },
-        {
-            "name": "debug",
-            "hidden": true,
-            "cacheVariables": {    
-                "CMAKE_BUILD_TYPE": "Debug"
-            }  
-        },
-        {
-            "name": "release",
-            "hidden": true,
-            "cacheVariables": {    
-                "CMAKE_BUILD_TYPE": "Release"
-            }  
-        },
-        {
-            "name": "ISS_Debug",
-            "inherits": ["iss", "debug", "32imc"]
-        },
-        {
-            "name": "Moonlight_Debug",
-            "inherits": ["moonlight", "debug", "32imc"]
-        },
-        {
-            "name": "TGC_VP_Debug",
-            "inherits": ["tgc_vp", "debug", "32imc"]
-        },
-        {
-            "name": "ISS_Debug_64",
-            "inherits": ["iss", "debug", "64imc"]
-        },
-        {
-            "name": "Moonlight_Debug_64",
-            "inherits": ["moonlight", "debug", "64imc"]
-        },
-        {
-            "name": "TGC_VP_Debug_64",
-            "inherits": ["tgc_vp", "debug", "64imc"]
-        },
-        {
-            "name": "ISS_Release",
-            "inherits": ["iss", "release", "32imc"]
-        },
-        {
-            "name": "Moonlight_Release",
-            "inherits": ["moonlight", "release", "32imc"]
-        },
-        {
-            "name": "TGC_VP_Release",
-            "inherits": ["tgc_vp", "release", "32imc"]
-        },
-        {
-            "name": "ISS_Release_64",
-            "inherits": ["iss", "release", "64imc"]
-        },
-        {
-            "name": "Moonlight_Release_64",
-            "inherits": ["moonlight", "release", "64imc"]
-        },
-        {
-            "name": "TGC_VP_Release_64",
-            "inherits": ["tgc_vp", "release", "64imc"]
-        }
-                 
-    ]
-}

hello-world/Makefile

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

hello-world/hello.c

@@ -1,21 +1,24 @@
 #include <stdint.h>
 #include <stdio.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "platform.h"
-#include <string.h>
+#include "encoding.h"
 
 int factorial(int i){
+
 	volatile int result = 1;
 	for (int ii = 1; ii <= i; ii++) {
 		result = result * ii;
 	}
 	return result;
+
 }
 
-int main() {
+int main()
-  int result = factorial(10);
+{
-  printf("Factorial is %d", result);
+	volatile int result = factorial (10);
+	printf("Factorial is %d\n", result);
+	printf("End of execution");
 	return 0;
 }