Note fuzz refresh in d/changelog

[deb_dpdk.git] / app / test / test_red.c

diff --git a/app/test/test_red.c b/app/test/test_red.c
index 81c9d67..348075d 100644 (file)
--- a/app/test/test_red.c
+++ b/app/test/test_red.c
@@ -57,6 +57,7 @@
 #define MSEC_PER_SEC           1000      /**< Milli-seconds per second */
 #define USEC_PER_MSEC          1000      /**< Micro-seconds per milli-second */
 #define USEC_PER_SEC           1000000   /**< Micro-seconds per second */
+#define NSEC_PER_SEC           (USEC_PER_SEC * 1000) /**< Nano-seconds per second */
 
 /**< structures for testing rte_red performance and function */
 struct test_rte_red_config {        /**< Test structure for RTE_RED config */
@@ -272,43 +273,6 @@ static int check_avg(double *diff, double avg, double exp_avg, double tolerance)
        return ret;
 }
 
-/**
- * get the clk frequency in Hz
- */
-static uint64_t get_machclk_freq(void)
-{
-       uint64_t start = 0;
-       uint64_t end = 0;
-       uint64_t diff = 0;
-       uint64_t clk_freq_hz = 0;
-       struct timespec tv_start = {0, 0}, tv_end = {0, 0};
-       struct timespec req = {0, 0};
-
-       req.tv_sec = 1;
-       req.tv_nsec = 0;
-
-       clock_gettime(CLOCK_REALTIME, &tv_start);
-       start = rte_rdtsc();
-
-       if (nanosleep(&req, NULL) != 0) {
-               perror("get_machclk_freq()");
-               exit(EXIT_FAILURE);
-       }
-
-       clock_gettime(CLOCK_REALTIME, &tv_end);
-       end = rte_rdtsc();
-
-       diff = (uint64_t)(tv_end.tv_sec - tv_start.tv_sec) * USEC_PER_SEC
-               + ((tv_end.tv_nsec - tv_start.tv_nsec + TEST_NSEC_MARGIN) /
-                  USEC_PER_MSEC); /**< diff is in micro secs */
-
-       if (diff == 0)
-               return 0;
-
-       clk_freq_hz = ((end - start) * USEC_PER_SEC / diff);
-       return clk_freq_hz;
-}
-
 /**
  * initialize the test rte_red config
  */
@@ -317,7 +281,7 @@ test_rte_red_init(struct test_config *tcfg)
 {
        unsigned i = 0;
 
-       tcfg->tvar->clk_freq = get_machclk_freq();
+       tcfg->tvar->clk_freq = rte_get_timer_hz();
        init_port_ts( tcfg->tvar->clk_freq );
 
        for (i = 0; i < tcfg->tconfig->num_cfg; i++) {
@@ -435,8 +399,8 @@ static struct test_queue ft_tqueue = {
 };
 
 static struct test_var ft_tvar = {
-       .wait_usec = 250000,
-       .num_iterations = 20,
+       .wait_usec = 10000,
+       .num_iterations = 5,
        .num_ops = 10000,
        .clk_freq = 0,
        .dropped = ft_dropped,
@@ -1747,6 +1711,16 @@ struct tests func_tests[] = {
        { &ovfl_test1_config, ovfl_test1 },
 };
 
+struct tests func_tests_quick[] = {
+       { &func_test1_config, func_test1 },
+       { &func_test2_config, func_test2 },
+       { &func_test3_config, func_test3 },
+       /* no test 4 as it takes a lot of time */
+       { &func_test5_config, func_test5 },
+       { &func_test6_config, func_test6 },
+       { &ovfl_test1_config, ovfl_test1 },
+};
+
 struct tests perf_tests[] = {
        { &perf1_test1_config, perf1_test },
        { &perf1_test2_config, perf1_test },
@@ -1850,31 +1824,62 @@ test_invalid_parameters(void)
        return 0;
 }
 
+static void
+show_stats(const uint32_t num_tests, const uint32_t num_pass)
+{
+       if (num_pass == num_tests)
+               printf("[total: %u, pass: %u]\n", num_tests, num_pass);
+       else
+               printf("[total: %u, pass: %u, fail: %u]\n", num_tests, num_pass,
+                      num_tests - num_pass);
+}
+
+static int
+tell_the_result(const uint32_t num_tests, const uint32_t num_pass)
+{
+       return (num_pass == num_tests) ? 0 : 1;
+}
+
 static int
 test_red(void)
 {
        uint32_t num_tests = 0;
        uint32_t num_pass = 0;
-       int ret = 0;
 
        if (test_invalid_parameters() < 0)
                return -1;
+       run_tests(func_tests_quick, RTE_DIM(func_tests_quick),
+                 &num_tests, &num_pass);
+       show_stats(num_tests, num_pass);
+       return tell_the_result(num_tests, num_pass);
+}
+
+static int
+test_red_perf(void)
+{
+       uint32_t num_tests = 0;
+       uint32_t num_pass = 0;
 
-       run_tests(func_tests, RTE_DIM(func_tests), &num_tests, &num_pass);
        run_tests(perf_tests, RTE_DIM(perf_tests), &num_tests, &num_pass);
+       show_stats(num_tests, num_pass);
+       return tell_the_result(num_tests, num_pass);
+}
 
-       if (num_pass == num_tests) {
-               printf("[total: %u, pass: %u]\n", num_tests, num_pass);
-               ret = 0;
-       } else {
-               printf("[total: %u, pass: %u, fail: %u]\n", num_tests, num_pass, num_tests - num_pass);
-               ret = -1;
-       }
-       return ret;
+static int
+test_red_all(void)
+{
+       uint32_t num_tests = 0;
+       uint32_t num_pass = 0;
+
+       if (test_invalid_parameters() < 0)
+               return -1;
+
+       run_tests(func_tests, RTE_DIM(func_tests), &num_tests, &num_pass);
+       run_tests(perf_tests, RTE_DIM(perf_tests), &num_tests, &num_pass);
+       show_stats(num_tests, num_pass);
+       return tell_the_result(num_tests, num_pass);
 }
 
-static struct test_command red_cmd = {
-       .command = "red_autotest",
-       .callback = test_red,
-};
-REGISTER_TEST_COMMAND(red_cmd);
+REGISTER_TEST_COMMAND(red_autotest, test_red);
+REGISTER_TEST_COMMAND(red_perf, test_red_perf);
+REGISTER_TEST_COMMAND(red_all, test_red_all);