From c11f68d20c9982f45d0c45c226312b31866a0301 Mon Sep 17 00:00:00 2001 From: Eyck-Alexander Jentzsch Date: Tue, 24 Mar 2026 18:00:50 +0100 Subject: [PATCH] initial test harness for smp regression --- port/moonlight/CMakeLists.txt | 33 ++- port/threadx_smp/CMakeLists.txt | 199 +++++++++++++++++- port/threadx_smp/inc/tx_port.h | 105 +++++++++ .../src/tx_thread_interrupt_control.S | 81 +++++++ test/CMakeLists.txt | 17 +- test/smp/CMakeLists.txt | 178 ++++++++++++++++ test/threadx/generate_trap_file.sh | 2 +- third-party/threadx | 2 +- 8 files changed, 605 insertions(+), 12 deletions(-) create mode 100644 port/threadx_smp/src/tx_thread_interrupt_control.S create mode 100644 test/smp/CMakeLists.txt diff --git a/port/moonlight/CMakeLists.txt b/port/moonlight/CMakeLists.txt index ae2e4c6..e790854 100644 --- a/port/moonlight/CMakeLists.txt +++ b/port/moonlight/CMakeLists.txt @@ -32,12 +32,19 @@ 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) +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() + +moonlight_define_platform(moonlight_platform_common threadx) +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 @@ -50,7 +57,19 @@ if(DEFINED NETXDUO_CUSTOM_PORT) endif() 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) + set(TAMP_PLATFORM_TARGET moonlight_platform_common) + endif() + + target_link_libraries(${TARGET} PRIVATE ${TAMP_PLATFORM_TARGET}) endfunction() function(target_add_moonlight_network_driver TARGET) diff --git a/port/threadx_smp/CMakeLists.txt b/port/threadx_smp/CMakeLists.txt index e4c04ee..1f2c4bd 100644 --- a/port/threadx_smp/CMakeLists.txt +++ b/port/threadx_smp/CMakeLists.txt @@ -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} diff --git a/port/threadx_smp/inc/tx_port.h b/port/threadx_smp/inc/tx_port.h index 698f36a..e4fc881 100644 --- a/port/threadx_smp/inc/tx_port.h +++ b/port/threadx_smp/inc/tx_port.h @@ -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) diff --git a/port/threadx_smp/src/tx_thread_interrupt_control.S b/port/threadx_smp/src/tx_thread_interrupt_control.S new file mode 100644 index 0000000..c75c7c4 --- /dev/null +++ b/port/threadx_smp/src/tx_thread_interrupt_control.S @@ -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 +/* } */ diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f8d8c89..0c9d216 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -19,6 +19,10 @@ add_subdirectory(${THREADX4TGFS_ROOT}/third-party/threadx ${CMAKE_BINARY_DIR}/th 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") @@ -60,11 +64,15 @@ 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}" "" "${multiValueArgs}" ${ARGN}) + cmake_parse_arguments(ST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) if(ST_UNPARSED_ARGUMENTS) message(FATAL_ERROR "setup_target(${TARGET} ...): unknown args: ${ST_UNPARSED_ARGUMENTS}") endif() @@ -73,7 +81,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(ST_SOURCES) target_sources(${TARGET} PRIVATE ${ST_SOURCES}) @@ -100,3 +112,4 @@ function(setup_target TARGET) endfunction() add_subdirectory(threadx regression_targets) +add_subdirectory(smp smp_regression_targets) diff --git a/test/smp/CMakeLists.txt b/test/smp/CMakeLists.txt new file mode 100644 index 0000000..8cafa8a --- /dev/null +++ b/test/smp/CMakeLists.txt @@ -0,0 +1,178 @@ +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_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_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 + ${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 # requires windows specific port + ${TX_REGRESSION_DIR}/threadx_initialize_kernel_setup_test.c +) + +set(TX_REGRESSION_TARGETS) + +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) + 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) + else() + set(test_libraries threadx_smp_regression_support) + endif() + + setup_target( + ${TARGET_NAME} + PLATFORM_TARGET moonlight_platform_common_smp + LIBRARIES ${test_libraries} + SOURCES ${TEST_SOURCE} + ) + + + list(APPEND TX_REGRESSION_TARGETS ${TARGET_NAME}) + set(TX_REGRESSION_TARGETS ${TX_REGRESSION_TARGETS} PARENT_SCOPE) + + add_test( + NAME ${CTEST_NAME} + COMMAND ${THREADX_TEST_SIMULATOR} + --isa=${THREADX_TEST_ISA} + -f $ + -m 60s + ) + set_tests_properties(${CTEST_NAME} PROPERTIES TIMEOUT 10) +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} +) diff --git a/test/threadx/generate_trap_file.sh b/test/threadx/generate_trap_file.sh index ad7d6e7..2e0f430 100755 --- a/test/threadx/generate_trap_file.sh +++ b/test/threadx/generate_trap_file.sh @@ -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 diff --git a/third-party/threadx b/third-party/threadx index 13ec502..8cd9aed 160000 --- a/third-party/threadx +++ b/third-party/threadx @@ -1 +1 @@ -Subproject commit 13ec5027ee00ca2338c4c988d5a13f9ef037e91a +Subproject commit 8cd9aedbbb014b1837d893681155487f440f9aea