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

Compare commits

base: Firmware/ThreadX4TGFS:47ba20d762fdbacbb1bf9f24dc3f19ea4649b1e6
Branches Tags
Firmware/ThreadX4TGFS:main
...
compare: Firmware/ThreadX4TGFS:870a5f9c3630dc7277fa980768670143cddd731f
Branches Tags
Firmware/ThreadX4TGFS:main

10 Commits
47ba20d762 ... 870a5f9c36

Author SHA1 Message Date
alex 870a5f9c36 adds newer version of threadx fork; 
regression tx and smp now works for Debug32 and Release32
 2026-03-26 16:18:04 +01:00
alex ab6c2d0bc4 adds newest version of threadx fork 
ATP Debug32 passes all tx and smp regression tests
 2026-03-26 15:56:47 +01:00
alex 8a41f3e0fa small cleanuo to smp asm files 2026-03-26 15:55:32 +01:00
alex 1aa9944581 corrects timeout for smp ctest 2026-03-25 09:27:44 +01:00
alex c9c2d2009f adds regression for smp 2026-03-25 08:49:20 +01:00
alex c11f68d20c initial test harness for smp regression 2026-03-24 18:00:50 +01:00
alex 7253aadd52 corrects alignment for 64bit in port 2026-03-24 14:38:16 +01:00
alex 24d22e42f6 moves threadx to minres fork 2026-03-24 14:37:47 +01:00
alex e02a58e25f switches to tohost based exit code, reducing complexity in deciding failure / pass 2026-03-23 16:58:56 +01:00
alex 4e87ae718b removes patching of kernel tets, as a correct testsuite requires a patched threadx anyways 
This will not build, as atp threadx is still checked in clean
 2026-03-23 16:32:33 +01:00
22 changed files with 977 additions and 375 deletions
Expand all files Collapse all files
.gitmodules
+1 -1
View File
@@ -1,6 +1,6 @@
[submodule "third-party/threadx"]
path = third-party/threadx
url = https://github.com/eclipse-threadx/threadx.git
url = https://github.com/Minres/threadx.git
[submodule "third-party/netxduo"]
path = third-party/netxduo
url = https://github.com/eclipse-threadx/netxduo.git
CMakeLists.txt
+7 -3
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}
)
target_add_moonlight_platform(${TARGET})
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)
port/moonlight/CMakeLists.txt
+37 -8
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,12 +33,23 @@ if(NX_DEBUG)
NX_DEBUG_PACKET)
endif()
add_library(moonlight_platform_common OBJECT
${MOONLIGHT_PLATFORM_SOURCES})
target_link_libraries(moonlight_platform_common PUBLIC
moonlight_platform_defaults
c
threadx)
# helper to tie in different threadx runtimes
function(moonlight_define_platform TARGET THREADX_TARGET)
add_library(${TARGET} OBJECT
${MOONLIGHT_PLATFORM_SOURCES})
target_link_libraries(${TARGET} PUBLIC
moonlight_platform_defaults
c
${THREADX_TARGET})
endfunction()
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()
if(DEFINED NETXDUO_CUSTOM_PORT)
add_library(moonlight_network_driver OBJECT
@@ -49,10 +61,27 @@ 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)
target_link_libraries(${TARGET} PRIVATE moonlight_platform_common)
set(options)
set(oneValueArgs PLATFORM_TARGET)
cmake_parse_arguments(TAMP "${options}" "${oneValueArgs}" "" ${ARGN})
if(TAMP_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "target_add_moonlight_platform(${TARGET} ...): unknown args: ${TAMP_UNPARSED_ARGUMENTS}")
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")
port/moonlight/src/bootup.c
+5 -2
View File
@@ -37,6 +37,7 @@ EXTERN_C function_t __init_array_start;
EXTERN_C function_t __init_array_end;
EXTERN_C function_t __fini_array_start;
EXTERN_C function_t __fini_array_end;
EXTERN_C volatile uintptr_t tohost;
// This function will be placed by the linker script according to the section
// Raw function 'called' by the CPU with no runtime.
@@ -119,9 +120,11 @@ void _initialize(void) {
_exit(rc);
}
// This should never be called. Busy loop with the CPU in idle state.
// This should never be called. Report the exit code through HTIF and idle the CPU.
void _exit(int exit_code) {
(void)exit_code;
uintptr_t htif_exit_code = (((uintptr_t)(unsigned int)exit_code) << 1) | 1u;
tohost = htif_exit_code;
csr_clr_bits_mie(MIE_MTI_BIT_MASK);
csr_clr_bits_mstatus(MSTATUS_MIE_BIT_MASK);
while (1) {
port/threadx/inc/tx_port.h
+4 -1
View File
@@ -96,11 +96,14 @@ typedef unsigned char UCHAR;
typedef int INT;
typedef unsigned int UINT;
typedef int LONG;
typedef unsigned int ULONG;
typedef unsigned int ULONG; // ThreadX expects ULONG to be 32 bit
typedef unsigned long long ULONG64;
typedef short SHORT;
typedef unsigned short USHORT;
#define ULONG64_DEFINED
#define ALIGN_TYPE_DEFINED
// Since ULONG is not actually unsigned long, it is to small to hold pointers for 64-bit systems
#define ALIGN_TYPE unsigned long
/* Define the priority levels for ThreadX. Legal values range
from 32 to 1024 and MUST be evenly divisible by 32. */
port/threadx_smp/CMakeLists.txt
+198 -1
View File
@@ -16,6 +16,7 @@ set(THREADX_SMP_CUSTOM_SRC
src/tx_initialize_low_level.S
src/tx_thread_context_restore.S
src/tx_thread_context_save.S
src/tx_thread_interrupt_control.S
src/tx_thread_schedule.S
src/tx_thread_smp_core_get.S
src/tx_thread_smp_core_preempt.c
@@ -43,7 +44,203 @@ threadx_smp_add_offsets(
OUT_INCLUDE_DIR THREADX_SMP_GENERATED_INC_DIR
)
file(GLOB THREADX_SMP_SOURCES ${THREADX_COMMON_SMP_DIR}/src/*.c)
set(THREADX_SMP_SOURCES
${THREADX_COMMON_SMP_DIR}/src/tx_block_allocate.c
${THREADX_COMMON_SMP_DIR}/src/tx_block_pool_cleanup.c
${THREADX_COMMON_SMP_DIR}/src/tx_block_pool_create.c
${THREADX_COMMON_SMP_DIR}/src/tx_block_pool_delete.c
${THREADX_COMMON_SMP_DIR}/src/tx_block_pool_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_block_pool_initialize.c
${THREADX_COMMON_SMP_DIR}/src/tx_block_pool_performance_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_block_pool_performance_system_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_block_pool_prioritize.c
${THREADX_COMMON_SMP_DIR}/src/tx_block_release.c
${THREADX_COMMON_SMP_DIR}/src/tx_byte_allocate.c
${THREADX_COMMON_SMP_DIR}/src/tx_byte_pool_cleanup.c
${THREADX_COMMON_SMP_DIR}/src/tx_byte_pool_create.c
${THREADX_COMMON_SMP_DIR}/src/tx_byte_pool_delete.c
${THREADX_COMMON_SMP_DIR}/src/tx_byte_pool_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_byte_pool_initialize.c
${THREADX_COMMON_SMP_DIR}/src/tx_byte_pool_performance_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_byte_pool_performance_system_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_byte_pool_prioritize.c
${THREADX_COMMON_SMP_DIR}/src/tx_byte_pool_search.c
${THREADX_COMMON_SMP_DIR}/src/tx_byte_release.c
${THREADX_COMMON_SMP_DIR}/src/txe_block_allocate.c
${THREADX_COMMON_SMP_DIR}/src/txe_block_pool_create.c
${THREADX_COMMON_SMP_DIR}/src/txe_block_pool_delete.c
${THREADX_COMMON_SMP_DIR}/src/txe_block_pool_info_get.c
${THREADX_COMMON_SMP_DIR}/src/txe_block_pool_prioritize.c
${THREADX_COMMON_SMP_DIR}/src/txe_block_release.c
${THREADX_COMMON_SMP_DIR}/src/txe_byte_allocate.c
${THREADX_COMMON_SMP_DIR}/src/txe_byte_pool_create.c
${THREADX_COMMON_SMP_DIR}/src/txe_byte_pool_delete.c
${THREADX_COMMON_SMP_DIR}/src/txe_byte_pool_info_get.c
${THREADX_COMMON_SMP_DIR}/src/txe_byte_pool_prioritize.c
${THREADX_COMMON_SMP_DIR}/src/txe_byte_release.c
${THREADX_COMMON_SMP_DIR}/src/txe_event_flags_create.c
${THREADX_COMMON_SMP_DIR}/src/txe_event_flags_delete.c
${THREADX_COMMON_SMP_DIR}/src/txe_event_flags_get.c
${THREADX_COMMON_SMP_DIR}/src/txe_event_flags_info_get.c
${THREADX_COMMON_SMP_DIR}/src/txe_event_flags_set.c
${THREADX_COMMON_SMP_DIR}/src/txe_event_flags_set_notify.c
${THREADX_COMMON_SMP_DIR}/src/txe_mutex_create.c
${THREADX_COMMON_SMP_DIR}/src/txe_mutex_delete.c
${THREADX_COMMON_SMP_DIR}/src/txe_mutex_get.c
${THREADX_COMMON_SMP_DIR}/src/txe_mutex_info_get.c
${THREADX_COMMON_SMP_DIR}/src/txe_mutex_prioritize.c
${THREADX_COMMON_SMP_DIR}/src/txe_mutex_put.c
${THREADX_COMMON_SMP_DIR}/src/txe_queue_create.c
${THREADX_COMMON_SMP_DIR}/src/txe_queue_delete.c
${THREADX_COMMON_SMP_DIR}/src/txe_queue_flush.c
${THREADX_COMMON_SMP_DIR}/src/txe_queue_front_send.c
${THREADX_COMMON_SMP_DIR}/src/txe_queue_info_get.c
${THREADX_COMMON_SMP_DIR}/src/txe_queue_prioritize.c
${THREADX_COMMON_SMP_DIR}/src/txe_queue_receive.c
${THREADX_COMMON_SMP_DIR}/src/txe_queue_send.c
${THREADX_COMMON_SMP_DIR}/src/txe_queue_send_notify.c
${THREADX_COMMON_SMP_DIR}/src/txe_semaphore_ceiling_put.c
${THREADX_COMMON_SMP_DIR}/src/txe_semaphore_create.c
${THREADX_COMMON_SMP_DIR}/src/txe_semaphore_delete.c
${THREADX_COMMON_SMP_DIR}/src/txe_semaphore_get.c
${THREADX_COMMON_SMP_DIR}/src/txe_semaphore_info_get.c
${THREADX_COMMON_SMP_DIR}/src/txe_semaphore_prioritize.c
${THREADX_COMMON_SMP_DIR}/src/txe_semaphore_put.c
${THREADX_COMMON_SMP_DIR}/src/txe_semaphore_put_notify.c
${THREADX_COMMON_SMP_DIR}/src/txe_thread_create.c
${THREADX_COMMON_SMP_DIR}/src/txe_thread_delete.c
${THREADX_COMMON_SMP_DIR}/src/txe_thread_entry_exit_notify.c
${THREADX_COMMON_SMP_DIR}/src/txe_thread_info_get.c
${THREADX_COMMON_SMP_DIR}/src/txe_thread_preemption_change.c
${THREADX_COMMON_SMP_DIR}/src/txe_thread_priority_change.c
${THREADX_COMMON_SMP_DIR}/src/txe_thread_relinquish.c
${THREADX_COMMON_SMP_DIR}/src/txe_thread_reset.c
${THREADX_COMMON_SMP_DIR}/src/txe_thread_resume.c
${THREADX_COMMON_SMP_DIR}/src/txe_thread_suspend.c
${THREADX_COMMON_SMP_DIR}/src/txe_thread_terminate.c
${THREADX_COMMON_SMP_DIR}/src/txe_thread_time_slice_change.c
${THREADX_COMMON_SMP_DIR}/src/txe_thread_wait_abort.c
${THREADX_COMMON_SMP_DIR}/src/txe_timer_activate.c
${THREADX_COMMON_SMP_DIR}/src/txe_timer_change.c
${THREADX_COMMON_SMP_DIR}/src/txe_timer_create.c
${THREADX_COMMON_SMP_DIR}/src/txe_timer_deactivate.c
${THREADX_COMMON_SMP_DIR}/src/txe_timer_delete.c
${THREADX_COMMON_SMP_DIR}/src/txe_timer_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_event_flags_cleanup.c
${THREADX_COMMON_SMP_DIR}/src/tx_event_flags_create.c
${THREADX_COMMON_SMP_DIR}/src/tx_event_flags_delete.c
${THREADX_COMMON_SMP_DIR}/src/tx_event_flags_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_event_flags_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_event_flags_initialize.c
${THREADX_COMMON_SMP_DIR}/src/tx_event_flags_performance_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_event_flags_performance_system_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_event_flags_set.c
${THREADX_COMMON_SMP_DIR}/src/tx_event_flags_set_notify.c
${THREADX_COMMON_SMP_DIR}/src/tx_initialize_high_level.c
${THREADX_COMMON_SMP_DIR}/src/tx_initialize_kernel_enter.c
${THREADX_COMMON_SMP_DIR}/src/tx_initialize_kernel_setup.c
${THREADX_COMMON_SMP_DIR}/src/tx_misra.c
${THREADX_COMMON_SMP_DIR}/src/tx_mutex_cleanup.c
${THREADX_COMMON_SMP_DIR}/src/tx_mutex_create.c
${THREADX_COMMON_SMP_DIR}/src/tx_mutex_delete.c
${THREADX_COMMON_SMP_DIR}/src/tx_mutex_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_mutex_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_mutex_initialize.c
${THREADX_COMMON_SMP_DIR}/src/tx_mutex_performance_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_mutex_performance_system_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_mutex_prioritize.c
${THREADX_COMMON_SMP_DIR}/src/tx_mutex_priority_change.c
${THREADX_COMMON_SMP_DIR}/src/tx_mutex_put.c
${THREADX_COMMON_SMP_DIR}/src/tx_queue_cleanup.c
${THREADX_COMMON_SMP_DIR}/src/tx_queue_create.c
${THREADX_COMMON_SMP_DIR}/src/tx_queue_delete.c
${THREADX_COMMON_SMP_DIR}/src/tx_queue_flush.c
${THREADX_COMMON_SMP_DIR}/src/tx_queue_front_send.c
${THREADX_COMMON_SMP_DIR}/src/tx_queue_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_queue_initialize.c
${THREADX_COMMON_SMP_DIR}/src/tx_queue_performance_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_queue_performance_system_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_queue_prioritize.c
${THREADX_COMMON_SMP_DIR}/src/tx_queue_receive.c
${THREADX_COMMON_SMP_DIR}/src/tx_queue_send.c
${THREADX_COMMON_SMP_DIR}/src/tx_queue_send_notify.c
${THREADX_COMMON_SMP_DIR}/src/tx_semaphore_ceiling_put.c
${THREADX_COMMON_SMP_DIR}/src/tx_semaphore_cleanup.c
${THREADX_COMMON_SMP_DIR}/src/tx_semaphore_create.c
${THREADX_COMMON_SMP_DIR}/src/tx_semaphore_delete.c
${THREADX_COMMON_SMP_DIR}/src/tx_semaphore_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_semaphore_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_semaphore_initialize.c
${THREADX_COMMON_SMP_DIR}/src/tx_semaphore_performance_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_semaphore_performance_system_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_semaphore_prioritize.c
${THREADX_COMMON_SMP_DIR}/src/tx_semaphore_put.c
${THREADX_COMMON_SMP_DIR}/src/tx_semaphore_put_notify.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_create.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_delete.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_entry_exit_notify.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_identify.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_initialize.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_performance_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_performance_system_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_preemption_change.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_priority_change.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_relinquish.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_reset.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_resume.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_shell_entry.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_sleep.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_smp_core_exclude.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_smp_core_exclude_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_smp_current_state_set.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_smp_debug_entry_insert.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_smp_high_level_initialize.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_smp_rebalance_execute_list.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_smp_utilities.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_stack_analyze.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_stack_error_handler.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_stack_error_notify.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_suspend.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_system_preempt_check.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_system_resume.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_system_suspend.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_terminate.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_timeout.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_time_slice.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_time_slice_change.c
${THREADX_COMMON_SMP_DIR}/src/tx_thread_wait_abort.c
${THREADX_COMMON_SMP_DIR}/src/tx_time_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_timer_activate.c
${THREADX_COMMON_SMP_DIR}/src/tx_timer_change.c
${THREADX_COMMON_SMP_DIR}/src/tx_timer_create.c
${THREADX_COMMON_SMP_DIR}/src/tx_timer_deactivate.c
${THREADX_COMMON_SMP_DIR}/src/tx_timer_delete.c
${THREADX_COMMON_SMP_DIR}/src/tx_timer_expiration_process.c
${THREADX_COMMON_SMP_DIR}/src/tx_timer_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_timer_initialize.c
${THREADX_COMMON_SMP_DIR}/src/tx_timer_performance_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_timer_performance_system_info_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_timer_smp_core_exclude.c
${THREADX_COMMON_SMP_DIR}/src/tx_timer_smp_core_exclude_get.c
${THREADX_COMMON_SMP_DIR}/src/tx_timer_system_activate.c
${THREADX_COMMON_SMP_DIR}/src/tx_timer_system_deactivate.c
${THREADX_COMMON_SMP_DIR}/src/tx_timer_thread_entry.c
${THREADX_COMMON_SMP_DIR}/src/tx_time_set.c
${THREADX_COMMON_SMP_DIR}/src/tx_trace_buffer_full_notify.c
${THREADX_COMMON_SMP_DIR}/src/tx_trace_disable.c
${THREADX_COMMON_SMP_DIR}/src/tx_trace_enable.c
${THREADX_COMMON_SMP_DIR}/src/tx_trace_event_filter.c
${THREADX_COMMON_SMP_DIR}/src/tx_trace_event_unfilter.c
${THREADX_COMMON_SMP_DIR}/src/tx_trace_initialize.c
${THREADX_COMMON_SMP_DIR}/src/tx_trace_interrupt_control.c
${THREADX_COMMON_SMP_DIR}/src/tx_trace_isr_enter_insert.c
${THREADX_COMMON_SMP_DIR}/src/tx_trace_isr_exit_insert.c
${THREADX_COMMON_SMP_DIR}/src/tx_trace_object_register.c
${THREADX_COMMON_SMP_DIR}/src/tx_trace_object_unregister.c
${THREADX_COMMON_SMP_DIR}/src/tx_trace_user_event_insert.c
)
add_library(threadx_smp STATIC)
target_sources(threadx_smp PRIVATE
${THREADX_SMP_SOURCES}
port/threadx_smp/inc/tx_port.h
+105
View File
@@ -77,6 +77,8 @@
/************* Define ThreadX SMP constants. *************/
#define TX_DISABLE_INLINE
/* Define the ThreadX SMP maximum number of cores. */
#ifndef TX_THREAD_SMP_MAX_CORES
@@ -271,6 +273,109 @@ typedef unsigned short USHORT;
#define TX_THREAD_COMPLETED_EXTENSION(thread_ptr)
#define TX_THREAD_TERMINATED_EXTENSION(thread_ptr)
/* Define automated regression test extensions. These are required for the
ThreadX regression tests. */
typedef unsigned int TEST_FLAG;
extern TEST_FLAG threadx_byte_allocate_loop_test;
extern TEST_FLAG threadx_byte_release_loop_test;
extern TEST_FLAG threadx_mutex_suspension_put_test;
extern TEST_FLAG threadx_mutex_suspension_priority_test;
#ifndef TX_TIMER_PROCESS_IN_ISR
extern TEST_FLAG threadx_delete_timer_thread;
#endif
extern void abort_and_resume_byte_allocating_thread(void);
extern void abort_all_threads_suspended_on_mutex(void);
extern void suspend_lowest_priority(void);
#ifndef TX_TIMER_PROCESS_IN_ISR
extern void delete_timer_thread(void);
#endif
extern TEST_FLAG test_stack_analyze_flag;
extern TEST_FLAG test_initialize_flag;
extern TEST_FLAG test_forced_mutex_timeout;
#ifdef TX_REGRESSION_TEST
/* Define extension macros for automated coverage tests. */
#define TX_BYTE_ALLOCATE_EXTENSION \
if (threadx_byte_allocate_loop_test == ((TEST_FLAG)1)) \
{ \
pool_ptr->tx_byte_pool_owner = TX_NULL; \
threadx_byte_allocate_loop_test = ((TEST_FLAG)0); \
}
#define TX_BYTE_RELEASE_EXTENSION \
if (threadx_byte_release_loop_test == ((TEST_FLAG)1)) \
{ \
threadx_byte_release_loop_test = ((TEST_FLAG)0); \
abort_and_resume_byte_allocating_thread(); \
}
#define TX_MUTEX_PUT_EXTENSION_1 \
if (threadx_mutex_suspension_put_test == ((TEST_FLAG)1)) \
{ \
threadx_mutex_suspension_put_test = ((TEST_FLAG)0); \
abort_all_threads_suspended_on_mutex(); \
}
#define TX_MUTEX_PUT_EXTENSION_2 \
if (test_forced_mutex_timeout == ((TEST_FLAG)1)) \
{ \
test_forced_mutex_timeout = ((TEST_FLAG)0); \
_tx_thread_wait_abort(mutex_ptr->tx_mutex_suspension_list); \
}
#define TX_MUTEX_PRIORITY_CHANGE_EXTENSION \
if (threadx_mutex_suspension_priority_test == ((TEST_FLAG)1)) \
{ \
threadx_mutex_suspension_priority_test = ((TEST_FLAG)0); \
suspend_lowest_priority(); \
}
#ifndef TX_TIMER_PROCESS_IN_ISR
#define TX_TIMER_INITIALIZE_EXTENSION(a) \
if (threadx_delete_timer_thread == ((TEST_FLAG)1)) \
{ \
threadx_delete_timer_thread = ((TEST_FLAG)0); \
delete_timer_thread(); \
(a) = ((UINT)1); \
}
#endif
#define TX_THREAD_STACK_ANALYZE_EXTENSION \
if (test_stack_analyze_flag == ((TEST_FLAG)1)) \
{ \
thread_ptr->tx_thread_id = ((TEST_FLAG)0); \
test_stack_analyze_flag = ((TEST_FLAG)0); \
} \
else if (test_stack_analyze_flag == ((TEST_FLAG)2)) \
{ \
stack_ptr = thread_ptr->tx_thread_stack_start; \
test_stack_analyze_flag = ((TEST_FLAG)0); \
} \
else if (test_stack_analyze_flag == ((TEST_FLAG)3)) \
{ \
*stack_ptr = TX_STACK_FILL; \
test_stack_analyze_flag = ((TEST_FLAG)0); \
} \
else \
{ \
test_stack_analyze_flag = ((TEST_FLAG)0); \
}
#define TX_INITIALIZE_KERNEL_ENTER_EXTENSION \
if (test_initialize_flag == ((TEST_FLAG)1)) \
{ \
test_initialize_flag = ((TEST_FLAG)0); \
return; \
}
#endif
/* Define the ThreadX object creation extensions for the remaining objects. */
#define TX_BLOCK_POOL_CREATE_EXTENSION(pool_ptr)
port/threadx_smp/src/tx_thread_interrupt_control.S
+81
View File
@@ -0,0 +1,81 @@
/***************************************************************************
* Copyright (c) 2024 Microsoft Corporation
*
* This program and the accompanying materials are made available under the
* terms of the MIT License which is available at
* https://opensource.org/licenses/MIT.
*
* SPDX-License-Identifier: MIT
**************************************************************************/
/**************************************************************************/
/**************************************************************************/
/** */
/** ThreadX Component */
/** */
/** Thread */
/** */
/**************************************************************************/
/**************************************************************************/
RETURN_MASK = 0x000000000000000F
SET_SR_MASK = 0xFFFFFFFFFFFFFFF0
.section .text
/**************************************************************************/
/* */
/* FUNCTION RELEASE */
/* */
/* _tx_thread_interrupt_control RISC-V64/GNU */
/* 6.2.1 */
/* AUTHOR */
/* */
/* Scott Larson, Microsoft Corporation */
/* */
/* DESCRIPTION */
/* */
/* This function is responsible for changing the interrupt lockout */
/* posture of the system. */
/* */
/* INPUT */
/* */
/* new_posture New interrupt lockout posture */
/* */
/* OUTPUT */
/* */
/* old_posture Old interrupt lockout posture */
/* */
/* CALLS */
/* */
/* None */
/* */
/* CALLED BY */
/* */
/* Application Code */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 03-08-2023 Scott Larson Initial Version 6.2.1 */
/* */
/**************************************************************************/
/* UINT _tx_thread_interrupt_control(UINT new_posture)
{ */
.global _tx_thread_interrupt_control
_tx_thread_interrupt_control:
/* Pickup current interrupt lockout posture. */
csrr t0, mstatus
mv t1, t0 // Save original mstatus for return
/* Apply the new interrupt posture. */
li t2, SET_SR_MASK // Build set SR mask
and t0, t0, t2 // Isolate interrupt lockout bits
or t0, t0, a0 // Put new lockout bits in
csrw mstatus, t0
andi a0, t1, RETURN_MASK // Return original mstatus.
ret
/* } */
port/threadx_smp/src/tx_thread_schedule.S
+6 -11
View File
@@ -80,20 +80,15 @@ _tx_thread_schedule:
la t0, _tx_thread_execute_ptr // Pickup address of execute ptr
add t0, t0, t4 // Select this hart's execute slot
_tx_thread_schedule_loop:
csrci mstatus, 0x08 // Lockout interrupts
LOAD t1, 0(t0) // Pickup next thread to execute
bnez t1, _tx_thread_schedule_thread // If non-NULL, continue
csrsi mstatus, 0x08 // Enable interrupts
#ifdef TX_ENABLE_WFI
csrci mstatus, 0x08 // Lockout interrupts
LOAD t1, 0(t0) // Pickup next thread to execute
bnez t1, _tx_thread_schedule_thread // If non-NULL, continue
csrsi mstatus, 0x08 // Enable interrupts
wfi // Wait for interrupt
j _tx_thread_schedule_loop // Keep looking for a thread
#else
csrci mstatus, 0x08 // Lockout interrupts
LOAD t1, 0(t0) // Pickup next thread to execute
bnez t1, _tx_thread_schedule_thread // If non-NULL, continue
csrsi mstatus, 0x08 // Enable interrupts
j _tx_thread_schedule_loop // Keep looking for a thread
#endif
j _tx_thread_schedule_loop // Keep looking for a thread
_tx_thread_schedule_thread:
/* Atomically claim the thread's ready token so only one hart can
port/threadx_smp/src/tx_thread_smp_protect.S
+1 -8
View File
@@ -23,18 +23,11 @@ _tx_thread_smp_protect:
/* Try to get the protection. */
LWU t4, 0(t1) // Pickup protection flag
beqz t4, _get_protection // If clear, try to claim it
/* Protection is busy. Restore interrupts and retry. */
csrw mstatus, a0 // Restore interrupts
j _tx_thread_smp_protect // Restart the protection attempt
_get_protection:
bnez t4, _protection_busy // If set, protection is busy
li t4, 1 // Build lock value
amoswap.w.aq t5, t4, (t1) // Attempt to get protection
bnez t5, _protection_busy // If old value != 0, retry
_got_protection:
fence rw, rw // Ensure lock acquisition is visible
sw t2, 4(t1) // Save owning hart
port/threadx_smp/src/tx_thread_smp_unprotect.S
-1
View File
@@ -35,7 +35,6 @@ _tx_thread_smp_unprotect:
/* Release the protection. */
li t3, -1 // Invalid owner value
sw t3, 4(t2) // Mark owning hart invalid
fence rw, rw // Ensure shared accesses complete
amoswap.w.rl x0, x0, (t2) // Release protection flag
_still_protected:
test/CMakeLists.txt
-102
View File
@@ -1,102 +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)
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)
function(setup_target TARGET)
set(options)
set(multiValueArgs LIBRARIES SOURCES)
cmake_parse_arguments(ST "${options}" "" "${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}
)
target_add_moonlight_platform(${TARGET})
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)
test/CMakePresets.json
-90
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"
}
]
}
test/smp/CMakeLists.txt
+275
View File
@@ -0,0 +1,275 @@
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
)
set(TX_CMAKE_DIR
${THREADX4TGFS_ROOT}/third-party/threadx/test/tx/cmake
)
set(TX_REGRESSION_CASES
${TX_REGRESSION_DIR}/threadx_block_memory_basic_test.c
${TX_REGRESSION_DIR}/threadx_block_memory_error_detection_test.c
${TX_REGRESSION_DIR}/threadx_block_memory_information_test.c
${TX_REGRESSION_DIR}/threadx_block_memory_prioritize_test.c
${TX_REGRESSION_DIR}/threadx_block_memory_suspension_test.c
${TX_REGRESSION_DIR}/threadx_block_memory_suspension_timeout_test.c
${TX_REGRESSION_DIR}/threadx_block_memory_thread_terminate_test.c
${TX_REGRESSION_DIR}/threadx_byte_memory_basic_test.c
${TX_REGRESSION_DIR}/threadx_byte_memory_information_test.c
${TX_REGRESSION_DIR}/threadx_byte_memory_prioritize_test.c
${TX_REGRESSION_DIR}/threadx_byte_memory_suspension_test.c
${TX_REGRESSION_DIR}/threadx_byte_memory_suspension_timeout_test.c
${TX_REGRESSION_DIR}/threadx_byte_memory_thread_contention_test.c
${TX_REGRESSION_DIR}/threadx_byte_memory_thread_terminate_test.c
${TX_REGRESSION_DIR}/threadx_event_flag_basic_test.c
${TX_REGRESSION_DIR}/threadx_event_flag_information_test.c
${TX_REGRESSION_DIR}/threadx_event_flag_isr_set_clear_test.c
${TX_REGRESSION_DIR}/threadx_event_flag_isr_wait_abort_test.c
${TX_REGRESSION_DIR}/threadx_event_flag_single_thread_terminate_test.c
${TX_REGRESSION_DIR}/threadx_event_flag_suspension_consume_test.c
${TX_REGRESSION_DIR}/threadx_event_flag_suspension_different_bits_consume_test.c
${TX_REGRESSION_DIR}/threadx_event_flag_suspension_different_bits_test.c
${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
${TX_REGRESSION_DIR}/threadx_mutex_information_test.c
${TX_REGRESSION_DIR}/threadx_mutex_nested_priority_inheritance_test.c
${TX_REGRESSION_DIR}/threadx_mutex_no_preemption_test.c
${TX_REGRESSION_DIR}/threadx_mutex_preemption_test.c
${TX_REGRESSION_DIR}/threadx_mutex_priority_inheritance_test.c
${TX_REGRESSION_DIR}/threadx_mutex_proritize_test.c
${TX_REGRESSION_DIR}/threadx_mutex_suspension_timeout_test.c
${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_empty_suspension_test.c
${TX_REGRESSION_DIR}/threadx_queue_flush_no_suspension_test.c
${TX_REGRESSION_DIR}/threadx_queue_flush_test.c
${TX_REGRESSION_DIR}/threadx_queue_front_send_test.c
${TX_REGRESSION_DIR}/threadx_queue_full_suspension_test.c
${TX_REGRESSION_DIR}/threadx_queue_information_test.c
${TX_REGRESSION_DIR}/threadx_queue_prioritize.c
${TX_REGRESSION_DIR}/threadx_queue_suspension_timeout_test.c
${TX_REGRESSION_DIR}/threadx_queue_thread_terminate_test.c
${TX_REGRESSION_DIR}/threadx_semaphore_basic_test.c
${TX_REGRESSION_DIR}/threadx_semaphore_ceiling_put_test.c
${TX_REGRESSION_DIR}/threadx_semaphore_delete_test.c
${TX_REGRESSION_DIR}/threadx_semaphore_information_test.c
${TX_REGRESSION_DIR}/threadx_semaphore_non_preemption_test.c
${TX_REGRESSION_DIR}/threadx_semaphore_preemption_test.c
${TX_REGRESSION_DIR}/threadx_semaphore_prioritize.c
${TX_REGRESSION_DIR}/threadx_semaphore_thread_terminate_test.c
${TX_REGRESSION_DIR}/threadx_semaphore_timeout_test.c
${TX_REGRESSION_DIR}/threadx_smp_multiple_threads_one_core_test.c
${TX_REGRESSION_DIR}/threadx_smp_non_trivial_scheduling_test.c
${TX_REGRESSION_DIR}/threadx_smp_one_thread_dynamic_exclusion_test.c
${TX_REGRESSION_DIR}/threadx_smp_preemption_threshold_test.c
${TX_REGRESSION_DIR}/threadx_smp_random_resume_suspend_exclusion_pt_test.c
${TX_REGRESSION_DIR}/threadx_smp_random_resume_suspend_exclusion_test.c
${TX_REGRESSION_DIR}/threadx_smp_random_resume_suspend_test.c
${TX_REGRESSION_DIR}/threadx_smp_rebalance_exclusion_test.c
${TX_REGRESSION_DIR}/threadx_smp_relinquish_test.c
${TX_REGRESSION_DIR}/threadx_smp_resume_suspend_accending_order_test.c
${TX_REGRESSION_DIR}/threadx_smp_resume_suspend_decending_order_test.c
${TX_REGRESSION_DIR}/threadx_smp_time_slice_test.c
${TX_REGRESSION_DIR}/threadx_smp_two_threads_one_core_test.c
${TX_REGRESSION_DIR}/threadx_thread_basic_execution_test.c
${TX_REGRESSION_DIR}/threadx_thread_basic_time_slice_test.c
${TX_REGRESSION_DIR}/threadx_thread_completed_test.c
${TX_REGRESSION_DIR}/threadx_thread_create_preemption_threshold_test.c
${TX_REGRESSION_DIR}/threadx_thread_delayed_suspension_test.c
${TX_REGRESSION_DIR}/threadx_thread_information_test.c
${TX_REGRESSION_DIR}/threadx_thread_multi_level_preemption_threshold_test.c
${TX_REGRESSION_DIR}/threadx_thread_multiple_non_current_test.c
${TX_REGRESSION_DIR}/threadx_thread_multiple_sleep_test.c
${TX_REGRESSION_DIR}/threadx_thread_multiple_suspension_test.c
${TX_REGRESSION_DIR}/threadx_thread_multiple_time_slice_test.c
${TX_REGRESSION_DIR}/threadx_thread_preemptable_suspension_test.c
${TX_REGRESSION_DIR}/threadx_thread_preemption_change_test.c
${TX_REGRESSION_DIR}/threadx_thread_priority_change.c
${TX_REGRESSION_DIR}/threadx_thread_relinquish_test.c
${TX_REGRESSION_DIR}/threadx_thread_reset_test.c
${TX_REGRESSION_DIR}/threadx_thread_simple_sleep_non_clear_test.c
${TX_REGRESSION_DIR}/threadx_thread_simple_sleep_test.c
${TX_REGRESSION_DIR}/threadx_thread_simple_suspend_test.c
${TX_REGRESSION_DIR}/threadx_thread_sleep_for_100ticks_test.c
${TX_REGRESSION_DIR}/threadx_thread_sleep_terminate_test.c
${TX_REGRESSION_DIR}/threadx_thread_stack_checking_test.c
${TX_REGRESSION_DIR}/threadx_thread_terminate_delete_test.c
${TX_REGRESSION_DIR}/threadx_thread_time_slice_change_test.c
${TX_REGRESSION_DIR}/threadx_thread_wait_abort_and_isr_test.c
${TX_REGRESSION_DIR}/threadx_thread_wait_abort_test.c
${TX_REGRESSION_DIR}/threadx_time_get_set_test.c
${TX_REGRESSION_DIR}/threadx_timer_activate_deactivate_test.c
${TX_REGRESSION_DIR}/threadx_timer_deactivate_accuracy_test.c
${TX_REGRESSION_DIR}/threadx_timer_information_test.c
${TX_REGRESSION_DIR}/threadx_timer_large_timer_accuracy_test.c
${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 #windows specifics in the test
)
add_library(
threadx_smp_regression_support STATIC
${TX_REGRESSION_DIR}/testcontrol.c
${TX_CMAKE_DIR}/samples/fake.c
)
target_link_libraries(threadx_smp_regression_support PUBLIC threadx_smp c)
target_compile_definitions(
threadx_smp_regression_support
PUBLIC
TX_REGRESSION_TEST
TX_THREAD_SMP_ONLY_CORE_0_DEFAULT
TX_SMP_NOT_POSSIBLE
CTEST
BATCH_TEST
TEST_STACK_SIZE_PRINTF=4096
)
function(add_threadx_regression_test TEST_SOURCE)
get_filename_component(TEST_NAME ${TEST_SOURCE} NAME_WE)
if(TEST_NAME STREQUAL "threadx_initialize_kernel_setup_test")
set(test_libraries threadx_smp)
else()
set(test_libraries threadx_smp_regression_support)
endif()
setup_target(
${TEST_NAME}
PLATFORM_TARGET moonlight_platform_common_smp
LIBRARIES ${test_libraries}
SOURCES ${TEST_SOURCE}
)
list(APPEND TX_REGRESSION_TARGETS ${TEST_NAME})
set(TX_REGRESSION_TARGETS ${TX_REGRESSION_TARGETS} PARENT_SCOPE)
add_test(
NAME ${TEST_NAME}
COMMAND ${THREADX_TEST_SIMULATOR}
--isa=${THREADX_TEST_ISA}
-f $<TARGET_FILE:${TEST_NAME}>
-m 60s
-p tb.top.num_cores=4
)
set_tests_properties(${TEST_NAME} PROPERTIES TIMEOUT 60)
endfunction()
foreach(test_case ${TX_REGRESSION_CASES})
add_threadx_regression_test(${test_case})
endforeach()
add_custom_target(
threadx_smp_regression_build
DEPENDS ${TX_REGRESSION_TARGETS}
)
test/smp/CMakePresets.json
+72
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" }
]
}
test/threadx/CMakeLists.txt
+111 -42
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
)
@@ -5,23 +107,6 @@ set(TX_CMAKE_DIR
${THREADX4TGFS_ROOT}/third-party/threadx/test/tx/cmake
)
# This test needs a local test_interrupt_dispatch() because it does not link testcontrol.c.
set(TX_KERNEL_SETUP_TEST_SOURCE_INPUT ${THREADX4TGFS_ROOT}/third-party/threadx/test/tx/regression/threadx_initialize_kernel_setup_test.c)
set(TX_KERNEL_SETUP_TEST_SOURCE ${CMAKE_BINARY_DIR}/generated/threadx_initialize_kernel_setup_test.c)
add_custom_command(
OUTPUT ${TX_KERNEL_SETUP_TEST_SOURCE}
COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/generate_kernel_setup_test_file.sh
${TX_KERNEL_SETUP_TEST_SOURCE_INPUT}
${TX_KERNEL_SETUP_TEST_SOURCE}
DEPENDS ${TX_KERNEL_SETUP_TEST_SOURCE_INPUT}
${CMAKE_CURRENT_LIST_DIR}/generate_kernel_setup_test_file.sh
VERBATIM
)
add_custom_target(threadx_regression_generated_kernel_setup_test
DEPENDS ${TX_KERNEL_SETUP_TEST_SOURCE}
)
set_source_files_properties(${TX_KERNEL_SETUP_TEST_SOURCE} PROPERTIES GENERATED TRUE)
set(TX_REGRESSION_CASES
${TX_REGRESSION_DIR}/threadx_block_memory_basic_test.c
${TX_REGRESSION_DIR}/threadx_block_memory_error_detection_test.c
@@ -118,7 +203,7 @@ set(TX_REGRESSION_CASES
${TX_REGRESSION_DIR}/threadx_timer_multiple_test.c
${TX_REGRESSION_DIR}/threadx_timer_simple_test.c
${TX_REGRESSION_DIR}/threadx_trace_basic_test.c
${TX_KERNEL_SETUP_TEST_SOURCE}
${TX_REGRESSION_DIR}/threadx_initialize_kernel_setup_test.c
)
set(TX_REGRESSION_TARGETS)
@@ -153,33 +238,17 @@ function(add_threadx_regression_test TEST_SOURCE)
SOURCES ${TEST_SOURCE}
)
if(TEST_NAME STREQUAL "threadx_initialize_kernel_setup_test")
add_dependencies(${TEST_NAME} threadx_regression_generated_kernel_setup_test)
endif()
list(APPEND TX_REGRESSION_TARGETS ${TEST_NAME})
set(TX_REGRESSION_TARGETS ${TX_REGRESSION_TARGETS} PARENT_SCOPE)
if(TEST_NAME STREQUAL "threadx_initialize_kernel_setup_test")
add_test(
NAME ${TEST_NAME}
COMMAND ${CMAKE_CURRENT_LIST_DIR}/run_threadx_simple_test.sh
${THREADX_TEST_SIMULATOR}
${THREADX_TEST_ISA}
$<TARGET_FILE:${TEST_NAME}>
"Running Initialize Kernel Setup Test................................ SUCCESS!"
"Running Initialize Kernel Setup Test................................ ERROR!"
)
else()
add_test(
NAME ${TEST_NAME}
COMMAND ${CMAKE_CURRENT_LIST_DIR}/run_threadx_test.sh
${THREADX_TEST_SIMULATOR}
${THREADX_TEST_ISA}
$<TARGET_FILE:${TEST_NAME}>
)
endif()
set_tests_properties(${TEST_NAME} PROPERTIES TIMEOUT 10)
add_test(
NAME ${TEST_NAME}
COMMAND ${THREADX_TEST_SIMULATOR}
--isa=${THREADX_TEST_ISA}
-f $<TARGET_FILE:${TEST_NAME}>
-m 60s
)
set_tests_properties(${TEST_NAME} PROPERTIES TIMEOUT 60)
endfunction()
foreach(test_case ${TX_REGRESSION_CASES})
test/threadx/CMakePresets.json
+72
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" }
]
}
test/threadx/generate_kernel_setup_test_file.sh
-16
View File
@@ -1,16 +0,0 @@
#!/bin/bash
set -eu
src="$1"
dst="$2"
anchor='void tx_application_define(void *first_unused_memory){}'
line=$(grep -n -F "$anchor" "$src" | head -n 1 | cut -d: -f1)
if [ -z "$line" ]; then
echo "failed to find tx_application_define anchor in kernel setup test source" >&2
exit 1
fi
mkdir -p "$(dirname "$dst")"
sed "${line}a\\
void test_interrupt_dispatch(void){}" "$src" > "$dst"
test/threadx/generate_trap_file.sh
+1 -1
View File
@@ -16,7 +16,7 @@ if [ -z "$line" ]; then
exit 1
fi
sed "${line}a\\
extern void test_interrupt_dispatch(void);" "$src" > "$tmp1"
void test_interrupt_dispatch(void) __attribute__((weak));\nvoid test_interrupt_dispatch(void) {}" "$src" > "$tmp1"
line=$(grep -n -F "$call_anchor" "$tmp1" | head -n 1 | cut -d: -f1)
if [ -z "$line" ]; then
test/threadx/run_threadx_simple_test.sh
-40
View File
@@ -1,40 +0,0 @@
#!/bin/bash
set -euo pipefail
simulator="$1"
isa="$2"
elf="$3"
pass_pattern="$4"
fail_pattern="$5"
if [ ! -x "$simulator" ]; then
echo "Simulator not found or not executable: $simulator" >&2
exit 2
fi
if [ ! -f "$elf" ]; then
echo "ELF not found: $elf" >&2
exit 2
fi
log_file=$(mktemp)
trap 'rm -f "$log_file"' EXIT
"$simulator" \
--isa="$isa" \
-f "$elf" \
-p tb.top.core.finish_condition=1 \
-m 10s \
| tee "$log_file"
if grep -Fq "$fail_pattern" "$log_file"; then
echo "ThreadX regression reported failure pattern: $fail_pattern" >&2
exit 1
fi
if ! grep -Fq "$pass_pattern" "$log_file"; then
echo "Missing expected success pattern in simulator output: $pass_pattern" >&2
exit 1
fi
exit 0
test/threadx/run_threadx_test.sh
-47
View File
@@ -1,47 +0,0 @@
#!/bin/bash
set -euo pipefail
simulator="$1"
isa="$2"
elf="$3"
if [ ! -x "$simulator" ]; then
echo "Simulator not found or not executable: $simulator" >&2
exit 2
fi
if [ ! -f "$elf" ]; then
echo "ELF not found: $elf" >&2
exit 2
fi
log_file=$(mktemp)
trap 'rm -f "$log_file"' EXIT
"$simulator" \
--isa="$isa" \
-f "$elf" \
-m 10s \
| tee "$log_file"
summary_line=$(grep -F "**** Test Summary:" "$log_file" | tail -n 1 || true)
if [ -z "$summary_line" ]; then
echo "Missing ThreadX test summary in simulator output" >&2
exit 1
fi
read -r passed failed errors <<EOF_SUMMARY
$(echo "$summary_line" | sed -n 's/.*Tests Passed:[[:space:]]*\([0-9][0-9]*\)[[:space:]]*Tests Failed:[[:space:]]*\([0-9][0-9]*\)[[:space:]]*System Errors:[[:space:]]*\([0-9][0-9]*\).*/\1 \2 \3/p')
EOF_SUMMARY
if [ -z "${passed:-}" ] || [ -z "${failed:-}" ] || [ -z "${errors:-}" ]; then
echo "Could not parse ThreadX test summary: $summary_line" >&2
exit 1
fi
if [ "$failed" -ne 0 ] || [ "$errors" -ne 0 ]; then
echo "ThreadX regression reported failure: passed=$passed failed=$failed errors=$errors" >&2
exit 1
fi
exit 0
third-party/threadx
Vendored
+1 -1
Submodule third-party/threadx updated: 4b6e8100d9...b148d1de41