From 8329e37a2459916c3796e029a7aeba6382dd6824 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 21 Nov 2023 11:13:16 +0100 Subject: spec: Fix memory benchmark configurations --- generate_membench.py | 46 +++++++++++++++++++++++------- spec/rtems/message/val/mem-bcst-rcv.yml | 2 ++ spec/rtems/message/val/mem-snd-rcv-del.yml | 2 ++ spec/rtems/message/val/mem-snd-rcv.yml | 2 ++ spec/rtems/message/val/mem-ugt-rcv.yml | 2 ++ spec/rtems/timer/val/mem-after.yml | 2 ++ spec/rtems/timer/val/mem-cancel.yml | 2 ++ spec/rtems/timer/val/mem-delete.yml | 2 ++ spec/rtems/timer/val/mem-reset.yml | 2 ++ spec/rtems/timer/val/mem-srv-after.yml | 2 ++ spec/rtems/timer/val/mem-srv-init.yml | 2 ++ spec/rtems/timer/val/mem-srv-when.yml | 2 ++ spec/rtems/timer/val/mem-when.yml | 2 ++ 13 files changed, 59 insertions(+), 11 deletions(-) diff --git a/generate_membench.py b/generate_membench.py index 9aebff18..bf9d61ea 100755 --- a/generate_membench.py +++ b/generate_membench.py @@ -311,7 +311,9 @@ ${../if/receive:/name}""", """(void) rtems_message_queue_construct( NULL, NULL ); (void) rtems_message_queue_send( 0, NULL, 0 ); (void) rtems_message_queue_receive( 0, NULL, NULL, 0, 0 );""", - _CONFIG_DEFAULT), + """#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 + +""" + _CONFIG_DEFAULT), _Test( "rtems/message", "ugt-rcv", @@ -323,7 +325,9 @@ ${../if/receive:/name}""", """(void) rtems_message_queue_construct( NULL, NULL ); (void) rtems_message_queue_urgent( 0, NULL, 0 ); (void) rtems_message_queue_receive( 0, NULL, NULL, 0, 0 );""", - _CONFIG_DEFAULT), + """#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 + +""" + _CONFIG_DEFAULT), _Test( "rtems/message", "bcst-rcv", @@ -335,7 +339,9 @@ ${../if/receive:/name}""", """(void) rtems_message_queue_construct( NULL, NULL ); (void) rtems_message_queue_broadcast( 0, NULL, 0, NULL ); (void) rtems_message_queue_receive( 0, NULL, NULL, 0, 0 );""", - _CONFIG_DEFAULT), + """#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 + +""" + _CONFIG_DEFAULT), _Test( "rtems/message", "snd-rcv-del", @@ -348,7 +354,9 @@ ${../if/receive:/name}, and ${../if/delete:/name}""", (void) rtems_message_queue_send( 0, NULL, 0 ); (void) rtems_message_queue_receive( 0, NULL, NULL, 0, 0 ); (void) rtems_message_queue_delete( 0 );""", - _CONFIG_DEFAULT), + """#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 + +""" + _CONFIG_DEFAULT), _Test( "rtems/part", "get-ret", @@ -593,7 +601,9 @@ ${../if/create:/name} and ${../if/fire-after:/name}""", None, """(void) rtems_timer_create( 0, NULL ); (void) rtems_timer_fire_after( 0, 0, NULL, NULL );""", - _CONFIG_DEFAULT), + """#define CONFIGURE_MAXIMUM_TIMERS 1 + +""" + _CONFIG_DEFAULT), _Test( "rtems/timer", "when", @@ -603,7 +613,9 @@ ${../if/create:/name} and ${../if/fire-when:/name}""", None, """(void) rtems_timer_create( 0, NULL ); (void) rtems_timer_fire_when( 0, NULL, NULL, NULL );""", - _CONFIG_DEFAULT), + """#define CONFIGURE_MAXIMUM_TIMERS 1 + +""" + _CONFIG_DEFAULT), _Test( "rtems/timer", "cancel", @@ -613,7 +625,9 @@ ${../if/create:/name} and ${../if/cancel:/name}""", None, """(void) rtems_timer_create( 0, NULL ); (void) rtems_timer_cancel( 0 );""", - _CONFIG_DEFAULT), + """#define CONFIGURE_MAXIMUM_TIMERS 1 + +""" + _CONFIG_DEFAULT), _Test( "rtems/timer", "reset", @@ -623,7 +637,9 @@ ${../if/create:/name} and ${../if/reset:/name}""", None, """(void) rtems_timer_create( 0, NULL ); (void) rtems_timer_reset( 0 );""", - _CONFIG_DEFAULT), + """#define CONFIGURE_MAXIMUM_TIMERS 1 + +""" + _CONFIG_DEFAULT), _Test( "rtems/timer", "delete", @@ -633,7 +649,9 @@ ${../if/create:/name} and ${../if/delete:/name}""", None, """(void) rtems_timer_create( 0, NULL ); (void) rtems_timer_delete( 0 );""", - _CONFIG_DEFAULT), + """#define CONFIGURE_MAXIMUM_TIMERS 1 + +""" + _CONFIG_DEFAULT), _Test( "rtems/timer", "srv-init", @@ -657,6 +675,8 @@ static void task_stack_deallocate( void *stack ) #define CONFIGURE_TASK_STACK_DEALLOCATOR task_stack_deallocate +#define CONFIGURE_MAXIMUM_TIMERS 1 + """ + _CONFIG_DEFAULT), _Test( "rtems/timer", @@ -667,7 +687,9 @@ ${../if/create:/name} and ${../if/server-fire-after:/name}""", None, """(void) rtems_timer_create( 0, NULL ); (void) rtems_timer_server_fire_after( 0, 0, NULL, NULL );""", - _CONFIG_DEFAULT), + """#define CONFIGURE_MAXIMUM_TIMERS 1 + +""" + _CONFIG_DEFAULT), _Test( "rtems/timer", "srv-when", @@ -677,7 +699,9 @@ ${../if/create:/name} and ${../if/server-fire-when:/name}""", None, """(void) rtems_timer_create( 0, NULL ); (void) rtems_timer_server_fire_when( 0, NULL, NULL, NULL );""", - _CONFIG_DEFAULT), + """#define CONFIGURE_MAXIMUM_TIMERS 1 + +""" + _CONFIG_DEFAULT), _Test( "rtems/userext", "create", diff --git a/spec/rtems/message/val/mem-bcst-rcv.yml b/spec/rtems/message/val/mem-bcst-rcv.yml index 40a8ddda..136b896e 100644 --- a/spec/rtems/message/val/mem-bcst-rcv.yml +++ b/spec/rtems/message/val/mem-bcst-rcv.yml @@ -21,6 +21,8 @@ test-code: | (void) rtems_message_queue_receive( 0, NULL, NULL, 0, 0 ); } + #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 + #define TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES #define TASK_STORAGE_SIZE \ diff --git a/spec/rtems/message/val/mem-snd-rcv-del.yml b/spec/rtems/message/val/mem-snd-rcv-del.yml index 44c73431..768cc772 100644 --- a/spec/rtems/message/val/mem-snd-rcv-del.yml +++ b/spec/rtems/message/val/mem-snd-rcv-del.yml @@ -22,6 +22,8 @@ test-code: | (void) rtems_message_queue_delete( 0 ); } + #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 + #define TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES #define TASK_STORAGE_SIZE \ diff --git a/spec/rtems/message/val/mem-snd-rcv.yml b/spec/rtems/message/val/mem-snd-rcv.yml index 6a9b8341..04e4a83b 100644 --- a/spec/rtems/message/val/mem-snd-rcv.yml +++ b/spec/rtems/message/val/mem-snd-rcv.yml @@ -21,6 +21,8 @@ test-code: | (void) rtems_message_queue_receive( 0, NULL, NULL, 0, 0 ); } + #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 + #define TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES #define TASK_STORAGE_SIZE \ diff --git a/spec/rtems/message/val/mem-ugt-rcv.yml b/spec/rtems/message/val/mem-ugt-rcv.yml index 4f177a70..24d81506 100644 --- a/spec/rtems/message/val/mem-ugt-rcv.yml +++ b/spec/rtems/message/val/mem-ugt-rcv.yml @@ -21,6 +21,8 @@ test-code: | (void) rtems_message_queue_receive( 0, NULL, NULL, 0, 0 ); } + #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 + #define TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES #define TASK_STORAGE_SIZE \ diff --git a/spec/rtems/timer/val/mem-after.yml b/spec/rtems/timer/val/mem-after.yml index d2cf32ac..586b2b2e 100644 --- a/spec/rtems/timer/val/mem-after.yml +++ b/spec/rtems/timer/val/mem-after.yml @@ -20,6 +20,8 @@ test-code: | (void) rtems_timer_fire_after( 0, 0, NULL, NULL ); } + #define CONFIGURE_MAXIMUM_TIMERS 1 + #define TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES #define TASK_STORAGE_SIZE \ diff --git a/spec/rtems/timer/val/mem-cancel.yml b/spec/rtems/timer/val/mem-cancel.yml index fab5c177..dd2a66bf 100644 --- a/spec/rtems/timer/val/mem-cancel.yml +++ b/spec/rtems/timer/val/mem-cancel.yml @@ -19,6 +19,8 @@ test-code: | (void) rtems_timer_cancel( 0 ); } + #define CONFIGURE_MAXIMUM_TIMERS 1 + #define TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES #define TASK_STORAGE_SIZE \ diff --git a/spec/rtems/timer/val/mem-delete.yml b/spec/rtems/timer/val/mem-delete.yml index f142fd6a..cc68ebb0 100644 --- a/spec/rtems/timer/val/mem-delete.yml +++ b/spec/rtems/timer/val/mem-delete.yml @@ -19,6 +19,8 @@ test-code: | (void) rtems_timer_delete( 0 ); } + #define CONFIGURE_MAXIMUM_TIMERS 1 + #define TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES #define TASK_STORAGE_SIZE \ diff --git a/spec/rtems/timer/val/mem-reset.yml b/spec/rtems/timer/val/mem-reset.yml index 98092728..c64a8301 100644 --- a/spec/rtems/timer/val/mem-reset.yml +++ b/spec/rtems/timer/val/mem-reset.yml @@ -19,6 +19,8 @@ test-code: | (void) rtems_timer_reset( 0 ); } + #define CONFIGURE_MAXIMUM_TIMERS 1 + #define TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES #define TASK_STORAGE_SIZE \ diff --git a/spec/rtems/timer/val/mem-srv-after.yml b/spec/rtems/timer/val/mem-srv-after.yml index 55424910..89c6691e 100644 --- a/spec/rtems/timer/val/mem-srv-after.yml +++ b/spec/rtems/timer/val/mem-srv-after.yml @@ -20,6 +20,8 @@ test-code: | (void) rtems_timer_server_fire_after( 0, 0, NULL, NULL ); } + #define CONFIGURE_MAXIMUM_TIMERS 1 + #define TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES #define TASK_STORAGE_SIZE \ diff --git a/spec/rtems/timer/val/mem-srv-init.yml b/spec/rtems/timer/val/mem-srv-init.yml index 9274c9b2..be95d467 100644 --- a/spec/rtems/timer/val/mem-srv-init.yml +++ b/spec/rtems/timer/val/mem-srv-init.yml @@ -33,6 +33,8 @@ test-code: | #define CONFIGURE_TASK_STACK_DEALLOCATOR task_stack_deallocate + #define CONFIGURE_MAXIMUM_TIMERS 1 + #define TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES #define TASK_STORAGE_SIZE \ diff --git a/spec/rtems/timer/val/mem-srv-when.yml b/spec/rtems/timer/val/mem-srv-when.yml index 57fe4e7c..1487053f 100644 --- a/spec/rtems/timer/val/mem-srv-when.yml +++ b/spec/rtems/timer/val/mem-srv-when.yml @@ -20,6 +20,8 @@ test-code: | (void) rtems_timer_server_fire_when( 0, NULL, NULL, NULL ); } + #define CONFIGURE_MAXIMUM_TIMERS 1 + #define TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES #define TASK_STORAGE_SIZE \ diff --git a/spec/rtems/timer/val/mem-when.yml b/spec/rtems/timer/val/mem-when.yml index 2d31c418..02fbc20b 100644 --- a/spec/rtems/timer/val/mem-when.yml +++ b/spec/rtems/timer/val/mem-when.yml @@ -20,6 +20,8 @@ test-code: | (void) rtems_timer_fire_when( 0, NULL, NULL, NULL ); } + #define CONFIGURE_MAXIMUM_TIMERS 1 + #define TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES #define TASK_STORAGE_SIZE \ -- cgit v1.2.3