hash: add scalable multi-writer insertion with Intel TSX
[dpdk.git] / app / test / test_red.c
index 7cf2221..2384c55 100644 (file)
@@ -43,8 +43,6 @@
 
 #include "test.h"
 
-#ifdef RTE_LIBRTE_SCHED
-
 #include <rte_red.h>
 
 #ifdef __INTEL_COMPILER
@@ -59,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 */
@@ -148,16 +147,7 @@ static void rdtsc_prof_init(struct rdtsc_prof *p, const char *name)
 
 static inline void rdtsc_prof_start(struct rdtsc_prof *p)
 {
-#ifdef __PIC__
-    asm volatile (
-    "mov %%ebx, %%edi\n"
-    "cpuid\n"
-    "xchgl %%ebx, %%edi;\n"
-       : : : "%eax", "%edi", "%ecx", "%edx" );
-#else
-       asm( "cpuid" : : : "%eax", "%ebx", "%ecx", "%edx" );
-#endif
-       p->clk_start = rte_rdtsc();
+       p->clk_start = rte_rdtsc_precise();
 }
 
 static inline void rdtsc_prof_end(struct rdtsc_prof *p)
@@ -240,7 +230,7 @@ static double calc_drop_prob(uint32_t min_th, uint32_t max_th,
        } else {
                drop_prob = 1.0;
        }
-       return (drop_prob);
+       return drop_prob;
 }
 
 /**
@@ -260,7 +250,7 @@ static int check_drop_rate(double *diff, double drop_rate, double drop_prob, dou
                        ret = 0;
                }
         }
-       return (ret);
+       return ret;
 }
 
 /**
@@ -280,7 +270,7 @@ static int check_avg(double *diff, double avg, double exp_avg, double tolerance)
                        ret = 0;
                 }
        }
-       return (ret);
+       return ret;
 }
 
 /**
@@ -291,12 +281,15 @@ 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;
+       static uint64_t clk_freq_hz;
        struct timespec tv_start = {0, 0}, tv_end = {0, 0};
        struct timespec req = {0, 0};
 
-       req.tv_sec = 1;
-       req.tv_nsec = 0;
+       if (clk_freq_hz != 0)
+               return clk_freq_hz;
+
+       req.tv_sec = 0;
+       req.tv_nsec = NSEC_PER_SEC / 4;
 
        clock_gettime(CLOCK_REALTIME, &tv_start);
        start = rte_rdtsc();
@@ -314,10 +307,10 @@ static uint64_t get_machclk_freq(void)
                   USEC_PER_MSEC); /**< diff is in micro secs */
 
        if (diff == 0)
-               return(0);
+               return 0;
 
        clk_freq_hz = ((end - start) * USEC_PER_SEC / diff);
-       return (clk_freq_hz);
+       return clk_freq_hz;
 }
 
 /**
@@ -337,14 +330,14 @@ test_rte_red_init(struct test_config *tcfg)
                                        (uint16_t)tcfg->tconfig->min_th,
                                        (uint16_t)tcfg->tconfig->max_th,
                                        (uint16_t)tcfg->tconfig->maxp_inv[i]) != 0) {
-                       return(FAIL);
+                       return FAIL;
                }
        }
 
        *tcfg->tqueue->q = 0;
        *tcfg->tvar->dropped = 0;
        *tcfg->tvar->enqueued = 0;
-       return(PASS);
+       return PASS;
 }
 
 /**
@@ -375,11 +368,11 @@ increase_actual_qsize(struct rte_red_config *red_cfg,
         * check if target actual queue size has been reached
         */
         if (*q != level)
-                return (-1);
+                return -1;
         /**
          * success
          */
-        return (0);
+        return 0;
 }
 
 /**
@@ -406,11 +399,11 @@ increase_average_qsize(struct rte_red_config *red_cfg,
          */
         avg = rte_red_get_avg_int(red_cfg, red);
         if (avg != level)
-                return (-1);
+                return -1;
         /**
          * success
          */
-        return (0);
+        return 0;
 }
 
 /**
@@ -446,8 +439,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,
@@ -583,7 +576,7 @@ static enum test_result func_test1(struct test_config *tcfg)
                       (double)tcfg->tqueue->drop_tolerance);
        }
 out:
-       return (result);
+       return result;
 }
 
 /**
@@ -694,7 +687,7 @@ static enum test_result func_test2(struct test_config *tcfg)
                       (double)tcfg->tqueue->drop_tolerance);
        }
 out:
-       return (result);
+       return result;
 }
 
 /**
@@ -807,7 +800,7 @@ static enum test_result func_test3(struct test_config *tcfg)
                       diff <= (double)tcfg->tqueue->avg_tolerance ? "pass" : "fail");
        }
 out:
-       return (result);
+       return result;
 }
 
 /**
@@ -949,7 +942,7 @@ static enum test_result func_test4(struct test_config *tcfg)
               diff, (double)tcfg->tqueue->avg_tolerance,
               diff <= (double)tcfg->tqueue->avg_tolerance ? "pass" : "fail");
 out:
-       return (result);
+       return result;
 }
 
 /**
@@ -1089,7 +1082,7 @@ static enum test_result func_test5(struct test_config *tcfg)
                       diff, (double)tcfg->tqueue->drop_tolerance);
        }
 out:
-       return (result);
+       return result;
 }
 
 /**
@@ -1220,7 +1213,7 @@ static enum test_result func_test6(struct test_config *tcfg)
                       diff <= tcfg->tqueue->avg_tolerance ? "pass" : "fail");
        }
 out:
-       return (result);
+       return result;
 }
 
 /**
@@ -1391,7 +1384,7 @@ static enum test_result perf1_test(struct test_config *tcfg)
 
        rdtsc_prof_print(&prof);
 out:
-       return (result);
+       return result;
 }
 
 /**
@@ -1578,7 +1571,7 @@ static enum test_result perf2_test(struct test_config *tcfg)
 
        rdtsc_prof_print(&prof);
 out:
-       return (result);
+       return result;
 }
 
 /**
@@ -1742,7 +1735,7 @@ static enum test_result ovfl_test1(struct test_config *tcfg)
               *tcfg->tvar->enqueued, *tcfg->tvar->dropped,
               drop_prob * 100.0, drop_rate * 100.0);
 out:
-       return (result);
+       return result;
 }
 
 /**
@@ -1758,6 +1751,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 },
@@ -1861,27 +1864,60 @@ 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 = {
@@ -1889,4 +1925,15 @@ static struct test_command red_cmd = {
        .callback = test_red,
 };
 REGISTER_TEST_COMMAND(red_cmd);
-#endif
+
+static struct test_command red_cmd_perf = {
+       .command = "red_perf",
+       .callback = test_red_perf,
+};
+REGISTER_TEST_COMMAND(red_cmd_perf);
+
+static struct test_command red_cmd_all = {
+       .command = "red_all",
+       .callback = test_red_all,
+};
+REGISTER_TEST_COMMAND(red_cmd_all);