X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_ring_perf.c;h=320c20cd2cb4c0918bdf207372f7cc9ca49f9ee6;hb=dd0eedb1cfcf0cb7423d859177c5bc6f931eaf8a;hp=25b249fe71a10e75c02d6055c4cc38744ec5055d;hpb=ac3fb3019c5205cfce968c884d8cc010d784307b;p=dpdk.git diff --git a/app/test/test_ring_perf.c b/app/test/test_ring_perf.c index 25b249fe71..320c20cd2c 100644 --- a/app/test/test_ring_perf.c +++ b/app/test/test_ring_perf.c @@ -1,35 +1,34 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2013 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. - * */ @@ -39,8 +38,6 @@ #include #include -#include - #include "test.h" /* @@ -57,7 +54,7 @@ #define RING_SIZE 4096 #define MAX_BURST 32 -/* +/* * the sizes to enqueue and dequeue in testing * (marked volatile so they won't be seen as compile-time constants) */ @@ -169,7 +166,7 @@ test_empty_dequeue(void) (double)(mc_end-mc_start) / iterations); } -/* +/* * for the separate enqueue and dequeue threads they take in one param * and return two. Input = burst size, output = cycle average for sp/sc & mp/mc */ @@ -178,9 +175,9 @@ struct thread_params { double spsc, mpmc; /* output value, the single or multi timings */ }; -/* +/* * Function that uses rdtsc to measure timing for ring enqueue. Needs pair - * thread running dequeue_bulk function + * thread running dequeue_bulk function */ static int enqueue_bulk(void *p) @@ -213,9 +210,9 @@ enqueue_bulk(void *p) return 0; } -/* +/* * Function that uses rdtsc to measure timing for ring dequeue. Needs pair - * thread running enqueue_bulk function + * thread running enqueue_bulk function */ static int dequeue_bulk(void *p) @@ -248,7 +245,7 @@ dequeue_bulk(void *p) return 0; } -/* +/* * Function that calls the enqueue and dequeue bulk functions on pairs of cores. * used to measure ring perf between hyperthreads, cores and sockets. */ @@ -256,7 +253,7 @@ static void run_on_core_pair(struct lcore_pair *cores, lcore_function_t f1, lcore_function_t f2) { - struct thread_params param1 = {.size = 0}, param2 = {.size = 0}; + struct thread_params param1 = {0}, param2 = {0}; unsigned i; for (i = 0; i < sizeof(bulk_sizes)/sizeof(bulk_sizes[0]); i++) { lcore_count = 0; @@ -278,7 +275,7 @@ run_on_core_pair(struct lcore_pair *cores, } } -/* +/* * Test function that determines how long an enqueue + dequeue of a single item * takes on a single lcore. Result is for comparison with the bulk enq+deq. */ @@ -310,7 +307,7 @@ test_single_enqueue_dequeue(void) (mc_end-mc_start) >> iter_shift); } -/* +/* * Test that does both enqueue and dequeue on a core using the burst() API calls * instead of the bulk() calls used in other tests. Results should be the same * as for the bulk function called on a single lcore. @@ -384,7 +381,7 @@ test_bulk_enqueue_dequeue(void) } } -int +static int test_ring_perf(void) { struct lcore_pair cores; @@ -416,3 +413,5 @@ test_ring_perf(void) } return 0; } + +REGISTER_TEST_COMMAND(ring_perf_autotest, test_ring_perf);