Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/52437/?format=api
{ "id": 52437, "url": "http://patches.dpdk.org/api/patches/52437/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190408182420.4398-2-aconole@redhat.com/", "project": { "id": 1, "url": "http://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": "<20190408182420.4398-2-aconole@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190408182420.4398-2-aconole@redhat.com", "date": "2019-04-08T18:24:18", "name": "[1/3] acl: fix arm argument types", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "f4816b1fa2b83b0aec482cb436b2bdcd3135c144", "submitter": { "id": 332, "url": "http://patches.dpdk.org/api/people/332/?format=api", "name": "Aaron Conole", "email": "aconole@redhat.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20190408182420.4398-2-aconole@redhat.com/mbox/", "series": [ { "id": 4189, "url": "http://patches.dpdk.org/api/series/4189/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4189", "date": "2019-04-08T18:24:17", "name": "librte_acl: fixes related to testing with the meson build", "version": 1, "mbox": "http://patches.dpdk.org/series/4189/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/52437/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/52437/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 [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id EA7D54CC7;\n\tMon, 8 Apr 2019 20:24:28 +0200 (CEST)", "from mx1.redhat.com (mx1.redhat.com [209.132.183.28])\n\tby dpdk.org (Postfix) with ESMTP id CA6382C55\n\tfor <dev@dpdk.org>; Mon, 8 Apr 2019 20:24:23 +0200 (CEST)", "from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 31A2E882EF;\n\tMon, 8 Apr 2019 18:24:23 +0000 (UTC)", "from dhcp-25.97.bos.redhat.com (unknown [10.18.25.61])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 9B643665C4;\n\tMon, 8 Apr 2019 18:24:22 +0000 (UTC)" ], "From": "Aaron Conole <aconole@redhat.com>", "To": "dev@dpdk.org", "Cc": "Konstantin Ananyev <konstantin.ananyev@intel.com>,\n\tJerin Jacob <jerinj@marvell.com>, Gavin Hu <gavin.hu@arm.com>", "Date": "Mon, 8 Apr 2019 14:24:18 -0400", "Message-Id": "<20190408182420.4398-2-aconole@redhat.com>", "In-Reply-To": "<20190408182420.4398-1-aconole@redhat.com>", "References": "<20190408182420.4398-1-aconole@redhat.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.13", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]); Mon, 08 Apr 2019 18:24:23 +0000 (UTC)", "Subject": "[dpdk-dev] [PATCH 1/3] acl: fix arm argument types", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Compiler complains of argument type mismatch, like:\n\n ../lib/librte_acl/acl_run_neon.h: In function ‘transition4’:\n ../lib/librte_acl/acl_run_neon.h:115:2: note: use -flax-vector-conversions\n to permit conversions between vectors with differing element types\n or numbers of subparts\n node_type = vbicq_s32(tr_hi_lo.val[0], index_msk);\n ^\n ../lib/librte_acl/acl_run_neon.h:115:41: error: incompatible type for\n argument 2 of ‘vbicq_s32’\n\nSigned-off-by: Aaron Conole <aconole@redhat.com>\n---\n lib/librte_acl/acl_run_neon.h | 46 ++++++++++++++++++++---------------\n 1 file changed, 27 insertions(+), 19 deletions(-)", "diff": "diff --git a/lib/librte_acl/acl_run_neon.h b/lib/librte_acl/acl_run_neon.h\nindex 01b9766d8..4a8e4b681 100644\n--- a/lib/librte_acl/acl_run_neon.h\n+++ b/lib/librte_acl/acl_run_neon.h\n@@ -112,37 +112,41 @@ transition4(int32x4_t next_input, const uint64_t *trans, uint64_t transitions[])\n \tindex_msk = vld1q_u32((const uint32_t *)&neon_acl_const.xmm_index_mask);\n \n \t/* Calc node type and node addr */\n-\tnode_type = vbicq_s32(tr_hi_lo.val[0], index_msk);\n-\taddr = vandq_s32(tr_hi_lo.val[0], index_msk);\n+\tnode_type = (uint32x4_t) vbicq_s32(tr_hi_lo.val[0],\n+\t\t\t\t (int32x4_t)index_msk);\n+\taddr = (uint32x4_t) vandq_s32(tr_hi_lo.val[0], (int32x4_t) index_msk);\n \n \t/* t = 0 */\n-\tt = veorq_s32(node_type, node_type);\n+\tt = veorq_s32((int32x4_t)node_type, (int32x4_t)node_type);\n \n \t/* mask for DFA type(0) nodes */\n-\tdfa_msk = vceqq_u32(node_type, t);\n+\tdfa_msk = vceqq_u32(node_type, (uint32x4_t)t);\n \n-\tmask = vld1q_s32((const int32_t *)&neon_acl_const.xmm_shuffle_input);\n-\tin = vqtbl1q_u8((uint8x16_t)next_input, (uint8x16_t)mask);\n+\tmask = (uint32x4_t)\n+\t vld1q_s32((const int32_t *)&neon_acl_const.xmm_shuffle_input);\n+\tin = (int32x4_t) vqtbl1q_u8((uint8x16_t)next_input, (uint8x16_t)mask);\n \n \t/* DFA calculations. */\n-\tr = vshrq_n_u32(in, 30); /* div by 64 */\n-\tmask = vld1q_s32((const int32_t *)&neon_acl_const.range_base);\n-\tr = vaddq_u8(r, mask);\n-\tt = vshrq_n_u32(in, 24);\n-\tr = vqtbl1q_u8((uint8x16_t)tr_hi_lo.val[1], (uint8x16_t)r);\n-\tdfa_ofs = vsubq_s32(t, r);\n+\tr = (int32x4_t) vshrq_n_u32((uint32x4_t) in, 30); /* div by 64 */\n+\tmask = (uint32x4_t)\n+\t vld1q_s32((const int32_t *)&neon_acl_const.range_base);\n+\tr = (int32x4_t) vaddq_u8((uint8x16_t)r, (uint8x16_t)mask);\n+\tt = (int32x4_t) vshrq_n_u32((uint32x4_t)in, 24);\n+\tr = (int32x4_t) vqtbl1q_u8((uint8x16_t)tr_hi_lo.val[1], (uint8x16_t)r);\n+\tdfa_ofs = (uint32x4_t) vsubq_s32(t, r);\n \n \t/* QUAD/SINGLE calculations. */\n-\tt = vcgtq_s8(in, tr_hi_lo.val[1]);\n-\tt = vabsq_s8(t);\n-\tt = vpaddlq_u8(t);\n-\tquad_ofs = vpaddlq_u16(t);\n+\tt = (int32x4_t) vcgtq_s8((int8x16_t)in, (int8x16_t)tr_hi_lo.val[1]);\n+\tt = (int32x4_t) vabsq_s8((int8x16_t)t);\n+\tt = (int32x4_t) vpaddlq_u8((uint8x16_t)t);\n+\tquad_ofs = vpaddlq_u16((uint16x8_t)t);\n \n \t/* blend DFA and QUAD/SINGLE. */\n-\tt = vbslq_u8(dfa_msk, dfa_ofs, quad_ofs);\n+\tt = (int32x4_t) vbslq_u8((uint8x16_t)dfa_msk, (uint8x16_t)dfa_ofs,\n+\t\t\t\t (uint8x16_t)quad_ofs);\n \n \t/* calculate address for next transitions */\n-\taddr = vaddq_u32(addr, t);\n+\taddr = vaddq_u32(addr, (uint32x4_t)t);\n \n \t/* Fill next transitions */\n \ttransitions[0] = trans[vgetq_lane_u32(addr, 0)];\n@@ -150,7 +154,7 @@ transition4(int32x4_t next_input, const uint64_t *trans, uint64_t transitions[])\n \ttransitions[2] = trans[vgetq_lane_u32(addr, 2)];\n \ttransitions[3] = trans[vgetq_lane_u32(addr, 3)];\n \n-\treturn vshrq_n_u32(next_input, CHAR_BIT);\n+\treturn (int32x4_t) vshrq_n_u32((uint32x4_t)next_input, CHAR_BIT);\n }\n \n /*\n@@ -179,6 +183,9 @@ search_neon_8(const struct rte_acl_ctx *ctx, const uint8_t **data,\n \tacl_match_check_x4(0, ctx, parms, &flows, &index_array[0]);\n \tacl_match_check_x4(4, ctx, parms, &flows, &index_array[4]);\n \n+\tmemset(&input0, 0, sizeof(input0));\n+\tmemset(&input1, 0, sizeof(input1));\n+\n \twhile (flows.started > 0) {\n \t\t/* Gather 4 bytes of input data for each stream. */\n \t\tinput0 = vsetq_lane_s32(GET_NEXT_4BYTES(parms, 0), input0, 0);\n@@ -240,6 +247,7 @@ search_neon_4(const struct rte_acl_ctx *ctx, const uint8_t **data,\n \t/* Check for any matches. */\n \tacl_match_check_x4(0, ctx, parms, &flows, index_array);\n \n+\tmemset(&input, 0, sizeof(input));\n \twhile (flows.started > 0) {\n \t\t/* Gather 4 bytes of input data for each stream. */\n \t\tinput = vsetq_lane_s32(GET_NEXT_4BYTES(parms, 0), input, 0);\n", "prefixes": [ "1/3" ] }