app/test: add timer_perf

Signed-off-by: Intel

diff --git a/app/test/Makefile b/app/test/Makefile
index a596ef8..1a56fb5 100644 (file)
--- a/app/test/Makefile
+++ b/app/test/Makefile
@@ -92,6 +92,7 @@ SRCS-$(CONFIG_RTE_APP_TEST) += test_kni.c
 SRCS-$(CONFIG_RTE_APP_TEST) += test_pmac_acl.c
 SRCS-$(CONFIG_RTE_APP_TEST) += test_power.c
 SRCS-$(CONFIG_RTE_APP_TEST) += test_common.c
+SRCS-$(CONFIG_RTE_APP_TEST) += test_timer_perf.c
 
 CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)

diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py
index d69f280..d98d711 100644 (file)
--- a/app/test/autotest_data.py
+++ b/app/test/autotest_data.py
@@ -444,5 +444,17 @@ non_parallel_test_group_list = [
                },
        ]
 },
-
+{
+       "Prefix":       "timer_perf",
+       "Memory" :      all_sockets(512),
+       "Tests" :       
+       [
+               {
+                "Name" :       "Timer performance autotest",
+                "Command" :    "timer_perf_autotest",
+                "Func" :       default_autotest,
+                "Report" :     None,
+               },
+       ]
+},
 ]

diff --git a/app/test/commands.c b/app/test/commands.c
index 4b98018..a907ff7 100644 (file)
--- a/app/test/commands.c
+++ b/app/test/commands.c
@@ -160,6 +160,8 @@ static void cmd_autotest_parsed(void *parsed_result,
                ret |= test_ring_perf();
        if (all || !strcmp(res->autotest, "timer_autotest"))
                ret |= test_timer();
+       if (all || !strcmp(res->autotest, "timer_perf_autotest"))
+               ret |= test_timer_perf();
        if (all || !strcmp(res->autotest, "mempool_autotest"))
                ret |= test_mempool();
        if (all || !strcmp(res->autotest, "mempool_perf_autotest"))
@@ -214,6 +216,7 @@ cmdline_parse_token_string_t cmd_autotest_autotest =
                        "red_autotest#meter_autotest#sched_autotest#"
                        "memcpy_perf_autotest#kni_autotest#"
                        "pm_autotest#acl_autotest#power_autotest#"
+                       "timer_perf_autotest#"
                        "common_autotest#all_autotests");
 
 cmdline_parse_inst_t cmd_autotest = {

diff --git a/app/test/test.h b/app/test/test.h
index b0cf6f7..463707d 100644 (file)
--- a/app/test/test.h
+++ b/app/test/test.h
@@ -64,6 +64,7 @@ int test_mempool(void);
 int test_mempool_perf(void);
 int test_mbuf(void);
 int test_timer(void);
+int test_timer_perf(void);
 int test_malloc(void);
 int test_memcpy(void);
 int test_memcpy_perf(void);

diff --git a/app/test/test_timer_perf.c b/app/test/test_timer_perf.c
new file mode 100644 (file)
index 0000000..c2ac44f
--- /dev/null
+++ b/app/test/test_timer_perf.c
@@ -0,0 +1,158 @@
+/*-
+ *   BSD LICENSE
+ * 
+ *   Copyright(c) 2010-2013 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
+ *   are met:
+ * 
+ *     * 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
+ *       distribution.
+ *     * 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
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <inttypes.h>
+#include <rte_cycles.h>
+#include <rte_timer.h>
+#include <rte_common.h>
+#include <rte_lcore.h>
+#include <rte_random.h>
+#include <rte_malloc.h>
+#include "test.h"
+
+#define MAX_ITERATIONS 1000000
+
+int outstanding_count = 0;
+
+static void
+timer_cb(struct rte_timer *t __rte_unused, void *param __rte_unused)
+{
+       outstanding_count--;
+}
+
+#define DELAY_SECONDS 1
+
+#ifdef RTE_EXEC_ENV_LINUXAPP
+#define do_delay() usleep(10)
+#else
+#define do_delay() rte_pause()
+#endif
+
+int
+test_timer_perf(void)
+{
+       unsigned iterations = 100;
+       unsigned i;
+       struct rte_timer *tms;
+       uint64_t start_tsc, end_tsc, delay_start;
+       unsigned lcore_id = rte_lcore_id();
+
+       tms = rte_malloc(NULL, sizeof(*tms) * MAX_ITERATIONS, 0);
+
+       for (i = 0; i < MAX_ITERATIONS; i++)
+               rte_timer_init(&tms[i]);
+
+       const uint64_t ticks = rte_get_timer_hz() * DELAY_SECONDS;
+       const uint64_t ticks_per_ms = rte_get_tsc_hz()/1000;
+       const uint64_t ticks_per_us = ticks_per_ms/1000;
+
+       while (iterations <= MAX_ITERATIONS) {
+
+               printf("Appending %u timers\n", iterations);
+               start_tsc = rte_rdtsc();
+               for (i = 0; i < iterations; i++)
+                       rte_timer_reset(&tms[i], ticks, SINGLE, lcore_id,
+                                       timer_cb, NULL);
+               end_tsc = rte_rdtsc();
+               printf("Time for %u timers: %"PRIu64" (%"PRIu64"ms), ", iterations,
+                               end_tsc-start_tsc, (end_tsc-start_tsc+ticks_per_ms/2)/(ticks_per_ms));
+               printf("Time per timer: %"PRIu64" (%"PRIu64"us)\n",
+                               (end_tsc-start_tsc)/iterations,
+                               ((end_tsc-start_tsc)/iterations+ticks_per_us/2)/(ticks_per_us));
+               outstanding_count = iterations;
+               delay_start = rte_get_timer_cycles();
+               while (rte_get_timer_cycles() < delay_start + ticks)
+                       do_delay();
+
+               start_tsc = rte_rdtsc();
+               while (outstanding_count)
+                       rte_timer_manage();
+               end_tsc = rte_rdtsc();
+               printf("Time for %u callbacks: %"PRIu64" (%"PRIu64"ms), ", iterations,
+                               end_tsc-start_tsc, (end_tsc-start_tsc+ticks_per_ms/2)/(ticks_per_ms));
+               printf("Time per callback: %"PRIu64" (%"PRIu64"us)\n",
+                               (end_tsc-start_tsc)/iterations,
+                               ((end_tsc-start_tsc)/iterations+ticks_per_us/2)/(ticks_per_us));
+
+               printf("Resetting %u timers\n", iterations);
+               start_tsc = rte_rdtsc();
+               for (i = 0; i < iterations; i++)
+                       rte_timer_reset(&tms[i], rte_rand() % ticks, SINGLE, lcore_id,
+                                       timer_cb, NULL);
+               end_tsc = rte_rdtsc();
+               printf("Time for %u timers: %"PRIu64" (%"PRIu64"ms), ", iterations,
+                               end_tsc-start_tsc, (end_tsc-start_tsc+ticks_per_ms/2)/(ticks_per_ms));
+               printf("Time per timer: %"PRIu64" (%"PRIu64"us)\n",
+                               (end_tsc-start_tsc)/iterations,
+                               ((end_tsc-start_tsc)/iterations+ticks_per_us/2)/(ticks_per_us));
+               outstanding_count = iterations;
+
+               delay_start = rte_get_timer_cycles();
+               while (rte_get_timer_cycles() < delay_start + ticks)
+                       do_delay();
+
+               rte_timer_manage();
+               if (outstanding_count != 0) {
+                       printf("Error: outstanding callback count = %d\n", outstanding_count);
+                       return -1;
+               }
+
+               iterations *= 10;
+               printf("\n");
+       }
+
+       printf("All timers processed ok\n");
+
+       /* measure time to poll an empty timer list */
+       start_tsc = rte_rdtsc();
+       for (i = 0; i < iterations; i++)
+               rte_timer_manage();
+       end_tsc = rte_rdtsc();
+       printf("\nTime per rte_timer_manage with zero timers: %"PRIu64" cycles\n",
+                       (end_tsc - start_tsc + iterations/2) / iterations);
+
+       /* measure time to poll a timer list with timers, but without
+        * calling any callbacks */
+       rte_timer_reset(&tms[0], ticks * 100, SINGLE, lcore_id,
+                       timer_cb, NULL);
+       start_tsc = rte_rdtsc();
+       for (i = 0; i < iterations; i++)
+               rte_timer_manage();
+       end_tsc = rte_rdtsc();
+       printf("Time per rte_timer_manage with zero callbacks: %"PRIu64" cycles\n",
+                       (end_tsc - start_tsc + iterations/2) / iterations);
+
+       return 0;
+}