net/ice: fix VLAN 0 adding based on VLAN mode

[dpdk.git] / app / test-eventdev / test_perf_common.c

diff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c
index e7cf75a..34cded3 100644 (file)
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -133,8 +133,9 @@ perf_event_timer_producer(void *arg)
        fflush(stdout);
        rte_delay_ms(1000);
        printf("%s(): lcore %d Average event timer arm latency = %.3f us\n",
-                       __func__, rte_lcore_id(), (float)(arm_latency / count) /
-                       (rte_get_timer_hz() / 1000000));
+                       __func__, rte_lcore_id(),
+                       count ? (float)(arm_latency / count) /
+                       (rte_get_timer_hz() / 1000000) : 0);
        return 0;
 }
 
@@ -194,8 +195,9 @@ perf_event_timer_producer_burst(void *arg)
        fflush(stdout);
        rte_delay_ms(1000);
        printf("%s(): lcore %d Average event timer arm latency = %.3f us\n",
-                       __func__, rte_lcore_id(), (float)(arm_latency / count) /
-                       (rte_get_timer_hz() / 1000000));
+                       __func__, rte_lcore_id(),
+                       count ? (float)(arm_latency / count) /
+                       (rte_get_timer_hz() / 1000000) : 0);
        return 0;
 }
 
@@ -222,7 +224,6 @@ processed_pkts(struct test_perf *t)
        uint8_t i;
        uint64_t total = 0;
 
-       rte_smp_rmb();
        for (i = 0; i < t->nb_workers; i++)
                total += t->worker[i].processed_pkts;
 
@@ -235,7 +236,6 @@ total_latency(struct test_perf *t)
        uint8_t i;
        uint64_t total = 0;
 
-       rte_smp_rmb();
        for (i = 0; i < t->nb_workers; i++)
                total += t->worker[i].latency;
 
@@ -252,7 +252,7 @@ perf_launch_lcores(struct evt_test *test, struct evt_options *opt,
 
        int port_idx = 0;
        /* launch workers */
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                if (!(opt->wlcores[lcore_id]))
                        continue;
 
@@ -266,7 +266,7 @@ perf_launch_lcores(struct evt_test *test, struct evt_options *opt,
        }
 
        /* launch producers */
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                if (!(opt->plcores[lcore_id]))
                        continue;
 
@@ -325,7 +325,6 @@ perf_launch_lcores(struct evt_test *test, struct evt_options *opt,
                                        opt->prod_type ==
                                        EVT_PROD_TYPE_EVENT_TIMER_ADPTR) {
                                        t->done = true;
-                                       rte_smp_wmb();
                                        break;
                                }
                        }
@@ -339,7 +338,6 @@ perf_launch_lcores(struct evt_test *test, struct evt_options *opt,
                                rte_event_dev_dump(opt->dev_id, stdout);
                                evt_err("No schedules for seconds, deadlock");
                                t->done = true;
-                               rte_smp_wmb();
                                break;
                        }
                        dead_lock_remaining = remaining;
@@ -539,8 +537,8 @@ perf_opt_check(struct evt_options *opt, uint64_t nb_queues)
 {
        unsigned int lcores;
 
-       /* N producer + N worker + 1 master when producer cores are used
-        * Else N worker + 1 master when Rx adapter is used
+       /* N producer + N worker + main when producer cores are used
+        * Else N worker + main when Rx adapter is used
         */
        lcores = opt->prod_type == EVT_PROD_TYPE_SYNT ? 3 : 2;
 
@@ -550,8 +548,8 @@ perf_opt_check(struct evt_options *opt, uint64_t nb_queues)
        }
 
        /* Validate worker lcores */
-       if (evt_lcores_has_overlap(opt->wlcores, rte_get_master_lcore())) {
-               evt_err("worker lcores overlaps with master lcore");
+       if (evt_lcores_has_overlap(opt->wlcores, rte_get_main_lcore())) {
+               evt_err("worker lcores overlaps with main lcore");
                return -1;
        }
        if (evt_lcores_has_overlap_multi(opt->wlcores, opt->plcores)) {
@@ -571,8 +569,8 @@ perf_opt_check(struct evt_options *opt, uint64_t nb_queues)
                        opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR) {
                /* Validate producer lcores */
                if (evt_lcores_has_overlap(opt->plcores,
-                                       rte_get_master_lcore())) {
-                       evt_err("producer lcores overlaps with master lcore");
+                                       rte_get_main_lcore())) {
+                       evt_err("producer lcores overlaps with main lcore");
                        return -1;
                }
                if (evt_has_disabled_lcore(opt->plcores)) {