Skip to content

Optimize stack management, fix preemption, and add automated QEMU testing for RISC-V32 port #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Winstonllllai wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Optimize stack management, fix preemption, and add automated QEMU testing for RISC-V32 port #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6dee013
docs: resolve merge conflicts in RISC-V 32-bit GNU port files
Winstonllllai Mar 10, 2026
85d0626
feat: implement Lazy FPU Stacking and Vector Table
Winstonllllai Mar 10, 2026
aad13e8
Implement WFI for Idle Loops and Enforce Shadow Stack Alignment
Winstonllllai Jan 8, 2026
633629d
feat: add RISC-V QEMU demo support and fix assembly implementation
Winstonllllai Mar 10, 2026
fedd124
Add RISC-V QEMU functional test runner and FPU verification
Winstonllllai Jan 18, 2026
ae13c5b
feat: use macros for stack offsets and enhance verification framework
Winstonllllai Mar 10, 2026
39ede67
Enable GP Relaxation optimization
Winstonllllai Jan 22, 2026
a1b2457
Optimize stack management and update QEMU port
Winstonllllai Mar 13, 2026
4425c5b
fix preemption logic and interrupt context restore
Winstonllllai Mar 13, 2026
fa9b870
build: stop tracking build_qemu directory and update copyright headers
Winstonllllai Mar 13, 2026
ae2aa03
delete output log file
Winstonllllai Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
.tmp/
_deps/
build/
build_qemu/
Debug/
CMakeFiles/
CMakeScripts/
Expand Down
47 changes: 46 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,49 @@ set(CPACK_SOURCE_IGNORE_FILES
".*~$"
)
set(CPACK_VERBATIM_VARIABLES YES)
include(CPack)
include(CPack)

# Enable the QEMU Virt demo application (Target: kernel.elf)
set(QEMU_DEMO_DIR ${CMAKE_CURRENT_LIST_DIR}/ports/risc-v32/gnu/example_build/qemu_virt)

add_executable(kernel.elf
${QEMU_DEMO_DIR}/demo_threadx.c
${QEMU_DEMO_DIR}/entry.s
${QEMU_DEMO_DIR}/uart.c
${QEMU_DEMO_DIR}/plic.c
${QEMU_DEMO_DIR}/hwtimer.c
${QEMU_DEMO_DIR}/trap.c
${QEMU_DEMO_DIR}/board.c
${QEMU_DEMO_DIR}/tx_initialize_low_level.S
)

Comment on lines +72 to +87
Copy link
Copy Markdown
Contributor

@akifejaz akifejaz Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is port/ level cmake, lets move this under ports/riscv32/ if possible.

target_link_libraries(kernel.elf PRIVATE threadx)

target_include_directories(kernel.elf PRIVATE
${CMAKE_CURRENT_LIST_DIR}/common/inc
${CMAKE_CURRENT_LIST_DIR}/ports/${THREADX_ARCH}/${THREADX_TOOLCHAIN}/inc
${QEMU_DEMO_DIR}
)

# Linker options
target_link_options(kernel.elf PRIVATE
-T${QEMU_DEMO_DIR}/link.lds
-nostartfiles
-Wl,-Map=kernel.map
)

# QEMU Test Runner Target
find_package(Python3 COMPONENTS Interpreter)
if(Python3_FOUND)
add_custom_target(check-functional-riscv32
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test/ports/azrtos_test_tx_gnu_riscv32_qemu.py
--elf $<TARGET_FILE:kernel.elf>
--qemu qemu-system-riscv32
--gdb gdb
DEPENDS kernel.elf
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Running QEMU/GDB Test Runner..."
)
else()
message(WARNING "Python3 not found, run_qemu_test target will not be available.")
endif()
2 changes: 1 addition & 1 deletion cmake/riscv32_gnu.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set(CMAKE_SYSTEM_PROCESSOR risc-v32)

set(THREADX_ARCH "risc-v32")
set(THREADX_TOOLCHAIN "gnu")
set(ARCH_FLAGS "-g -march=rv32gc -mabi=ilp32d -mcmodel=medany")
set(ARCH_FLAGS "-g -march=rv32gc -mabi=ilp32d -mcmodel=medany -mrelax")
set(CFLAGS "${ARCH_FLAGS}")
set(ASFLAGS "${ARCH_FLAGS}")
set(LDFLAGS "${ARCH_FLAGS}")
Expand Down
8 changes: 6 additions & 2 deletions ports/risc-v32/gnu/example_build/qemu_virt/demo_threadx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ void tx_application_define(void *first_unused_memory)

tx_thread_create(&thread_2, "thread 2", thread_2_entry, 2,
pointer, DEMO_STACK_SIZE,
16, 16, 4, TX_AUTO_START);
10, 10, 4, TX_AUTO_START);
Copy link
Copy Markdown
Contributor

@akifejaz akifejaz Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why we need this?


/* Allocate the stack for thread 3. */
tx_byte_allocate(&byte_pool_0, (VOID **) &pointer, DEMO_STACK_SIZE, TX_NO_WAIT);
Expand Down Expand Up @@ -201,7 +201,7 @@ UINT status;
thread_0_counter++;

/* Sleep for 10 ticks. */
tx_thread_sleep(10);
tx_thread_sleep(1);

/* Set event flag 0 to wakeup thread 5. */
status = tx_event_flags_set(&event_flags_0, 0x1, TX_OR);
Expand Down Expand Up @@ -337,6 +337,7 @@ ULONG actual_flags;
}
}

float fpu_test_val = 0.0f;
Copy link
Copy Markdown
Contributor

@akifejaz akifejaz Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can be moved to top after other #defines.


void thread_6_and_7_entry(ULONG thread_input)
{
Expand All @@ -363,6 +364,9 @@ UINT status;
if (status != TX_SUCCESS)
break;

/* FPU Test*/
fpu_test_val += 1.1f;

/* Get the mutex again with suspension. This shows
that an owning thread may retrieve the mutex it
owns multiple times. */
Expand Down
7 changes: 5 additions & 2 deletions ports/risc-v32/gnu/example_build/qemu_virt/entry.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

.section .text
.section .init
.align 4
.global _start
.extern main
Expand All @@ -11,7 +11,10 @@ _start:
bne t0, zero, 1f
li x1, 0
li x2, 0
li x3, 0
.option push
.option norelax
la gp, __global_pointer$
.option pop
Comment on lines +14 to +17
Copy link
Copy Markdown
Contributor

@akifejaz akifejaz Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

x3 register is missing. also I'm not sure why we need to change .text to .init.

li x4, 0
li x5, 0
li x6, 0
Expand Down
5 changes: 5 additions & 0 deletions ports/risc-v32/gnu/example_build/qemu_virt/link.lds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ SECTIONS
* where qemu's -kernel jumps.
*/
. = 0x80000000;

.init : {
KEEP (*(.init))
}

.text : {
*(.text .text.*)
Expand All @@ -24,6 +28,7 @@ SECTIONS

.data : {
. = ALIGN(16);
PROVIDE( __global_pointer$ = . + 0x800 );
*(.sdata .sdata.*) /* do not need to distinguish this from .data */
. = ALIGN(16);
*(.data .data.*)
Expand Down
19 changes: 15 additions & 4 deletions ports/risc-v32/gnu/example_build/qemu_virt/tx_initialize_low_level.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
**************************************************************************/

#include "csr.h"
#include "tx_port.h"

.section .text
.align 4
Expand All @@ -21,6 +22,7 @@
/* AUTHOR */
/* */
/* Akif Ejaz, 10xEngineers */
/* Wei-Chen Lai, National Cheng Kung University */
/* */
/* DESCRIPTION */
/* */
Expand Down Expand Up @@ -60,13 +62,13 @@
.extern trap_handler
.extern _tx_thread_context_restore
trap_entry:
#if defined(__riscv_float_abi_single) || defined(__riscv_float_abi_double)
addi sp, sp, -260 // Allocate space for all registers - with floating point enabled (65*4)
#if defined(__riscv_flen) && ((__riscv_flen == 32)||(__riscv_flen == 64))
addi sp, sp, -65*REGBYTES // Allocate space for all registers - with floating point enabled
#else
addi sp, sp, -128 // Allocate space for all registers - without floating point enabled (32*4)
addi sp, sp, -32*REGBYTES // Allocate space for all registers - without floating point enabled
#endif

sw x1, 112(sp) // Store RA (28*4 = 112, because call will override ra [ra is a callee register in riscv])
STORE x1, 28*REGBYTES(sp) // Store RA, 28*REGBYTES(because call will override ra [ra is a calle register in riscv])
Comment on lines +65 to +71
Copy link
Copy Markdown
Contributor

@akifejaz akifejaz Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we intentionally used the hardcoded numbers, so we do not have to include .h file in .S files.


call _tx_thread_context_save

Expand Down Expand Up @@ -133,6 +135,11 @@ _err:
.extern board_init
_tx_initialize_low_level:

/* debug print
.section .rodata
debug_str_init:
.string "DEBUG : threadx/ports/risc-v32/gnu/example_build/qemu_virt/tx_initialize_low_level.S, _tx_initialize_low_level\n"
*/
.section .text

la t0, _tx_thread_system_stack_ptr
Expand All @@ -155,6 +162,10 @@ _tx_initialize_low_level:
addi sp, sp, -4
sw ra, 0(sp)
call board_init
/* debug print
la a0, debug_str_init
call uart_puts
*/
lw ra, 0(sp)
addi sp, sp, 4
la t0, trap_entry
Expand Down
Loading