changes Presets to a Composition based approach for hello-world

.gitignore

@@ -151,6 +151,4 @@ compile_commands.json
 CTestTestfile.cmake
 *.dump
 
-.vscode/c_cpp_properties.json
+build
-semihosting_test/build/semihosting_test
-semihosting_test/build/Makefile

CMakeLists.txt

@@ -4,8 +4,11 @@ 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} && make -C benchmarks/dhrystone BOARD=${BOARD} ISA=${ISA} && make -C benchmarks/coremark BOARD=${BOARD} ISA=${ISA}
+	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})

bare-metal-bsp

@@ -1 +1 @@
-Subproject commit 87dc0ec2304adcb94a25b397a357aadae1304867
+Subproject commit a33b51a7086b6f03a34c9f1d489aa0370bee9ccd

benchmarks/coremark/CMakeLists.txt

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,109 @@
+{
+    "version": 3,
+    "vendor": {
+        "conan": {}
+    },
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 24,
+        "patch": 0
+    },
+    "configurePresets": [
+        {
+            "name": "ISS_Debug",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Debug",
+                "BOARD": "iss",  
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        },
+        {
+            "name": "Moonlight_Debug",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Debug",  
+                "BOARD": "moonlight",
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        },
+        {
+            "name": "TGC_Debug",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Debug",  
+                "BOARD": "tgc_vp",   
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        },
+        {
+            "name": "ISS_Debug_64",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Debug",
+                "BOARD": "iss",
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
+            }
+        },
+        {
+            "name": "Moonlight_Debug_64",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Debug",  
+                "BOARD": "moonlight",
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
+            }
+        },
+        {
+            "name": "TGC_Debug_64",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Debug",  
+                "BOARD": "tgc_vp",   
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
+            }
+        },
+        {
+            "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/core_portme.c

@@ -15,55 +15,58 @@ limitations under the License.
 
 Original Author: Shay Gal-on
 */
-#include "coremark.h"
 #include "core_portme.h"
-//Read cycle CSR
+#include "coremark.h"
-unsigned long long _read_cycle()
+#include <unistd.h>
-{
+// Read cycle CSR
-    unsigned long long result;
+unsigned long long _read_cycle() {
-    unsigned long lower;
+  unsigned long long result;
-    unsigned long upper1;
+  unsigned long lower;
-    unsigned long upper2;
+  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 %1, cycle;\n"
+               "        csrr %2, cycleh;\n"
-        "        csrr %2, cycleh;\n"
+               "        bne %0, %2, repeat_cycle_%=;\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) = lower;
+  *((unsigned long *)(&result) + 1) = upper1;
-    *((unsigned long *)(&result)+1) = upper1;
 
-    return result;
+  return result;
 }
 
-volatile int tohost;
+// extern volatile int tohost;
-volatile int fromhost;
+// extern volatile int fromhost;
 
-void exit(int n){
+void write_hex(int fd, uint32_t hex);
-      tohost = 0x1;
+
-      for (;;);
+void exit(int n) {
+  write_hex(STDERR_FILENO, 1);
+  // tohost = 0x1;
+  for (;;)
+    ;
 }
 
-void __libc_init_array (void) {
+void __libc_init_array(void) {
-/*
+  /*
-    size_t count;
+      size_t count;
-    size_t i;
+      size_t i;
-    count = __preinit_array_end - __preinit_array_start;
+      count = __preinit_array_end - __preinit_array_start;
-    for (i = 0; i < count; i++)
+      for (i = 0; i < count; i++)
-        __preinit_array_start[i] ();
+          __preinit_array_start[i] ();
 
-#ifdef HAVE_INIT_FINI
+  #ifdef HAVE_INIT_FINI
-    _init ();
+      _init ();
-#endif
+  #endif
 
-    count = __init_array_end - __init_array_start;
+      count = __init_array_end - __init_array_start;
-    for (i = 0; i < count; i++)
+      for (i = 0; i < count; i++)
-    __init_array_start[i] ();
+      __init_array_start[i] ();
-*/
+  */
 }
 #if VALIDATION_RUN
 volatile ee_s32 seed1_volatile = 0x3415;
@@ -89,10 +92,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.
@@ -101,11 +101,11 @@ barebones_clock()
    does not occur. If there are issues with the return value overflowing,
    increase this value.
         */
-#define GETMYTIME(_t)              (*_t = barebones_clock())
+#define GETMYTIME(_t) (*_t = barebones_clock())
-#define MYTIMEDIFF(fin, ini)       ((fin) - (ini))
+#define MYTIMEDIFF(fin, ini) ((fin) - (ini))
-#define TIMER_RES_DIVIDER          1
+#define TIMER_RES_DIVIDER 1
 #define SAMPLE_TIME_IMPLEMENTATION 1
-#define EE_TICKS_PER_SEC           (CLOCKS_PER_SEC / TIMER_RES_DIVIDER)
+#define EE_TICKS_PER_SEC (CLOCKS_PER_SEC / TIMER_RES_DIVIDER)
 
 /** Define Host specific (POSIX), or target specific global time variables. */
 static CORETIMETYPE start_time_val, stop_time_val;
@@ -118,11 +118,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 +127,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,11 +138,9 @@ 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
+  return elapsed;
-        = (CORE_TICKS)(MYTIMEDIFF(stop_time_val, start_time_val));
-    return elapsed;
 }
 /* Function : time_in_secs
         Convert the value returned by get_time to seconds.
@@ -159,11 +149,9 @@ 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;
-    secs_ret retval = ((secs_ret)ticks) / (secs_ret)EE_TICKS_PER_SEC;
-    return retval;
 }
 
 ee_u32 default_num_contexts = 1;
@@ -172,27 +160,18 @@ 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 *))
+              "pointer!\n");
-    {
+  }
-        ee_printf(
+  if (sizeof(ee_u32) != 4) {
-            "ERROR! Please define ee_ptr_int to a type that holds a "
+    ee_printf("ERROR! Please define ee_u32 to a 32b unsigned type!\n");
-            "pointer!\n");
+  }
-    }
+  p->portable_id = 1;
-    if (sizeof(ee_u32) != 4)
+  ee_printf("portable_init finished.\n");
-    {
-        ee_printf("ERROR! Please define ee_u32 to a 32b unsigned type!\n");
-    }
-    p->portable_id = 1;
-    ee_printf("portable_init finished.\n");
 }
 /* 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/dhrystone/.gitignore

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

benchmarks/dhrystone/CMakeLists.txt

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,109 @@
+{
+    "version": 3,
+    "vendor": {
+        "conan": {}
+    },
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 24,
+        "patch": 0
+    },
+    "configurePresets": [
+        {
+            "name": "ISS_Debug",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Debug",
+                "BOARD": "iss",  
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        },
+        {
+            "name": "Moonlight_Debug",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Debug",  
+                "BOARD": "moonlight",
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        },
+        {
+            "name": "TGC_Debug",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Debug",  
+                "BOARD": "tgc_vp",   
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
+            }
+        },
+        {
+            "name": "ISS_Debug_64",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Debug",
+                "BOARD": "iss",
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
+            }
+        },
+        {
+            "name": "Moonlight_Debug_64",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Debug",  
+                "BOARD": "moonlight",
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
+            }
+        },
+        {
+            "name": "TGC_Debug_64",
+            "cacheVariables": {    
+                "CMAKE_BUILD_TYPE": "Debug",  
+                "BOARD": "tgc_vp",   
+                "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
+            }
+        },
+        {
+            "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
@@ -17,7 +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))
 
 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", (int) Ptr_Glob->Ptr_Comp);
+  printf ("  Ptr_Comp:          %d\n", (long) 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", (int) Next_Ptr_Glob->Ptr_Comp);
+  printf ("  Ptr_Comp:          %d\n", (long) 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,4 +1,5 @@
 #include "platform.h"
+#include <unistd.h>
 #ifndef ITERATIONS
 #define ITERATIONS 20000
 #endif
@@ -6,20 +7,16 @@
 /* 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)
+long time(void) { return get_timer_value(); }
-{
-  return get_timer_value();
-}
 
 // set the number of dhrystone iterations
-void __wrap_scanf(const char* fmt, int* n)
+void __wrap_scanf(const char *fmt, int *n) { *n = ITERATIONS; }
-{
-  *n = ITERATIONS;
-}
 
-extern volatile uint32_t tohost;
+// extern volatile uint64_t tohost;
 
-void exit(int n){
+void exit(int n) {
-      tohost = 0x1;
+  // tohost = 0x1;
-      for (;;);
+  write_hex(STDERR_FILENO, 1);
+  for (;;)
+    ;
 }

hello-world/.gitignore

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

hello-world/CMakeLists.txt

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,117 @@
+{
+    "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/rv64imc.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", "rv32imc"]
+        },
+        {
+            "name": "Moonlight_Debug",
+            "inherits": ["moonlight", "debug", "rv32imc"]
+        },
+        {
+            "name": "TGC_VP_Debug",
+            "inherits": ["tgc_vp", "debug", "rv32imc"]
+        },
+        {
+            "name": "ISS_Debug_64",
+            "inherits": ["iss", "debug", "rv64imc"]
+        },
+        {
+            "name": "Moonlight_Debug_64",
+            "inherits": ["moonlight", "debug", "rv64imc"]
+        },
+        {
+            "name": "TGC_VP_Debug_64",
+            "inherits": ["tgc_vp", "debug", "rv64imc"]
+        },
+        {
+            "name": "ISS_Release",
+            "inherits": ["iss", "release", "rv32imc"]
+        },
+        {
+            "name": "Moonlight_Release",
+            "inherits": ["moonlight", "release", "rv32imc"]
+        },
+        {
+            "name": "TGC_VP_Release",
+            "inherits": ["tgc_vp", "release", "rv32imc"]
+        },
+        {
+            "name": "ISS_Release_64",
+            "inherits": ["iss", "release", "rv64imc"]
+        },
+        {
+            "name": "Moonlight_Release_64",
+            "inherits": ["moonlight", "release", "rv64imc"]
+        },
+        {
+            "name": "TGC_VP_Release_64",
+            "inherits": ["tgc_vp", "release", "rv64imc"]
+        }
+    ]
+}

hello-world/Makefile

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

hello-world/hello.c

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