On Wed, Jan 27, 2021 at 04:47:45PM +0800, Leyi Rong wrote:
> Disable i40e avx512 code path for windows build to
> avoid the mingw build error.
>
> Fixes: e6a6a138919f ("net/i40e: add AVX512 vector path")
>
> Signed-off-by: Leyi Rong <leyi.r...@intel.com>
> ---
> drivers/net/i40e/meson.build | 26 ++++++++++++++------------
> 1 file changed, 14 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build
> index c0acdf4fd4..34c9dfa681 100644
> --- a/drivers/net/i40e/meson.build
> +++ b/drivers/net/i40e/meson.build
> @@ -54,19 +54,21 @@ if arch_subdir == 'x86'
> cc.has_argument('-mavx512f') and
> cc.has_argument('-mavx512bw'))
>
> - if i40e_avx512_cpu_support == true or i40e_avx512_cc_support == true
> - cflags += ['-DCC_AVX512_SUPPORT']
> - avx512_args = [cflags, '-mavx512f', '-mavx512bw']
> - if cc.has_argument('-march=skylake-avx512')
> - avx512_args += '-march=skylake-avx512'
> + if not is_windows or cc.get_id() == 'clang'
> + if i40e_avx512_cpu_support == true or i40e_avx512_cc_support ==
> true
Rather than changing this whole block to indent it further following the
new condition check, I think a simpler fix might be to insert:
if is_windows and cc.get_id() != 'clang'
i40e_avx512_cc_support = false
endif
just after the initial assignment to i40e_avx512_cc_support. [Alternatively,
you can include those conditions in the assignment itself, but it's
probably more readable done separately as I show above.]
/Bruce
