app/test: isolate lpm performance cases

[dpdk.git] / app / test / test_lpm6.c

diff --git a/app/test/test_lpm6.c b/app/test/test_lpm6.c
index b464342..9163cd7 100644 (file)
--- a/app/test/test_lpm6.c
+++ b/app/test/test_lpm6.c
@@ -30,25 +30,16 @@
  *   (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 <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <sys/queue.h>
-
-#include <time.h>
-
-#include "test.h"
 
-#include <rte_common.h>
-#include <rte_cycles.h>
 #include <rte_memory.h>
-#include <rte_random.h>
-#include <rte_branch_prediction.h>
-#include <rte_ip.h>
+#include <rte_lpm6.h>
 
-#include "rte_lpm6.h"
+#include "test.h"
 #include "test_lpm6_routes.h"
 
 #define TEST_LPM_ASSERT(cond) do {                                            \
@@ -88,7 +79,6 @@ static int32_t test24(void);
 static int32_t test25(void);
 static int32_t test26(void);
 static int32_t test27(void);
-static int32_t perf_test(void);
 
 rte_lpm6_test tests6[] = {
 /* Test Cases */
@@ -120,7 +110,6 @@ rte_lpm6_test tests6[] = {
        test25,
        test26,
        test27,
-       perf_test,
 };
 
 #define NUM_LPM6_TESTS                (sizeof(tests6)/sizeof(tests6[0]))
@@ -1762,143 +1751,7 @@ test27(void)
 }
 
 /*
- * Lookup performance test
- */
-
-#define ITERATIONS (1 << 10)
-#define BATCH_SIZE 100000
-
-static void
-print_route_distribution(const struct rules_tbl_entry *table, uint32_t n)
-{
-       unsigned i, j;
-
-       printf("Route distribution per prefix width: \n");
-       printf("DEPTH    QUANTITY (PERCENT)\n");
-       printf("--------------------------- \n");
-
-       /* Count depths. */
-       for(i = 1; i <= 128; i++) {
-               unsigned depth_counter = 0;
-               double percent_hits;
-
-               for (j = 0; j < n; j++)
-                       if (table[j].depth == (uint8_t) i)
-                               depth_counter++;
-
-               percent_hits = ((double)depth_counter)/((double)n) * 100;
-               printf("%.2u%15u (%.2f)\n", i, depth_counter, percent_hits);
-       }
-       printf("\n");
-}
-
-int32_t
-perf_test(void)
-{
-       struct rte_lpm6 *lpm = NULL;
-       struct rte_lpm6_config config;
-       uint64_t begin, total_time;
-       unsigned i, j;
-       uint8_t next_hop_add = 0xAA, next_hop_return = 0;
-       int status = 0;
-       int64_t count = 0;
-
-       config.max_rules = 1000000;
-       config.number_tbl8s = NUMBER_TBL8S;
-       config.flags = 0;
-
-       rte_srand(rte_rdtsc());
-
-       printf("No. routes = %u\n", (unsigned) NUM_ROUTE_ENTRIES);
-
-       print_route_distribution(large_route_table, (uint32_t) NUM_ROUTE_ENTRIES);
-
-       lpm = rte_lpm6_create(__func__, SOCKET_ID_ANY, &config);
-       TEST_LPM_ASSERT(lpm != NULL);
-
-       /* Measure add. */
-       begin = rte_rdtsc();
-
-       for (i = 0; i < NUM_ROUTE_ENTRIES; i++) {
-               if (rte_lpm6_add(lpm, large_route_table[i].ip,
-                               large_route_table[i].depth, next_hop_add) == 0)
-                       status++;
-       }
-       /* End Timer. */
-       total_time = rte_rdtsc() - begin;
-
-       printf("Unique added entries = %d\n", status);
-       printf("Average LPM Add: %g cycles\n",
-                       (double)total_time / NUM_ROUTE_ENTRIES);
-
-       /* Measure single Lookup */
-       total_time = 0;
-       count = 0;
-
-       for (i = 0; i < ITERATIONS; i ++) {
-               begin = rte_rdtsc();
-
-               for (j = 0; j < NUM_IPS_ENTRIES; j ++) {
-                       if (rte_lpm6_lookup(lpm, large_ips_table[j].ip,
-                                       &next_hop_return) != 0)
-                               count++;
-               }
-
-               total_time += rte_rdtsc() - begin;
-
-       }
-       printf("Average LPM Lookup: %.1f cycles (fails = %.1f%%)\n",
-                       (double)total_time / ((double)ITERATIONS * BATCH_SIZE),
-                       (count * 100.0) / (double)(ITERATIONS * BATCH_SIZE));
-
-       /* Measure bulk Lookup */
-       total_time = 0;
-       count = 0;
-
-       uint8_t ip_batch[NUM_IPS_ENTRIES][16];
-       int16_t next_hops[NUM_IPS_ENTRIES];
-
-       for (i = 0; i < NUM_IPS_ENTRIES; i++)
-               memcpy(ip_batch[i], large_ips_table[i].ip, 16);
-
-       for (i = 0; i < ITERATIONS; i ++) {
-
-               /* Lookup per batch */
-               begin = rte_rdtsc();
-               rte_lpm6_lookup_bulk_func(lpm, ip_batch, next_hops, NUM_IPS_ENTRIES);
-               total_time += rte_rdtsc() - begin;
-
-               for (j = 0; j < NUM_IPS_ENTRIES; j++)
-                       if (next_hops[j] < 0)
-                               count++;
-       }
-       printf("BULK LPM Lookup: %.1f cycles (fails = %.1f%%)\n",
-                       (double)total_time / ((double)ITERATIONS * BATCH_SIZE),
-                       (count * 100.0) / (double)(ITERATIONS * BATCH_SIZE));
-
-       /* Delete */
-       status = 0;
-       begin = rte_rdtsc();
-
-       for (i = 0; i < NUM_ROUTE_ENTRIES; i++) {
-               /* rte_lpm_delete(lpm, ip, depth) */
-               status += rte_lpm6_delete(lpm, large_route_table[i].ip,
-                               large_route_table[i].depth);
-       }
-
-       total_time += rte_rdtsc() - begin;
-
-       printf("Average LPM Delete: %g cycles\n",
-                       (double)total_time / NUM_ROUTE_ENTRIES);
-
-       rte_lpm6_delete_all(lpm);
-       rte_lpm6_free(lpm);
-
-       return PASS;
-}
-
-/*
- * Do all unit and performance tests.
+ * Do all unit tests.
  */
 static int
 test_lpm6(void)