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

_apply patch failure_

Submitter: Zhang, Qi Z <qi.z.zhang@intel.com>
Date: Monday, December 12 2022 21:36:28 
Applied on: CommitID:c581c49cd3fcaff596fbe566e270b442e6326c79
Apply patch set 120772 failed:

Checking patch drivers/common/iavf/meson.build...
Checking patch drivers/net/ice/ice_rxtx_common_avx.h...
Checking patch drivers/net/ice/ice_rxtx_vec_avx2.c...
Checking patch drivers/net/ice/ice_rxtx_vec_avx512.c...
Checking patch drivers/net/ice/ice_rxtx_vec_sse.c...
Checking patch drivers/net/ice/meson.build...
error: while searching for:

deps += ['hash', 'net', 'common_iavf']
includes += include_directories('base', '../../common/iavf')
iova_as_pa = dpdk_conf.get('RTE_IOVA_AS_PA')

if arch_subdir == 'x86'
    sources += files('ice_rxtx_vec_sse.c')

error: patch failed: drivers/net/ice/meson.build:20
error: while searching for:
    if cc.get_define('__AVX2__', args: machine_args) != ''
        cflags += ['-DCC_AVX2_SUPPORT']
        sources += files('ice_rxtx_vec_avx2.c')
    elif iova_as_pa == 1 and cc.has_argument('-mavx2')
        cflags += ['-DCC_AVX2_SUPPORT']
        ice_avx2_lib = static_library('ice_avx2_lib',
                'ice_rxtx_vec_avx2.c',

error: patch failed: drivers/net/ice/meson.build:35
error: while searching for:
                cc.has_argument('-mavx512bw')
    )

    if iova_as_pa == 1 and (ice_avx512_cpu_support == true or ice_avx512_cc_support == true)
        cflags += ['-DCC_AVX512_SUPPORT']
        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
        if cc.has_argument('-march=skylake-avx512')

error: patch failed: drivers/net/ice/meson.build:56
Applied patch drivers/common/iavf/meson.build cleanly.
Applied patch drivers/net/ice/ice_rxtx_common_avx.h cleanly.
Applied patch drivers/net/ice/ice_rxtx_vec_avx2.c cleanly.
Applied patch drivers/net/ice/ice_rxtx_vec_avx512.c cleanly.
Applied patch drivers/net/ice/ice_rxtx_vec_sse.c cleanly.
Applying patch drivers/net/ice/meson.build with 3 rejects...
Rejected hunk #1.
Rejected hunk #2.
Rejected hunk #3.
Hunk #4 applied cleanly.
diff a/drivers/net/ice/meson.build b/drivers/net/ice/meson.build	(rejected hunks)
@@ -20,7 +20,6 @@ testpmd_sources = files('ice_testpmd.c')
 
 deps += ['hash', 'net', 'common_iavf']
 includes += include_directories('base', '../../common/iavf')
-iova_as_pa = dpdk_conf.get('RTE_IOVA_AS_PA')
 
 if arch_subdir == 'x86'
     sources += files('ice_rxtx_vec_sse.c')
@@ -35,7 +34,7 @@ if arch_subdir == 'x86'
     if cc.get_define('__AVX2__', args: machine_args) != ''
         cflags += ['-DCC_AVX2_SUPPORT']
         sources += files('ice_rxtx_vec_avx2.c')
-    elif iova_as_pa == 1 and cc.has_argument('-mavx2')
+    elif cc.has_argument('-mavx2')
         cflags += ['-DCC_AVX2_SUPPORT']
         ice_avx2_lib = static_library('ice_avx2_lib',
                 'ice_rxtx_vec_avx2.c',
@@ -56,7 +55,7 @@ if arch_subdir == 'x86'
                 cc.has_argument('-mavx512bw')
     )
 
-    if iova_as_pa == 1 and (ice_avx512_cpu_support == true or ice_avx512_cc_support == true)
+    if ice_avx512_cpu_support == true or ice_avx512_cc_support == true
         cflags += ['-DCC_AVX512_SUPPORT']
         avx512_args = [cflags, '-mavx512f', '-mavx512bw']
         if cc.has_argument('-march=skylake-avx512')

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

UNH-IOL DPDK Community Lab