X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_spinlock.c;h=180d6deb3b45f7f56f06df38d2ca25741b2cade8;hb=775a8cfc46969a4bb0e7206a2e7b2a630f2f0966;hp=16036a96a2750f0144ddbafefb086f12d63a8d15;hpb=dada9ef6edc59015b6674b5a95258787c71401b0;p=dpdk.git diff --git a/app/test/test_spinlock.c b/app/test/test_spinlock.c index 16036a96a2..180d6deb3b 100644 --- a/app/test/test_spinlock.c +++ b/app/test/test_spinlock.c @@ -1,56 +1,54 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2012 Intel Corporation. All rights reserved. + * + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions * are met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * */ #include #include #include +#include #include #include -#include - #include #include #include #include #include -#include #include #include #include #include #include +#include #include "test.h" @@ -80,7 +78,9 @@ static rte_spinlock_t sl, sl_try; static rte_spinlock_t sl_tab[RTE_MAX_LCORE]; static rte_spinlock_recursive_t slr; -static unsigned count; +static unsigned count = 0; + +static rte_atomic32_t synchro; static int test_spinlock_per_core(__attribute__((unused)) void *arg) @@ -126,60 +126,77 @@ test_spinlock_recursive_per_core(__attribute__((unused)) void *arg) return 0; } -static volatile int count1, count2; static rte_spinlock_t lk = RTE_SPINLOCK_INITIALIZER; -static unsigned int max = 10000000; /* 10M */ -static volatile uint64_t looptime[RTE_MAX_LCORE]; +static uint64_t lock_count[RTE_MAX_LCORE] = {0}; + +#define TIME_MS 100 static int -load_loop_fn(__attribute__((unused)) void *dummy) +load_loop_fn(void *func_param) { - uint64_t end, begin; - begin = rte_get_hpet_cycles(); - unsigned int i = 0; - for ( i = 0; i < max; i++) { - rte_spinlock_lock(&lk); - count1++; - rte_spinlock_unlock(&lk); - count2++; + uint64_t time_diff = 0, begin; + uint64_t hz = rte_get_timer_hz(); + uint64_t lcount = 0; + const int use_lock = *(int*)func_param; + const unsigned lcore = rte_lcore_id(); + + /* wait synchro for slaves */ + if (lcore != rte_get_master_lcore()) + while (rte_atomic32_read(&synchro) == 0); + + begin = rte_get_timer_cycles(); + while (time_diff < hz * TIME_MS / 1000) { + if (use_lock) + rte_spinlock_lock(&lk); + lcount++; + if (use_lock) + rte_spinlock_unlock(&lk); + /* delay to make lock duty cycle slighlty realistic */ + rte_delay_us(1); + time_diff = rte_get_timer_cycles() - begin; } - end = rte_get_hpet_cycles(); - looptime[rte_lcore_id()] = end - begin; + lock_count[lcore] = lcount; return 0; } static int -test_spinlock_load(void) +test_spinlock_perf(void) { - if (rte_lcore_count()<= 1) { - printf("no cores counted\n"); - return -1; - } - printf ("Running %u tests.......\n", max); - printf ("Number of cores = %u\n", rte_lcore_count()); + unsigned int i; + uint64_t total = 0; + int lock = 0; + const unsigned lcore = rte_lcore_id(); - rte_eal_mp_remote_launch(load_loop_fn, NULL , CALL_MASTER); - rte_eal_mp_wait_lcore(); + printf("\nTest with no lock on single core...\n"); + load_loop_fn(&lock); + printf("Core [%u] count = %"PRIu64"\n", lcore, lock_count[lcore]); + memset(lock_count, 0, sizeof(lock_count)); - unsigned int k = 0; - uint64_t avgtime = 0; + printf("\nTest with lock on single core...\n"); + lock = 1; + load_loop_fn(&lock); + printf("Core [%u] count = %"PRIu64"\n", lcore, lock_count[lcore]); + memset(lock_count, 0, sizeof(lock_count)); - RTE_LCORE_FOREACH(k) { - printf("Core [%u] time = %"PRIu64"\n", k, looptime[k]); - avgtime += looptime[k]; - } + printf("\nTest with lock on %u cores...\n", rte_lcore_count()); - avgtime = avgtime / rte_lcore_count(); - printf("Average time = %"PRIu64"\n", avgtime); + /* Clear synchro and start slaves */ + rte_atomic32_set(&synchro, 0); + rte_eal_mp_remote_launch(load_loop_fn, &lock, SKIP_MASTER); - int check = 0; - check = max * rte_lcore_count(); - if (count1 == check && count2 != check) - printf("Passed Load test\n"); - else { - printf("Failed load test\n"); - return -1; + /* start synchro and launch test on master */ + rte_atomic32_set(&synchro, 1); + load_loop_fn(&lock); + + rte_eal_mp_wait_lcore(); + + RTE_LCORE_FOREACH(i) { + printf("Core [%u] count = %"PRIu64"\n", i, lock_count[i]); + total += lock_count[i]; } + + printf("Total count = %"PRIu64"\n", total); + return 0; } @@ -207,7 +224,7 @@ test_spinlock_try(__attribute__((unused)) void *arg) * Test rte_eal_get_lcore_state() in addition to spinlocks * as we have "waiting" then "running" lcores. */ -int +static int test_spinlock(void) { int ret = 0; @@ -241,14 +258,11 @@ test_spinlock(void) RTE_LCORE_FOREACH_SLAVE(i) { rte_spinlock_unlock(&sl_tab[i]); - rte_delay_ms(100); + rte_delay_ms(10); } rte_eal_mp_wait_lcore(); - if (test_spinlock_load()<0) - return -1; - rte_spinlock_recursive_lock(&slr); /* @@ -313,5 +327,14 @@ test_spinlock(void) rte_spinlock_recursive_unlock(&slr); rte_spinlock_recursive_unlock(&slr); + if (test_spinlock_perf() < 0) + return -1; + return ret; } + +static struct test_command spinlock_cmd = { + .command = "spinlock_autotest", + .callback = test_spinlock, +}; +REGISTER_TEST_COMMAND(spinlock_cmd);