Firmware/ThreadX4TGFS
8
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduces Regression for 32 and 64 bit threadx and smp kernel in Debug, MinSizeRel and Release configuration #4

Merged
alex merged 79 commits from feature/test into main 2026-04-02 14:09:29 +01:00
Conversation 0 Commits 79 Files Changed 61 +515 -364
9 changed files with 515 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c9c2d2009f - Show all commits

8
CMakeLists.txt
View File

@@ -40,7 +40,7 @@ add_subdirectory(port/moonlight)
function(setup_target TARGET)
set(options)
set(oneValueArgs) #None for now
set(oneValueArgs PLATFORM_TARGET)
set(multiValueArgs LIBRARIES SOURCES)
cmake_parse_arguments(ST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
if(ST_UNPARSED_ARGUMENTS)
@@ -51,7 +51,11 @@ function(setup_target 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("netxduo" IN_LIST ST_LIBRARIES)
target_add_moonlight_network_driver(${TARGET})
@@ -83,4 +87,4 @@ endfunction()
setup_target(thread_demo LIBRARIES threadx SOURCES src/thread_demo/main.c)
setup_target(tcp_demo LIBRARIES threadx netxduo SOURCES src/tcp_demo/main.c)
setup_target(smp_demo LIBRARIES threadx_smp SOURCES src/thread_demo/main.c)
setup_target(smp_demo PLATFORM_TARGET moonlight_platform_common_smp LIBRARIES threadx_smp SOURCES src/thread_demo/main.c)

14
port/moonlight/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ set(THREADX4TGFS_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..)
set(MOONLIGHT_SRC_DIR ${MOONLIGHT_ROOT}/src)
set(MOONLIGHT_INC_DIR ${MOONLIGHT_ROOT}/inc)
if(NOT DEFINED MOONLIGHT_TRAP_SOURCE)
if(NOT DEFINED MOONLIGHT_TRAP_SOURCE) # Hook to use vectored traps, also used in regression testing
set(MOONLIGHT_TRAP_SOURCE ${MOONLIGHT_SRC_DIR}/trap_non_vectored.c)
endif()
@@ -15,6 +15,7 @@ set(MOONLIGHT_PLATFORM_SOURCES
${MOONLIGHT_SRC_DIR}/exception.c
${MOONLIGHT_SRC_DIR}/vector_table.c)
# define a basic library containing all generic board components
add_library(moonlight_platform_defaults INTERFACE)
target_include_directories(moonlight_platform_defaults INTERFACE
${MOONLIGHT_INC_DIR}
@@ -32,6 +33,7 @@ if(NX_DEBUG)
NX_DEBUG_PACKET)
endif()
# helper to tie in different threadx runtimes
function(moonlight_define_platform TARGET THREADX_TARGET)
add_library(${TARGET} OBJECT
${MOONLIGHT_PLATFORM_SOURCES})
@@ -41,7 +43,10 @@ function(moonlight_define_platform TARGET THREADX_TARGET)
${THREADX_TARGET})
endfunction()
moonlight_define_platform(moonlight_platform_common threadx)
if(TARGET threadx)
moonlight_define_platform(moonlight_platform_common threadx)
endif()
if(TARGET threadx_smp)
moonlight_define_platform(moonlight_platform_common_smp threadx_smp)
endif()
@@ -56,6 +61,7 @@ if(DEFINED NETXDUO_CUSTOM_PORT)
netxduo)
endif()
# helper for consumers to inject moonlight as a dependency into a target
function(target_add_moonlight_platform TARGET)
set(options)
set(oneValueArgs PLATFORM_TARGET)
@@ -66,12 +72,16 @@ function(target_add_moonlight_platform TARGET)
endif()
if(NOT TAMP_PLATFORM_TARGET)
if(NOT TARGET moonlight_platform_common)
message(FATAL_ERROR "moonlight_platform_common is not available in this build; pass PLATFORM_TARGET explicitly")
endif()
set(TAMP_PLATFORM_TARGET moonlight_platform_common)
endif()
target_link_libraries(${TARGET} PRIVATE ${TAMP_PLATFORM_TARGET})
endfunction()
# helper to inject the network driver into a target
function(target_add_moonlight_network_driver TARGET)
if(NOT TARGET moonlight_network_driver)
message(FATAL_ERROR "moonlight_network_driver requires netxduo to be available in this build")

115
test/CMakeLists.txt
View File

@@ -1,115 +0,0 @@
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})
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)
add_subdirectory(${THREADX4TGFS_ROOT}/port/threadx_smp ${CMAKE_BINARY_DIR}/port/threadx_smp)
target_link_libraries(threadx_smp PUBLIC c)
target_compile_definitions(threadx_smp PUBLIC TX_REGRESSION_TEST TX_THREAD_SMP_ONLY_CORE_0_DEFAULT TX_SMP_NOT_POSSIBLE)
project(threadx_regression 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()
# Evaluate the variable from the toolchain file to decide which XLEN we are targetting (IMAC only!)
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()
# The regression tests require the Timer ISR to call the function test_interrupt_dispatch(void)
# We patch the current trap handler and include it using MOONLIGHT_TRAP_SOURCE.
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}/threadx/generate_trap_file.sh
${MOONLIGHT_TRAP_SOURCE_INPUT}
${MOONLIGHT_TRAP_SOURCE}
DEPENDS ${MOONLIGHT_TRAP_SOURCE_INPUT}
${CMAKE_CURRENT_LIST_DIR}/threadx/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)
if(TARGET moonlight_platform_common_smp)
add_dependencies(moonlight_platform_common_smp threadx_regression_generated_trap)
endif()
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 ${SIZE} $<TARGET_FILE:${TARGET}>
COMMAND ${OBJDUMP} -S $<TARGET_FILE:${TARGET}> > ${CMAKE_BINARY_DIR}/${TARGET}.dis
#COMMENT "Creating collateral for ${TARGET}"
)
endfunction()
add_subdirectory(threadx regression_targets)
add_subdirectory(smp smp_regression_targets)

90
test/CMakePresets.json
View File

@@ -1,90 +0,0 @@
{
"version": 3,
"cmakeMinimumRequired": {
"major": 3,
"minor": 24,
"patch": 0
},
"configurePresets": [
{
"name": "Debug",
"binaryDir": "${sourceDir}/../build/${presetName}/test",
"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",
"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",
"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",
"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",
"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",
"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"
}
]
}

123
test/smp/CMakeLists.txt
View File

@@ -1,3 +1,104 @@
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_smp_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)
add_subdirectory(${THREADX4TGFS_ROOT}/port/threadx_smp ${CMAKE_BINARY_DIR}/port/threadx_smp)
target_link_libraries(threadx_smp PUBLIC c)
target_compile_definitions(threadx_smp PUBLIC TX_REGRESSION_TEST TX_THREAD_SMP_ONLY_CORE_0_DEFAULT TX_SMP_NOT_POSSIBLE)
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 ${THREADX4TGFS_ROOT}/test/threadx/generate_trap_file.sh
${MOONLIGHT_TRAP_SOURCE_INPUT}
${MOONLIGHT_TRAP_SOURCE}
DEPENDS ${MOONLIGHT_TRAP_SOURCE_INPUT}
${THREADX4TGFS_ROOT}/test/threadx/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_smp 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/smp/regression
)
@@ -31,6 +132,7 @@ set(TX_REGRESSION_CASES
${TX_REGRESSION_DIR}/threadx_event_flag_suspension_test.c
${TX_REGRESSION_DIR}/threadx_event_flag_suspension_timeout_test.c
${TX_REGRESSION_DIR}/threadx_event_flag_thread_terminate_test.c
${TX_REGRESSION_DIR}/threadx_initialize_kernel_setup_test.c
${TX_REGRESSION_DIR}/threadx_interrupt_control_test.c
${TX_REGRESSION_DIR}/threadx_mutex_basic_test.c
${TX_REGRESSION_DIR}/threadx_mutex_delete_test.c
@@ -44,10 +146,10 @@ set(TX_REGRESSION_CASES
${TX_REGRESSION_DIR}/threadx_mutex_thread_terminate_test.c
${TX_REGRESSION_DIR}/threadx_queue_basic_eight_word_test.c
${TX_REGRESSION_DIR}/threadx_queue_basic_four_word_test.c
${TX_REGRESSION_DIR}/threadx_queue_basic_max_message_size_test.c
${TX_REGRESSION_DIR}/threadx_queue_basic_one_word_test.c
${TX_REGRESSION_DIR}/threadx_queue_basic_sixteen_word_test.c
${TX_REGRESSION_DIR}/threadx_queue_basic_two_word_test.c
${TX_REGRESSION_DIR}/threadx_queue_basic_max_message_size_test.c
${TX_REGRESSION_DIR}/threadx_queue_empty_suspension_test.c
${TX_REGRESSION_DIR}/threadx_queue_flush_no_suspension_test.c
${TX_REGRESSION_DIR}/threadx_queue_flush_test.c
@@ -113,12 +215,9 @@ set(TX_REGRESSION_CASES
${TX_REGRESSION_DIR}/threadx_timer_multiple_accuracy_test.c
${TX_REGRESSION_DIR}/threadx_timer_multiple_test.c
${TX_REGRESSION_DIR}/threadx_timer_simple_test.c
#${TX_REGRESSION_DIR}/threadx_trace_basic_test.c # requires windows specific port
${TX_REGRESSION_DIR}/threadx_initialize_kernel_setup_test.c
#${TX_REGRESSION_DIR}/threadx_trace_basic_test.c #windows specifics in the test
)
set(TX_REGRESSION_TARGETS)
add_library(
threadx_smp_regression_support STATIC
${TX_REGRESSION_DIR}/testcontrol.c
@@ -138,8 +237,6 @@ target_compile_definitions(
function(add_threadx_regression_test TEST_SOURCE)
get_filename_component(TEST_NAME ${TEST_SOURCE} NAME_WE)
set(TARGET_NAME smp_${TEST_NAME})
set(CTEST_NAME smp_${TEST_NAME})
if(TEST_NAME STREQUAL "threadx_initialize_kernel_setup_test")
set(test_libraries threadx_smp)
@@ -148,24 +245,24 @@ function(add_threadx_regression_test TEST_SOURCE)
endif()
setup_target(
${TARGET_NAME}
${TEST_NAME}
PLATFORM_TARGET moonlight_platform_common_smp
LIBRARIES ${test_libraries}
SOURCES ${TEST_SOURCE}
)
list(APPEND TX_REGRESSION_TARGETS ${TARGET_NAME})
list(APPEND TX_REGRESSION_TARGETS ${TEST_NAME})
set(TX_REGRESSION_TARGETS ${TX_REGRESSION_TARGETS} PARENT_SCOPE)
add_test(
NAME ${CTEST_NAME}
NAME ${TEST_NAME}
COMMAND ${THREADX_TEST_SIMULATOR}
--isa=${THREADX_TEST_ISA}
-f $<TARGET_FILE:${TARGET_NAME}>
-f $<TARGET_FILE:${TEST_NAME}>
-m 60s
-p tb.top.num_cores=4
)
set_tests_properties(${CTEST_NAME} PROPERTIES TIMEOUT 10)
set_tests_properties(${TEST_NAME} PROPERTIES TIMEOUT 10)
endfunction()
foreach(test_case ${TX_REGRESSION_CASES})

72
test/smp/CMakePresets.json Normal file
View File

@@ -0,0 +1,72 @@
{
"version": 3,
"cmakeMinimumRequired": {
"major": 3,
"minor": 24,
"patch": 0
},
"configurePresets": [
{
"name": "Debug",
"binaryDir": "${sourceDir}/../../build/${presetName}/test/smp",
"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/smp",
"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/smp",
"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/smp",
"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/smp",
"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/smp",
"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" }
]
}

103
test/threadx/CMakeLists.txt
View File

@@ -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)

72
test/threadx/CMakePresets.json Normal file
View File

@@ -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" }
]
}

2
third-party/threadx vendored

Submodule third-party/threadx updated: 8cd9aedbbb...cfbccc838e