diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2023-11-24 20:03:42 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2023-11-28 14:30:47 +0100 |
commit | 9fd5d474d3ad739f65dc7e9b544cd96f32397647 (patch) | |
tree | 191260e628397e5dbd255a77ac5f4a6b4f08eccb | |
parent | 016a218cc80f5ff1acaf17452067d473f5177e89 (diff) |
testsuites/isvv: Do not use CFLAGS defines
The CFLAGS influence the entire build. Using them for tests is madness. The
funny defines affected the rtems_board_support_package() directive.
45 files changed, 210 insertions, 193 deletions
diff --git a/spec/build/testsuites/isvv/grp.yml b/spec/build/testsuites/isvv/grp.yml index 318626487f..0076ca494d 100644 --- a/spec/build/testsuites/isvv/grp.yml +++ b/spec/build/testsuites/isvv/grp.yml @@ -12,10 +12,6 @@ install: [] ldflags: [] links: - role: build-dependency - uid: optgr712rc -- role: build-dependency - uid: optgr740 -- role: build-dependency uid: 00_uni_test_reference - role: build-dependency uid: 00_mrsp_omip_uni diff --git a/spec/build/testsuites/isvv/optgr712rc.yml b/spec/build/testsuites/isvv/optgr712rc.yml deleted file mode 100644 index 84751229f0..0000000000 --- a/spec/build/testsuites/isvv/optgr712rc.yml +++ /dev/null @@ -1,17 +0,0 @@ -SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause -actions: -- set-value: -Dgr712rc=1 -- env-assign: null -- env-append: CFLAGS -build-type: option -copyrights: -- Copyright (C) 2022 Critical Software SA -default: -- enabled-by: true - value: null -description: | - Enable flags to configure ISVV tests for gr712rc -enabled-by: sparc/gr712rc -links: [] -name: ISVV_FLAGS -type: build diff --git a/spec/build/testsuites/isvv/optgr740.yml b/spec/build/testsuites/isvv/optgr740.yml deleted file mode 100644 index 1ff260d05e..0000000000 --- a/spec/build/testsuites/isvv/optgr740.yml +++ /dev/null @@ -1,17 +0,0 @@ -SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause -actions: -- set-value: -Dgr740=1 -- env-assign: null -- env-append: CFLAGS -build-type: option -copyrights: -- Copyright (C) 2022 Critical Software SA -default: -- enabled-by: true - value: null -description: | - Enable flags to configure ISVV tests for gr740 -enabled-by: sparc/gr740 -links: [] -name: ISVV_FLAGS -type: build diff --git a/spec/build/testsuites/isvv/optperiodlength.yml b/spec/build/testsuites/isvv/optperiodlength.yml new file mode 100644 index 0000000000..4344d34b74 --- /dev/null +++ b/spec/build/testsuites/isvv/optperiodlength.yml @@ -0,0 +1,19 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +actions: +- get-integer: null +- define: null +build-type: option +copyrights: +- Copyright (C) 2023 embedded brains GmbH & Co. KG +default: +- enabled-by: sparc/gr740 + value: 800 +- enabled-by: true + value: 2500 +description: | + The period length for the ISVV tests. +enabled-by: true +format: '{}' +links: [] +name: ISVV_TEST_PERIOD_LENGTH +type: build diff --git a/spec/build/testsuites/isvv/optprocessors.yml b/spec/build/testsuites/isvv/optprocessors.yml new file mode 100644 index 0000000000..cbcb0836ed --- /dev/null +++ b/spec/build/testsuites/isvv/optprocessors.yml @@ -0,0 +1,19 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +actions: +- get-integer: null +- define: null +build-type: option +copyrights: +- Copyright (C) 2023 embedded brains GmbH & Co. KG +default: +- enabled-by: sparc/gr740 + value: 4 +- enabled-by: true + value: 2 +description: | + The processor count for the ISVV tests. +enabled-by: true +format: '{}' +links: [] +name: ISVV_TEST_PROCESSORS +type: build diff --git a/spec/build/testsuites/isvv/optt0period.yml b/spec/build/testsuites/isvv/optt0period.yml new file mode 100644 index 0000000000..38164d7ca5 --- /dev/null +++ b/spec/build/testsuites/isvv/optt0period.yml @@ -0,0 +1,20 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +actions: +- get-integer: null +- define: null +build-type: option +copyrights: +- Copyright (C) 2023 embedded brains GmbH & Co. KG +default: +- enabled-by: sparc/gr740 + value: 400 +- enabled-by: true + value: 600 +description: | + The T0 period for the ISVV tests. The value depends on the processor + performance. +enabled-by: true +format: '{}' +links: [] +name: ISVV_TEST_T0_PERIOD +type: build diff --git a/spec/build/testsuites/isvv/optt1period.yml b/spec/build/testsuites/isvv/optt1period.yml new file mode 100644 index 0000000000..19125dd252 --- /dev/null +++ b/spec/build/testsuites/isvv/optt1period.yml @@ -0,0 +1,20 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +actions: +- get-integer: null +- define: null +build-type: option +copyrights: +- Copyright (C) 2023 embedded brains GmbH & Co. KG +default: +- enabled-by: sparc/gr740 + value: 200 +- enabled-by: true + value: 300 +description: | + The T1 period for the ISVV tests. The value depends on the processor + performance. +enabled-by: true +format: '{}' +links: [] +name: ISVV_TEST_T1_PERIOD +type: build diff --git a/spec/build/testsuites/testopts.yml b/spec/build/testsuites/testopts.yml index 48724d492c..b5e60b4d89 100644 --- a/spec/build/testsuites/testopts.yml +++ b/spec/build/testsuites/testopts.yml @@ -9,5 +9,13 @@ install-path: ${BSP_INCLUDEDIR}/rtems links: - role: build-dependency uid: optverbosity +- role: build-dependency + uid: isvv/optperiodlength +- role: build-dependency + uid: isvv/optprocessors +- role: build-dependency + uid: isvv/optt0period +- role: build-dependency + uid: isvv/optt1period target: cpukit/include/rtems/testopts.h type: build diff --git a/testsuites/isvv/00_uni_test_reference/basic_smp_uni.c b/testsuites/isvv/00_uni_test_reference/basic_smp_uni.c index c31cfc3b29..3d4c195d99 100644 --- a/testsuites/isvv/00_uni_test_reference/basic_smp_uni.c +++ b/testsuites/isvv/00_uni_test_reference/basic_smp_uni.c @@ -53,9 +53,9 @@ #define ITOA_STR_SIZE (8 * sizeof(int) + 1) // test specific global vars -#undef TEST_PROCESSORS -#define TEST_PROCESSORS 1 -#define TASK_COUNT TEST_PROCESSORS +#undef ISVV_TEST_PROCESSORS +#define ISVV_TEST_PROCESSORS 1 +#define TASK_COUNT ISVV_TEST_PROCESSORS static void Init(rtems_task_argument arg) { @@ -80,9 +80,9 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS -#define CONFIGURE_MAXIMUM_TASKS (TEST_PROCESSORS + 2) +#define CONFIGURE_MAXIMUM_TASKS (ISVV_TEST_PROCESSORS + 2) #define CONFIGURE_MINIMUM_TASKS_WITH_USER_PROVIDED_STORAGE \ CONFIGURE_MAXIMUM_TASKS diff --git a/testsuites/isvv/00_uni_test_reference/mrsp_omip_uni.c b/testsuites/isvv/00_uni_test_reference/mrsp_omip_uni.c index b4dfd5b893..29348660cd 100644 --- a/testsuites/isvv/00_uni_test_reference/mrsp_omip_uni.c +++ b/testsuites/isvv/00_uni_test_reference/mrsp_omip_uni.c @@ -54,8 +54,8 @@ TASK_ATTRIBUTES) // test specific global vars -#undef TEST_PROCESSORS -#define TEST_PROCESSORS 1 +#undef ISVV_TEST_PROCESSORS +#define ISVV_TEST_PROCESSORS 1 #define TASK_COUNT 3 #define END_OF_STREAM UINT8_MAX @@ -369,7 +369,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_SEMAPHORES 2 diff --git a/testsuites/isvv/01_basic_smp_multi/basic_smp_multi.c b/testsuites/isvv/01_basic_smp_multi/basic_smp_multi.c index ff7ce9ac68..add603edba 100644 --- a/testsuites/isvv/01_basic_smp_multi/basic_smp_multi.c +++ b/testsuites/isvv/01_basic_smp_multi/basic_smp_multi.c @@ -52,7 +52,7 @@ #define ITOA_STR_SIZE (8 * sizeof(int) + 1) // test specific global vars -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS static rtems_id start_barrier; static rtems_id TASK_COUNTER_SEMAPHORE; @@ -166,13 +166,13 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_SEMAPHORES 1 #define CONFIGURE_MAXIMUM_BARRIERS 1 -#define CONFIGURE_MAXIMUM_TASKS ( TEST_PROCESSORS + 1 ) +#define CONFIGURE_MAXIMUM_TASKS ( ISVV_TEST_PROCESSORS + 1 ) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/02_core_affinity_multi/core_affinity_multi.c b/testsuites/isvv/02_core_affinity_multi/core_affinity_multi.c index 5f3fea32d7..aa6e7b2a5c 100644 --- a/testsuites/isvv/02_core_affinity_multi/core_affinity_multi.c +++ b/testsuites/isvv/02_core_affinity_multi/core_affinity_multi.c @@ -54,7 +54,7 @@ #define ITOA_STR_SIZE (8 * sizeof(int) + 1) // test specific global vars -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS static rtems_id start_barrier; static rtems_id TASK_COUNTER_SEMAPHORE; @@ -171,13 +171,13 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_SEMAPHORES 1 #define CONFIGURE_MAXIMUM_BARRIERS 1 -#define CONFIGURE_MAXIMUM_TASKS ( TEST_PROCESSORS + 1 ) +#define CONFIGURE_MAXIMUM_TASKS ( ISVV_TEST_PROCESSORS + 1 ) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/03_semaphores_multi/semaphores_multi.c b/testsuites/isvv/03_semaphores_multi/semaphores_multi.c index b9e3ddb31d..b3ff92aa6e 100644 --- a/testsuites/isvv/03_semaphores_multi/semaphores_multi.c +++ b/testsuites/isvv/03_semaphores_multi/semaphores_multi.c @@ -58,7 +58,7 @@ #define ITOA_STR_SIZE (8 * sizeof(int) + 1) // test specific global vars -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS rtems_event_set event_send[4] = {RTEMS_EVENT_1, RTEMS_EVENT_2, @@ -209,7 +209,7 @@ static void Init(rtems_task_argument arg) { #define CONFIGURE_MAXIMUM_BARRIERS 1 -#define CONFIGURE_MAXIMUM_TASKS (TEST_PROCESSORS + 1) +#define CONFIGURE_MAXIMUM_TASKS (ISVV_TEST_PROCESSORS + 1) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/04_messages_multi/messages_multi.c b/testsuites/isvv/04_messages_multi/messages_multi.c index 556e819333..9e82e34f31 100644 --- a/testsuites/isvv/04_messages_multi/messages_multi.c +++ b/testsuites/isvv/04_messages_multi/messages_multi.c @@ -56,7 +56,7 @@ #define ITOA_STR_SIZE (8 * sizeof(int) + 1) // test specific global vars -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS #define TOTAL_TILES 64 #define MAX_MESSAGE_QUEUES 5 @@ -232,13 +232,13 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES MAX_MESSAGE_QUEUES #define CONFIGURE_MAXIMUM_SEMAPHORES 1 -#define CONFIGURE_MAXIMUM_TASKS ( TEST_PROCESSORS + 1 ) +#define CONFIGURE_MAXIMUM_TASKS ( ISVV_TEST_PROCESSORS + 1 ) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/05_priorities_multi/priorities_multi.c b/testsuites/isvv/05_priorities_multi/priorities_multi.c index 7eceda6a30..cb83fe96ad 100644 --- a/testsuites/isvv/05_priorities_multi/priorities_multi.c +++ b/testsuites/isvv/05_priorities_multi/priorities_multi.c @@ -61,7 +61,7 @@ #define ITOA_STR_SIZE (8 * sizeof(int) + 1) // test specific global vars -#define TASK_COUNT (TEST_PROCESSORS * 2) +#define TASK_COUNT (ISVV_TEST_PROCESSORS * 2) #define TOTAL_TILES 64 #define MAX_MESSAGE_QUEUES (TASK_COUNT + 1) @@ -242,7 +242,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES MAX_MESSAGE_QUEUES diff --git a/testsuites/isvv/06_rate_monotonic_multi/rate_monotonic_multi.c b/testsuites/isvv/06_rate_monotonic_multi/rate_monotonic_multi.c index 2b7d66b2c6..cc50c2105a 100644 --- a/testsuites/isvv/06_rate_monotonic_multi/rate_monotonic_multi.c +++ b/testsuites/isvv/06_rate_monotonic_multi/rate_monotonic_multi.c @@ -54,15 +54,10 @@ /* Given the board, define rate monotonic period length to approx. the mean time needed to calculate a single tile */ -#ifdef gr740 - const rtems_interval PERIOD_LENGTH = 800; -#endif -#ifdef gr712rc - const rtems_interval PERIOD_LENGTH = 2500; -#endif +const rtems_interval PERIOD_LENGTH = ISVV_TEST_PERIOD_LENGTH; // test specific global vars -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS #define TOTAL_TILES 64 rtems_event_set event_send[4] = {RTEMS_EVENT_1, @@ -249,7 +244,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_SEMAPHORES 1 @@ -257,7 +252,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_MAXIMUM_BARRIERS 1 -#define CONFIGURE_MAXIMUM_TASKS (TEST_PROCESSORS + 1) +#define CONFIGURE_MAXIMUM_TASKS (ISVV_TEST_PROCESSORS + 1) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/07_timer_multi/timer_multi.c b/testsuites/isvv/07_timer_multi/timer_multi.c index ac163bfa66..2643cf7751 100644 --- a/testsuites/isvv/07_timer_multi/timer_multi.c +++ b/testsuites/isvv/07_timer_multi/timer_multi.c @@ -62,7 +62,7 @@ #define ITOA_STR_SIZE (8 * sizeof(int) + 1) // test specific global vars -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS #define TOTAL_TILES 64 void service_timer(rtems_id timer_id, void *user_data); @@ -246,7 +246,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_SEMAPHORES 1 @@ -256,7 +256,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_MAXIMUM_TIMERS 2 -#define CONFIGURE_MAXIMUM_TASKS (TEST_PROCESSORS + 1) +#define CONFIGURE_MAXIMUM_TASKS (ISVV_TEST_PROCESSORS + 1) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/09_timer_server_multi/timer_server_multi.c b/testsuites/isvv/09_timer_server_multi/timer_server_multi.c index 016761b9dd..f61cda6e05 100644 --- a/testsuites/isvv/09_timer_server_multi/timer_server_multi.c +++ b/testsuites/isvv/09_timer_server_multi/timer_server_multi.c @@ -67,7 +67,7 @@ #define ITOA_STR_SIZE (8 * sizeof(int) + 1) // test specific global vars -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS rtems_event_set event_send[4] = {RTEMS_EVENT_1, RTEMS_EVENT_2, @@ -224,7 +224,7 @@ static void Init( rtems_task_argument arg ) { #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_SEMAPHORES 1 @@ -234,7 +234,7 @@ static void Init( rtems_task_argument arg ) { #define CONFIGURE_MAXIMUM_TIMERS 2 -#define CONFIGURE_MAXIMUM_TASKS (TEST_PROCESSORS + 1) +#define CONFIGURE_MAXIMUM_TASKS (ISVV_TEST_PROCESSORS + 1) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/10_barrier_multi/barrier_multi.c b/testsuites/isvv/10_barrier_multi/barrier_multi.c index 8f023813f6..d5a3601b52 100644 --- a/testsuites/isvv/10_barrier_multi/barrier_multi.c +++ b/testsuites/isvv/10_barrier_multi/barrier_multi.c @@ -59,7 +59,7 @@ #define ITOA_STR_SIZE (8 * sizeof(int) + 1) // test specific global vars -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS #define TOTAL_TILES 64 rtems_event_set event_send[] = {RTEMS_EVENT_1, @@ -259,7 +259,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES MAX_MESSAGE_QUEUES @@ -267,7 +267,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_MAXIMUM_BARRIERS 2 -#define CONFIGURE_MAXIMUM_TASKS (TEST_PROCESSORS + 1) +#define CONFIGURE_MAXIMUM_TASKS (ISVV_TEST_PROCESSORS + 1) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/10_barrier_multi/barrier_multi_timeout.c b/testsuites/isvv/10_barrier_multi/barrier_multi_timeout.c index 7d41641cb6..665f5afe12 100644 --- a/testsuites/isvv/10_barrier_multi/barrier_multi_timeout.c +++ b/testsuites/isvv/10_barrier_multi/barrier_multi_timeout.c @@ -62,7 +62,7 @@ #define ITOA_STR_SIZE (8 * sizeof(int) + 1) // test specific global vars -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS #define TOTAL_TILES 64 rtems_event_set event_send[] = {RTEMS_EVENT_1, @@ -294,7 +294,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES MAX_MESSAGE_QUEUES @@ -302,7 +302,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_MAXIMUM_BARRIERS 2 -#define CONFIGURE_MAXIMUM_TASKS (TEST_PROCESSORS + 1) +#define CONFIGURE_MAXIMUM_TASKS (ISVV_TEST_PROCESSORS + 1) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/11_MrsP_multi/mrsp_multi.c b/testsuites/isvv/11_MrsP_multi/mrsp_multi.c index f5c23d1b86..3d7f7c7ffe 100644 --- a/testsuites/isvv/11_MrsP_multi/mrsp_multi.c +++ b/testsuites/isvv/11_MrsP_multi/mrsp_multi.c @@ -54,8 +54,8 @@ TASK_ATTRIBUTES) // test specific global vars -#undef TEST_PROCESSORS -#define TEST_PROCESSORS 2 +#undef ISVV_TEST_PROCESSORS +#define ISVV_TEST_PROCESSORS 2 #define TASK_COUNT 3 #define END_OF_STREAM UINT8_MAX @@ -378,7 +378,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_SEMAPHORES 2 diff --git a/testsuites/isvv/12_OMIP_multi/omip_multi.c b/testsuites/isvv/12_OMIP_multi/omip_multi.c index 5256b04487..c050aebadb 100644 --- a/testsuites/isvv/12_OMIP_multi/omip_multi.c +++ b/testsuites/isvv/12_OMIP_multi/omip_multi.c @@ -54,8 +54,8 @@ TASK_ATTRIBUTES) // test specific global vars -#undef TEST_PROCESSORS -#define TEST_PROCESSORS 2 +#undef ISVV_TEST_PROCESSORS +#define ISVV_TEST_PROCESSORS 2 #define TASK_COUNT 3 #define END_OF_STREAM UINT8_MAX @@ -378,7 +378,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_SEMAPHORES 2 diff --git a/testsuites/isvv/13_priority_inheritance/priority_inheritance.c b/testsuites/isvv/13_priority_inheritance/priority_inheritance.c index afa5a61350..ab0854bb1c 100644 --- a/testsuites/isvv/13_priority_inheritance/priority_inheritance.c +++ b/testsuites/isvv/13_priority_inheritance/priority_inheritance.c @@ -48,16 +48,6 @@ * and shows that our high priority task will FREQUENTLY overrun the time in its critical region */ -// Different periods for our periodic tasks needed for robustness and reliability as -// Execution is dependant on processor clock speed i.e 250 MHz for gr740 and 80 MHz for gr712rc -#ifdef gr740 -#define T0_PERIOD 400 -#define T1_PERIOD 200 -#else -#define T0_PERIOD 600 -#define T1_PERIOD 300 -#endif - #ifdef PRIO_INHERIT #define PRIO_PROTOCOL_SWITCH RTEMS_INHERIT_PRIORITY #else @@ -96,8 +86,8 @@ static float inSensorDataIm[FFT_SIZE]; MAX_TLS_SIZE + RTEMS_MINIMUM_STACK_SIZE, \ TASK_ATTRIBUTES) -#undef TEST_PROCESSORS -#define TEST_PROCESSORS 1 +#undef ISVV_TEST_PROCESSORS +#define ISVV_TEST_PROCESSORS 1 #define TASK_COUNT 3 #define EVENT_FINISHED_PROCESSING RTEMS_EVENT_0 @@ -136,7 +126,7 @@ static void solar_flare_analysis(rtems_task_argument arg) while (1) { - WaitPeriod(ctx->period_0_id, T0_PERIOD); + WaitPeriod(ctx->period_0_id, ISVV_TEST_T0_PERIOD); // Timer to see how long it takes to enter and exit critical region start_time = rtems_clock_get_ticks_since_boot(); @@ -173,7 +163,7 @@ static void decode_communications(rtems_task_argument arg) while (1) { - WaitPeriod(ctx->period_1_id, T1_PERIOD); + WaitPeriod(ctx->period_1_id, ISVV_TEST_T1_PERIOD); start_time = rtems_clock_get_ticks_since_boot(); @@ -193,7 +183,7 @@ static void decode_communications(rtems_task_argument arg) // If the execution time is greater than the period, and hence implicit deadline, then // this test cannot sufficiently be completed with the resources and parameters must be changed - if (elapsed_time >= T1_PERIOD) + if (elapsed_time >= ISVV_TEST_T1_PERIOD) print_string("[ERROR] Execution time of T1 is greater than period. Please reduce T1_TUNE_REPS \n"); } @@ -411,7 +401,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_TASKS (TASK_COUNT + 1) diff --git a/testsuites/isvv/14_immediate_ceiling_protocol/immediate_ceiling.c b/testsuites/isvv/14_immediate_ceiling_protocol/immediate_ceiling.c index 4d1916820d..df82aa8110 100644 --- a/testsuites/isvv/14_immediate_ceiling_protocol/immediate_ceiling.c +++ b/testsuites/isvv/14_immediate_ceiling_protocol/immediate_ceiling.c @@ -48,16 +48,6 @@ * and shows that our high priority task will FREQUENTLY overrun the time in its critical region */ -// Different periods for our periodic tasks needed for robustness and reliability as -// Execution is dependant on processor clock speed i.e 250 MHz for gr740 and 80 MHz for gr712rc -#ifdef gr740 -#define T0_PERIOD 400 -#define T1_PERIOD 200 -#else -#define T0_PERIOD 600 -#define T1_PERIOD 300 -#endif - #ifdef PRIO_CEILING #define PRIO_PROTOCOL_SWITCH RTEMS_PRIORITY_CEILING #else @@ -96,8 +86,8 @@ static float inSensorDataIm[FFT_SIZE]; MAX_TLS_SIZE + RTEMS_MINIMUM_STACK_SIZE, \ TASK_ATTRIBUTES) -#undef TEST_PROCESSORS -#define TEST_PROCESSORS 1 +#undef ISVV_TEST_PROCESSORS +#define ISVV_TEST_PROCESSORS 1 #define TASK_COUNT 3 #define EVENT_FINISHED_PROCESSING RTEMS_EVENT_0 @@ -136,7 +126,7 @@ static void solar_flare_analysis(rtems_task_argument arg) while (1) { - WaitPeriod(ctx->period_0_id, T0_PERIOD); + WaitPeriod(ctx->period_0_id, ISVV_TEST_T0_PERIOD); // Timer to see how long it takes to enter and exit critical region start_time = rtems_clock_get_ticks_since_boot(); @@ -173,7 +163,7 @@ static void decode_communications(rtems_task_argument arg) while (1) { - WaitPeriod(ctx->period_1_id, T1_PERIOD); + WaitPeriod(ctx->period_1_id, ISVV_TEST_T1_PERIOD); start_time = rtems_clock_get_ticks_since_boot(); @@ -193,7 +183,7 @@ static void decode_communications(rtems_task_argument arg) // If the execution time is greater than the period, and hence implicit deadline, then // this test cannot sufficiently be completed with the resources and parameters must be changed - if (elapsed_time >= T1_PERIOD) + if (elapsed_time >= ISVV_TEST_T1_PERIOD) print_string("[ERROR] Execution time of T1 is greater than period. Please reduce T1_TUNE_REPS \n"); } @@ -430,7 +420,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_TASKS (TASK_COUNT + 1) diff --git a/testsuites/isvv/15_clock_manager_undefined_behaviour/clock_manager_undefined_behaviour.c b/testsuites/isvv/15_clock_manager_undefined_behaviour/clock_manager_undefined_behaviour.c index 7bbeae8bd9..07b4d4182e 100644 --- a/testsuites/isvv/15_clock_manager_undefined_behaviour/clock_manager_undefined_behaviour.c +++ b/testsuites/isvv/15_clock_manager_undefined_behaviour/clock_manager_undefined_behaviour.c @@ -53,7 +53,7 @@ #define TASK_ATTRIBUTES RTEMS_FLOATING_POINT // test specific global vars -#define TASK_COUNT (TEST_PROCESSORS - 1) +#define TASK_COUNT (ISVV_TEST_PROCESSORS - 1) #define ITOA_STR_SIZE (8 * sizeof(int) + 1) @@ -539,13 +539,13 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_SEMAPHORES 1 #define CONFIGURE_MAXIMUM_BARRIERS 1 -#define CONFIGURE_MAXIMUM_TASKS (TEST_PROCESSORS + 1) +#define CONFIGURE_MAXIMUM_TASKS (ISVV_TEST_PROCESSORS + 1) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/16_task_manager_undefined_behaviour/task_manager_undefined_behaviour.c b/testsuites/isvv/16_task_manager_undefined_behaviour/task_manager_undefined_behaviour.c index 6852e5899f..787d000bef 100644 --- a/testsuites/isvv/16_task_manager_undefined_behaviour/task_manager_undefined_behaviour.c +++ b/testsuites/isvv/16_task_manager_undefined_behaviour/task_manager_undefined_behaviour.c @@ -57,7 +57,7 @@ // We want to create mandelbrot executions whilst our task manager functions // are executed on another core -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS #define CALCULATION_TASKS ((TASK_COUNT) - 1) // Timing related variables to ensure concurrent executions @@ -425,7 +425,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_SEMAPHORES 1 @@ -434,7 +434,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_MAXIMUM_BARRIERS 1 -#define CONFIGURE_MAXIMUM_TASKS (TEST_PROCESSORS + 1) +#define CONFIGURE_MAXIMUM_TASKS (ISVV_TEST_PROCESSORS + 1) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/17_barrier_manager_undefined_behaviour/barrier_manager_undefined_behaviour.c b/testsuites/isvv/17_barrier_manager_undefined_behaviour/barrier_manager_undefined_behaviour.c index b9cbd103ad..581416c005 100644 --- a/testsuites/isvv/17_barrier_manager_undefined_behaviour/barrier_manager_undefined_behaviour.c +++ b/testsuites/isvv/17_barrier_manager_undefined_behaviour/barrier_manager_undefined_behaviour.c @@ -59,7 +59,7 @@ // test specific global vars #define TEST_BARRIERS_COUNT 3 -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS #define TOTAL_TILES 64 #define EVENT_BARRIER RTEMS_EVENT_5 @@ -404,13 +404,13 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_SEMAPHORES 1 #define CONFIGURE_MAXIMUM_BARRIERS 5 -#define CONFIGURE_MAXIMUM_TASKS (TEST_PROCESSORS + 1) +#define CONFIGURE_MAXIMUM_TASKS (ISVV_TEST_PROCESSORS + 1) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/18_event_manager_undefined_behaviour/event_manager_undefined_behaviour.c b/testsuites/isvv/18_event_manager_undefined_behaviour/event_manager_undefined_behaviour.c index d4fd458b9a..5094ea1b10 100644 --- a/testsuites/isvv/18_event_manager_undefined_behaviour/event_manager_undefined_behaviour.c +++ b/testsuites/isvv/18_event_manager_undefined_behaviour/event_manager_undefined_behaviour.c @@ -63,10 +63,10 @@ #define SEND_EVENTS_PERIOD 2 // One task for sending events, one task for receiving events, and n-1 calculation tasks -#define TASK_COUNT (TEST_PROCESSORS) + 1 +#define TASK_COUNT (ISVV_TEST_PROCESSORS) + 1 // We want to create mandelbrot executions whilst our events manager functions execute -#define CALCULATION_TASKS (TEST_PROCESSORS) - 1 +#define CALCULATION_TASKS (ISVV_TEST_PROCESSORS) - 1 #define EVENT_CALLS 15 const rtems_event_set TEST_EVENTS[EVENT_CALLS] = {RTEMS_EVENT_0, @@ -377,7 +377,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS // Reduce the priority of the Init task so all other tasks can be scheduled to all other cores #define CONFIGURE_INIT_TASK_PRIORITY PRIO_LOW diff --git a/testsuites/isvv/19_message_manager_undefined_behaviour/message_manager_undefined_behaviour.c b/testsuites/isvv/19_message_manager_undefined_behaviour/message_manager_undefined_behaviour.c index 48b2aa7cbd..d963ca31ea 100644 --- a/testsuites/isvv/19_message_manager_undefined_behaviour/message_manager_undefined_behaviour.c +++ b/testsuites/isvv/19_message_manager_undefined_behaviour/message_manager_undefined_behaviour.c @@ -57,7 +57,7 @@ #define TEST_MESSAGE_QUEUES_COUNT 3 -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS #define TEST_TASK (TASK_COUNT - 1) #define MANDL_TASKS (TASK_COUNT - 1) #define TOTAL_TILES 64 @@ -305,13 +305,13 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES MAX_MESSAGE_QUEUES #define CONFIGURE_MAXIMUM_BARRIERS 1 -#define CONFIGURE_MAXIMUM_TASKS (TEST_PROCESSORS + 1) +#define CONFIGURE_MAXIMUM_TASKS (ISVV_TEST_PROCESSORS + 1) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/20_partition_manager_undefined_behaviour/partition_manager_undefined_behaviour.c b/testsuites/isvv/20_partition_manager_undefined_behaviour/partition_manager_undefined_behaviour.c index 6006f4e64a..9b5bac1617 100644 --- a/testsuites/isvv/20_partition_manager_undefined_behaviour/partition_manager_undefined_behaviour.c +++ b/testsuites/isvv/20_partition_manager_undefined_behaviour/partition_manager_undefined_behaviour.c @@ -59,8 +59,8 @@ // We want to create mandelbrot executions whilst our manager functions // Are executed on another core -#define TASK_COUNT TEST_PROCESSORS -#define CALCULATION_TASKS ((TEST_PROCESSORS) - 1) +#define TASK_COUNT ISVV_TEST_PROCESSORS +#define CALCULATION_TASKS ((ISVV_TEST_PROCESSORS) - 1) // Timing related variables to ensure concurrent executions #define RELATIVE_SLEEP 0 @@ -314,7 +314,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_SEMAPHORES 1 @@ -325,7 +325,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_MAXIMUM_BARRIERS 1 -#define CONFIGURE_MAXIMUM_TASKS ((TEST_PROCESSORS) + 1) +#define CONFIGURE_MAXIMUM_TASKS ((ISVV_TEST_PROCESSORS) + 1) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/21_semaphore_manager_undefined_behaviour/semaphore_manager_undefined_behaviour.c b/testsuites/isvv/21_semaphore_manager_undefined_behaviour/semaphore_manager_undefined_behaviour.c index 778c938c60..7893f936d2 100644 --- a/testsuites/isvv/21_semaphore_manager_undefined_behaviour/semaphore_manager_undefined_behaviour.c +++ b/testsuites/isvv/21_semaphore_manager_undefined_behaviour/semaphore_manager_undefined_behaviour.c @@ -55,7 +55,7 @@ TASK_ATTRIBUTES) // test specific global vars -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS #define MANDL_TASKS (TASK_COUNT - 1) #define LAST_TASK (TASK_COUNT - 1) @@ -620,13 +620,13 @@ static void Init(rtems_task_argument arg) { #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_SEMAPHORES 1 #define CONFIGURE_MAXIMUM_BARRIERS 1 -#define CONFIGURE_MAXIMUM_TASKS (TEST_PROCESSORS + 1) +#define CONFIGURE_MAXIMUM_TASKS (ISVV_TEST_PROCESSORS + 1) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/22_base_defs_undefined_behaviour/base_defs_undefined_behaviour.c b/testsuites/isvv/22_base_defs_undefined_behaviour/base_defs_undefined_behaviour.c index ebe58c7240..92cb3e0300 100644 --- a/testsuites/isvv/22_base_defs_undefined_behaviour/base_defs_undefined_behaviour.c +++ b/testsuites/isvv/22_base_defs_undefined_behaviour/base_defs_undefined_behaviour.c @@ -56,10 +56,10 @@ #define TASK_ATTRIBUTES RTEMS_FLOATING_POINT // One task for undefined task, and n-1 calculation tasks -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS // We want to create mandelbrot executions whilst our undefined calls are executing -#define CALCULATION_TASKS ((TEST_PROCESSORS)-1) +#define CALCULATION_TASKS ((ISVV_TEST_PROCESSORS)-1) #define FUNCTION_CALLS 32 #define UNDEF_FUNC_CALLS (FUNCTION_CALLS / 2) @@ -294,7 +294,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS // Reduce the priority of the Init task so all other tasks can be schedules to all other cores #define CONFIGURE_INIT_TASK_PRIORITY PRIO_LOW diff --git a/testsuites/isvv/23.10_uni_cache_l2_enabled/uni_cache_l2_enabled.c b/testsuites/isvv/23.10_uni_cache_l2_enabled/uni_cache_l2_enabled.c index bf1ac2083e..155386ff1d 100644 --- a/testsuites/isvv/23.10_uni_cache_l2_enabled/uni_cache_l2_enabled.c +++ b/testsuites/isvv/23.10_uni_cache_l2_enabled/uni_cache_l2_enabled.c @@ -77,10 +77,10 @@ TASK_ATTRIBUTES) // test specific global vars -#undef TEST_PROCESSORS -#define TEST_PROCESSORS 1 +#undef ISVV_TEST_PROCESSORS +#define ISVV_TEST_PROCESSORS 1 -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS #define TOTAL_TILES 64 #define MAX_MESSAGE_SIZE sizeof(uint8_t) @@ -329,9 +329,9 @@ static void Init(rtems_task_argument arg){ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS -#define CONFIGURE_MAXIMUM_TASKS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_TASKS ISVV_TEST_PROCESSORS #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/23.11_multi_cache_l2_enabled/multi_cache_l2_enabled.c b/testsuites/isvv/23.11_multi_cache_l2_enabled/multi_cache_l2_enabled.c index 73badbf092..51220f0793 100644 --- a/testsuites/isvv/23.11_multi_cache_l2_enabled/multi_cache_l2_enabled.c +++ b/testsuites/isvv/23.11_multi_cache_l2_enabled/multi_cache_l2_enabled.c @@ -47,7 +47,7 @@ * There is one set of math equations processed: * - named "filter_simulation" * - * The equations for "filter_simulation" are used by TEST_PROCESSORS tasks that + * The equations for "filter_simulation" are used by ISVV_TEST_PROCESSORS tasks that * processes small sections of a "data array" in parallel. * * The locations in memory for acessing the small sections of the "data arrays" do @@ -90,7 +90,7 @@ TASK_ATTRIBUTES) // test specific global vars -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS #define TOTAL_TILES 64 #define MAX_MESSAGE_QUEUES 5 @@ -448,13 +448,13 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES MAX_MESSAGE_QUEUES #define CONFIGURE_MAXIMUM_SEMAPHORES 1 -#define CONFIGURE_MAXIMUM_TASKS ( TEST_PROCESSORS + 1 ) +#define CONFIGURE_MAXIMUM_TASKS ( ISVV_TEST_PROCESSORS + 1 ) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/23.12_multi_cache_l2_disabled/multi_cache_l2_disabled.c b/testsuites/isvv/23.12_multi_cache_l2_disabled/multi_cache_l2_disabled.c index a9e0382b03..0146090f00 100644 --- a/testsuites/isvv/23.12_multi_cache_l2_disabled/multi_cache_l2_disabled.c +++ b/testsuites/isvv/23.12_multi_cache_l2_disabled/multi_cache_l2_disabled.c @@ -47,7 +47,7 @@ * There is one set of math equations processed: * - named "filter_simulation" * - * The equations for "filter_simulation" are used by TEST_PROCESSORS tasks that + * The equations for "filter_simulation" are used by ISVV_TEST_PROCESSORS tasks that * processes small sections of a "data array" in parallel. * * The locations in memory for acessing the small sections of the "data arrays" do @@ -91,7 +91,7 @@ TASK_ATTRIBUTES) // test specific global vars -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS #define TOTAL_TILES 64 #define MAX_MESSAGE_QUEUES 5 @@ -450,13 +450,13 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES MAX_MESSAGE_QUEUES #define CONFIGURE_MAXIMUM_SEMAPHORES 1 -#define CONFIGURE_MAXIMUM_TASKS ( TEST_PROCESSORS + 1 ) +#define CONFIGURE_MAXIMUM_TASKS ( ISVV_TEST_PROCESSORS + 1 ) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/23.1_uni_cache_way_locking_disabled/uni_cache_way_locking_disabled.c b/testsuites/isvv/23.1_uni_cache_way_locking_disabled/uni_cache_way_locking_disabled.c index 311812bf91..9f1321fc6a 100644 --- a/testsuites/isvv/23.1_uni_cache_way_locking_disabled/uni_cache_way_locking_disabled.c +++ b/testsuites/isvv/23.1_uni_cache_way_locking_disabled/uni_cache_way_locking_disabled.c @@ -78,8 +78,8 @@ // test specific global vars -#undef TEST_PROCESSORS -#define TEST_PROCESSORS 1 +#undef ISVV_TEST_PROCESSORS +#define ISVV_TEST_PROCESSORS 1 #define TASK_COUNT (2+2) //2 parallel tasks for "filter simulation" and // another 2 sequential tasks for "snr processing" @@ -501,9 +501,9 @@ static void Init(rtems_task_argument arg){ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS -#define CONFIGURE_MAXIMUM_TASKS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_TASKS ISVV_TEST_PROCESSORS #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/23.2_multi_cache_way_locking_disabled/multi_cache_way_locking_disabled.c b/testsuites/isvv/23.2_multi_cache_way_locking_disabled/multi_cache_way_locking_disabled.c index 653d7e3cc9..1bb36501c8 100644 --- a/testsuites/isvv/23.2_multi_cache_way_locking_disabled/multi_cache_way_locking_disabled.c +++ b/testsuites/isvv/23.2_multi_cache_way_locking_disabled/multi_cache_way_locking_disabled.c @@ -112,9 +112,9 @@ typedef struct{ rtems_id main_task; uint8_t ntiles; uint8_t next_tile; - rtems_id task_filter_simulation_id[TEST_PROCESSORS]; + rtems_id task_filter_simulation_id[ISVV_TEST_PROCESSORS]; rtems_id tile_queue; - rtems_id message_queue[TEST_PROCESSORS]; + rtems_id message_queue[ISVV_TEST_PROCESSORS]; rtems_id filter_mutex_id; float filter_sim_process_time; uint64_t accxL2; @@ -658,7 +658,7 @@ static void Init(rtems_task_argument arg){ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES MAX_MESSAGE_QUEUES diff --git a/testsuites/isvv/23.3_multi_cache_way_locking_enabled/multi_cache_way_locking_enabled.c b/testsuites/isvv/23.3_multi_cache_way_locking_enabled/multi_cache_way_locking_enabled.c index 5e85036ddf..2542169889 100644 --- a/testsuites/isvv/23.3_multi_cache_way_locking_enabled/multi_cache_way_locking_enabled.c +++ b/testsuites/isvv/23.3_multi_cache_way_locking_enabled/multi_cache_way_locking_enabled.c @@ -124,9 +124,9 @@ typedef struct{ rtems_id main_task; uint8_t ntiles; uint8_t next_tile; - rtems_id task_filter_simulation_id[TEST_PROCESSORS]; + rtems_id task_filter_simulation_id[ISVV_TEST_PROCESSORS]; rtems_id tile_queue; - rtems_id message_queue[TEST_PROCESSORS]; + rtems_id message_queue[ISVV_TEST_PROCESSORS]; rtems_id filter_mutex_id; float filter_sim_process_time; uint64_t accxL2; @@ -672,7 +672,7 @@ static void Init(rtems_task_argument arg){ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES MAX_MESSAGE_QUEUES diff --git a/testsuites/isvv/23.4_uni_cache_split_transactions_disabled/uni_cache_split_transactions_disabled.c b/testsuites/isvv/23.4_uni_cache_split_transactions_disabled/uni_cache_split_transactions_disabled.c index 1d7c62948c..52f23092a7 100644 --- a/testsuites/isvv/23.4_uni_cache_split_transactions_disabled/uni_cache_split_transactions_disabled.c +++ b/testsuites/isvv/23.4_uni_cache_split_transactions_disabled/uni_cache_split_transactions_disabled.c @@ -78,10 +78,10 @@ TASK_ATTRIBUTES) // test specific global vars -#undef TEST_PROCESSORS -#define TEST_PROCESSORS 1 +#undef ISVV_TEST_PROCESSORS +#define ISVV_TEST_PROCESSORS 1 -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS #define TOTAL_TILES 64 #define MAX_MESSAGE_SIZE sizeof(uint8_t) @@ -333,9 +333,9 @@ static void Init(rtems_task_argument arg){ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS -#define CONFIGURE_MAXIMUM_TASKS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_TASKS ISVV_TEST_PROCESSORS #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/23.5_multi_cache_split_transactions_disabled/multi_cache_split_transactions_disabled.c b/testsuites/isvv/23.5_multi_cache_split_transactions_disabled/multi_cache_split_transactions_disabled.c index d748d9fd7e..bd52f04734 100644 --- a/testsuites/isvv/23.5_multi_cache_split_transactions_disabled/multi_cache_split_transactions_disabled.c +++ b/testsuites/isvv/23.5_multi_cache_split_transactions_disabled/multi_cache_split_transactions_disabled.c @@ -47,7 +47,7 @@ * There is one set of math equations processed: * - named "filter_simulation" * - * The equations for "filter_simulation" are used by TEST_PROCESSORS tasks that + * The equations for "filter_simulation" are used by ISVV_TEST_PROCESSORS tasks that * processes small sections of a "data array" in parallel. * * The locations in memory for acessing the small sections of the "data arrays" do @@ -90,7 +90,7 @@ TASK_ATTRIBUTES) // test specific global vars -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS #define TOTAL_TILES 64 #define MAX_MESSAGE_QUEUES 5 @@ -450,13 +450,13 @@ static void Init(rtems_task_argument arg){ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES MAX_MESSAGE_QUEUES #define CONFIGURE_MAXIMUM_SEMAPHORES 1 -#define CONFIGURE_MAXIMUM_TASKS ( TEST_PROCESSORS + 1 ) +#define CONFIGURE_MAXIMUM_TASKS ( ISVV_TEST_PROCESSORS + 1 ) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/23.6_multi_cache_split_transactions_enabled/multi_cache_split_transactions_enabled.c b/testsuites/isvv/23.6_multi_cache_split_transactions_enabled/multi_cache_split_transactions_enabled.c index b24966c979..a699f9e0f2 100644 --- a/testsuites/isvv/23.6_multi_cache_split_transactions_enabled/multi_cache_split_transactions_enabled.c +++ b/testsuites/isvv/23.6_multi_cache_split_transactions_enabled/multi_cache_split_transactions_enabled.c @@ -47,7 +47,7 @@ * There is one set of math equations processed: * - named "filter_simulation" * - * The equations for "filter_simulation" are used by TEST_PROCESSORS tasks that + * The equations for "filter_simulation" are used by ISVV_TEST_PROCESSORS tasks that * processes small sections of a "data array" in parallel. * * The locations in memory for acessing the small sections of the "data arrays" do @@ -94,7 +94,7 @@ TASK_ATTRIBUTES) // test specific global vars -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS #define TOTAL_TILES 64 #define MAX_MESSAGE_QUEUES 5 @@ -454,13 +454,13 @@ static void Init(rtems_task_argument arg){ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES MAX_MESSAGE_QUEUES #define CONFIGURE_MAXIMUM_SEMAPHORES 1 -#define CONFIGURE_MAXIMUM_TASKS ( TEST_PROCESSORS + 1 ) +#define CONFIGURE_MAXIMUM_TASKS ( ISVV_TEST_PROCESSORS + 1 ) #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/23.7_uni_cache_repl_policy_l2_lru/uni_cache_repl_policy_l2_lru.c b/testsuites/isvv/23.7_uni_cache_repl_policy_l2_lru/uni_cache_repl_policy_l2_lru.c index d349e0636a..26ad34d96b 100644 --- a/testsuites/isvv/23.7_uni_cache_repl_policy_l2_lru/uni_cache_repl_policy_l2_lru.c +++ b/testsuites/isvv/23.7_uni_cache_repl_policy_l2_lru/uni_cache_repl_policy_l2_lru.c @@ -78,10 +78,10 @@ // test specific global vars -#undef TEST_PROCESSORS -#define TEST_PROCESSORS 1 +#undef ISVV_TEST_PROCESSORS +#define ISVV_TEST_PROCESSORS 1 -#define TASK_COUNT TEST_PROCESSORS +#define TASK_COUNT ISVV_TEST_PROCESSORS #define TOTAL_TILES 128 #define MAX_MESSAGE_SIZE sizeof(uint8_t) @@ -498,9 +498,9 @@ static void Init(rtems_task_argument arg){ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS -#define CONFIGURE_MAXIMUM_TASKS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_TASKS ISVV_TEST_PROCESSORS #define CONFIGURE_SCHEDULER_EDF_SMP diff --git a/testsuites/isvv/23.8_multi_cache_repl_policy_l2_lru/multi_cache_repl_policy_l2_lru.c b/testsuites/isvv/23.8_multi_cache_repl_policy_l2_lru/multi_cache_repl_policy_l2_lru.c index 46ed9eb7c8..d4de52783a 100644 --- a/testsuites/isvv/23.8_multi_cache_repl_policy_l2_lru/multi_cache_repl_policy_l2_lru.c +++ b/testsuites/isvv/23.8_multi_cache_repl_policy_l2_lru/multi_cache_repl_policy_l2_lru.c @@ -679,7 +679,7 @@ static void Init(rtems_task_argument arg){ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES MAX_MESSAGE_QUEUES diff --git a/testsuites/isvv/23.9_multi_cache_repl_policy_l2_random/multi_cache_repl_policy_l2_random.c b/testsuites/isvv/23.9_multi_cache_repl_policy_l2_random/multi_cache_repl_policy_l2_random.c index 5888b8107e..da05134aad 100644 --- a/testsuites/isvv/23.9_multi_cache_repl_policy_l2_random/multi_cache_repl_policy_l2_random.c +++ b/testsuites/isvv/23.9_multi_cache_repl_policy_l2_random/multi_cache_repl_policy_l2_random.c @@ -682,7 +682,7 @@ static void Init(rtems_task_argument arg){ #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_PROCESSORS TEST_PROCESSORS +#define CONFIGURE_MAXIMUM_PROCESSORS ISVV_TEST_PROCESSORS #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES MAX_MESSAGE_QUEUES diff --git a/testsuites/isvv/shared/utils.h b/testsuites/isvv/shared/utils.h index 3de91eb3a9..d8d735e172 100644 --- a/testsuites/isvv/shared/utils.h +++ b/testsuites/isvv/shared/utils.h @@ -29,15 +29,9 @@ * Calculates the mandebroot set */ #include <rtems.h> +#include <rtems/testopts.h> #include "trig_tables.h" -#ifdef gr740 - #define TEST_PROCESSORS 4 -#endif -#ifdef gr712rc - #define TEST_PROCESSORS 2 -#endif - #define MAXITERATION 255 #define IMAGE_WIDTH 2250 #define IMAGE_HEIGHT 2250 |