From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.elyzion.net (freeside.gandi.net [217.70.181.31]) by dpdk.org (Postfix) with ESMTP id E39CD95CF for ; Tue, 14 Jun 2016 15:03:34 +0200 (CEST) Received: from nikita (uid 1001) (envelope-from nikita@elyzion.net) id 1d1aa by mail.elyzion.net (DragonFly Mail Agent v0.10); Tue, 14 Jun 2016 15:03:34 +0200 From: Nikita Kozlov To: dev@dpdk.org Cc: Bruce Richardson Date: Tue, 14 Jun 2016 15:03:30 +0200 Message-Id: <1465909410-4668-5-git-send-email-nikita@elyzion.net> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1465909410-4668-1-git-send-email-nikita@elyzion.net> References: <1462539092-24389-1-git-send-email-bruce.richardson@intel.com> <1465909410-4668-1-git-send-email-nikita@elyzion.net> Subject: [dpdk-dev] [PATCH 4/4] test: change lpm perf test to use routes as resource X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2016 13:03:35 -0000 Change the lpm perf autotest to use the routes data from the resource data stored in the binary rather than including it directly into the C file as a C header. This speeds up compile and link time, without changing the test results. Signed-off-by: Nikita Kozlov Signed-off-by: Bruce Richardson --- app/test/test_lpm_perf.c | 83 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 76 insertions(+), 7 deletions(-) diff --git a/app/test/test_lpm_perf.c b/app/test/test_lpm_perf.c index 41da811..f72250f 100644 --- a/app/test/test_lpm_perf.c +++ b/app/test/test_lpm_perf.c @@ -34,16 +34,28 @@ #include #include #include +#include #include #include #include #include +#include +#include #include "test.h" -#include "test_lpm_routes.h" +#include "resource.h" #include "test_xmmt_ops.h" +REGISTER_LINKED_RESOURCE(test_lpm_data) + +struct route_rule { + uint32_t ip; + uint8_t depth; +}; +static struct route_rule *large_route_table; +static unsigned int num_route_entries; + #define TEST_LPM_ASSERT(cond) do { \ if (!(cond)) { \ printf("Error at line %d: \n", __LINE__); \ @@ -80,6 +92,62 @@ print_route_distribution(const struct route_rule *table, uint32_t n) } static int +load_large_route_table(void) +{ + const struct resource *r; + const char *lpm_data; + + r = resource_find("test_lpm_data"); + TEST_ASSERT_NOT_NULL(r, "No large lpm table data found"); + + /* the routing table size is going to be less than the size of the + * resource, since text extries are more verbose. Allocate this as + * the max size, and shrink the allocation later + */ + large_route_table = rte_malloc(NULL, resource_size(r), 0); + if (large_route_table == NULL) + return -1; + + /* parse the lpm table. All entries are of format: + * {IP-as-decimal-unsigned, depth} + * For example: + * {1234567U, 24}, + * We use the "U" and "}" characters as format check characters, + * after parsing each number. + */ + for (lpm_data = r->begin; lpm_data < r->end; lpm_data++) { + if (*lpm_data == '{') { + char *endptr; + + lpm_data++; + large_route_table[num_route_entries].ip = \ + strtoul(lpm_data, &endptr, 0); + if (*endptr != 'U') { + if (num_route_entries > 0) + printf("Failed parse of %.*s\n", 12, lpm_data); + continue; + } + + lpm_data = endptr + 2; /* skip U and , */ + large_route_table[num_route_entries].depth = \ + strtoul(lpm_data, &endptr, 0); + if (*endptr != '}') { + if (num_route_entries > 0) + printf("Failed parse of %.*s\n",5, lpm_data); + continue; + } + + num_route_entries++; + } + } + + large_route_table = rte_realloc(large_route_table, + sizeof(large_route_table[0]) * num_route_entries, 0); + printf("Read %u route entries\n", num_route_entries); + return 0; +} + +static int test_lpm_perf(void) { struct rte_lpm *lpm = NULL; @@ -97,9 +165,10 @@ test_lpm_perf(void) rte_srand(rte_rdtsc()); - printf("No. routes = %u\n", (unsigned) NUM_ROUTE_ENTRIES); + TEST_ASSERT_SUCCESS(load_large_route_table(), "Error loading lpm table"); + printf("No. routes = %u\n", (unsigned) num_route_entries); - print_route_distribution(large_route_table, (uint32_t) NUM_ROUTE_ENTRIES); + print_route_distribution(large_route_table, (uint32_t) num_route_entries); lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config); TEST_LPM_ASSERT(lpm != NULL); @@ -107,7 +176,7 @@ test_lpm_perf(void) /* Measue add. */ begin = rte_rdtsc(); - for (i = 0; i < NUM_ROUTE_ENTRIES; i++) { + for (i = 0; i < num_route_entries; i++) { if (rte_lpm_add(lpm, large_route_table[i].ip, large_route_table[i].depth, next_hop_add) == 0) status++; @@ -136,7 +205,7 @@ test_lpm_perf(void) (unsigned) cache_line_counter, (unsigned) cache_line_counter * 64); printf("Average LPM Add: %g cycles\n", - (double)total_time / NUM_ROUTE_ENTRIES); + (double)total_time / num_route_entries); /* Measure single Lookup */ total_time = 0; @@ -225,7 +294,7 @@ test_lpm_perf(void) status = 0; begin = rte_rdtsc(); - for (i = 0; i < NUM_ROUTE_ENTRIES; i++) { + for (i = 0; i < num_route_entries; i++) { /* rte_lpm_delete(lpm, ip, depth) */ status += rte_lpm_delete(lpm, large_route_table[i].ip, large_route_table[i].depth); @@ -234,7 +303,7 @@ test_lpm_perf(void) total_time += rte_rdtsc() - begin; printf("Average LPM Delete: %g cycles\n", - (double)total_time / NUM_ROUTE_ENTRIES); + (double)total_time / num_route_entries); rte_lpm_delete_all(lpm); rte_lpm_free(lpm); -- 2.8.1