From: Bruce Richardson <bruce.richardson@intel.com> To: dev@dpdk.org Cc: brian90013@gmail.com, Bruce Richardson <bruce.richardson@intel.com>, wenzhuo.lu@intel.com, leyi.rong@intel.com, stable@dpdk.org, Qiming Yang <qiming.yang@intel.com>, Qi Zhang <qi.z.zhang@intel.com> Subject: [dpdk-stable] [PATCH 2/2] net/ice: fix generic build on FreeBSD Date: Wed, 18 Aug 2021 17:38:16 +0100 Message-ID: <20210818163816.19143-2-bruce.richardson@intel.com> (raw) In-Reply-To: <20210818163816.19143-1-bruce.richardson@intel.com> The common header file for vectorization is included in multiple files, and so must use macros for the current compilation unit, rather than the compiler-capability flag set for the whole driver. With the current, incorrect, macro, the AVX512 or AVX2 flags may be set when compiling up SSE code, leading to compilation errors. Changing from "CC_AVX*_SUPPORT" to the compiler-defined "__AVX*__" macros fixes this issue. Bugzilla ID: 788 Fixes: a4e480de268e ("net/ice: optimize Tx by using AVX512") Fixes: 20daa1c978b7 ("net/ice: fix crash in AVX512") Cc: wenzhuo.lu@intel.com Cc: leyi.rong@intel.com Cc: stable@dpdk.org Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- drivers/net/ice/ice_rxtx_vec_common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/ice_rxtx_vec_common.h b/drivers/net/ice/ice_rxtx_vec_common.h index 2d8ef7dc8a..e609a75fc6 100644 --- a/drivers/net/ice/ice_rxtx_vec_common.h +++ b/drivers/net/ice/ice_rxtx_vec_common.h @@ -194,7 +194,7 @@ _ice_tx_queue_release_mbufs_vec(struct ice_tx_queue *txq) */ i = txq->tx_next_dd - txq->tx_rs_thresh + 1; -#ifdef CC_AVX512_SUPPORT +#ifdef __AVX512VL__ struct rte_eth_dev *dev = &rte_eth_devices[txq->vsi->adapter->pf.dev_data->port_id]; if (dev->tx_pkt_burst == ice_xmit_pkts_vec_avx512 || @@ -352,7 +352,7 @@ ice_tx_vec_dev_check_default(struct rte_eth_dev *dev) return result; } -#ifdef CC_AVX2_SUPPORT +#ifdef __AVX2__ static __rte_always_inline void ice_rxq_rearm_common(struct ice_rx_queue *rxq, __rte_unused bool avx512) { @@ -414,7 +414,7 @@ ice_rxq_rearm_common(struct ice_rx_queue *rxq, __rte_unused bool avx512) _mm_store_si128((__m128i *)&rxdp++->read, dma_addr1); } #else -#ifdef CC_AVX512_SUPPORT +#ifdef __AVX512VL__ if (avx512) { struct rte_mbuf *mb0, *mb1, *mb2, *mb3; struct rte_mbuf *mb4, *mb5, *mb6, *mb7; -- 2.30.2
next prev parent reply other threads:[~2021-08-18 16:38 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <bug-788-3@http.bugs.dpdk.org/> 2021-08-18 16:38 ` [dpdk-stable] [PATCH 1/2] net/i40e: " Bruce Richardson 2021-08-18 16:38 ` Bruce Richardson [this message] 2021-08-30 8:18 ` [dpdk-stable] [PATCH 2/2] net/ice: " Rong, Leyi 2021-09-01 6:24 ` Zhang, Qi Z 2021-09-01 6:23 ` [dpdk-stable] [dpdk-dev] [PATCH 1/2] net/i40e: " Zhang, Qi Z 2021-09-29 12:13 [dpdk-stable] " Leyi Rong 2021-09-29 12:13 ` [dpdk-stable] [PATCH 2/2] net/ice: " Leyi Rong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210818163816.19143-2-bruce.richardson@intel.com \ --to=bruce.richardson@intel.com \ --cc=brian90013@gmail.com \ --cc=dev@dpdk.org \ --cc=leyi.rong@intel.com \ --cc=qi.z.zhang@intel.com \ --cc=qiming.yang@intel.com \ --cc=stable@dpdk.org \ --cc=wenzhuo.lu@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git