On Wed, Mar 19, 2025 at 11:11:17AM +0100, David Marchand wrote:
> On Tue, Mar 18, 2025 at 6:35 PM Bruce Richardson
> <bruce.richard...@intel.com> wrote:
> >
> > Remove driver-specific build instructions for the AVX2 and AVX-512 code,
> > and rely instead on the generic driver build file.
> >
> > Signed-off-by: Bruce Richardson <bruce.richard...@intel.com>
>
> There is a small merge conflict, so a rebase will be needed.
>
> Some nits.
>
> > ---
> > drivers/net/intel/i40e/meson.build | 26 ++------------------------
> > drivers/net/intel/iavf/meson.build | 25 ++-----------------------
> > drivers/net/intel/ice/meson.build | 25 ++-----------------------
> > drivers/net/intel/idpf/meson.build | 25 ++-----------------------
> > 4 files changed, 8 insertions(+), 93 deletions(-)
> >
> > diff --git a/drivers/net/intel/i40e/meson.build
> > b/drivers/net/intel/i40e/meson.build
> > index 2973ed1a01..25a3d72714 100644
> > --- a/drivers/net/intel/i40e/meson.build
> > +++ b/drivers/net/intel/i40e/meson.build
> > @@ -40,35 +40,13 @@ includes += include_directories('base')
> >
> > if arch_subdir == 'x86'
> > sources += files('i40e_rxtx_vec_sse.c')
> > + sources_avx2 = files('i40e_rxtx_vec_avx2.c')
> > + sources_avx512 = files('i40e_rxtx_vec_avx512.c')
>
> I prefer += (which is also used later in this series).
>
Ack, will change.
> >
> > if is_windows and cc.get_id() != 'clang'
> > cflags += ['-fno-asynchronous-unwind-tables']
> > endif
> >
> > - i40e_avx2_lib = static_library('i40e_avx2_lib',
> > - 'i40e_rxtx_vec_avx2.c',
> > - dependencies: [static_rte_ethdev, static_rte_kvargs,
> > static_rte_hash],
> > - include_directories: includes,
> > - c_args: [cflags, cc_avx2_flags])
> > - objs += i40e_avx2_lib.extract_objects('i40e_rxtx_vec_avx2.c')
> > -
> > - if cc_has_avx512
> > - cflags += ['-DCC_AVX512_SUPPORT']
> > - avx512_args = cflags + cc_avx512_flags
> > - if cc.has_argument('-march=skylake-avx512')
> > - avx512_args += '-march=skylake-avx512'
> > - if cc.has_argument('-Wno-overriding-option')
> > - avx512_args += '-Wno-overriding-option'
> > - endif
> > - endif
> > - i40e_avx512_lib = static_library('i40e_avx512_lib',
> > - 'i40e_rxtx_vec_avx512.c',
> > - dependencies: [static_rte_ethdev,
> > - static_rte_kvargs, static_rte_hash],
> > - include_directories: includes,
> > - c_args: avx512_args)
> > - objs += i40e_avx512_lib.extract_objects('i40e_rxtx_vec_avx512.c')
> > - endif
> > elif arch_subdir == 'ppc'
>
> Below seems not indented the same as above.
>
Yes, the indentation is incorrect, but since I'm not modifying these lines,
I'm not going to do a whitespace adjustment - save polluting the history.
/Bruce
