adds regression for smp

2026-03-25 08:49:20 +01:00
parent c11f68d20c
commit c9c2d2009f
9 changed files with 515 additions and 364 deletions
--- a/test/threadx/CMakeLists.txt
+++ b/test/threadx/CMakeLists.txt
@@ -1,3 +1,105 @@
+cmake_minimum_required(VERSION 3.21)
+
+set(BUILD_SHARED_LIBS OFF)
+get_filename_component(THREADX4TGFS_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
+
+if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
+  set(CMAKE_TOOLCHAIN_FILE
+    ${THREADX4TGFS_ROOT}/cmake/rv32imac_gnu.cmake
+    CACHE FILEPATH "Toolchain file")
+endif()
+include(${CMAKE_TOOLCHAIN_FILE})
+
+project(threadx_regression LANGUAGES C ASM)
+enable_testing()
+
+set(TARGET_MEM "ram_dram" CACHE STRING "memory map to use")
+set(CMAKE_EXECUTABLE_SUFFIX_C ".elf")
+
+set(THREADX_TEST_SIMULATOR
+  ""
+  CACHE FILEPATH "Path to the RISC-V VP executable used by CTest")
+if(NOT THREADX_TEST_SIMULATOR)
+  message(FATAL_ERROR
+    "THREADX_TEST_SIMULATOR is not set. Configure with -DTHREADX_TEST_SIMULATOR=/path/to/riscv-vp")
+endif()
+
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "risc-v32")
+  set(THREADX_TEST_ISA "rv32imac_m")
+elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "risc-v64")
+  set(THREADX_TEST_ISA "rv64imac_m")
+else()
+  message(FATAL_ERROR
+    "Unsupported CMAKE_SYSTEM_PROCESSOR for VP ISA selection: ${CMAKE_SYSTEM_PROCESSOR}")
+endif()
+
+set(__THREAD_LOCAL_STORAGE OFF)
+add_subdirectory(${THREADX4TGFS_ROOT}/third-party/picolibc ${CMAKE_BINARY_DIR}/picolibc)
+target_link_libraries(c PUBLIC gcc)
+
+set(THREADX_CUSTOM_PORT ${THREADX4TGFS_ROOT}/port/threadx)
+add_subdirectory(${THREADX4TGFS_ROOT}/third-party/threadx ${CMAKE_BINARY_DIR}/threadx)
+target_link_libraries(threadx PUBLIC c)
+target_compile_definitions(threadx PUBLIC TX_REGRESSION_TEST)
+
+set(MOONLIGHT_TRAP_SOURCE_INPUT ${THREADX4TGFS_ROOT}/port/moonlight/src/trap_non_vectored.c)
+set(MOONLIGHT_TRAP_SOURCE ${CMAKE_BINARY_DIR}/generated/trap_non_vectored.c)
+add_custom_command(
+  OUTPUT ${MOONLIGHT_TRAP_SOURCE}
+  COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/generate_trap_file.sh
+          ${MOONLIGHT_TRAP_SOURCE_INPUT}
+          ${MOONLIGHT_TRAP_SOURCE}
+  DEPENDS ${MOONLIGHT_TRAP_SOURCE_INPUT}
+          ${CMAKE_CURRENT_LIST_DIR}/generate_trap_file.sh
+  VERBATIM
+)
+add_custom_target(threadx_regression_generated_trap DEPENDS ${MOONLIGHT_TRAP_SOURCE})
+set_source_files_properties(${MOONLIGHT_TRAP_SOURCE} PROPERTIES GENERATED TRUE)
+
+add_subdirectory(${THREADX4TGFS_ROOT}/port/moonlight ${CMAKE_BINARY_DIR}/port/moonlight)
+add_dependencies(moonlight_platform_common threadx_regression_generated_trap)
+
+function(setup_target TARGET)
+  set(options)
+  set(oneValueArgs PLATFORM_TARGET)
+  set(multiValueArgs LIBRARIES SOURCES)
+  cmake_parse_arguments(ST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+  if(ST_UNPARSED_ARGUMENTS)
+    message(FATAL_ERROR "setup_target(${TARGET} ...): unknown args: ${ST_UNPARSED_ARGUMENTS}")
+  endif()
+
+  add_executable(${TARGET})
+  set_target_properties(${TARGET} PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+  )
+  if(ST_PLATFORM_TARGET)
+    target_add_moonlight_platform(${TARGET} PLATFORM_TARGET ${ST_PLATFORM_TARGET})
+  else()
+    target_add_moonlight_platform(${TARGET})
+  endif()
+
+  if(ST_SOURCES)
+    target_sources(${TARGET} PRIVATE ${ST_SOURCES})
+  endif()
+
+  if(ST_LIBRARIES)
+    target_link_libraries(${TARGET} PRIVATE ${ST_LIBRARIES})
+  endif()
+
+  target_link_options(${TARGET} PRIVATE
+    -nostartfiles
+    -nostdlib
+    -T ${THREADX4TGFS_ROOT}/src/${TARGET_MEM}.lds
+    -Wl,--gc-sections
+    -Wl,-Map=${CMAKE_BINARY_DIR}/${TARGET}.map)
+
+  add_custom_command(TARGET ${TARGET} POST_BUILD
+    COMMAND ${OBJCOPY} -O ihex $<TARGET_FILE:${TARGET}> ${CMAKE_BINARY_DIR}/${TARGET}.hex
+    COMMAND ${OBJCOPY} -O binary $<TARGET_FILE:${TARGET}> ${CMAKE_BINARY_DIR}/${TARGET}.bin
+    COMMAND ${OBJDUMP} -S $<TARGET_FILE:${TARGET}> > ${CMAKE_BINARY_DIR}/${TARGET}.dis
+  )
+endfunction()
+
 set(TX_REGRESSION_DIR
    ${THREADX4TGFS_ROOT}/third-party/threadx/test/tx/regression
 )
@@ -136,7 +238,6 @@ function(add_threadx_regression_test TEST_SOURCE)
        SOURCES ${TEST_SOURCE}
    )

-
    list(APPEND TX_REGRESSION_TARGETS ${TEST_NAME})
    set(TX_REGRESSION_TARGETS ${TX_REGRESSION_TARGETS} PARENT_SCOPE)

--- a/test/threadx/CMakePresets.json
+++ b/test/threadx/CMakePresets.json
@@ -0,0 +1,72 @@
+{
+  "version": 3,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 24,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "Debug",
+      "binaryDir": "${sourceDir}/../../build/${presetName}/test/threadx",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../../cmake/rv64imac_gnu.cmake",
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+      }
+    },
+    {
+      "name": "Debug32",
+      "binaryDir": "${sourceDir}/../../build/${presetName}/test/threadx",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../../cmake/rv32imac_gnu.cmake",
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+      }
+    },
+    {
+      "name": "Release",
+      "binaryDir": "${sourceDir}/../../build/${presetName}/test/threadx",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../../cmake/rv64imac_gnu.cmake",
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+      }
+    },
+    {
+      "name": "Release32",
+      "binaryDir": "${sourceDir}/../../build/${presetName}/test/threadx",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../../cmake/rv32imac_gnu.cmake",
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+      }
+    },
+    {
+      "name": "MinSizeRel",
+      "binaryDir": "${sourceDir}/../../build/${presetName}/test/threadx",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../../cmake/rv64imac_gnu.cmake",
+        "CMAKE_BUILD_TYPE": "MinSizeRel",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+      }
+    },
+    {
+      "name": "MinSizeRel32",
+      "binaryDir": "${sourceDir}/../../build/${presetName}/test/threadx",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../../cmake/rv32imac_gnu.cmake",
+        "CMAKE_BUILD_TYPE": "MinSizeRel",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+      }
+    }
+  ],
+  "buildPresets": [
+    { "name": "Debug", "configurePreset": "Debug" },
+    { "name": "Debug32", "configurePreset": "Debug32" },
+    { "name": "Release", "configurePreset": "Release" },
+    { "name": "Release32", "configurePreset": "Release32" },
+    { "name": "MinSizeRel", "configurePreset": "MinSizeRel" },
+    { "name": "MinSizeRel32", "configurePreset": "MinSizeRel32" }
+  ]
+}