From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 58DD2A0547;
Fri, 10 Sep 2021 15:38:24 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id A044741179;
Fri, 10 Sep 2021 15:37:30 +0200 (CEST)
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
by mails.dpdk.org (Postfix) with ESMTP id 7835341144
for <dev@dpdk.org>; Fri, 10 Sep 2021 15:37:24 +0200 (CEST)
X-IronPort-AV: E=McAfee;i="6200,9189,10102"; a="221113284"
X-IronPort-AV: E=Sophos;i="5.85,283,1624345200"; d="scan'208";a="221113284"
Received: from fmsmga002.fm.intel.com ([10.253.24.26])
by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
10 Sep 2021 06:37:23 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.85,283,1624345200"; d="scan'208";a="549328545"
Received: from silpixa00400573.ir.intel.com (HELO
silpixa00400573.ger.corp.intel.com) ([10.237.223.107])
by fmsmga002.fm.intel.com with ESMTP; 10 Sep 2021 06:37:23 -0700
From: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
To: dev@dpdk.org
Date: Fri, 10 Sep 2021 14:37:00 +0100
Message-Id: <20210910133713.93103-11-cristian.dumitrescu@intel.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20210910133713.93103-1-cristian.dumitrescu@intel.com>
References: <20210910123003.85448-1-cristian.dumitrescu@intel.com>
<20210910133713.93103-1-cristian.dumitrescu@intel.com>
Subject: [dpdk-dev] [PATCH V2 11/24] pipeline: create inline functions for
DMA instruction
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
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>
Create inline functions for the DMA instruction.
Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
lib/pipeline/rte_swx_pipeline.c | 80 ++++++------------
lib/pipeline/rte_swx_pipeline_internal.h | 100 +++++++++++++++++++++++
2 files changed, 123 insertions(+), 57 deletions(-)
diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c
index 72606f1a06..a06dc8d348 100644
--- a/lib/pipeline/rte_swx_pipeline.c
+++ b/lib/pipeline/rte_swx_pipeline.c
@@ -2465,46 +2465,12 @@ instr_mov_i_exec(struct rte_swx_pipeline *p)
* dma.
*/
static inline void
-__instr_dma_ht_exec(struct rte_swx_pipeline *p, uint32_t n_dma);
-
-static inline void
-__instr_dma_ht_exec(struct rte_swx_pipeline *p, uint32_t n_dma)
+instr_dma_ht_exec(struct rte_swx_pipeline *p)
{
struct thread *t = &p->threads[p->thread_id];
struct instruction *ip = t->ip;
- uint8_t *action_data = t->structs[0];
- uint64_t valid_headers = t->valid_headers;
- uint32_t i;
-
- for (i = 0; i < n_dma; i++) {
- uint32_t header_id = ip->dma.dst.header_id[i];
- uint32_t struct_id = ip->dma.dst.struct_id[i];
- uint32_t offset = ip->dma.src.offset[i];
- uint32_t n_bytes = ip->dma.n_bytes[i];
-
- struct header_runtime *h = &t->headers[header_id];
- uint8_t *h_ptr0 = h->ptr0;
- uint8_t *h_ptr = t->structs[struct_id];
-
- void *dst = MASK64_BIT_GET(valid_headers, header_id) ?
- h_ptr : h_ptr0;
- void *src = &action_data[offset];
-
- TRACE("[Thread %2u] dma h.s t.f\n", p->thread_id);
- /* Headers. */
- memcpy(dst, src, n_bytes);
- t->structs[struct_id] = dst;
- valid_headers = MASK64_BIT_SET(valid_headers, header_id);
- }
-
- t->valid_headers = valid_headers;
-}
-
-static inline void
-instr_dma_ht_exec(struct rte_swx_pipeline *p)
-{
- __instr_dma_ht_exec(p, 1);
+ __instr_dma_ht_exec(p, t, ip);
/* Thread. */
thread_ip_inc(p);
@@ -2513,10 +2479,10 @@ instr_dma_ht_exec(struct rte_swx_pipeline *p)
static inline void
instr_dma_ht2_exec(struct rte_swx_pipeline *p)
{
- TRACE("[Thread %2u] *** The next 2 instructions are fused. ***\n",
- p->thread_id);
+ struct thread *t = &p->threads[p->thread_id];
+ struct instruction *ip = t->ip;
- __instr_dma_ht_exec(p, 2);
+ __instr_dma_ht2_exec(p, t, ip);
/* Thread. */
thread_ip_inc(p);
@@ -2525,10 +2491,10 @@ instr_dma_ht2_exec(struct rte_swx_pipeline *p)
static inline void
instr_dma_ht3_exec(struct rte_swx_pipeline *p)
{
- TRACE("[Thread %2u] *** The next 3 instructions are fused. ***\n",
- p->thread_id);
+ struct thread *t = &p->threads[p->thread_id];
+ struct instruction *ip = t->ip;
- __instr_dma_ht_exec(p, 3);
+ __instr_dma_ht3_exec(p, t, ip);
/* Thread. */
thread_ip_inc(p);
@@ -2537,10 +2503,10 @@ instr_dma_ht3_exec(struct rte_swx_pipeline *p)
static inline void
instr_dma_ht4_exec(struct rte_swx_pipeline *p)
{
- TRACE("[Thread %2u] *** The next 4 instructions are fused. ***\n",
- p->thread_id);
+ struct thread *t = &p->threads[p->thread_id];
+ struct instruction *ip = t->ip;
- __instr_dma_ht_exec(p, 4);
+ __instr_dma_ht4_exec(p, t, ip);
/* Thread. */
thread_ip_inc(p);
@@ -2549,10 +2515,10 @@ instr_dma_ht4_exec(struct rte_swx_pipeline *p)
static inline void
instr_dma_ht5_exec(struct rte_swx_pipeline *p)
{
- TRACE("[Thread %2u] *** The next 5 instructions are fused. ***\n",
- p->thread_id);
+ struct thread *t = &p->threads[p->thread_id];
+ struct instruction *ip = t->ip;
- __instr_dma_ht_exec(p, 5);
+ __instr_dma_ht5_exec(p, t, ip);
/* Thread. */
thread_ip_inc(p);
@@ -2561,10 +2527,10 @@ instr_dma_ht5_exec(struct rte_swx_pipeline *p)
static inline void
instr_dma_ht6_exec(struct rte_swx_pipeline *p)
{
- TRACE("[Thread %2u] *** The next 6 instructions are fused. ***\n",
- p->thread_id);
+ struct thread *t = &p->threads[p->thread_id];
+ struct instruction *ip = t->ip;
- __instr_dma_ht_exec(p, 6);
+ __instr_dma_ht6_exec(p, t, ip);
/* Thread. */
thread_ip_inc(p);
@@ -2573,10 +2539,10 @@ instr_dma_ht6_exec(struct rte_swx_pipeline *p)
static inline void
instr_dma_ht7_exec(struct rte_swx_pipeline *p)
{
- TRACE("[Thread %2u] *** The next 7 instructions are fused. ***\n",
- p->thread_id);
+ struct thread *t = &p->threads[p->thread_id];
+ struct instruction *ip = t->ip;
- __instr_dma_ht_exec(p, 7);
+ __instr_dma_ht7_exec(p, t, ip);
/* Thread. */
thread_ip_inc(p);
@@ -2585,10 +2551,10 @@ instr_dma_ht7_exec(struct rte_swx_pipeline *p)
static inline void
instr_dma_ht8_exec(struct rte_swx_pipeline *p)
{
- TRACE("[Thread %2u] *** The next 8 instructions are fused. ***\n",
- p->thread_id);
+ struct thread *t = &p->threads[p->thread_id];
+ struct instruction *ip = t->ip;
- __instr_dma_ht_exec(p, 8);
+ __instr_dma_ht8_exec(p, t, ip);
/* Thread. */
thread_ip_inc(p);
diff --git a/lib/pipeline/rte_swx_pipeline_internal.h b/lib/pipeline/rte_swx_pipeline_internal.h
index 1bf94159a9..ec8e342a5d 100644
--- a/lib/pipeline/rte_swx_pipeline_internal.h
+++ b/lib/pipeline/rte_swx_pipeline_internal.h
@@ -2111,4 +2111,104 @@ __instr_mov_i_exec(struct rte_swx_pipeline *p __rte_unused,
MOV_I(t, ip);
}
+/*
+ * dma.
+ */
+static inline void
+__instr_dma_ht_many_exec(struct rte_swx_pipeline *p __rte_unused,
+ struct thread *t,
+ const struct instruction *ip,
+ uint32_t n_dma)
+{
+ uint8_t *action_data = t->structs[0];
+ uint64_t valid_headers = t->valid_headers;
+ uint32_t i;
+
+ for (i = 0; i < n_dma; i++) {
+ uint32_t header_id = ip->dma.dst.header_id[i];
+ uint32_t struct_id = ip->dma.dst.struct_id[i];
+ uint32_t offset = ip->dma.src.offset[i];
+ uint32_t n_bytes = ip->dma.n_bytes[i];
+
+ struct header_runtime *h = &t->headers[header_id];
+ uint8_t *h_ptr0 = h->ptr0;
+ uint8_t *h_ptr = t->structs[struct_id];
+
+ void *dst = MASK64_BIT_GET(valid_headers, header_id) ?
+ h_ptr : h_ptr0;
+ void *src = &action_data[offset];
+
+ TRACE("[Thread %2u] dma h.s t.f\n", p->thread_id);
+
+ /* Headers. */
+ memcpy(dst, src, n_bytes);
+ t->structs[struct_id] = dst;
+ valid_headers = MASK64_BIT_SET(valid_headers, header_id);
+ }
+
+ t->valid_headers = valid_headers;
+}
+
+static inline void
+__instr_dma_ht_exec(struct rte_swx_pipeline *p, struct thread *t, const struct instruction *ip)
+{
+ __instr_dma_ht_many_exec(p, t, ip, 1);
+}
+
+static inline void
+__instr_dma_ht2_exec(struct rte_swx_pipeline *p, struct thread *t, const struct instruction *ip)
+{
+ TRACE("[Thread %2u] *** The next 2 instructions are fused. ***\n", p->thread_id);
+
+ __instr_dma_ht_many_exec(p, t, ip, 2);
+}
+
+static inline void
+__instr_dma_ht3_exec(struct rte_swx_pipeline *p, struct thread *t, const struct instruction *ip)
+{
+ TRACE("[Thread %2u] *** The next 3 instructions are fused. ***\n", p->thread_id);
+
+ __instr_dma_ht_many_exec(p, t, ip, 3);
+}
+
+static inline void
+__instr_dma_ht4_exec(struct rte_swx_pipeline *p, struct thread *t, const struct instruction *ip)
+{
+ TRACE("[Thread %2u] *** The next 4 instructions are fused. ***\n", p->thread_id);
+
+ __instr_dma_ht_many_exec(p, t, ip, 4);
+}
+
+static inline void
+__instr_dma_ht5_exec(struct rte_swx_pipeline *p, struct thread *t, const struct instruction *ip)
+{
+ TRACE("[Thread %2u] *** The next 5 instructions are fused. ***\n", p->thread_id);
+
+ __instr_dma_ht_many_exec(p, t, ip, 5);
+}
+
+static inline void
+__instr_dma_ht6_exec(struct rte_swx_pipeline *p, struct thread *t, const struct instruction *ip)
+{
+ TRACE("[Thread %2u] *** The next 6 instructions are fused. ***\n", p->thread_id);
+
+ __instr_dma_ht_many_exec(p, t, ip, 6);
+}
+
+static inline void
+__instr_dma_ht7_exec(struct rte_swx_pipeline *p, struct thread *t, const struct instruction *ip)
+{
+ TRACE("[Thread %2u] *** The next 7 instructions are fused. ***\n", p->thread_id);
+
+ __instr_dma_ht_many_exec(p, t, ip, 7);
+}
+
+static inline void
+__instr_dma_ht8_exec(struct rte_swx_pipeline *p, struct thread *t, const struct instruction *ip)
+{
+ TRACE("[Thread %2u] *** The next 8 instructions are fused. ***\n", p->thread_id);
+
+ __instr_dma_ht_many_exec(p, t, ip, 8);
+}
+
#endif
--
2.17.1