[dpdk-test-report] |WARNING| pw94884-94885 [PATCH] [v2, 2/2] net/ice: add Rx AVX2 offload path

[dpdklab at iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/94884

_apply patch failure_

Submitter: Wenzhuo Lu <wenzhuo.lu at intel.com>
Date: Monday, June 28 2021 07:53:04 
Applied on: CommitID:2508c18cff9ffb217ac40e44071dc2762d257f31
Apply patch set 94884-94885 failed:

Checking patch drivers/net/ice/ice_rxtx.c...
error: while searching for:
#ifdef RTE_ARCH_X86
	struct ice_tx_queue *txq;
	int i;
	int tx_check_ret;
	bool use_avx512 = false;
	bool use_avx2 = false;

	if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
		tx_check_ret = ice_tx_vec_dev_check(dev);

error: patch failed: drivers/net/ice/ice_rxtx.c:3294
error: while searching for:
			rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1 &&
			rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512BW) == 1)
#ifdef CC_AVX512_SUPPORT
				use_avx512 = true;
#else
			PMD_DRV_LOG(NOTICE,
				"AVX512 is not supported in build env");
#endif
			if (!use_avx512 && tx_check_ret == ICE_VECTOR_PATH &&
			(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)
				use_avx2 = true;

			if (!use_avx512 && tx_check_ret == ICE_VECTOR_OFFLOAD_PATH)
				ad->tx_vec_allowed = false;

			if (ad->tx_vec_allowed) {

error: patch failed: drivers/net/ice/ice_rxtx.c:3308
error: while searching for:
	}

	if (ad->tx_vec_allowed) {
		if (use_avx512) {
#ifdef CC_AVX512_SUPPORT
			if (tx_check_ret == ICE_VECTOR_OFFLOAD_PATH) {
				PMD_DRV_LOG(NOTICE,

error: patch failed: drivers/net/ice/ice_rxtx.c:3337
Hunk #4 succeeded at 3339 (offset -7 lines).
error: while searching for:
			}
#endif
		} else {
			PMD_DRV_LOG(DEBUG, "Using %sVector Tx (port %d).",
				    use_avx2 ? "avx2 " : "",
				    dev->data->port_id);
			dev->tx_pkt_burst = use_avx2 ?
					    ice_xmit_pkts_vec_avx2 :
					    ice_xmit_pkts_vec;
		}
		dev->tx_pkt_prepare = NULL;

		return;
	}

error: patch failed: drivers/net/ice/ice_rxtx.c:3353
Checking patch drivers/net/ice/ice_rxtx.h...
Checking patch drivers/net/ice/ice_rxtx_vec_avx2.c...
Applying patch drivers/net/ice/ice_rxtx.c with 4 rejects...
Rejected hunk #1.
Rejected hunk #2.
Rejected hunk #3.
Hunk #4 applied cleanly.
Rejected hunk #5.
Applied patch drivers/net/ice/ice_rxtx.h cleanly.
Applied patch drivers/net/ice/ice_rxtx_vec_avx2.c cleanly.
diff a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c	(rejected hunks)
@@ -3294,9 +3294,9 @@
 #ifdef RTE_ARCH_X86
 	struct ice_tx_queue *txq;
 	int i;
-	int tx_check_ret;
-	bool use_avx512 = false;
-	bool use_avx2 = false;
+	int tx_check_ret = -1;
+	bool cap_avx512 = false;
+	bool cap_avx2 = false;
 
 	if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
 		tx_check_ret = ice_tx_vec_dev_check(dev);
@@ -3308,18 +3308,18 @@
 			rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1 &&
 			rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512BW) == 1)
 #ifdef CC_AVX512_SUPPORT
-				use_avx512 = true;
+				cap_avx512 = true;
 #else
 			PMD_DRV_LOG(NOTICE,
 				"AVX512 is not supported in build env");
 #endif
-			if (!use_avx512 && tx_check_ret == ICE_VECTOR_PATH &&
-			(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)
-				use_avx2 = true;
+			if ((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)
+				cap_avx2 = true;
 
-			if (!use_avx512 && tx_check_ret == ICE_VECTOR_OFFLOAD_PATH)
+			if (!cap_avx2 && !cap_avx512 &&
+			    tx_check_ret == ICE_VECTOR_OFFLOAD_PATH)
 				ad->tx_vec_allowed = false;
 
 			if (ad->tx_vec_allowed) {
@@ -3337,7 +3337,8 @@
 	}
 
 	if (ad->tx_vec_allowed) {
-		if (use_avx512) {
+		dev->tx_pkt_prepare = NULL;
+		if (cap_avx512) {
 #ifdef CC_AVX512_SUPPORT
 			if (tx_check_ret == ICE_VECTOR_OFFLOAD_PATH) {
 				PMD_DRV_LOG(NOTICE,
@@ -3353,14 +3355,22 @@
 			}
 #endif
 		} else {
-			PMD_DRV_LOG(DEBUG, "Using %sVector Tx (port %d).",
-				    use_avx2 ? "avx2 " : "",
-				    dev->data->port_id);
-			dev->tx_pkt_burst = use_avx2 ?
-					    ice_xmit_pkts_vec_avx2 :
-					    ice_xmit_pkts_vec;
+			if (tx_check_ret == ICE_VECTOR_OFFLOAD_PATH) {
+				PMD_DRV_LOG(NOTICE,
+					    "Using AVX2 OFFLOAD Vector Tx (port %d).",
+					    dev->data->port_id);
+				dev->tx_pkt_burst =
+					ice_xmit_pkts_vec_avx2_offload;
+				dev->tx_pkt_prepare = ice_prep_pkts;
+			} else {
+				PMD_DRV_LOG(DEBUG, "Using %sVector Tx (port %d).",
+					    cap_avx2 ? "avx2 " : "",
+					    dev->data->port_id);
+				dev->tx_pkt_burst = cap_avx2 ?
+						    ice_xmit_pkts_vec_avx2 :
+						    ice_xmit_pkts_vec;
+			}
 		}
-		dev->tx_pkt_prepare = NULL;
 
 		return;
 	}
Skipped patch 'doc/guides/rel_notes/release_21_08.rst'.
Checking patch drivers/net/ice/ice_rxtx.c...
error: drivers/net/ice/ice_rxtx.c: does not match index
Checking patch drivers/net/ice/ice_rxtx.h...
error: drivers/net/ice/ice_rxtx.h: does not match index
Checking patch drivers/net/ice/ice_rxtx_vec_avx2.c...
error: drivers/net/ice/ice_rxtx_vec_avx2.c: does not match index

https://lab.dpdk.org/results/dashboard/patchsets/17528/

UNH-IOL DPDK Community Lab