SDK Re-aligned with RTL, tested on main magia_v3

Author: Dequino

CMakeLists.txt

@@ -64,6 +64,8 @@ endif ()
 if (COMPILER STREQUAL "GCC_MULTILIB")
     set(ISA rv32imc_xcvalu_xcvbi_xcvbitmanip_xcvhwlp_xcvmac_xcvmem_xcvsimd_xcvelw_zfinx_zhinxmin)
     set(CV32E40P 1)
+else ()
+    set(CV32E40P 0)
 endif ()
 
 message(STATUS "[MAGIA-SDK] ABI                     : ${ABI}")

cmake/pulp_config.cmake

@@ -14,7 +14,11 @@ set(PULP_CORE_COUNT 8 CACHE STRING "Number of PULP cores per cluster")
 # ISA/ABI — same toolchain as CV32 Controller
 set(PULP_ARCH rv CACHE STRING "PULP32 ARCH prefix")
 set(PULP_XLEN 32 CACHE STRING "PULP32 XLEN")
+if (${COMPILER_NAME} STREQUAL "riscv64-unknown-elf-gcc")
 set(PULP_XTEN imc_xcvalu_xcvbi_xcvbitmanip_xcvhwlp_xcvmac_xcvmem_xcvsimd_xcvelw_zfinx_zhinxmin CACHE STRING "PULP32 ISA extensions")
+else ()
+set(PULP_XTEN imcxgap9 CACHE STRING "PULP32 ISA extensions")
+endif ()
 set(PULP_ABI ilp CACHE STRING "PULP32 ABI prefix")
 set(PULP_MARCH "-march=${PULP_ARCH}${PULP_XLEN}${PULP_XTEN}")
 set(PULP_MABI "-mabi=${PULP_ABI}${PULP_XLEN}")
@@ -24,6 +28,7 @@ set(PULP_ARCH_FLAGS
     ${PULP_MARCH}
     ${PULP_MABI}
 )
+
 set(PULP_COMPILE_FLAGS
     ${PULP_ARCH_FLAGS}
     "-O2"
@@ -38,74 +43,28 @@ set(PULP_COMPILE_FLAGS
     "-fdata-sections"
     "-fPIC"
     "-mcmodel=medany"
-    "-fno-builtin"
     "-fno-jump-tables"
-    "-fno-common"
     "-msmall-data-limit=0"
     "-DPULP_CORE_COUNT=${PULP_CORE_COUNT}"
-    "-DCV32E40P"
     "-nostartfiles"
     "-nostdlib"
     "-U__riscv__"
-    "-static"
 )
+
 set(PULP_CFLAGS_DEFINES
     "-DPULP_CORE_COUNT=${PULP_CORE_COUNT}"
     "-DPULP_TARGET"
-    "-DCV32E40P"
+    "-DCV32E40P=${CV32E40P}"
     # "-save-temps"
 )
- set(PULP_LINK_FLAGS
-    ${PULP_ARCH_FLAGS}
+ 
+set(PULP_LINK_FLAGS
+    ${PULP_ARCH_FLAGS}      
     "-nostartfiles"
     "-nostdlib"
-    "-Wl,--gc-sections"
-    "-Wl,--allow-multiple-definition"
-    "-T${PULP_LINK_SCRIPT}"
-    "-flto"
     "-Wl,-z,norelro"
+    "-Wl,--allow-multiple-definition"
 )
-# # Compiler flags for PULP task binary (position-independent, bare-metal)
-# set(PULP_COMPILE_FLAGS
-#     ${PULP_MARCH}
-#     ${PULP_MABI}
-#     "-fPIC"
-#     "-mcmodel=medany"
-#     "-static"
-#     "-nostartfiles"
-#     "-nostdlib"
-#     "-O2"
-#     "-g"
-#     "-Wall"
-#     "-Wextra"
-#     "-Wno-unused-parameter"
-#     "-Wno-unused-variable"
-#     "-Wno-unused-function"
-#     "-Wundef"
-#     "-fno-common"
-#     "-ffunction-sections"
-#     "-fdata-sections"
-#     "-fno-builtin"
-#     "-fno-jump-tables"
-#     "-msmall-data-limit=0"
-# )
-
-# set(PULP_CFLAGS_DEFINES
-#     "-DPULP_CORE_COUNT=${PULP_CORE_COUNT}"
-#     "-DPULP_TARGET"
-#     "-DCV32E40P=${CV32E40P}"
-#     "-save-temps"
-# )
-
-# set(PULP_LINK_FLAGS
-#     "-nostartfiles"
-#     "-nostdlib"
-#     "-Wl,-z,norelro"
-#     "-Wl,--allow-multiple-definition"
-#     "-flto"
-#     "-Wl,--gc-sections"
-#     "-Wl,--undefined=hello_task"
-# )
 
 # add_pulp_task defaults
 set(PULP_TASK_OUTPUT_ROOT "${CMAKE_BINARY_DIR}/bin/${TARGET_PLATFORM}")

cmake/pulp_helpers.cmake

@@ -84,7 +84,7 @@ function(add_pulp_task)
             ${TASK_INCLUDE_FLAGS}
             ${PULP_LINK_FLAGS}
             ${TASK_UNDEF_FLAGS}
-            # -T${PULP_LINK_SCRIPT}
+            -T${PULP_LINK_SCRIPT}
             -o ${TASK_ELF}
             ${TASK_CRT0_OBJ}
             ${MAGIA_IO_SRC}
@@ -198,8 +198,8 @@ function(add_cv32_executable_with_pulp)
         ${PULP_HEADER_DIR}
     )
 
-    target_compile_options(${ARG_TARGET_NAME} PRIVATE ${CV32_COMPILE_FLAGS})
-    target_link_options(${ARG_TARGET_NAME} PRIVATE ${CV32_LINK_FLAGS})
+    target_compile_options(${ARG_TARGET_NAME} PRIVATE ${PULP_COMPILE_FLAGS})
+    target_link_options(${ARG_TARGET_NAME} PRIVATE ${PULP_LINK_FLAGS})
     target_link_libraries(${ARG_TARGET_NAME} PUBLIC runtime hal)
 
     add_dependencies(${ARG_TARGET_NAME} ${${ARG_TARGET_NAME}_PULP_TARGET})
@@ -273,8 +273,8 @@ function(add_cv32_executable_with_pulp_and_spatz)
         ${PULP_HEADER_DIR}
     )
 
-    target_compile_options(${ARG_TARGET_NAME} PRIVATE ${CV32_COMPILE_FLAGS})
-    target_link_options(${ARG_TARGET_NAME} PRIVATE ${CV32_LINK_FLAGS})
+    target_compile_options(${ARG_TARGET_NAME} PRIVATE ${PULP_COMPILE_FLAGS})
+    target_link_options(${ARG_TARGET_NAME} PRIVATE ${PULP_LINK_FLAGS})
     target_link_libraries(${ARG_TARGET_NAME} PUBLIC runtime hal)
 
     add_dependencies(${ARG_TARGET_NAME}

cmake/toolchain_gcc_multilib.cmake

@@ -10,8 +10,10 @@ set(CMAKE_EXECUTABLE_SUFFIX ".elf")
 set(CMAKE_SYSTEM_NAME Generic)
 
 set(CMAKE_C_COMPILER riscv64-unknown-elf-gcc)
+set(COMPILER_NAME riscv64-unknown-elf-gcc)
 set(CMAKE_CXX_COMPILER riscv64-unknown-elf-g++)
 set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
 set(CMAKE_OBJCOPY riscv64-unknown-elf-objcopy)
 set(CMAKE_OBJDUMP riscv64-unknown-elf-objdump)
-set(CMAKE_AR riscv64-unknown-elf-ar)
+set(CMAKE_AR riscv64-unknown-elf-ar)
+

cmake/toolchain_gcc_pulp.cmake

@@ -10,6 +10,7 @@ set(CMAKE_EXECUTABLE_SUFFIX ".elf")
 set(CMAKE_SYSTEM_NAME Generic)
 
 set(CMAKE_C_COMPILER riscv32-unknown-elf-gcc)
+set(COMPILER_NAME riscv32-unknown-elf-gcc)
 set(CMAKE_CXX_COMPILER riscv32-unknown-elf-g++)
 set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
 set(CMAKE_OBJCOPY riscv32-unknown-elf-objcopy)

scripts/extract_pulp_symbols.sh

@@ -26,7 +26,7 @@ echo "#define PULP_BINARY_START ((uint32_t)&_pulp_binary_start)" >> "${TASK_HEAD
 # Add task function entry points (all global functions with 'task' in their name)
 echo "" >> "${TASK_HEADER}"
 echo "/* Task function entry points - OFFSETS from PULP_BINARY_START */" >> "${TASK_HEADER}"
-"${OBJDUMP}" -t "${TASK_ELF}" | awk '$2 == "g" && $NF ~ /task/ {print $1, $NF}' | while read addr name; do
+"${OBJDUMP}" -t "${TASK_ELF}" | grep -E "F .text.*task" | awk '{print $1, $NF}' | while read addr name; do
     if [[ "$name" != "__first_task" ]]; then
     TASK_NAME=$(echo "$name" | tr 'a-z' 'A-Z')
     echo "#define ${TASK_NAME} (PULP_BINARY_START + 0x${addr})" >> "${TASK_HEADER}"

targets/magia_v3/include/utils/eu_isa_utils.h

@@ -151,9 +151,13 @@ static inline uint32_t eu_wait_events_polling(uint32_t event_mask, uint32_t time
 static inline unsigned int evt_read32(unsigned int addr)
 {
     unsigned int value;
-// Direct p.elw inline assembly for PULP cores (RI5CY, CV32E40P)
+// Direct p.elw inline assembly for PULP cores (CV32E40P)
 #if STALLING == 0
+#if CV32E40P == 1
     __asm__ __volatile__("cv.elw %0, 0(%1)" : "=r"(value) : "r"(addr) : "memory");
+#else
+    __asm__ __volatile__("p.elw %0, 0(%1)" : "=r"(value) : "r"(addr) : "memory");
+#endif
 #endif
     return value;
 }

targets/magia_v3/include/utils/typedefs.h

@@ -2,7 +2,7 @@
 #define TYPEDEFS_H_
 
 // GCC_MULTILIB doesn't know what a float16 is.
-#if CV32E40P
+#if CV32E40P == 1
 typedef _Float16 float16;
 #endif
 

tests/magia/mesh/hello_world/src/test.c

@@ -16,13 +16,13 @@ int main(void)
 
     int test = NULL;
 
-    // volatile float a = -12.0456f;
-    // volatile float b = 4.0f;
-    // volatile float c = (a + b);
+    volatile float16 a = -12.0456f;
+    volatile float16 b = 4.0f;
+    volatile float16 c = (a + b);
     int test_integer = -123;
 
-    // uint32_t *v = (uint32_t *) &c;
-    // printf("Hello world! %#x\n", *v);
+    uint32_t *v = (uint32_t *) &c;
+    printf("Hello world! %#x\n", *v);
     // printf("Hello world! %f\n", c);
     printf("Hello world! %d\n", test_integer);
 

tests/pulp_on_magia/hello_pulp/pulp_task/hello_task.c

@@ -1,11 +1,14 @@
-#include "tile.h"
+#include "utils/magia_utils.h"
+#include "addr_map/tile_addr_map.h"
+#include "utils/printf.h"
+
 
 void hello_pulp_task(void)
 {
     uint32_t hartid   = get_hartid();
     uint32_t local_id = GET_PULP_LOCAL_ID(hartid);
     uint32_t tile_id  = GET_PULP_TILE_ID(hartid);
-    wait_nop((tile_id + 1) * hartid * 2000);
+    //wait_nop((tile_id + 1) * hartid * 2000);
     printf("[PULP][tile-id=%u local-core-id=%u global-hartid=%u] Hello from PULP!\n",
            tile_id,
            local_id,