Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2258/?format=api
{ "id": 2258, "url": "https://patches.dpdk.org/api/patches/2258/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1421090181-17150-13-git-send-email-konstantin.ananyev@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1421090181-17150-13-git-send-email-konstantin.ananyev@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1421090181-17150-13-git-send-email-konstantin.ananyev@intel.com", "date": "2015-01-12T19:16:16", "name": "[dpdk-dev,v2,12/17] test-acl: add ability to manually select RT method.", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "b117a2b278b7ed6db57969d0ec4a9f0b87415b13", "submitter": { "id": 33, "url": "https://patches.dpdk.org/api/people/33/?format=api", "name": "Ananyev, Konstantin", "email": "konstantin.ananyev@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1421090181-17150-13-git-send-email-konstantin.ananyev@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/2258/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/2258/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id CB37B5ADF;\n\tMon, 12 Jan 2015 20:17:04 +0100 (CET)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby dpdk.org (Postfix) with ESMTP id 46D5C5A7E\n\tfor <dev@dpdk.org>; Mon, 12 Jan 2015 20:16:39 +0100 (CET)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby fmsmga101.fm.intel.com with ESMTP; 12 Jan 2015 11:16:37 -0800", "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby orsmga003.jf.intel.com with ESMTP; 12 Jan 2015 11:10:32 -0800", "from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com\n\t[10.237.217.46])\n\tby irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id\n\tt0CJGa0c008641; Mon, 12 Jan 2015 19:16:36 GMT", "from sivswdev02.ir.intel.com (localhost [127.0.0.1])\n\tby sivswdev02.ir.intel.com with ESMTP id t0CJGZJD017286;\n\tMon, 12 Jan 2015 19:16:35 GMT", "(from kananye1@localhost)\n\tby sivswdev02.ir.intel.com with id t0CJGZ5Z017282;\n\tMon, 12 Jan 2015 19:16:35 GMT" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.04,691,1406617200\"; d=\"scan'208\";a=\"511102623\"", "From": "Konstantin Ananyev <konstantin.ananyev@intel.com>", "To": "dev@dpdk.org", "Date": "Mon, 12 Jan 2015 19:16:16 +0000", "Message-Id": "<1421090181-17150-13-git-send-email-konstantin.ananyev@intel.com>", "X-Mailer": "git-send-email 1.7.4.1", "In-Reply-To": "<1421090181-17150-1-git-send-email-konstantin.ananyev@intel.com>", "References": "<1421090181-17150-1-git-send-email-konstantin.ananyev@intel.com>", "Subject": "[dpdk-dev] [PATCH v2 12/17] test-acl: add ability to manually\n\tselect RT method.", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "In test-acl replace command-line option \"--scalar\" with new one:\n\"--alg=scalar|sse|avx2\".\nAllows user manually select preferred classify() method.\n\nSigned-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>\n---\n app/test-acl/main.c | 93 ++++++++++++++++++++++++++++++++++++++++++-----------\n 1 file changed, 75 insertions(+), 18 deletions(-)", "diff": "diff --git a/app/test-acl/main.c b/app/test-acl/main.c\nindex b3d4294..52f43c6 100644\n--- a/app/test-acl/main.c\n+++ b/app/test-acl/main.c\n@@ -82,7 +82,7 @@\n #define\tOPT_RULE_NUM\t\t\"rulenum\"\n #define\tOPT_TRACE_NUM\t\t\"tracenum\"\n #define\tOPT_TRACE_STEP\t\t\"tracestep\"\n-#define\tOPT_SEARCH_SCALAR\t\"scalar\"\n+#define\tOPT_SEARCH_ALG\t\t\"alg\"\n #define\tOPT_BLD_CATEGORIES\t\"bldcat\"\n #define\tOPT_RUN_CATEGORIES\t\"runcat\"\n #define\tOPT_ITER_NUM\t\t\"iter\"\n@@ -102,6 +102,26 @@ enum {\n \tDUMP_MAX\n };\n \n+struct acl_alg {\n+\tconst char *name;\n+\tenum rte_acl_classify_alg alg;\n+};\n+\n+static const struct acl_alg acl_alg[] = {\n+\t{\n+\t\t.name = \"scalar\",\n+\t\t.alg = RTE_ACL_CLASSIFY_SCALAR,\n+\t},\n+\t{\n+\t\t.name = \"sse\",\n+\t\t.alg = RTE_ACL_CLASSIFY_SSE,\n+\t},\n+\t{\n+\t\t.name = \"avx2\",\n+\t\t.alg = RTE_ACL_CLASSIFY_AVX2,\n+\t},\n+};\n+\n static struct {\n \tconst char *prgname;\n \tconst char *rule_file;\n@@ -114,11 +134,11 @@ static struct {\n \tuint32_t trace_sz;\n \tuint32_t iter_num;\n \tuint32_t verbose;\n-\tuint32_t scalar;\n+\tuint32_t ipv6;\n+\tstruct acl_alg alg;\n \tuint32_t used_traces;\n \tvoid *traces;\n \tstruct rte_acl_ctx *acx;\n-\tuint32_t\t\t\tipv6;\n } config = {\n \t.bld_categories = 3,\n \t.run_categories = 1,\n@@ -127,6 +147,10 @@ static struct {\n \t.trace_step = TRACE_STEP_DEF,\n \t.iter_num = 1,\n \t.verbose = DUMP_MAX,\n+\t.alg = {\n+\t\t.name = \"default\",\n+\t\t.alg = RTE_ACL_CLASSIFY_DEFAULT,\n+\t},\n \t.ipv6 = 0\n };\n \n@@ -774,13 +798,12 @@ acx_init(void)\n \tif (config.acx == NULL)\n \t\trte_exit(rte_errno, \"failed to create ACL context\\n\");\n \n-\t/* set default classify method to scalar for this context. */\n-\tif (config.scalar) {\n-\t\tret = rte_acl_set_ctx_classify(config.acx,\n-\t\t\tRTE_ACL_CLASSIFY_SCALAR);\n+\t/* set default classify method for this context. */\n+\tif (config.alg.alg != RTE_ACL_CLASSIFY_DEFAULT) {\n+\t\tret = rte_acl_set_ctx_classify(config.acx, config.alg.alg);\n \t\tif (ret != 0)\n-\t\t\trte_exit(ret, \"failed to setup classify method \"\n-\t\t\t\t\"for ACL context\\n\");\n+\t\t\trte_exit(ret, \"failed to setup %s method \"\n+\t\t\t\t\"for ACL context\\n\", config.alg.name);\n \t}\n \n \t/* add ACL rules. */\n@@ -809,7 +832,7 @@ acx_init(void)\n }\n \n static uint32_t\n-search_ip5tuples_once(uint32_t categories, uint32_t step, int scalar)\n+search_ip5tuples_once(uint32_t categories, uint32_t step, const char *alg)\n {\n \tint ret;\n \tuint32_t i, j, k, n, r;\n@@ -847,7 +870,7 @@ search_ip5tuples_once(uint32_t categories, uint32_t step, int scalar)\n \n \tdump_verbose(DUMP_SEARCH, stdout,\n \t\t\"%s(%u, %u, %s) returns %u\\n\", __func__,\n-\t\tcategories, step, scalar != 0 ? \"scalar\" : \"sse\", i);\n+\t\tcategories, step, alg, i);\n \treturn i;\n }\n \n@@ -863,7 +886,7 @@ search_ip5tuples(__attribute__((unused)) void *arg)\n \n \tfor (i = 0; i != config.iter_num; i++) {\n \t\tpkt += search_ip5tuples_once(config.run_categories,\n-\t\t\tconfig.trace_step, config.scalar);\n+\t\t\tconfig.trace_step, config.alg.name);\n \t}\n \n \ttm = rte_rdtsc() - start;\n@@ -891,8 +914,40 @@ get_uint32_opt(const char *opt, const char *name, uint32_t min, uint32_t max)\n }\n \n static void\n+get_alg_opt(const char *opt, const char *name)\n+{\n+\tuint32_t i;\n+\n+\tfor (i = 0; i != RTE_DIM(acl_alg); i++) {\n+\t\tif (strcmp(opt, acl_alg[i].name) == 0) {\n+\t\t\tconfig.alg = acl_alg[i];\n+\t\t\treturn;\n+\t\t}\n+\t}\n+\n+\trte_exit(-EINVAL, \"invalid value: \\\"%s\\\" for option: %s\\n\",\n+\t\topt, name);\n+}\n+\n+static void\n print_usage(const char *prgname)\n {\n+\tuint32_t i, n, rc;\n+\tchar buf[PATH_MAX];\n+\n+\tn = 0;\n+\tbuf[0] = 0;\n+\n+\tfor (i = 0; i < RTE_DIM(acl_alg) - 1; i++) {\n+\t\trc = snprintf(buf + n, sizeof(buf) - n, \"%s|\",\n+\t\t\tacl_alg[i].name);\n+\t\tif (rc > sizeof(buf) - n)\n+\t\t\tbreak;\n+\t\tn += rc;\n+\t}\n+\n+\tsnprintf(buf + n, sizeof(buf) - n, \"%s\", acl_alg[i].name);\n+\n \tfprintf(stdout,\n \t\tPRINT_USAGE_START\n \t\t\"--\" OPT_RULE_FILE \"=<rules set file>\\n\"\n@@ -911,10 +966,11 @@ print_usage(const char *prgname)\n \t\t\t\"but not greater then %u]\\n\"\n \t\t\"[--\" OPT_ITER_NUM \"=<number of iterations to perform>]\\n\"\n \t\t\"[--\" OPT_VERBOSE \"=<verbose level>]\\n\"\n-\t\t\"[--\" OPT_SEARCH_SCALAR \"=<use scalar version>]\\n\"\n+\t\t\"[--\" OPT_SEARCH_ALG \"=%s]\\n\"\n \t\t\"[--\" OPT_IPV6 \"=<IPv6 rules and trace files>]\\n\",\n \t\tprgname, RTE_ACL_RESULTS_MULTIPLIER,\n-\t\t(uint32_t)RTE_ACL_MAX_CATEGORIES);\n+\t\t(uint32_t)RTE_ACL_MAX_CATEGORIES,\n+\t\tbuf);\n }\n \n static void\n@@ -930,7 +986,8 @@ dump_config(FILE *f)\n \tfprintf(f, \"%s:%u\\n\", OPT_RUN_CATEGORIES, config.run_categories);\n \tfprintf(f, \"%s:%u\\n\", OPT_ITER_NUM, config.iter_num);\n \tfprintf(f, \"%s:%u\\n\", OPT_VERBOSE, config.verbose);\n-\tfprintf(f, \"%s:%u\\n\", OPT_SEARCH_SCALAR, config.scalar);\n+\tfprintf(f, \"%s:%u(%s)\\n\", OPT_SEARCH_ALG, config.alg.alg,\n+\t\tconfig.alg.name);\n \tfprintf(f, \"%s:%u\\n\", OPT_IPV6, config.ipv6);\n }\n \n@@ -958,7 +1015,7 @@ get_input_opts(int argc, char **argv)\n \t\t{OPT_RUN_CATEGORIES, 1, 0, 0},\n \t\t{OPT_ITER_NUM, 1, 0, 0},\n \t\t{OPT_VERBOSE, 1, 0, 0},\n-\t\t{OPT_SEARCH_SCALAR, 0, 0, 0},\n+\t\t{OPT_SEARCH_ALG, 1, 0, 0},\n \t\t{OPT_IPV6, 0, 0, 0},\n \t\t{NULL, 0, 0, 0}\n \t};\n@@ -1002,8 +1059,8 @@ get_input_opts(int argc, char **argv)\n \t\t\tconfig.verbose = get_uint32_opt(optarg,\n \t\t\t\tlgopts[opt_idx].name, DUMP_NONE, DUMP_MAX);\n \t\t} else if (strcmp(lgopts[opt_idx].name,\n-\t\t\t\tOPT_SEARCH_SCALAR) == 0) {\n-\t\t\tconfig.scalar = 1;\n+\t\t\t\tOPT_SEARCH_ALG) == 0) {\n+\t\t\tget_alg_opt(optarg, lgopts[opt_idx].name);\n \t\t} else if (strcmp(lgopts[opt_idx].name, OPT_IPV6) == 0) {\n \t\t\tconfig.ipv6 = 1;\n \t\t}\n", "prefixes": [ "dpdk-dev", "v2", "12/17" ] }