From d88b0e7fc8cdf344217e631b93bd4d6f77510af1 Mon Sep 17 00:00:00 2001 From: Jennifer Averett Date: Thu, 22 May 2014 09:00:14 -0500 Subject: smpschedaffinity01: New test. This test verifies that affinity is honored when set prior to task start. --- testsuites/smptests/Makefile.am | 1 + testsuites/smptests/configure.ac | 1 + testsuites/smptests/smpschedaffinity01/Makefile.am | 19 +++ testsuites/smptests/smpschedaffinity01/init.c | 173 +++++++++++++++++++++ .../smpschedaffinity01/smpschedaffinity01.doc | 11 ++ .../smpschedaffinity01/smpschedaffinity01.scn | 15 ++ 6 files changed, 220 insertions(+) create mode 100644 testsuites/smptests/smpschedaffinity01/Makefile.am create mode 100644 testsuites/smptests/smpschedaffinity01/init.c create mode 100644 testsuites/smptests/smpschedaffinity01/smpschedaffinity01.doc create mode 100644 testsuites/smptests/smpschedaffinity01/smpschedaffinity01.scn diff --git a/testsuites/smptests/Makefile.am b/testsuites/smptests/Makefile.am index 1edfbde7f0..227c036000 100644 --- a/testsuites/smptests/Makefile.am +++ b/testsuites/smptests/Makefile.am @@ -23,6 +23,7 @@ SUBDIRS += smplock01 SUBDIRS += smpmigration01 SUBDIRS += smpmigration02 SUBDIRS += smpmrsp01 +SUBDIRS += smpschedaffinity01 SUBDIRS += smpscheduler01 SUBDIRS += smpscheduler02 SUBDIRS += smpscheduler03 diff --git a/testsuites/smptests/configure.ac b/testsuites/smptests/configure.ac index 79b3bf8a2b..88b43cdf9d 100644 --- a/testsuites/smptests/configure.ac +++ b/testsuites/smptests/configure.ac @@ -81,6 +81,7 @@ smpmrsp01/Makefile smppsxaffinity01/Makefile smppsxaffinity02/Makefile smppsxsignal01/Makefile +smpschedaffinity01/Makefile smpscheduler01/Makefile smpscheduler02/Makefile smpscheduler03/Makefile diff --git a/testsuites/smptests/smpschedaffinity01/Makefile.am b/testsuites/smptests/smpschedaffinity01/Makefile.am new file mode 100644 index 0000000000..353abe155b --- /dev/null +++ b/testsuites/smptests/smpschedaffinity01/Makefile.am @@ -0,0 +1,19 @@ +rtems_tests_PROGRAMS = smpschedaffinity01 +smpschedaffinity01_SOURCES = init.c + +dist_rtems_tests_DATA = smpschedaffinity01.scn smpschedaffinity01.doc + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am + +AM_CPPFLAGS += -I$(top_srcdir)/../support/include + +LINK_OBJS = $(smpschedaffinity01_OBJECTS) +LINK_LIBS = $(smpschedaffinity01_LDLIBS) + +smpschedaffinity01$(EXEEXT): $(smpschedaffinity01_OBJECTS) $(smpschedaffinity01_DEPENDENCIES) + @rm -f smpschedaffinity01$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/smptests/smpschedaffinity01/init.c b/testsuites/smptests/smpschedaffinity01/init.c new file mode 100644 index 0000000000..1f1e32a5da --- /dev/null +++ b/testsuites/smptests/smpschedaffinity01/init.c @@ -0,0 +1,173 @@ +/* + * COPYRIGHT (c) 2014. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.org/license/LICENSE. + */ + +/* + * Start 4 tasks with affinity for each of the 4 cpus. + * Allow tasks to set their actual cpu value and delete themselves. + * Verify the actual cpu values match the expected cpu values. + * + * Init task is at a lower priority 8 and the threads + * with affinity are at priority 4, so the affinity task + * on the core init is running on will preempt it. + * + * Test tasks run and delete themselves. + * Init task never blocks. + */ + +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif + +#include + +#include "tmacros.h" + +const char rtems_test_name[] = "SMPSCHEDAFFINITY 1"; + +#define NUM_CPUS 4 +#define TASK_COUNT 5 + +struct task_data_t { + rtems_id id; + int expected_cpu; + cpu_set_t cpuset; + bool ran; + int actual_cpu; +}; + +static struct task_data_t task_data[NUM_CPUS] = { + {0x0, 2, {{0x4}}, false, -1}, + {0x0, 0, {{0x1}}, false, -1}, + {0x0, 3, {{0x8}}, false, -1}, + {0x0, 1, {{0x2}}, false, -1} +}; + +/* + * Spin loop to allow tasks to delay without yeilding the + * processor. + */ +static void test_delay(int ticks) +{ + rtems_interval start, stop; + start = rtems_clock_get_ticks_since_boot(); + do { + stop = rtems_clock_get_ticks_since_boot(); + } while ( (stop - start) < ticks ); +} + +static void task(rtems_task_argument arg) +{ + uint32_t cpu; + cpu_set_t cpuset; + + cpu = rtems_get_current_processor(); + + rtems_task_get_affinity( rtems_task_self(), sizeof(cpuset), &cpuset ); + + task_data[arg].ran = true; + task_data[arg].actual_cpu = cpu; + + rtems_task_delete( RTEMS_SELF ); +} + +static void test(void) +{ + rtems_status_code sc; + rtems_task_argument i; + size_t size; + uint32_t cpu_count; + + /* Get the number of processors that we are using. */ + cpu_count = rtems_get_processor_count(); + + size = sizeof(cpu_set_t); + + /* Create and start tasks on each cpu with the appropriate affinity. */ + for (i = 0; i < NUM_CPUS; i++) { + + /* Skip if this cpu doesn't exist, don't create task */ + if ( task_data[i].expected_cpu >= cpu_count ) { + printf( "Skipping TA0%d because on a core we do not have\n", i ); + continue; + } + + sc = rtems_task_create( + rtems_build_name('T', 'A', '0', '0'+i), + 4, + RTEMS_MINIMUM_STACK_SIZE, + RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, + &task_data[ i ].id + ); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + printf("Set TA%d affinity to cpu %d\n", i, task_data[i].expected_cpu ); + sc = rtems_task_set_affinity( task_data[ i ].id, size, &task_data[i].cpuset ); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + printf("Start TA%d on cpu %d\n", i, task_data[i].expected_cpu); + sc = rtems_task_start( task_data[ i ].id, task, i ); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + } + + /* spin for 100 ticks */ + test_delay(100); + + printf("Verify Tasks Ran\n"); + for (i = 0; i < NUM_CPUS; i++) { + + /* Skip if this cpu doesn't exist, task doesn't exist */ + if ( task_data[i].expected_cpu >= cpu_count ) { + printf( "Skipping TA0%d because on a core we do not have\n", i ); + continue; + } + + /* print the expected and actual values */ + printf( "TA0%d: ran=%d expected=%d actual=%d\n", + i, + task_data[i].ran, + task_data[i].expected_cpu, + task_data[i].actual_cpu + ); + + /* Abort test if values are not as expected */ + rtems_test_assert( task_data[i].ran == true ); + rtems_test_assert( task_data[i].expected_cpu == task_data[i].actual_cpu ); + } +} + +static void Init(rtems_task_argument arg) +{ + TEST_BEGIN(); + + test(); + + TEST_END(); + rtems_test_exit(0); +} + +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_SMP_APPLICATION + +#define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP + +#define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS + +#define CONFIGURE_MAXIMUM_TASKS TASK_COUNT + +#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION + + #define CONFIGURE_INIT_TASK_PRIORITY 8 +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE + +#define CONFIGURE_INIT + +#include diff --git a/testsuites/smptests/smpschedaffinity01/smpschedaffinity01.doc b/testsuites/smptests/smpschedaffinity01/smpschedaffinity01.doc new file mode 100644 index 0000000000..124b5ed652 --- /dev/null +++ b/testsuites/smptests/smpschedaffinity01/smpschedaffinity01.doc @@ -0,0 +1,11 @@ +This file describes the directives and concepts tested by this test set. + +test set name: smpschedaffinity01 + +directives: + + - _Scheduler_priority_affinity_xxx + +concepts: + + - Ensure that affinity is honored when set prior to task start. diff --git a/testsuites/smptests/smpschedaffinity01/smpschedaffinity01.scn b/testsuites/smptests/smpschedaffinity01/smpschedaffinity01.scn new file mode 100644 index 0000000000..caefb2257f --- /dev/null +++ b/testsuites/smptests/smpschedaffinity01/smpschedaffinity01.scn @@ -0,0 +1,15 @@ +*** BEGIN OF TEST SMPSCHEDAFFINITY 1 *** +Set TA0 affinity to cpu 2 +Start TA0 on cpu 2 +Set TA1 affinity to cpu 0 +Start TA1 on cpu 0 +Set TA2 affinity to cpu 3 +Start TA2 on cpu 3 +Set TA3 affinity to cpu 1 +Start TA3 on cpu 1 +Verify Tasks Ran +TA00: ran=1 expected=2 actual=2 +TA01: ran=1 expected=0 actual=0 +TA02: ran=1 expected=3 actual=3 +TA03: ran=1 expected=1 actual=1 +*** END OF TEST SMPSCHEDAFFINITY 1 *** -- cgit v1.2.3