From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [RFC PATCH 3/4] test: change lpm test to use routes as resource
Date: Fri, 6 May 2016 13:51:31 +0100 [thread overview]
Message-ID: <1462539092-24389-4-git-send-email-bruce.richardson@intel.com> (raw)
In-Reply-To: <1462539092-24389-1-git-send-email-bruce.richardson@intel.com>
Change the lpm 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: Bruce Richardson <bruce.richardson@intel.com>
---
app/test/test_lpm.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 69 insertions(+), 1 deletion(-)
diff --git a/app/test/test_lpm.c b/app/test/test_lpm.c
index d2aa5de..4234a52 100644
--- a/app/test/test_lpm.c
+++ b/app/test/test_lpm.c
@@ -34,6 +34,7 @@
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
+#include <string.h>
#include <errno.h>
#include <sys/queue.h>
@@ -44,16 +45,23 @@
#include <rte_branch_prediction.h>
#include <rte_ip.h>
#include <time.h>
+#include <rte_malloc.h>
#include "test.h"
#include "resource.h"
#include "rte_lpm.h"
-#include "test_lpm_routes.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__); \
@@ -1427,6 +1435,64 @@ perf_test(void)
return PASS;
}
+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->beg; 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",
+ strndupa(lpm_data, 12));
+ 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",
+ strndupa(lpm_data, 5));
+ 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;
+}
+
/*
* Do all unit and performance tests.
*/
@@ -1437,6 +1503,8 @@ test_lpm(void)
unsigned i;
int status, global_status = 0;
+ TEST_ASSERT_SUCCESS(load_large_route_table(), "Error loading lpm table");
+
for (i = 0; i < NUM_LPM_TESTS; i++) {
status = tests[i]();
if (status < 0) {
--
2.5.5
next prev parent reply other threads:[~2016-05-06 12:51 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-06 12:51 [dpdk-dev] [RFC PATCH 0/4] Convert lpm data from header to resource Bruce Richardson
2016-05-06 12:51 ` [dpdk-dev] [RFC PATCH 1/4] test: add lpm routes as a linked resource Bruce Richardson
2016-05-06 12:51 ` [dpdk-dev] [RFC PATCH 2/4] test: make all lpm routes be of unsigned type Bruce Richardson
2016-05-06 12:51 ` Bruce Richardson [this message]
2016-05-06 13:02 ` [dpdk-dev] [RFC PATCH 3/4] test: change lpm test to use routes as resource Bruce Richardson
2016-05-06 12:51 ` [dpdk-dev] [RFC PATCH 4/4] test: change lpm routes file from header to data file Bruce Richardson
2016-05-06 13:20 ` [dpdk-dev] [RFC PATCH 0/4] Convert lpm data from header to resource Thomas Monjalon
2016-06-14 13:03 ` [dpdk-dev] [PATCH " Nikita Kozlov
2016-06-14 13:03 ` [dpdk-dev] [PATCH 1/4] test: make all lpm routes be of unsigned type Nikita Kozlov
2016-06-14 13:03 ` [dpdk-dev] [PATCH 2/4] test: change lpm routes file from header to data file Nikita Kozlov
2016-06-14 13:03 ` [dpdk-dev] [PATCH 3/4] test: change lpm test to use routes as resource Nikita Kozlov
2016-06-14 13:03 ` [dpdk-dev] [PATCH 4/4] test: change lpm perf " Nikita Kozlov
2016-06-14 14:25 ` [dpdk-dev] [PATCH 0/4] Convert lpm data from header to resource Thomas Monjalon
2016-07-14 16:06 ` [dpdk-dev] [PATCH v2 0/5] change lpm route table from code to data Bruce Richardson
2016-07-14 16:06 ` [dpdk-dev] [PATCH v2 1/5] test: fix unneeded routes table include from lpm test Bruce Richardson
2016-07-14 16:06 ` [dpdk-dev] [PATCH v2 2/5] test: make all lpm routes be of unsigned type Bruce Richardson
2016-07-14 16:06 ` [dpdk-dev] [PATCH v2 3/5] test: add lpm routes as a linked resource Bruce Richardson
2016-07-14 16:06 ` [dpdk-dev] [PATCH v2 4/5] test: change lpm test to use routes as resource Bruce Richardson
2016-07-14 16:06 ` [dpdk-dev] [PATCH v2 5/5] test: change lpm routes file from header to data file Bruce Richardson
2016-07-15 23:05 ` Thomas Monjalon
2016-07-16 9:46 ` Richardson, Bruce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462539092-24389-4-git-send-email-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).