Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/55082/?format=api
{ "id": 55082, "url": "http://patches.dpdk.org/api/patches/55082/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1560964274-83070-2-git-send-email-nicolas.chautru@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": "<1560964274-83070-2-git-send-email-nicolas.chautru@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1560964274-83070-2-git-send-email-nicolas.chautru@intel.com", "date": "2019-06-19T17:11:12", "name": "[v6,1/3] baseband/turbo_sw: option to build turbosw PMD without SDK", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "a2bc135b09f790e03f5d25272c9a3f359feb3545", "submitter": { "id": 1314, "url": "http://patches.dpdk.org/api/people/1314/?format=api", "name": "Chautru, Nicolas", "email": "nicolas.chautru@intel.com" }, "delegate": { "id": 6690, "url": "http://patches.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1560964274-83070-2-git-send-email-nicolas.chautru@intel.com/mbox/", "series": [ { "id": 5087, "url": "http://patches.dpdk.org/api/series/5087/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=5087", "date": "2019-06-19T17:11:11", "name": "BBDEV turbo_sw PMD compilation fix", "version": 6, "mbox": "http://patches.dpdk.org/series/5087/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/55082/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/55082/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 B4D3B1D0AF;\n\tWed, 19 Jun 2019 19:12:05 +0200 (CEST)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby dpdk.org (Postfix) with ESMTP id 0CF0B1C432\n\tfor <dev@dpdk.org>; Wed, 19 Jun 2019 19:12:00 +0200 (CEST)", "from orsmga007.jf.intel.com ([10.7.209.58])\n\tby orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t19 Jun 2019 10:11:59 -0700", "from skx-5gnr-sc12-4.sc.intel.com ([172.25.69.210])\n\tby orsmga007.jf.intel.com with ESMTP; 19 Jun 2019 10:11:59 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.63,393,1557212400\"; d=\"scan'208\";a=\"150665853\"", "From": "Nicolas Chautru <nicolas.chautru@intel.com>", "To": "akhil.goyal@nxp.com,\n\tdev@dpdk.org", "Cc": "ferruh.yigit@intel.com, thomas@monjalon.net, amr.mokhtar@intel.com,\n\tkamilx.chalupnik@intel.com, Nicolas Chautru <nicolas.chautru@intel.com>", "Date": "Wed, 19 Jun 2019 10:11:12 -0700", "Message-Id": "<1560964274-83070-2-git-send-email-nicolas.chautru@intel.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1560964274-83070-1-git-send-email-nicolas.chautru@intel.com>", "References": "<1560444716-18594-2-git-send-email-nicolas.chautru@intel.com>\n\t<1560964274-83070-1-git-send-email-nicolas.chautru@intel.com>", "Subject": "[dpdk-dev] [PATCH v6 1/3] baseband/turbo_sw: option to build\n\tturbosw PMD without SDK", "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": "Adding compile flag to allow to build the turbo_sw PMD\nwithout dependency to have the SDK libraries installed.\n\nAcked-by: Kamil Chalupnik <kamilx.chalupnik@intel.com>\nAcked-by: Nicolas Chautru <nicolas.chautru@intel.com>\nSigned-off-by: Nicolas Chautru <nicolas.chautru@intel.com>\n---\n config/common_base | 3 +-\n drivers/baseband/turbo_sw/Makefile | 13 +++----\n drivers/baseband/turbo_sw/bbdev_turbo_software.c | 45 +++++++++++++++++++++++-\n mk/rte.app.mk | 3 ++\n 4 files changed, 56 insertions(+), 8 deletions(-)", "diff": "diff --git a/config/common_base b/config/common_base\nindex 6b96e0e..bc80209 100644\n--- a/config/common_base\n+++ b/config/common_base\n@@ -523,6 +523,7 @@ CONFIG_RTE_PMD_PACKET_PREFETCH=y\n CONFIG_RTE_LIBRTE_BBDEV=y\n CONFIG_RTE_BBDEV_MAX_DEVS=128\n CONFIG_RTE_BBDEV_OFFLOAD_COST=y\n+CONFIG_RTE_BBDEV_SDK_AVX2=n\n \n #\n # Compile PMD for NULL bbdev device\n@@ -532,7 +533,7 @@ CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL=y\n #\n # Compile PMD for turbo software bbdev device\n #\n-CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=n\n+CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y\n \n #\n # Compile generic crypto device library\ndiff --git a/drivers/baseband/turbo_sw/Makefile b/drivers/baseband/turbo_sw/Makefile\nindex d364677..414d0d9 100644\n--- a/drivers/baseband/turbo_sw/Makefile\n+++ b/drivers/baseband/turbo_sw/Makefile\n@@ -3,9 +3,6 @@\n \n include $(RTE_SDK)/mk/rte.vars.mk\n \n-ifeq ($(FLEXRAN_SDK),)\n-$(error \"Please define FLEXRAN_SDK environment variable\")\n-endif\n \n # library name\n LIB = librte_pmd_bbdev_turbo_sw.a\n@@ -21,17 +18,21 @@ LDLIBS += -lrte_bus_vdev\n # versioning export map\n EXPORT_MAP := rte_pmd_bbdev_turbo_sw_version.map\n \n-# external library dependencies\n+# external library dependencies if available\n+ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),y)\n+ifeq ($(FLEXRAN_SDK),)\n+$(error \"Please define FLEXRAN_SDK environment variable\")\n+endif\n CFLAGS += -I$(FLEXRAN_SDK)/lib_common\n CFLAGS += -I$(FLEXRAN_SDK)/lib_turbo\n CFLAGS += -I$(FLEXRAN_SDK)/lib_crc\n CFLAGS += -I$(FLEXRAN_SDK)/lib_rate_matching\n-\n LDLIBS += -L$(FLEXRAN_SDK)/lib_turbo -lturbo\n LDLIBS += -L$(FLEXRAN_SDK)/lib_crc -lcrc\n LDLIBS += -L$(FLEXRAN_SDK)/lib_rate_matching -lrate_matching\n LDLIBS += -L$(FLEXRAN_SDK)/lib_common -lcommon\n-LDLIBS += -lstdc++ -lirc -limf -lipps\n+LDLIBS += -lstdc++ -lirc -limf -lipps -lsvml\n+endif\n \n # library version\n LIBABIVER := 1\ndiff --git a/drivers/baseband/turbo_sw/bbdev_turbo_software.c b/drivers/baseband/turbo_sw/bbdev_turbo_software.c\nindex 5204a77..cac8920 100644\n--- a/drivers/baseband/turbo_sw/bbdev_turbo_software.c\n+++ b/drivers/baseband/turbo_sw/bbdev_turbo_software.c\n@@ -14,10 +14,11 @@\n #include <rte_bbdev.h>\n #include <rte_bbdev_pmd.h>\n \n+#ifdef RTE_BBDEV_SDK_AVX2\n #include <phy_turbo.h>\n #include <phy_crc.h>\n #include <phy_rate_match.h>\n-#include <divide.h>\n+#endif\n \n #define DRIVER_NAME baseband_turbo_sw\n \n@@ -83,6 +84,7 @@ struct turbo_sw_queue {\n \tenum rte_bbdev_op_type type;\n } __rte_cache_aligned;\n \n+#ifdef RTE_BBDEV_SDK_AVX2\n static inline char *\n mbuf_append(struct rte_mbuf *m_head, struct rte_mbuf *m, uint16_t len)\n {\n@@ -128,6 +130,7 @@ struct turbo_sw_queue {\n \n \treturn result;\n }\n+#endif\n \n /* Read flag value 0/1 from bitmap */\n static inline bool\n@@ -143,6 +146,7 @@ struct turbo_sw_queue {\n \tstruct bbdev_private *internals = dev->data->dev_private;\n \n \tstatic const struct rte_bbdev_op_cap bbdev_capabilities[] = {\n+#ifdef RTE_BBDEV_SDK_AVX2\n \t\t{\n \t\t\t.type = RTE_BBDEV_OP_TURBO_DEC,\n \t\t\t.cap.turbo_dec = {\n@@ -172,6 +176,7 @@ struct turbo_sw_queue {\n \t\t\t\t.num_buffers_dst = RTE_BBDEV_MAX_CODE_BLOCKS,\n \t\t\t}\n \t\t},\n+#endif\n \t\tRTE_BBDEV_END_OF_CAPABILITIES_LIST()\n \t};\n \n@@ -410,6 +415,7 @@ struct turbo_sw_queue {\n \t.queue_release = q_release\n };\n \n+#ifdef RTE_BBDEV_SDK_AVX2\n /* Checks if the encoder input buffer is correct.\n * Returns 0 if it's valid, -1 otherwise.\n */\n@@ -464,6 +470,7 @@ struct turbo_sw_queue {\n \n \treturn 0;\n }\n+#endif\n \n static inline void\n process_enc_cb(struct turbo_sw_queue *q, struct rte_bbdev_enc_op *op,\n@@ -472,6 +479,7 @@ struct turbo_sw_queue {\n \t\tstruct rte_mbuf *m_out, uint16_t in_offset, uint16_t out_offset,\n \t\tuint16_t in_length, struct rte_bbdev_stats *q_stats)\n {\n+#ifdef RTE_BBDEV_SDK_AVX2\n \tint ret;\n \tint16_t k_idx;\n \tuint16_t m;\n@@ -724,6 +732,22 @@ struct turbo_sw_queue {\n \t\t}\n \t\t*tmp_out = 0;\n \t}\n+#else\n+\tRTE_SET_USED(q);\n+\tRTE_SET_USED(op);\n+\tRTE_SET_USED(r);\n+\tRTE_SET_USED(c);\n+\tRTE_SET_USED(k);\n+\tRTE_SET_USED(ncb);\n+\tRTE_SET_USED(e);\n+\tRTE_SET_USED(m_in);\n+\tRTE_SET_USED(m_out_head);\n+\tRTE_SET_USED(m_out);\n+\tRTE_SET_USED(in_offset);\n+\tRTE_SET_USED(out_offset);\n+\tRTE_SET_USED(in_length);\n+\tRTE_SET_USED(q_stats);\n+#endif\n }\n \n static inline void\n@@ -835,6 +859,7 @@ struct turbo_sw_queue {\n \t\t\tNULL);\n }\n \n+#ifdef RTE_BBDEV_SDK_AVX2\n static inline void\n move_padding_bytes(const uint8_t *in, uint8_t *out, uint16_t k,\n \t\tuint16_t ncb)\n@@ -847,6 +872,7 @@ struct turbo_sw_queue {\n \trte_memcpy(&out[nd + kpi + 64], &in[kpi], d);\n \trte_memcpy(&out[(nd - 1) + 2 * (kpi + 64)], &in[2 * kpi], d);\n }\n+#endif\n \n static inline void\n process_dec_cb(struct turbo_sw_queue *q, struct rte_bbdev_dec_op *op,\n@@ -856,6 +882,7 @@ struct turbo_sw_queue {\n \t\tuint16_t crc24_overlap, uint16_t in_length,\n \t\tstruct rte_bbdev_stats *q_stats)\n {\n+#ifdef RTE_BBDEV_SDK_AVX2\n \tint ret;\n \tint32_t k_idx;\n \tint32_t iter_cnt;\n@@ -972,6 +999,22 @@ struct turbo_sw_queue {\n \t\trte_bbdev_log(ERR, \"Turbo Decoder failed\");\n \t\treturn;\n \t}\n+#else\n+\tRTE_SET_USED(q);\n+\tRTE_SET_USED(op);\n+\tRTE_SET_USED(c);\n+\tRTE_SET_USED(k);\n+\tRTE_SET_USED(kw);\n+\tRTE_SET_USED(m_in);\n+\tRTE_SET_USED(m_out_head);\n+\tRTE_SET_USED(m_out);\n+\tRTE_SET_USED(in_offset);\n+\tRTE_SET_USED(out_offset);\n+\tRTE_SET_USED(check_crc_24b);\n+\tRTE_SET_USED(crc24_overlap);\n+\tRTE_SET_USED(in_length);\n+\tRTE_SET_USED(q_stats);\n+#endif\n }\n \n static inline void\ndiff --git a/mk/rte.app.mk b/mk/rte.app.mk\nindex 7c9b4b5..878cc31 100644\n--- a/mk/rte.app.mk\n+++ b/mk/rte.app.mk\n@@ -221,11 +221,14 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += -lrte_pmd_bbdev_null\n \n # TURBO SOFTWARE PMD is dependent on the FLEXRAN library\n _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -lrte_pmd_bbdev_turbo_sw\n+ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),y)\n+# Dependency on the FLEXRAN SDK library if available\n _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_crc -lcrc\n _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_turbo -lturbo\n _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_rate_matching -lrate_matching\n _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_common -lcommon\n _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -lirc -limf -lstdc++ -lipps\n+endif # CONFIG_RTE_BBDEV_SDK_AVX2\n endif # CONFIG_RTE_LIBRTE_BBDEV\n \n ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y)\n", "prefixes": [ "v6", "1/3" ] }