Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 98602,
    "url": "http://patches.dpdk.org/api/patches/98602/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210910123003.85448-5-cristian.dumitrescu@intel.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": "<20210910123003.85448-5-cristian.dumitrescu@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20210910123003.85448-5-cristian.dumitrescu@intel.com",
    "date": "2021-09-10T12:29:44",
    "name": "[05/24] pipeline: create inline functions for extract instruction",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "0224c60f4d8b47ed3402a6c89cf9edec0376bde5",
    "submitter": {
        "id": 19,
        "url": "http://patches.dpdk.org/api/people/19/?format=api",
        "name": "Cristian Dumitrescu",
        "email": "cristian.dumitrescu@intel.com"
    },
    "delegate": null,
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210910123003.85448-5-cristian.dumitrescu@intel.com/mbox/",
    "series": [
        {
            "id": 18838,
            "url": "http://patches.dpdk.org/api/series/18838/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=18838",
            "date": "2021-09-10T12:29:44",
            "name": "[01/24] pipeline: move data structures to internal header file",
            "version": 1,
            "mbox": "http://patches.dpdk.org/series/18838/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/98602/comments/",
    "check": "warning",
    "checks": "http://patches.dpdk.org/api/patches/98602/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@inbox.dpdk.org",
        "Delivered-To": "patchwork@inbox.dpdk.org",
        "Received": [
            "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 17190A0547;\n\tFri, 10 Sep 2021 14:30:22 +0200 (CEST)",
            "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 8C37940E46;\n\tFri, 10 Sep 2021 14:30:21 +0200 (CEST)",
            "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n by mails.dpdk.org (Postfix) with ESMTP id EC192406B4\n for <dev@dpdk.org>; Fri, 10 Sep 2021 14:30:18 +0200 (CEST)",
            "from orsmga001.jf.intel.com ([10.7.209.18])\n by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 10 Sep 2021 05:30:09 -0700",
            "from silpixa00400573.ir.intel.com (HELO\n silpixa00400573.ger.corp.intel.com) ([10.237.223.107])\n by orsmga001.jf.intel.com with ESMTP; 10 Sep 2021 05:30:08 -0700"
        ],
        "X-IronPort-AV": [
            "E=McAfee;i=\"6200,9189,10102\"; a=\"243386257\"",
            "E=Sophos;i=\"5.85,282,1624345200\"; d=\"scan'208\";a=\"243386257\"",
            "E=Sophos;i=\"5.85,282,1624345200\"; d=\"scan'208\";a=\"514279710\""
        ],
        "X-ExtLoop1": "1",
        "From": "Cristian Dumitrescu <cristian.dumitrescu@intel.com>",
        "To": "dev@dpdk.org",
        "Date": "Fri, 10 Sep 2021 13:29:44 +0100",
        "Message-Id": "<20210910123003.85448-5-cristian.dumitrescu@intel.com>",
        "X-Mailer": "git-send-email 2.17.1",
        "In-Reply-To": "<20210910123003.85448-1-cristian.dumitrescu@intel.com>",
        "References": "<20210910123003.85448-1-cristian.dumitrescu@intel.com>",
        "Subject": "[dpdk-dev] [PATCH 05/24] pipeline: create inline functions for\n extract 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>,\n <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 <mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>\n---\n lib/pipeline/rte_swx_pipeline.c          | 130 ++++-------------\n lib/pipeline/rte_swx_pipeline_internal.h | 178 +++++++++++++++++++++++\n 2 files changed, 203 insertions(+), 105 deletions(-)",
    "diff": "diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c\nindex bcf796f8c3..fd7e31b709 100644\n--- a/lib/pipeline/rte_swx_pipeline.c\n+++ b/lib/pipeline/rte_swx_pipeline.c\n@@ -1665,52 +1665,12 @@ instr_hdr_lookahead_translate(struct rte_swx_pipeline *p,\n }\n \n static inline void\n-__instr_hdr_extract_exec(struct rte_swx_pipeline *p, uint32_t n_extract);\n-\n-static inline void\n-__instr_hdr_extract_exec(struct rte_swx_pipeline *p, uint32_t n_extract)\n+instr_hdr_extract_exec(struct rte_swx_pipeline *p)\n {\n \tstruct thread *t = &p->threads[p->thread_id];\n \tstruct instruction *ip = t->ip;\n-\tuint64_t valid_headers = t->valid_headers;\n-\tuint8_t *ptr = t->ptr;\n-\tuint32_t offset = t->pkt.offset;\n-\tuint32_t length = t->pkt.length;\n-\tuint32_t i;\n \n-\tfor (i = 0; i < n_extract; i++) {\n-\t\tuint32_t header_id = ip->io.hdr.header_id[i];\n-\t\tuint32_t struct_id = ip->io.hdr.struct_id[i];\n-\t\tuint32_t n_bytes = ip->io.hdr.n_bytes[i];\n-\n-\t\tTRACE(\"[Thread %2u]: extract header %u (%u bytes)\\n\",\n-\t\t      p->thread_id,\n-\t\t      header_id,\n-\t\t      n_bytes);\n-\n-\t\t/* Headers. */\n-\t\tt->structs[struct_id] = ptr;\n-\t\tvalid_headers = MASK64_BIT_SET(valid_headers, header_id);\n-\n-\t\t/* Packet. */\n-\t\toffset += n_bytes;\n-\t\tlength -= n_bytes;\n-\t\tptr += n_bytes;\n-\t}\n-\n-\t/* Headers. */\n-\tt->valid_headers = valid_headers;\n-\n-\t/* Packet. */\n-\tt->pkt.offset = offset;\n-\tt->pkt.length = length;\n-\tt->ptr = ptr;\n-}\n-\n-static inline void\n-instr_hdr_extract_exec(struct rte_swx_pipeline *p)\n-{\n-\t__instr_hdr_extract_exec(p, 1);\n+\t__instr_hdr_extract_exec(p, t, ip);\n \n \t/* Thread. */\n \tthread_ip_inc(p);\n@@ -1719,10 +1679,10 @@ instr_hdr_extract_exec(struct rte_swx_pipeline *p)\n static inline void\n instr_hdr_extract2_exec(struct rte_swx_pipeline *p)\n {\n-\tTRACE(\"[Thread %2u] *** The next 2 instructions are fused. ***\\n\",\n-\t      p->thread_id);\n+\tstruct thread *t = &p->threads[p->thread_id];\n+\tstruct instruction *ip = t->ip;\n \n-\t__instr_hdr_extract_exec(p, 2);\n+\t__instr_hdr_extract2_exec(p, t, ip);\n \n \t/* Thread. */\n \tthread_ip_inc(p);\n@@ -1731,10 +1691,10 @@ instr_hdr_extract2_exec(struct rte_swx_pipeline *p)\n static inline void\n instr_hdr_extract3_exec(struct rte_swx_pipeline *p)\n {\n-\tTRACE(\"[Thread %2u] *** The next 3 instructions are fused. ***\\n\",\n-\t      p->thread_id);\n+\tstruct thread *t = &p->threads[p->thread_id];\n+\tstruct instruction *ip = t->ip;\n \n-\t__instr_hdr_extract_exec(p, 3);\n+\t__instr_hdr_extract3_exec(p, t, ip);\n \n \t/* Thread. */\n \tthread_ip_inc(p);\n@@ -1743,10 +1703,10 @@ instr_hdr_extract3_exec(struct rte_swx_pipeline *p)\n static inline void\n instr_hdr_extract4_exec(struct rte_swx_pipeline *p)\n {\n-\tTRACE(\"[Thread %2u] *** The next 4 instructions are fused. ***\\n\",\n-\t      p->thread_id);\n+\tstruct thread *t = &p->threads[p->thread_id];\n+\tstruct instruction *ip = t->ip;\n \n-\t__instr_hdr_extract_exec(p, 4);\n+\t__instr_hdr_extract4_exec(p, t, ip);\n \n \t/* Thread. */\n \tthread_ip_inc(p);\n@@ -1755,10 +1715,10 @@ instr_hdr_extract4_exec(struct rte_swx_pipeline *p)\n static inline void\n instr_hdr_extract5_exec(struct rte_swx_pipeline *p)\n {\n-\tTRACE(\"[Thread %2u] *** The next 5 instructions are fused. ***\\n\",\n-\t      p->thread_id);\n+\tstruct thread *t = &p->threads[p->thread_id];\n+\tstruct instruction *ip = t->ip;\n \n-\t__instr_hdr_extract_exec(p, 5);\n+\t__instr_hdr_extract5_exec(p, t, ip);\n \n \t/* Thread. */\n \tthread_ip_inc(p);\n@@ -1767,10 +1727,10 @@ instr_hdr_extract5_exec(struct rte_swx_pipeline *p)\n static inline void\n instr_hdr_extract6_exec(struct rte_swx_pipeline *p)\n {\n-\tTRACE(\"[Thread %2u] *** The next 6 instructions are fused. ***\\n\",\n-\t      p->thread_id);\n+\tstruct thread *t = &p->threads[p->thread_id];\n+\tstruct instruction *ip = t->ip;\n \n-\t__instr_hdr_extract_exec(p, 6);\n+\t__instr_hdr_extract6_exec(p, t, ip);\n \n \t/* Thread. */\n \tthread_ip_inc(p);\n@@ -1779,10 +1739,10 @@ instr_hdr_extract6_exec(struct rte_swx_pipeline *p)\n static inline void\n instr_hdr_extract7_exec(struct rte_swx_pipeline *p)\n {\n-\tTRACE(\"[Thread %2u] *** The next 7 instructions are fused. ***\\n\",\n-\t      p->thread_id);\n+\tstruct thread *t = &p->threads[p->thread_id];\n+\tstruct instruction *ip = t->ip;\n \n-\t__instr_hdr_extract_exec(p, 7);\n+\t__instr_hdr_extract7_exec(p, t, ip);\n \n \t/* Thread. */\n \tthread_ip_inc(p);\n@@ -1791,10 +1751,10 @@ instr_hdr_extract7_exec(struct rte_swx_pipeline *p)\n static inline void\n instr_hdr_extract8_exec(struct rte_swx_pipeline *p)\n {\n-\tTRACE(\"[Thread %2u] *** The next 8 instructions are fused. ***\\n\",\n-\t      p->thread_id);\n+\tstruct thread *t = &p->threads[p->thread_id];\n+\tstruct instruction *ip = t->ip;\n \n-\t__instr_hdr_extract_exec(p, 8);\n+\t__instr_hdr_extract8_exec(p, t, ip);\n \n \t/* Thread. */\n \tthread_ip_inc(p);\n@@ -1806,35 +1766,7 @@ instr_hdr_extract_m_exec(struct rte_swx_pipeline *p)\n \tstruct thread *t = &p->threads[p->thread_id];\n \tstruct instruction *ip = t->ip;\n \n-\tuint64_t valid_headers = t->valid_headers;\n-\tuint8_t *ptr = t->ptr;\n-\tuint32_t offset = t->pkt.offset;\n-\tuint32_t length = t->pkt.length;\n-\n-\tuint32_t n_bytes_last = METADATA_READ(t, ip->io.io.offset, ip->io.io.n_bits);\n-\tuint32_t header_id = ip->io.hdr.header_id[0];\n-\tuint32_t struct_id = ip->io.hdr.struct_id[0];\n-\tuint32_t n_bytes = ip->io.hdr.n_bytes[0];\n-\n-\tstruct header_runtime *h = &t->headers[header_id];\n-\n-\tTRACE(\"[Thread %2u]: extract header %u (%u + %u bytes)\\n\",\n-\t      p->thread_id,\n-\t      header_id,\n-\t      n_bytes,\n-\t      n_bytes_last);\n-\n-\tn_bytes += n_bytes_last;\n-\n-\t/* Headers. */\n-\tt->structs[struct_id] = ptr;\n-\tt->valid_headers = MASK64_BIT_SET(valid_headers, header_id);\n-\th->n_bytes = n_bytes;\n-\n-\t/* Packet. */\n-\tt->pkt.offset = offset + n_bytes;\n-\tt->pkt.length = length - n_bytes;\n-\tt->ptr = ptr + n_bytes;\n+\t__instr_hdr_extract_m_exec(p, t, ip);\n \n \t/* Thread. */\n \tthread_ip_inc(p);\n@@ -1846,19 +1778,7 @@ instr_hdr_lookahead_exec(struct rte_swx_pipeline *p)\n \tstruct thread *t = &p->threads[p->thread_id];\n \tstruct instruction *ip = t->ip;\n \n-\tuint64_t valid_headers = t->valid_headers;\n-\tuint8_t *ptr = t->ptr;\n-\n-\tuint32_t header_id = ip->io.hdr.header_id[0];\n-\tuint32_t struct_id = ip->io.hdr.struct_id[0];\n-\n-\tTRACE(\"[Thread %2u]: lookahead header %u\\n\",\n-\t      p->thread_id,\n-\t      header_id);\n-\n-\t/* Headers. */\n-\tt->structs[struct_id] = ptr;\n-\tt->valid_headers = MASK64_BIT_SET(valid_headers, header_id);\n+\t__instr_hdr_lookahead_exec(p, t, ip);\n \n \t/* Thread. */\n \tthread_ip_inc(p);\ndiff --git a/lib/pipeline/rte_swx_pipeline_internal.h b/lib/pipeline/rte_swx_pipeline_internal.h\nindex e9fe6632b6..1519bcc305 100644\n--- a/lib/pipeline/rte_swx_pipeline_internal.h\n+++ b/lib/pipeline/rte_swx_pipeline_internal.h\n@@ -1580,4 +1580,182 @@ __instr_tx_i_exec(struct rte_swx_pipeline *p, struct thread *t, const struct ins\n \tport->pkt_tx(port->obj, pkt);\n }\n \n+/*\n+ * extract.\n+ */\n+static inline void\n+__instr_hdr_extract_many_exec(struct rte_swx_pipeline *p __rte_unused,\n+\t\t\t      struct thread *t,\n+\t\t\t      const struct instruction *ip,\n+\t\t\t      uint32_t n_extract)\n+{\n+\tuint64_t valid_headers = t->valid_headers;\n+\tuint8_t *ptr = t->ptr;\n+\tuint32_t offset = t->pkt.offset;\n+\tuint32_t length = t->pkt.length;\n+\tuint32_t i;\n+\n+\tfor (i = 0; i < n_extract; i++) {\n+\t\tuint32_t header_id = ip->io.hdr.header_id[i];\n+\t\tuint32_t struct_id = ip->io.hdr.struct_id[i];\n+\t\tuint32_t n_bytes = ip->io.hdr.n_bytes[i];\n+\n+\t\tTRACE(\"[Thread %2u]: extract header %u (%u bytes)\\n\",\n+\t\t      p->thread_id,\n+\t\t      header_id,\n+\t\t      n_bytes);\n+\n+\t\t/* Headers. */\n+\t\tt->structs[struct_id] = ptr;\n+\t\tvalid_headers = MASK64_BIT_SET(valid_headers, header_id);\n+\n+\t\t/* Packet. */\n+\t\toffset += n_bytes;\n+\t\tlength -= n_bytes;\n+\t\tptr += n_bytes;\n+\t}\n+\n+\t/* Headers. */\n+\tt->valid_headers = valid_headers;\n+\n+\t/* Packet. */\n+\tt->pkt.offset = offset;\n+\tt->pkt.length = length;\n+\tt->ptr = ptr;\n+}\n+\n+static inline void\n+__instr_hdr_extract_exec(struct rte_swx_pipeline *p,\n+\t\t\t struct thread *t,\n+\t\t\t const struct instruction *ip)\n+{\n+\t__instr_hdr_extract_many_exec(p, t, ip, 1);\n+}\n+\n+static inline void\n+__instr_hdr_extract2_exec(struct rte_swx_pipeline *p,\n+\t\t\t  struct thread *t,\n+\t\t\t  const struct instruction *ip)\n+{\n+\tTRACE(\"[Thread %2u] *** The next 2 instructions are fused. ***\\n\", p->thread_id);\n+\n+\t__instr_hdr_extract_many_exec(p, t, ip, 2);\n+}\n+\n+static inline void\n+__instr_hdr_extract3_exec(struct rte_swx_pipeline *p,\n+\t\t\t  struct thread *t,\n+\t\t\t  const struct instruction *ip)\n+{\n+\tTRACE(\"[Thread %2u] *** The next 3 instructions are fused. ***\\n\", p->thread_id);\n+\n+\t__instr_hdr_extract_many_exec(p, t, ip, 3);\n+}\n+\n+static inline void\n+__instr_hdr_extract4_exec(struct rte_swx_pipeline *p,\n+\t\t\t  struct thread *t,\n+\t\t\t  const struct instruction *ip)\n+{\n+\tTRACE(\"[Thread %2u] *** The next 4 instructions are fused. ***\\n\", p->thread_id);\n+\n+\t__instr_hdr_extract_many_exec(p, t, ip, 4);\n+}\n+\n+static inline void\n+__instr_hdr_extract5_exec(struct rte_swx_pipeline *p,\n+\t\t\t  struct thread *t,\n+\t\t\t  const struct instruction *ip)\n+{\n+\tTRACE(\"[Thread %2u] *** The next 5 instructions are fused. ***\\n\", p->thread_id);\n+\n+\t__instr_hdr_extract_many_exec(p, t, ip, 5);\n+}\n+\n+static inline void\n+__instr_hdr_extract6_exec(struct rte_swx_pipeline *p,\n+\t\t\t  struct thread *t,\n+\t\t\t  const struct instruction *ip)\n+{\n+\tTRACE(\"[Thread %2u] *** The next 6 instructions are fused. ***\\n\", p->thread_id);\n+\n+\t__instr_hdr_extract_many_exec(p, t, ip, 6);\n+}\n+\n+static inline void\n+__instr_hdr_extract7_exec(struct rte_swx_pipeline *p,\n+\t\t\t  struct thread *t,\n+\t\t\t  const struct instruction *ip)\n+{\n+\tTRACE(\"[Thread %2u] *** The next 7 instructions are fused. ***\\n\", p->thread_id);\n+\n+\t__instr_hdr_extract_many_exec(p, t, ip, 7);\n+}\n+\n+static inline void\n+__instr_hdr_extract8_exec(struct rte_swx_pipeline *p,\n+\t\t\t  struct thread *t,\n+\t\t\t  const struct instruction *ip)\n+{\n+\tTRACE(\"[Thread %2u] *** The next 8 instructions are fused. ***\\n\", p->thread_id);\n+\n+\t__instr_hdr_extract_many_exec(p, t, ip, 8);\n+}\n+\n+static inline void\n+__instr_hdr_extract_m_exec(struct rte_swx_pipeline *p __rte_unused,\n+\t\t\t   struct thread *t,\n+\t\t\t   const struct instruction *ip)\n+{\n+\tuint64_t valid_headers = t->valid_headers;\n+\tuint8_t *ptr = t->ptr;\n+\tuint32_t offset = t->pkt.offset;\n+\tuint32_t length = t->pkt.length;\n+\n+\tuint32_t n_bytes_last = METADATA_READ(t, ip->io.io.offset, ip->io.io.n_bits);\n+\tuint32_t header_id = ip->io.hdr.header_id[0];\n+\tuint32_t struct_id = ip->io.hdr.struct_id[0];\n+\tuint32_t n_bytes = ip->io.hdr.n_bytes[0];\n+\n+\tstruct header_runtime *h = &t->headers[header_id];\n+\n+\tTRACE(\"[Thread %2u]: extract header %u (%u + %u bytes)\\n\",\n+\t      p->thread_id,\n+\t      header_id,\n+\t      n_bytes,\n+\t      n_bytes_last);\n+\n+\tn_bytes += n_bytes_last;\n+\n+\t/* Headers. */\n+\tt->structs[struct_id] = ptr;\n+\tt->valid_headers = MASK64_BIT_SET(valid_headers, header_id);\n+\th->n_bytes = n_bytes;\n+\n+\t/* Packet. */\n+\tt->pkt.offset = offset + n_bytes;\n+\tt->pkt.length = length - n_bytes;\n+\tt->ptr = ptr + n_bytes;\n+}\n+\n+static inline void\n+__instr_hdr_lookahead_exec(struct rte_swx_pipeline *p __rte_unused,\n+\t\t\t   struct thread *t,\n+\t\t\t   const struct instruction *ip)\n+{\n+\tuint64_t valid_headers = t->valid_headers;\n+\tuint8_t *ptr = t->ptr;\n+\n+\tuint32_t header_id = ip->io.hdr.header_id[0];\n+\tuint32_t struct_id = ip->io.hdr.struct_id[0];\n+\n+\tTRACE(\"[Thread %2u]: lookahead header %u\\n\",\n+\t      p->thread_id,\n+\t      header_id);\n+\n+\t/* Headers. */\n+\tt->structs[struct_id] = ptr;\n+\tt->valid_headers = MASK64_BIT_SET(valid_headers, header_id);\n+}\n+\n #endif\n",
    "prefixes": [
        "05/24"
    ]
}