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 0344946F1D; Wed, 17 Sep 2025 11:18:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A53040678; Wed, 17 Sep 2025 11:17:45 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by mails.dpdk.org (Postfix) with ESMTP id E268C40663 for ; Wed, 17 Sep 2025 11:17:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1758100662; x=1789636662; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BnnzD88vQ9dnTtbCBR/5qxl44BZPvUyxUcMELJeZG9U=; b=cib69LXFegIU5euxhjwSCZiWr7rc7W4on8u98+N5nlP9CZr7vKcuOGsg gYzYaECtj0AwhdyfkEtGkwwg/xBJ9sDzIYbVzYIx9QsDsRDmrnuNJtKUK XvLsLOiivZ1Z6Azxz1kORRDvtSTogWHkSzw6khvwADc9wL+iaqyZEbUsi d0y16LjotPvtkMkHbUzXE75+nbU1Wc7G/p24hFS4QFFVy/55N8vkJq0bS JYeFMpti5wioz//DMOhq9mQz5p8T0RUUvHMBvUDhe+v3ghGIFTQHLde4D WLZp7mXn4WAdUOW6QIX/pyfbICDpFyUpntcmh3sMq7RcjMh5Ky8GmXDhJ g==; X-CSE-ConnectionGUID: T+CVv1v2SjWGrddnV9pQOQ== X-CSE-MsgGUID: w+D4755fTMegWqbdIxqjOQ== X-IronPort-AV: E=McAfee;i="6800,10657,11555"; a="60464529" X-IronPort-AV: E=Sophos;i="6.18,271,1751266800"; d="scan'208";a="60464529" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2025 02:17:42 -0700 X-CSE-ConnectionGUID: lBIjOKrLRYGXbF3gsX3EYg== X-CSE-MsgGUID: Ys5tIxHsTE2vKbBY74dNLA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,271,1751266800"; d="scan'208";a="174760567" Received: from silpixa00401177.ir.intel.com ([10.237.213.77]) by orviesa009.jf.intel.com with ESMTP; 17 Sep 2025 02:17:40 -0700 From: Ciara Loftus To: dev@dpdk.org Cc: Ciara Loftus Subject: [PATCH v2 4/5] net/cpfl: use the new common vector capability function Date: Wed, 17 Sep 2025 09:17:30 +0000 Message-Id: <20250917091731.3632520-5-ciara.loftus@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250917091731.3632520-1-ciara.loftus@intel.com> References: <20250911143145.3355960-1-ciara.loftus@intel.com> <20250917091731.3632520-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 cpfl driver. Also, remove unused elements related to AVX capability from the idpf_vport structure, now that neither the idpf or cpfl drivers use them. Signed-off-by: Ciara Loftus --- v2: * Removed check for AVX512DQ in the driver code as it's in the common code now. --- drivers/net/intel/cpfl/cpfl_rxtx.c | 50 ++++++------------- drivers/net/intel/cpfl/cpfl_rxtx_vec_common.h | 12 +++++ drivers/net/intel/idpf/idpf_common_device.h | 4 -- 3 files changed, 26 insertions(+), 40 deletions(-) diff --git a/drivers/net/intel/cpfl/cpfl_rxtx.c b/drivers/net/intel/cpfl/cpfl_rxtx.c index 02e81f7f34..0f5b645f89 100644 --- a/drivers/net/intel/cpfl/cpfl_rxtx.c +++ b/drivers/net/intel/cpfl/cpfl_rxtx.c @@ -1411,26 +1411,13 @@ cpfl_set_rx_function(struct rte_eth_dev *dev) struct idpf_vport *vport = &cpfl_vport->base; #ifdef RTE_ARCH_X86 struct cpfl_rx_queue *cpfl_rxq; + enum rte_vect_max_simd rx_simd_width = RTE_VECT_SIMD_DISABLED; int i; if (cpfl_rx_vec_dev_check_default(dev) == CPFL_VECTOR_PATH && rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) { vport->rx_vec_allowed = true; - - if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) == 1 && - rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_256) - vport->rx_use_avx2 = true; - - if (rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_512) -#ifdef CC_AVX512_SUPPORT - if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1 && - rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512BW) == 1 && - rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512DQ)) - vport->rx_use_avx512 = true; -#else - PMD_DRV_LOG(NOTICE, - "AVX512 is not supported in build env"); -#endif /* CC_AVX512_SUPPORT */ + rx_simd_width = cpfl_get_max_simd_bitwidth(); } else { vport->rx_vec_allowed = false; } @@ -1446,7 +1433,7 @@ cpfl_set_rx_function(struct rte_eth_dev *dev) (void)idpf_qc_splitq_rx_vec_setup(&cpfl_rxq->base); } #ifdef CC_AVX512_SUPPORT - if (vport->rx_use_avx512) { + if (rx_simd_width == RTE_VECT_SIMD_512) { PMD_DRV_LOG(NOTICE, "Using Split AVX512 Vector Rx (port %d).", dev->data->port_id); @@ -1466,7 +1453,7 @@ cpfl_set_rx_function(struct rte_eth_dev *dev) (void)idpf_qc_singleq_rx_vec_setup(&cpfl_rxq->base); } #ifdef CC_AVX512_SUPPORT - if (vport->rx_use_avx512) { + if (rx_simd_width == RTE_VECT_SIMD_512) { PMD_DRV_LOG(NOTICE, "Using Single AVX512 Vector Rx (port %d).", dev->data->port_id); @@ -1474,7 +1461,7 @@ cpfl_set_rx_function(struct rte_eth_dev *dev) return; } #endif /* CC_AVX512_SUPPORT */ - if (vport->rx_use_avx2) { + if (rx_simd_width == RTE_VECT_SIMD_256) { PMD_DRV_LOG(NOTICE, "Using Single AVX2 Vector Rx (port %d).", dev->data->port_id); @@ -1522,6 +1509,7 @@ cpfl_set_tx_function(struct rte_eth_dev *dev) struct cpfl_vport *cpfl_vport = dev->data->dev_private; struct idpf_vport *vport = &cpfl_vport->base; #ifdef RTE_ARCH_X86 + enum rte_vect_max_simd tx_simd_width = RTE_VECT_SIMD_DISABLED; #ifdef CC_AVX512_SUPPORT struct cpfl_tx_queue *cpfl_txq; int i; @@ -1530,22 +1518,12 @@ cpfl_set_tx_function(struct rte_eth_dev *dev) if (cpfl_tx_vec_dev_check_default(dev) == CPFL_VECTOR_PATH && rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) { vport->tx_vec_allowed = true; - - if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) == 1 && - rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_256) - vport->tx_use_avx2 = true; - - if (rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_512) + tx_simd_width = cpfl_get_max_simd_bitwidth(); #ifdef CC_AVX512_SUPPORT - { - if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1 && - rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512BW) == 1) - vport->tx_use_avx512 = true; - if (vport->tx_use_avx512) { - for (i = 0; i < dev->data->nb_tx_queues; i++) { - cpfl_txq = dev->data->tx_queues[i]; - idpf_qc_tx_vec_avx512_setup(&cpfl_txq->base); - } + if (tx_simd_width == RTE_VECT_SIMD_512) { + for (i = 0; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + idpf_qc_tx_vec_avx512_setup(&cpfl_txq->base); } } #else @@ -1561,7 +1539,7 @@ cpfl_set_tx_function(struct rte_eth_dev *dev) if (vport->txq_model == VIRTCHNL2_QUEUE_MODEL_SPLIT) { if (vport->tx_vec_allowed) { #ifdef CC_AVX512_SUPPORT - if (vport->tx_use_avx512) { + if (tx_simd_width == RTE_VECT_SIMD_512) { PMD_DRV_LOG(NOTICE, "Using Split AVX512 Vector Tx (port %d).", dev->data->port_id); @@ -1579,7 +1557,7 @@ cpfl_set_tx_function(struct rte_eth_dev *dev) } else { if (vport->tx_vec_allowed) { #ifdef CC_AVX512_SUPPORT - if (vport->tx_use_avx512) { + if (tx_simd_width == RTE_VECT_SIMD_512) { for (i = 0; i < dev->data->nb_tx_queues; i++) { cpfl_txq = dev->data->tx_queues[i]; if (cpfl_txq == NULL) @@ -1594,7 +1572,7 @@ cpfl_set_tx_function(struct rte_eth_dev *dev) return; } #endif /* CC_AVX512_SUPPORT */ - if (vport->tx_use_avx2) { + if (tx_simd_width == RTE_VECT_SIMD_256) { PMD_DRV_LOG(NOTICE, "Using Single AVX2 Vector Tx (port %d).", dev->data->port_id); diff --git a/drivers/net/intel/cpfl/cpfl_rxtx_vec_common.h b/drivers/net/intel/cpfl/cpfl_rxtx_vec_common.h index f1e555b5f8..525ca9a6e0 100644 --- a/drivers/net/intel/cpfl/cpfl_rxtx_vec_common.h +++ b/drivers/net/intel/cpfl/cpfl_rxtx_vec_common.h @@ -11,6 +11,10 @@ #include "cpfl_ethdev.h" #include "cpfl_rxtx.h" +#ifdef RTE_ARCH_X86 +#include "../common/rx_vec_x86.h" +#endif + #define CPFL_SCALAR_PATH 0 #define CPFL_VECTOR_PATH 1 #define CPFL_RX_NO_VECTOR_FLAGS ( \ @@ -121,4 +125,12 @@ cpfl_tx_vec_dev_check_default(struct rte_eth_dev *dev) return CPFL_VECTOR_PATH; } +#ifdef RTE_ARCH_X86 +static inline enum rte_vect_max_simd +cpfl_get_max_simd_bitwidth(void) +{ + return ci_get_x86_max_simd_bitwidth(); +} +#endif + #endif /*_CPFL_RXTX_VEC_COMMON_H_*/ diff --git a/drivers/net/intel/idpf/idpf_common_device.h b/drivers/net/intel/idpf/idpf_common_device.h index 62665ad286..11baa195e5 100644 --- a/drivers/net/intel/idpf/idpf_common_device.h +++ b/drivers/net/intel/idpf/idpf_common_device.h @@ -135,10 +135,6 @@ struct idpf_vport { bool rx_vec_allowed; bool tx_vec_allowed; - bool rx_use_avx2; - bool tx_use_avx2; - bool rx_use_avx512; - bool tx_use_avx512; struct virtchnl2_vport_stats eth_stats_offset; -- 2.34.1