From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id B6328A04DB;
Fri, 16 Oct 2020 10:19:10 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 344F61EBA5;
Fri, 16 Oct 2020 10:14:17 +0200 (CEST)
Received: from mga04.intel.com (mga04.intel.com [192.55.52.120])
by dpdk.org (Postfix) with ESMTP id A23A21EB98
for <dev@dpdk.org>; Fri, 16 Oct 2020 10:14:14 +0200 (CEST)
IronPort-SDR: EsjlLiNhO6dYtkpPXi7dwVXPuq04Ee6MbklXhzGZYZZVMs98J/BPP0QZQdRpiM91bV/oFkg5zK
+jiryKB46DHA==
X-IronPort-AV: E=McAfee;i="6000,8403,9775"; a="163937704"
X-IronPort-AV: E=Sophos;i="5.77,382,1596524400"; d="scan'208";a="163937704"
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga006.fm.intel.com ([10.253.24.20])
by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
16 Oct 2020 01:14:14 -0700
IronPort-SDR: BuxyUYDHULPw4Og4rWNeDU97s+QjOLjnvSZIZmKZ4+M5+QpDUQCjY5jSkfNghZdzDtm3hU4PBi
EvoVJwzvKPqg==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.77,382,1596524400"; d="scan'208";a="521097044"
Received: from silpixa00400355.ir.intel.com (HELO
silpixa00400355.ger.corp.intel.com) ([10.237.222.239])
by fmsmga006.fm.intel.com with ESMTP; 16 Oct 2020 01:14:11 -0700
From: Ciara Power <ciara.power@intel.com>
To: dev@dpdk.org
Cc: viktorin@rehivetech.com, ruifeng.wang@arm.com, jerinj@marvell.com,
drc@linux.vnet.ibm.com, bruce.richardson@intel.com,
konstantin.ananyev@intel.com, david.marchand@redhat.com,
Ciara Power <ciara.power@intel.com>,
Nithin Dabilpuram <ndabilpuram@marvell.com>,
Pavan Nikhilesh <pbhagavatula@marvell.com>,
Kiran Kumar K <kirankumark@marvell.com>
Date: Fri, 16 Oct 2020 09:13:19 +0100
Message-Id: <20201016081320.186775-18-ciara.power@intel.com>
X-Mailer: git-send-email 2.22.0
In-Reply-To: <20201016081320.186775-1-ciara.power@intel.com>
References: <20200807155859.63888-1-ciara.power@intel.com>
<20201016081320.186775-1-ciara.power@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v8 17/18] node: choose vector path at runtime
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>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
When choosing the vector path, max SIMD bitwidth is now checked to
ensure the vector path is suitable. To do this, the scalar function is
chosen by default in the struct, but at node initialisation time, this
function pointer is updated to the vector version if supported, and
if it is within the max SIMD bitwidth limit.
Cc: Nithin Dabilpuram <ndabilpuram@marvell.com>
Cc: Pavan Nikhilesh <pbhagavatula@marvell.com>
Cc: Jerin Jacob <jerinj@marvell.com>
Cc: Kiran Kumar K <kirankumark@marvell.com>
Signed-off-by: Ciara Power <ciara.power@intel.com>
Acked-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
---
v6:
- Removed generic process function.
- Change the process function pointer at node init time to vector
function if suitable.
---
lib/librte_node/ip4_lookup.c | 14 +++++++++-----
lib/librte_node/ip4_lookup_neon.h | 2 +-
lib/librte_node/ip4_lookup_sse.h | 2 +-
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/lib/librte_node/ip4_lookup.c b/lib/librte_node/ip4_lookup.c
index 293c77f39e..934a6d7eab 100644
--- a/lib/librte_node/ip4_lookup.c
+++ b/lib/librte_node/ip4_lookup.c
@@ -34,10 +34,10 @@ static struct ip4_lookup_node_main ip4_lookup_nm;
#include "ip4_lookup_neon.h"
#elif defined(RTE_ARCH_X86)
#include "ip4_lookup_sse.h"
-#else
+#endif
static uint16_t
-ip4_lookup_node_process(struct rte_graph *graph, struct rte_node *node,
+ip4_lookup_node_process_scalar(struct rte_graph *graph, struct rte_node *node,
void **objs, uint16_t nb_objs)
{
struct rte_ipv4_hdr *ipv4_hdr;
@@ -109,8 +109,6 @@ ip4_lookup_node_process(struct rte_graph *graph, struct rte_node *node,
return nb_objs;
}
-#endif
-
int
rte_node_ip4_route_add(uint32_t ip, uint8_t depth, uint16_t next_hop,
enum rte_node_ip4_lookup_next next_node)
@@ -194,13 +192,19 @@ ip4_lookup_node_init(const struct rte_graph *graph, struct rte_node *node)
init_once = 1;
}
*lpm_p = ip4_lookup_nm.lpm_tbl[graph->socket];
+
+#if defined(__ARM_NEON) || defined(RTE_ARCH_X86)
+ if (rte_get_max_simd_bitwidth() >= RTE_SIMD_128)
+ node->process = ip4_lookup_node_process_vec;
+#endif
+
node_dbg("ip4_lookup", "Initialized ip4_lookup node");
return 0;
}
static struct rte_node_register ip4_lookup_node = {
- .process = ip4_lookup_node_process,
+ .process = ip4_lookup_node_process_scalar,
.name = "ip4_lookup",
.init = ip4_lookup_node_init,
diff --git a/lib/librte_node/ip4_lookup_neon.h b/lib/librte_node/ip4_lookup_neon.h
index 5e5a7d87be..0ad2763b82 100644
--- a/lib/librte_node/ip4_lookup_neon.h
+++ b/lib/librte_node/ip4_lookup_neon.h
@@ -7,7 +7,7 @@
/* ARM64 NEON */
static uint16_t
-ip4_lookup_node_process(struct rte_graph *graph, struct rte_node *node,
+ip4_lookup_node_process_vec(struct rte_graph *graph, struct rte_node *node,
void **objs, uint16_t nb_objs)
{
struct rte_mbuf *mbuf0, *mbuf1, *mbuf2, *mbuf3, **pkts;
diff --git a/lib/librte_node/ip4_lookup_sse.h b/lib/librte_node/ip4_lookup_sse.h
index a071cc5919..264c986071 100644
--- a/lib/librte_node/ip4_lookup_sse.h
+++ b/lib/librte_node/ip4_lookup_sse.h
@@ -7,7 +7,7 @@
/* X86 SSE */
static uint16_t
-ip4_lookup_node_process(struct rte_graph *graph, struct rte_node *node,
+ip4_lookup_node_process_vec(struct rte_graph *graph, struct rte_node *node,
void **objs, uint16_t nb_objs)
{
struct rte_mbuf *mbuf0, *mbuf1, *mbuf2, *mbuf3, **pkts;
--
2.22.0