From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F3BFC46D5A; Mon, 18 Aug 2025 13:00:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 34A7E40677; Mon, 18 Aug 2025 12:59:41 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by mails.dpdk.org (Postfix) with ESMTP id D430640662 for ; Mon, 18 Aug 2025 12:59:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1755514778; x=1787050778; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TcZpaA0WlEKW+gQJIUWhp1S6DPJzl/H60rZz/2FKVEs=; b=Oh7OEtMp9HzP0gSCdMCYajxmKp5vPh2yfi0lRFDtUBXlayhSQC9fwNEm 0vdFT5Ox1FX0kO4uCZMMqyDoYxm4i4dziQlxZgFrRfwXVvacskbP6JOfS NqAacwQXqQhGufrN6Tsb9O3VAd//uw7b7JbvXDI34GU4I6uvn2nuMPgFF UEIPwI5GEKaFBWfjI7DNFjbvksDUVK53N51b/DIWipGoHr4FmXpBuf0hM oBSDdqxXk1Jx7+C6atfXy+T0vf1mXK5wsYwlIMn7u0atNBoW2VUOysHIf vu4RW27fpniAIgPegdFZfWEjSkxutt4XfZmNK4WhJlKOBZP/MdCRmElSv Q==; X-CSE-ConnectionGUID: MGcAVblWQlSLxDtC2lYYlA== X-CSE-MsgGUID: XZGXajMhS3ezLKr1JzpZjA== X-IronPort-AV: E=McAfee;i="6800,10657,11524"; a="83165432" X-IronPort-AV: E=Sophos;i="6.17,293,1747724400"; d="scan'208";a="83165432" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Aug 2025 03:59:37 -0700 X-CSE-ConnectionGUID: djZOn0HwTiOQ2tPTbj6qhQ== X-CSE-MsgGUID: Fa9zyRcsRpWLnamK2A7ZbQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.17,293,1747724400"; d="scan'208";a="166722960" Received: from silpixa00401177.ir.intel.com ([10.237.213.77]) by orviesa006.jf.intel.com with ESMTP; 18 Aug 2025 03:59:36 -0700 From: Ciara Loftus To: dev@dpdk.org Cc: Ciara Loftus , Bruce Richardson Subject: [PATCH v3 06/15] net/ice: use the new common vector capability function Date: Mon, 18 Aug 2025 10:59:05 +0000 Message-Id: <20250818105914.169732-7-ciara.loftus@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250818105914.169732-1-ciara.loftus@intel.com> References: <20250818105914.169732-1-ciara.loftus@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Use the new function for determining the maximum simd bitwidth in the ice driver. Signed-off-by: Ciara Loftus Acked-by: Bruce Richardson --- v3: * removed unnecessary #ifdef CC_AVX512_SUPPORT * changed == RTE_VECT_SIMD_256 to >= RTE_VECT_SIMD_256 --- drivers/net/intel/ice/ice_ethdev.h | 5 +-- drivers/net/intel/ice/ice_rxtx.c | 56 +++++------------------- drivers/net/intel/ice/ice_rxtx.h | 1 + drivers/net/intel/ice/ice_rxtx_vec_sse.c | 6 +++ 4 files changed, 21 insertions(+), 47 deletions(-) diff --git a/drivers/net/intel/ice/ice_ethdev.h b/drivers/net/intel/ice/ice_ethdev.h index 4505644f87..8d975c23de 100644 --- a/drivers/net/intel/ice/ice_ethdev.h +++ b/drivers/net/intel/ice/ice_ethdev.h @@ -11,6 +11,7 @@ #include #include +#include #include "base/ice_common.h" #include "base/ice_adminq_cmd.h" @@ -674,9 +675,7 @@ struct ice_adapter { /* Set bit if the engine is disabled */ unsigned long disabled_engine_mask; struct ice_parser *psr; - /* used only on X86, zero on other Archs */ - bool tx_use_avx2; - bool tx_use_avx512; + enum rte_vect_max_simd tx_simd_width; bool rx_vec_offload_support; }; diff --git a/drivers/net/intel/ice/ice_rxtx.c b/drivers/net/intel/ice/ice_rxtx.c index 428e136bfe..3c2f1a9235 100644 --- a/drivers/net/intel/ice/ice_rxtx.c +++ b/drivers/net/intel/ice/ice_rxtx.c @@ -3703,7 +3703,7 @@ ice_set_rx_function(struct rte_eth_dev *dev) struct ci_rx_queue *rxq; int i; int rx_check_ret = -1; - bool rx_use_avx512 = false, rx_use_avx2 = false; + enum rte_vect_max_simd rx_simd_width = RTE_VECT_SIMD_DISABLED; rx_check_ret = ice_rx_vec_dev_check(dev); if (ad->ptp_ena) @@ -3720,35 +3720,20 @@ ice_set_rx_function(struct rte_eth_dev *dev) break; } } + rx_simd_width = ice_get_max_simd_bitwidth(); - if (rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_512 && - rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1 && - rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512BW) == 1) -#ifdef CC_AVX512_SUPPORT - rx_use_avx512 = true; -#else - PMD_DRV_LOG(NOTICE, - "AVX512 is not supported in build env"); -#endif - if (!rx_use_avx512 && - (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) == 1 || - rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1) && - rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_256) - rx_use_avx2 = true; } else { ad->rx_vec_allowed = false; } if (ad->rx_vec_allowed) { if (dev->data->scattered_rx) { - if (rx_use_avx512) { -#ifdef CC_AVX512_SUPPORT + if (rx_simd_width == RTE_VECT_SIMD_512) { if (ad->rx_vec_offload_support) ad->rx_func_type = ICE_RX_AVX512_SCATTERED_OFFLOAD; else ad->rx_func_type = ICE_RX_AVX512_SCATTERED; -#endif - } else if (rx_use_avx2) { + } else if (rx_simd_width >= RTE_VECT_SIMD_256) { if (ad->rx_vec_offload_support) ad->rx_func_type = ICE_RX_AVX2_SCATTERED_OFFLOAD; else @@ -3757,14 +3742,12 @@ ice_set_rx_function(struct rte_eth_dev *dev) ad->rx_func_type = ICE_RX_SSE_SCATTERED; } } else { - if (rx_use_avx512) { -#ifdef CC_AVX512_SUPPORT + if (rx_simd_width == RTE_VECT_SIMD_512) { if (ad->rx_vec_offload_support) ad->rx_func_type = ICE_RX_AVX512_OFFLOAD; else ad->rx_func_type = ICE_RX_AVX512; -#endif - } else if (rx_use_avx2) { + } else if (rx_simd_width >= RTE_VECT_SIMD_256) { if (ad->rx_vec_offload_support) ad->rx_func_type = ICE_RX_AVX2_OFFLOAD; else @@ -4032,29 +4015,14 @@ ice_set_tx_function(struct rte_eth_dev *dev) int tx_check_ret = -1; if (rte_eal_process_type() == RTE_PROC_PRIMARY) { - ad->tx_use_avx2 = false; - ad->tx_use_avx512 = false; + ad->tx_simd_width = RTE_VECT_SIMD_DISABLED; tx_check_ret = ice_tx_vec_dev_check(dev); + ad->tx_simd_width = ice_get_max_simd_bitwidth(); if (tx_check_ret >= 0 && rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) { ad->tx_vec_allowed = true; - if (rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_512 && - rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1 && - rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512BW) == 1) -#ifdef CC_AVX512_SUPPORT - ad->tx_use_avx512 = true; -#else - PMD_DRV_LOG(NOTICE, - "AVX512 is not supported in build env"); -#endif - if (!ad->tx_use_avx512 && - (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) == 1 || - rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1) && - rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_256) - ad->tx_use_avx2 = true; - - if (!ad->tx_use_avx2 && !ad->tx_use_avx512 && + if (ad->tx_simd_width < RTE_VECT_SIMD_256 && tx_check_ret == ICE_VECTOR_OFFLOAD_PATH) ad->tx_vec_allowed = false; @@ -4074,7 +4042,7 @@ ice_set_tx_function(struct rte_eth_dev *dev) if (ad->tx_vec_allowed) { dev->tx_pkt_prepare = NULL; - if (ad->tx_use_avx512) { + if (ad->tx_simd_width == RTE_VECT_SIMD_512) { #ifdef CC_AVX512_SUPPORT if (tx_check_ret == ICE_VECTOR_OFFLOAD_PATH) { PMD_DRV_LOG(NOTICE, @@ -4100,9 +4068,9 @@ ice_set_tx_function(struct rte_eth_dev *dev) dev->tx_pkt_prepare = ice_prep_pkts; } else { PMD_DRV_LOG(DEBUG, "Using %sVector Tx (port %d).", - ad->tx_use_avx2 ? "avx2 " : "", + ad->tx_simd_width == RTE_VECT_SIMD_256 ? "avx2 " : "", dev->data->port_id); - dev->tx_pkt_burst = ad->tx_use_avx2 ? + dev->tx_pkt_burst = ad->tx_simd_width == RTE_VECT_SIMD_256 ? ice_xmit_pkts_vec_avx2 : ice_xmit_pkts_vec; } diff --git a/drivers/net/intel/ice/ice_rxtx.h b/drivers/net/intel/ice/ice_rxtx.h index 0301d05888..8c3d6c413a 100644 --- a/drivers/net/intel/ice/ice_rxtx.h +++ b/drivers/net/intel/ice/ice_rxtx.h @@ -261,6 +261,7 @@ uint16_t ice_xmit_pkts_vec_avx512_offload(void *tx_queue, int ice_fdir_programming(struct ice_pf *pf, struct ice_fltr_desc *fdir_desc); int ice_tx_done_cleanup(void *txq, uint32_t free_cnt); int ice_get_monitor_addr(void *rx_queue, struct rte_power_monitor_cond *pmc); +enum rte_vect_max_simd ice_get_max_simd_bitwidth(void); #define FDIR_PARSING_ENABLE_PER_QUEUE(ad, on) do { \ int i; \ diff --git a/drivers/net/intel/ice/ice_rxtx_vec_sse.c b/drivers/net/intel/ice/ice_rxtx_vec_sse.c index d818b3b728..1545bc3b6e 100644 --- a/drivers/net/intel/ice/ice_rxtx_vec_sse.c +++ b/drivers/net/intel/ice/ice_rxtx_vec_sse.c @@ -735,3 +735,9 @@ ice_tx_vec_dev_check(struct rte_eth_dev *dev) { return ice_tx_vec_dev_check_default(dev); } + +enum rte_vect_max_simd +ice_get_max_simd_bitwidth(void) +{ + return ci_get_x86_max_simd_bitwidth(); +} -- 2.34.1