diff --git a/0001-m4-Test-avx512-for-x86-only.patch b/0001-m4-Test-avx512-for-x86-only.patch new file mode 100644 index 0000000..76ce0ff --- /dev/null +++ b/0001-m4-Test-avx512-for-x86-only.patch @@ -0,0 +1,46 @@ +From edf699ec6404da3612b58aab85d7da12f0dc9733 Mon Sep 17 00:00:00 2001 +From: Cheng Li +Date: Fri, 16 Sep 2022 09:56:18 +0000 +Subject: [PATCH] m4: Test avx512 for x86 only. + +'as' command of arm version may don't support option '--64', this +patch is to move the avx512 test into x86 branch to avoid this. + +Fixes: 352b6c7116cd ("dpif-lookup: add avx512 gather implementation.") +Tested-by: Harry van Haaren +Signed-off-by: Cheng Li +Signed-off-by: Ilya Maximets +--- + m4/openvswitch.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 +index 21808483e..09134feca 100644 +--- a/m4/openvswitch.m4 ++++ b/m4/openvswitch.m4 +@@ -436,8 +436,8 @@ AC_DEFUN([OVS_CHECK_BINUTILS_AVX512], + mkdir -p build-aux + OBJFILE=build-aux/binutils_avx512_check.o + GATHER_PARAMS='0x8(,%ymm1,1),%ymm0{%k2}' +- echo "vpgatherqq $GATHER_PARAMS" | as --64 -o $OBJFILE - + if ($CC -dumpmachine | grep x86_64) >/dev/null 2>&1; then ++ echo "vpgatherqq $GATHER_PARAMS" | as --64 -o $OBJFILE - + if (objdump -d --no-show-raw-insn $OBJFILE | grep -q $GATHER_PARAMS) >/dev/null 2>&1; then + ovs_cv_binutils_avx512_good=yes + else +@@ -446,11 +446,11 @@ AC_DEFUN([OVS_CHECK_BINUTILS_AVX512], + dnl and causing zmm usage with buggy binutils versions. + CFLAGS="$CFLAGS -mno-avx512f" + fi ++ rm $OBJFILE + else + dnl non x86_64 architectures don't have avx512, so not affected + ovs_cv_binutils_avx512_good=no + fi]) +- rm $OBJFILE + if test "$ovs_cv_binutils_avx512_good" = yes; then + AC_DEFINE([HAVE_LD_AVX512_GOOD], [1], + [Define to 1 if binutils correctly supports AVX512.]) +-- +2.37.3 + diff --git a/openvswitch.changes b/openvswitch.changes index 8d58197..ce7ff6b 100644 --- a/openvswitch.changes +++ b/openvswitch.changes @@ -3,6 +3,7 @@ Thu Sep 29 11:58:47 UTC 2022 - Dirk Müller - add a77ad9693c8b49055389559187fe74eddb619746.patch to avoid the cpu detection code being compiled with AVX512 enabled +- add 0001-m4-Test-avx512-for-x86-only.patch ------------------------------------------------------------------- Mon Sep 12 19:55:30 UTC 2022 - Andreas Stieger diff --git a/openvswitch.spec b/openvswitch.spec index f5f37c3..92920e8 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -62,6 +62,7 @@ Patch5: 0001-openvswitch-merge-compiler.h-files-into-one-file.patch Patch6: 0002-build-Seperated-common-used-headers.patch Patch7: openvswitch-2.17.2-Fix-tests-with-GNU-grep-3.8.patch Patch8: a77ad9693c8b49055389559187fe74eddb619746.patch +Patch9: 0001-m4-Test-avx512-for-x86-only.patch # Python subpackage BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools}