DPDK patches and discussions
 help / color / mirror / Atom feed
* [dpdk-dev] [PATCH] build: check functionality rather than binutils version
@ 2020-06-17 10:40 Bruce Richardson
  2020-06-17 11:45 ` Thomas Monjalon
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Bruce Richardson @ 2020-06-17 10:40 UTC (permalink / raw)
  To: dev; +Cc: ferruh.yigit, thomas, Bruce Richardson

Rather than checking the binutils version number, which can lead to
unnecessary disabling of AVX512 if fixes have been backported to distro
versions, we can instead check the output of "as" from binutils to see if
it is correct.

These checks use the minimal assembly reproduction code posted to the
public bug tracker for gcc/binutils for those issues [1][2]. If the
binutils bug is present, the instruction parameters - specifically the
displacement parameter - will be different in the disassembled output
compared to the input. Therefore each check involves assembling a single
instruction and disassembling it again, checking that the two match.

[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90028
[2] https://sourceware.org/bugzilla/show_bug.cgi?id=23465

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 buildtools/binutils-avx512-check.sh | 26 ++++++++++++++++++++++++++
 buildtools/meson.build              |  3 +--
 config/x86/meson.build              | 10 +++-------
 meson.build                         |  5 ++++-
 4 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100755 buildtools/binutils-avx512-check.sh

diff --git a/buildtools/binutils-avx512-check.sh b/buildtools/binutils-avx512-check.sh
new file mode 100755
index 000000000..1e894d84d
--- /dev/null
+++ b/buildtools/binutils-avx512-check.sh
@@ -0,0 +1,26 @@
+#! /bin/sh
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2020 Intel Corporation
+
+AS=${AS:-as}
+MESON_BUILD_ROOT=${MESON_BUILD_ROOT:-/tmp}
+OBJFILE=$MESON_BUILD_ROOT/binutils-avx512-check.o
+# from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90028
+GATHER_PARAMS='0x8(,%ymm1,1),%ymm0{%k2}'
+# from https://sourceware.org/bugzilla/show_bug.cgi?id=23465
+MOVAPS_PARAMS='0x40(,%rax,1),%zmm0'
+
+# assemble vmovaps statement to file
+echo "vmovaps $MOVAPS_PARAMS" | $AS --64 -o $OBJFILE -
+# check the parameters are correct in the output, using objdump
+objdump -d  --no-show-raw-insn $OBJFILE | grep -q $MOVAPS_PARAMS || {
+	echo "vmovaps displacement error with as"
+	exit 1
+}
+
+# assemble vpgather to file and similarly check
+echo "vpgatherqq $GATHER_PARAMS" | $AS --64 -o $OBJFILE -
+objdump -d  --no-show-raw-insn $OBJFILE | grep -q $GATHER_PARAMS || {
+	echo "vpgatherqq displacement error with as"
+	exit 1
+}
diff --git a/buildtools/meson.build b/buildtools/meson.build
index d5f8291be..73a847c52 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -1,13 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017-2019 Intel Corporation
 
-subdir('pmdinfogen')
-
 pkgconf = find_program('pkg-config', 'pkgconf', required: false)
 pmdinfo = find_program('gen-pmdinfo-cfile.sh')
 list_dir_globs = find_program('list-dir-globs.py')
 check_symbols = find_program('check-symbols.sh')
 ldflags_ibverbs_static = find_program('options-ibverbs-static.sh')
+binutils_avx512_check = find_program('binutils-avx512-check.sh')
 
 # set up map-to-def script using python, either built-in or external
 python3 = import('python').find_installation(required: false)
diff --git a/config/x86/meson.build b/config/x86/meson.build
index adc857ba2..fbcd8e455 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -3,14 +3,10 @@
 
 # get binutils version for the workaround of Bug 97
 if not is_windows
-	ldver = run_command('ld', '-v').stdout().strip()
-	if ldver.contains('2.30') and cc.has_argument('-mno-avx512f')
+	as_ok = run_command(binutils_avx512_check)
+	if as_ok.returncode() != 0 and cc.has_argument('-mno-avx512f')
 		machine_args += '-mno-avx512f'
-		message('Binutils 2.30 detected, disabling AVX512 support as workaround for bug #97')
-	endif
-	if ldver.contains('2.31') and cc.has_argument('-mno-avx512f')
-		machine_args += '-mno-avx512f'
-		message('Binutils 2.31 detected, disabling AVX512 support as workaround for bug #249')
+		message('Binutils error with AVX512 assembly, disabling AVX512 support')
 	endif
 endif
 
diff --git a/meson.build b/meson.build
index 750fdeab1..ab4d60cfa 100644
--- a/meson.build
+++ b/meson.build
@@ -41,10 +41,13 @@ global_inc = include_directories('.', 'config',
 	'lib/librte_eal/@0@/include'.format(host_machine.system()),
 	'lib/librte_eal/@0@/include'.format(arch_subdir),
 )
+
+# do configuration and get tool paths
+subdir('buildtools')
 subdir('config')
 
 # build libs and drivers
-subdir('buildtools')
+subdir('buildtools/pmdinfogen')
 subdir('lib')
 subdir('drivers')
 
-- 
2.25.1


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [dpdk-dev] [PATCH] build: check functionality rather than binutils version
  2020-06-17 10:40 [dpdk-dev] [PATCH] build: check functionality rather than binutils version Bruce Richardson
@ 2020-06-17 11:45 ` Thomas Monjalon
  2020-06-17 14:32   ` Bruce Richardson
  2020-06-18 11:56 ` [dpdk-dev] [PATCH v2] " Bruce Richardson
  2020-07-04 11:48 ` [dpdk-dev] [PATCH v3] " Bruce Richardson
  2 siblings, 1 reply; 10+ messages in thread
From: Thomas Monjalon @ 2020-06-17 11:45 UTC (permalink / raw)
  To: Bruce Richardson; +Cc: dev, ferruh.yigit

17/06/2020 12:40, Bruce Richardson:
> Rather than checking the binutils version number, which can lead to
> unnecessary disabling of AVX512 if fixes have been backported to distro
> versions, we can instead check the output of "as" from binutils to see if
> it is correct.
> 
> These checks use the minimal assembly reproduction code posted to the
> public bug tracker for gcc/binutils for those issues [1][2]. If the
> binutils bug is present, the instruction parameters - specifically the
> displacement parameter - will be different in the disassembled output
> compared to the input. Therefore each check involves assembling a single
> instruction and disassembling it again, checking that the two match.

Whaoh, that's a very specific optimization :)
Which distro is affected (backported binutils fix)?

> [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90028
> [2] https://sourceware.org/bugzilla/show_bug.cgi?id=23465
> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> --- a/buildtools/meson.build
> +++ b/buildtools/meson.build
> -subdir('pmdinfogen')

Why removing pmdinfogen?

> --- a/meson.build
> +++ b/meson.build
> +# do configuration and get tool paths
> +subdir('buildtools')
>  subdir('config')
>  
>  # build libs and drivers
> -subdir('buildtools')
> +subdir('buildtools/pmdinfogen')

Is it related to binutils check?

[...]
> -	ldver = run_command('ld', '-v').stdout().strip()
> -	if ldver.contains('2.30') and cc.has_argument('-mno-avx512f')
> +	as_ok = run_command(binutils_avx512_check)
> +	if as_ok.returncode() != 0 and cc.has_argument('-mno-avx512f')

"as_ok" is difficult to understand.
I would suggest "binutils_avx512_ok".

> +		message('Binutils error with AVX512 assembly, disabling AVX512 support')

It looks like something which should be part of meson itself.



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [dpdk-dev] [PATCH] build: check functionality rather than binutils version
  2020-06-17 11:45 ` Thomas Monjalon
@ 2020-06-17 14:32   ` Bruce Richardson
  0 siblings, 0 replies; 10+ messages in thread
From: Bruce Richardson @ 2020-06-17 14:32 UTC (permalink / raw)
  To: Thomas Monjalon; +Cc: dev, ferruh.yigit

On Wed, Jun 17, 2020 at 01:45:57PM +0200, Thomas Monjalon wrote:
> 17/06/2020 12:40, Bruce Richardson:
> > Rather than checking the binutils version number, which can lead to
> > unnecessary disabling of AVX512 if fixes have been backported to distro
> > versions, we can instead check the output of "as" from binutils to see if
> > it is correct.
> > 
> > These checks use the minimal assembly reproduction code posted to the
> > public bug tracker for gcc/binutils for those issues [1][2]. If the
> > binutils bug is present, the instruction parameters - specifically the
> > displacement parameter - will be different in the disassembled output
> > compared to the input. Therefore each check involves assembling a single
> > instruction and disassembling it again, checking that the two match.
> 
> Whaoh, that's a very specific optimization :)
> Which distro is affected (backported binutils fix)?
> 

Not an optimization, it's a bug, which necessitates disabling a whole
instruction set, so we should really check for the bug rather than assuming
all versions are affected. From [2] below, we have confirmation that the
fix has been backported to both 2.30 and 2.31 binutils branches.

> > [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90028
> > [2] https://sourceware.org/bugzilla/show_bug.cgi?id=23465
> > 
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> > ---
> > --- a/buildtools/meson.build
> > +++ b/buildtools/meson.build
> > -subdir('pmdinfogen')
> 
> Why removing pmdinfogen?

The pmdinfogen requires values that are set in the config folder, but the
config folder processing now uses scripts that are in the buildtools
folder. While we could refer to them using relative paths, I felt it better
to separate out the compilation of pmdinfogen to the rest of the buildutils
processing, which is simply assigning variables to scripts to make them
easier to call later in the processing.

> 
> > --- a/meson.build
> > +++ b/meson.build
> > +# do configuration and get tool paths
> > +subdir('buildtools')
> >  subdir('config')
> >  
> >  # build libs and drivers
> > -subdir('buildtools')
> > +subdir('buildtools/pmdinfogen')
> 
> Is it related to binutils check?
> 
Pretty much. It just makes it easier to have the config processing use
scripts in the buildtools folder.

> [...]
> > -	ldver = run_command('ld', '-v').stdout().strip()
> > -	if ldver.contains('2.30') and cc.has_argument('-mno-avx512f')
> > +	as_ok = run_command(binutils_avx512_check)
> > +	if as_ok.returncode() != 0 and cc.has_argument('-mno-avx512f')
> 
> "as_ok" is difficult to understand.
> I would suggest "binutils_avx512_ok".
> 
Sure, can change for v2 - though I'd suggest the slightly shorter
binutils_ok.

> > +		message('Binutils error with AVX512 assembly, disabling AVX512 support')
> 
> It looks like something which should be part of meson itself.
> 
That would certainly be nice to have, but I consider it infeasible, since
there will be, even in the best case, a lag between a bug being discovered
and workarounds making its way into tools. Even then you still have an
update problem to work around it - update binutils and bug goes away, or
update meson and you can work around it. In both cases you are requiring
the user to update something, so fixing in DPDK is best.

/Bruce

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [dpdk-dev] [PATCH v2] build: check functionality rather than binutils version
  2020-06-17 10:40 [dpdk-dev] [PATCH] build: check functionality rather than binutils version Bruce Richardson
  2020-06-17 11:45 ` Thomas Monjalon
@ 2020-06-18 11:56 ` Bruce Richardson
  2020-06-18 12:05   ` Van Haaren, Harry
  2020-07-02 21:28   ` Thomas Monjalon
  2020-07-04 11:48 ` [dpdk-dev] [PATCH v3] " Bruce Richardson
  2 siblings, 2 replies; 10+ messages in thread
From: Bruce Richardson @ 2020-06-18 11:56 UTC (permalink / raw)
  To: dev; +Cc: ferruh.yigit, thomas, Bruce Richardson

Rather than checking the binutils version number, which can lead to
unnecessary disabling of AVX512 if fixes have been backported to distro
versions, we can instead check the output of "as" from binutils to see if
it is correct.

The check in the script uses the minimal assembly reproduction code posted
to the public bug tracker for gcc/binutils for those issues [1]. If the
binutils bug is present, the instruction parameters - specifically the
displacement parameter - will be different in the disassembled output
compared to the input. Therefore the check involves assembling a single
instruction and disassembling it again, checking that the two match.

[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90028

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>

---
V2:
- Renamed "as_ok" variable to "binutils_ok" for readability
- Removed one test case from the script because even though two DPDK bugs
  were filed, the one binutils bug is the root cause, and a single commit
  fixes them both
- Changed message() to warning() in the printout
---
 buildtools/binutils-avx512-check.sh | 16 ++++++++++++++++
 buildtools/meson.build              |  3 +--
 config/x86/meson.build              | 10 +++-------
 meson.build                         |  5 ++++-
 4 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100755 buildtools/binutils-avx512-check.sh

diff --git a/buildtools/binutils-avx512-check.sh b/buildtools/binutils-avx512-check.sh
new file mode 100755
index 000000000..cef7b09ed
--- /dev/null
+++ b/buildtools/binutils-avx512-check.sh
@@ -0,0 +1,16 @@
+#! /bin/sh
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2020 Intel Corporation
+
+AS=${AS:-as}
+MESON_BUILD_ROOT=${MESON_BUILD_ROOT:-/tmp}
+OBJFILE=$MESON_BUILD_ROOT/binutils-avx512-check.o
+# from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90028
+GATHER_PARAMS='0x8(,%ymm1,1),%ymm0{%k2}'
+
+# assemble vpgather to file and similarly check
+echo "vpgatherqq $GATHER_PARAMS" | $AS --64 -o $OBJFILE -
+objdump -d  --no-show-raw-insn $OBJFILE | grep -q $GATHER_PARAMS || {
+	echo "vpgatherqq displacement error with as"
+	exit 1
+}
diff --git a/buildtools/meson.build b/buildtools/meson.build
index d5f8291be..73a847c52 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -1,13 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017-2019 Intel Corporation
 
-subdir('pmdinfogen')
-
 pkgconf = find_program('pkg-config', 'pkgconf', required: false)
 pmdinfo = find_program('gen-pmdinfo-cfile.sh')
 list_dir_globs = find_program('list-dir-globs.py')
 check_symbols = find_program('check-symbols.sh')
 ldflags_ibverbs_static = find_program('options-ibverbs-static.sh')
+binutils_avx512_check = find_program('binutils-avx512-check.sh')
 
 # set up map-to-def script using python, either built-in or external
 python3 = import('python').find_installation(required: false)
diff --git a/config/x86/meson.build b/config/x86/meson.build
index adc857ba2..6ec020ef6 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -3,14 +3,10 @@
 
 # get binutils version for the workaround of Bug 97
 if not is_windows
-	ldver = run_command('ld', '-v').stdout().strip()
-	if ldver.contains('2.30') and cc.has_argument('-mno-avx512f')
+	binutils_ok = run_command(binutils_avx512_check)
+	if binutils_ok.returncode() != 0 and cc.has_argument('-mno-avx512f')
 		machine_args += '-mno-avx512f'
-		message('Binutils 2.30 detected, disabling AVX512 support as workaround for bug #97')
-	endif
-	if ldver.contains('2.31') and cc.has_argument('-mno-avx512f')
-		machine_args += '-mno-avx512f'
-		message('Binutils 2.31 detected, disabling AVX512 support as workaround for bug #249')
+		warning('Binutils error with AVX512 assembly, disabling AVX512 support')
 	endif
 endif
 
diff --git a/meson.build b/meson.build
index 750fdeab1..ab4d60cfa 100644
--- a/meson.build
+++ b/meson.build
@@ -41,10 +41,13 @@ global_inc = include_directories('.', 'config',
 	'lib/librte_eal/@0@/include'.format(host_machine.system()),
 	'lib/librte_eal/@0@/include'.format(arch_subdir),
 )
+
+# do configuration and get tool paths
+subdir('buildtools')
 subdir('config')
 
 # build libs and drivers
-subdir('buildtools')
+subdir('buildtools/pmdinfogen')
 subdir('lib')
 subdir('drivers')
 
-- 
2.25.1


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [dpdk-dev] [PATCH v2] build: check functionality rather than binutils version
  2020-06-18 11:56 ` [dpdk-dev] [PATCH v2] " Bruce Richardson
@ 2020-06-18 12:05   ` Van Haaren, Harry
  2020-07-02 21:28   ` Thomas Monjalon
  1 sibling, 0 replies; 10+ messages in thread
From: Van Haaren, Harry @ 2020-06-18 12:05 UTC (permalink / raw)
  To: Richardson, Bruce, dev; +Cc: Yigit, Ferruh, thomas, Richardson, Bruce

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Bruce Richardson
> Sent: Thursday, June 18, 2020 12:57 PM
> To: dev@dpdk.org
> Cc: Yigit, Ferruh <ferruh.yigit@intel.com>; thomas@monjalon.net; Richardson,
> Bruce <bruce.richardson@intel.com>
> Subject: [dpdk-dev] [PATCH v2] build: check functionality rather than binutils
> version
> 
> Rather than checking the binutils version number, which can lead to
> unnecessary disabling of AVX512 if fixes have been backported to distro
> versions, we can instead check the output of "as" from binutils to see if
> it is correct.
> 
> The check in the script uses the minimal assembly reproduction code posted
> to the public bug tracker for gcc/binutils for those issues [1]. If the
> binutils bug is present, the instruction parameters - specifically the
> displacement parameter - will be different in the disassembled output
> compared to the input. Therefore the check involves assembling a single
> instruction and disassembling it again, checking that the two match.
> 
> [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90028
> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>

Tested on binutils 2.30 without backported fixes, can confirm that __AVX512F__ define is
not present at meson configure time.

Tested-by: Harry van Haaren <harry.van.haaren@intel.com>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [dpdk-dev] [PATCH v2] build: check functionality rather than binutils version
  2020-06-18 11:56 ` [dpdk-dev] [PATCH v2] " Bruce Richardson
  2020-06-18 12:05   ` Van Haaren, Harry
@ 2020-07-02 21:28   ` Thomas Monjalon
  2020-07-03 10:35     ` Bruce Richardson
  1 sibling, 1 reply; 10+ messages in thread
From: Thomas Monjalon @ 2020-07-02 21:28 UTC (permalink / raw)
  To: Bruce Richardson; +Cc: dev, ferruh.yigit

18/06/2020 13:56, Bruce Richardson:
> Rather than checking the binutils version number, which can lead to
> unnecessary disabling of AVX512 if fixes have been backported to distro
> versions, we can instead check the output of "as" from binutils to see if
> it is correct.
> 
> The check in the script uses the minimal assembly reproduction code posted
> to the public bug tracker for gcc/binutils for those issues [1]. If the
> binutils bug is present, the instruction parameters - specifically the
> displacement parameter - will be different in the disassembled output
> compared to the input. Therefore the check involves assembling a single
> instruction and disassembling it again, checking that the two match.
[...]
> --- /dev/null
> +++ b/buildtools/binutils-avx512-check.sh
> +MESON_BUILD_ROOT=${MESON_BUILD_ROOT:-/tmp}
> +OBJFILE=$MESON_BUILD_ROOT/binutils-avx512-check.o
> +# from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90028
> +GATHER_PARAMS='0x8(,%ymm1,1),%ymm0{%k2}'
> +
> +# assemble vpgather to file and similarly check
> +echo "vpgatherqq $GATHER_PARAMS" | $AS --64 -o $OBJFILE -
> +objdump -d  --no-show-raw-insn $OBJFILE | grep -q $GATHER_PARAMS || {
> +	echo "vpgatherqq displacement error with as"
> +	exit 1
> +}

For the temporary OBJFILE, please use mktemp and trap for cleanup.
If you grep "mktemp" in DPDK, you will see the filename is pretty well
standardized with "dpdk." as prefix.
Thanks



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [dpdk-dev] [PATCH v2] build: check functionality rather than binutils version
  2020-07-02 21:28   ` Thomas Monjalon
@ 2020-07-03 10:35     ` Bruce Richardson
  0 siblings, 0 replies; 10+ messages in thread
From: Bruce Richardson @ 2020-07-03 10:35 UTC (permalink / raw)
  To: Thomas Monjalon; +Cc: dev, ferruh.yigit

On Thu, Jul 02, 2020 at 11:28:51PM +0200, Thomas Monjalon wrote:
> 18/06/2020 13:56, Bruce Richardson:
> > Rather than checking the binutils version number, which can lead to
> > unnecessary disabling of AVX512 if fixes have been backported to distro
> > versions, we can instead check the output of "as" from binutils to see if
> > it is correct.
> > 
> > The check in the script uses the minimal assembly reproduction code posted
> > to the public bug tracker for gcc/binutils for those issues [1]. If the
> > binutils bug is present, the instruction parameters - specifically the
> > displacement parameter - will be different in the disassembled output
> > compared to the input. Therefore the check involves assembling a single
> > instruction and disassembling it again, checking that the two match.
> [...]
> > --- /dev/null
> > +++ b/buildtools/binutils-avx512-check.sh
> > +MESON_BUILD_ROOT=${MESON_BUILD_ROOT:-/tmp}
> > +OBJFILE=$MESON_BUILD_ROOT/binutils-avx512-check.o
> > +# from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90028
> > +GATHER_PARAMS='0x8(,%ymm1,1),%ymm0{%k2}'
> > +
> > +# assemble vpgather to file and similarly check
> > +echo "vpgatherqq $GATHER_PARAMS" | $AS --64 -o $OBJFILE -
> > +objdump -d  --no-show-raw-insn $OBJFILE | grep -q $GATHER_PARAMS || {
> > +	echo "vpgatherqq displacement error with as"
> > +	exit 1
> > +}
> 
> For the temporary OBJFILE, please use mktemp and trap for cleanup.
> If you grep "mktemp" in DPDK, you will see the filename is pretty well
> standardized with "dpdk." as prefix.
> Thanks
>
Will change for v3 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [dpdk-dev] [PATCH v3] build: check functionality rather than binutils version
  2020-06-17 10:40 [dpdk-dev] [PATCH] build: check functionality rather than binutils version Bruce Richardson
  2020-06-17 11:45 ` Thomas Monjalon
  2020-06-18 11:56 ` [dpdk-dev] [PATCH v2] " Bruce Richardson
@ 2020-07-04 11:48 ` Bruce Richardson
  2020-07-05 14:52   ` Thomas Monjalon
  2 siblings, 1 reply; 10+ messages in thread
From: Bruce Richardson @ 2020-07-04 11:48 UTC (permalink / raw)
  To: dev; +Cc: thomas, Bruce Richardson, Harry van Haaren

Rather than checking the binutils version number, which can lead to
unnecessary disabling of AVX512 if fixes have been backported to distro
versions, we can instead check the output of "as" from binutils to see if
it is correct.

The check in the script uses the minimal assembly reproduction code posted
to the public bug tracker for gcc/binutils for those issues [1]. If the
binutils bug is present, the instruction parameters - specifically the
displacement parameter - will be different in the disassembled output
compared to the input. Therefore the check involves assembling a single
instruction and disassembling it again, checking that the two match.

[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90028

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Tested-by: Harry van Haaren <harry.van.haaren@intel.com>

---
V3:
- Use mktemp to create a temporary file rather than place object file in
  build folder. Use trap to ensure temp file deletion on exit.

V2:
- Renamed "as_ok" variable to "binutils_ok" for readability
- Removed one test case from the script because even though two DPDK bugs
  were filed, the one binutils bug is the root cause, and a single commit
  fixes them both
- Changed message() to warning() in the printout
---
 buildtools/binutils-avx512-check.sh | 16 ++++++++++++++++
 buildtools/meson.build              |  3 +--
 config/x86/meson.build              | 10 +++-------
 meson.build                         |  5 ++++-
 4 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100755 buildtools/binutils-avx512-check.sh

diff --git a/buildtools/binutils-avx512-check.sh b/buildtools/binutils-avx512-check.sh
new file mode 100755
index 000000000..a7e068140
--- /dev/null
+++ b/buildtools/binutils-avx512-check.sh
@@ -0,0 +1,16 @@
+#! /bin/sh
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2020 Intel Corporation
+
+AS=${AS:-as}
+OBJFILE=$(mktemp -t dpdk.binutils-check.XXXXXX.o)
+trap 'rm -f "$OBJFILE"' EXIT
+# from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90028
+GATHER_PARAMS='0x8(,%ymm1,1),%ymm0{%k2}'
+
+# assemble vpgather to file and similarly check
+echo "vpgatherqq $GATHER_PARAMS" | $AS --64 -o $OBJFILE -
+objdump -d  --no-show-raw-insn $OBJFILE | grep -q $GATHER_PARAMS || {
+	echo "vpgatherqq displacement error with as"
+	exit 1
+}
diff --git a/buildtools/meson.build b/buildtools/meson.build
index f9d2fdf74..cf0048f3c 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -1,13 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017-2019 Intel Corporation
 
-subdir('pmdinfogen')
-
 pkgconf = find_program('pkg-config', 'pkgconf', required: false)
 pmdinfo = find_program('gen-pmdinfo-cfile.sh')
 list_dir_globs = find_program('list-dir-globs.py')
 check_symbols = find_program('check-symbols.sh')
 ldflags_ibverbs_static = find_program('options-ibverbs-static.sh')
+binutils_avx512_check = find_program('binutils-avx512-check.sh')
 
 # set up map-to-win script using python, either built-in or external
 python3 = import('python').find_installation(required: false)
diff --git a/config/x86/meson.build b/config/x86/meson.build
index adc857ba2..6ec020ef6 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -3,14 +3,10 @@
 
 # get binutils version for the workaround of Bug 97
 if not is_windows
-	ldver = run_command('ld', '-v').stdout().strip()
-	if ldver.contains('2.30') and cc.has_argument('-mno-avx512f')
+	binutils_ok = run_command(binutils_avx512_check)
+	if binutils_ok.returncode() != 0 and cc.has_argument('-mno-avx512f')
 		machine_args += '-mno-avx512f'
-		message('Binutils 2.30 detected, disabling AVX512 support as workaround for bug #97')
-	endif
-	if ldver.contains('2.31') and cc.has_argument('-mno-avx512f')
-		machine_args += '-mno-avx512f'
-		message('Binutils 2.31 detected, disabling AVX512 support as workaround for bug #249')
+		warning('Binutils error with AVX512 assembly, disabling AVX512 support')
 	endif
 endif
 
diff --git a/meson.build b/meson.build
index d21adfd30..7c336df6d 100644
--- a/meson.build
+++ b/meson.build
@@ -40,10 +40,13 @@ global_inc = include_directories('.', 'config',
 	'lib/librte_eal/@0@/include'.format(host_machine.system()),
 	'lib/librte_eal/@0@/include'.format(arch_subdir),
 )
+
+# do configuration and get tool paths
+subdir('buildtools')
 subdir('config')
 
 # build libs and drivers
-subdir('buildtools')
+subdir('buildtools/pmdinfogen')
 subdir('lib')
 subdir('drivers')
 
-- 
2.25.1


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [dpdk-dev] [PATCH v3] build: check functionality rather than binutils version
  2020-07-04 11:48 ` [dpdk-dev] [PATCH v3] " Bruce Richardson
@ 2020-07-05 14:52   ` Thomas Monjalon
  0 siblings, 0 replies; 10+ messages in thread
From: Thomas Monjalon @ 2020-07-05 14:52 UTC (permalink / raw)
  To: Bruce Richardson; +Cc: dev, Harry van Haaren

04/07/2020 13:48, Bruce Richardson:
> Rather than checking the binutils version number, which can lead to
> unnecessary disabling of AVX512 if fixes have been backported to distro
> versions, we can instead check the output of "as" from binutils to see if
> it is correct.
> 
> The check in the script uses the minimal assembly reproduction code posted
> to the public bug tracker for gcc/binutils for those issues [1]. If the
> binutils bug is present, the instruction parameters - specifically the
> displacement parameter - will be different in the disassembled output
> compared to the input. Therefore the check involves assembling a single
> instruction and disassembling it again, checking that the two match.
> 
> [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90028
> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> Tested-by: Harry van Haaren <harry.van.haaren@intel.com>
> 
> ---
> V3:
> - Use mktemp to create a temporary file rather than place object file in
>   build folder. Use trap to ensure temp file deletion on exit.
> 
> V2:
> - Renamed "as_ok" variable to "binutils_ok" for readability
> - Removed one test case from the script because even though two DPDK bugs
>   were filed, the one binutils bug is the root cause, and a single commit
>   fixes them both
> - Changed message() to warning() in the printout

Applied, thanks




^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [dpdk-dev] [PATCH v2] build: check functionality rather than binutils version
@ 2020-07-02 17:56 Van Haaren, Harry
  0 siblings, 0 replies; 10+ messages in thread
From: Van Haaren, Harry @ 2020-07-02 17:56 UTC (permalink / raw)
  To: Richardson, Bruce, dev; +Cc: Yigit, Ferruh, thomas, Richardson, Bruce

> -----Original Message-----
> From: Van Haaren, Harry
> Sent: Thursday, June 18, 2020 1:05 PM
> To: 'Bruce Richardson' <bruce.richardson@intel.com>; dev@dpdk.org
> Cc: Yigit, Ferruh <ferruh.yigit@intel.com>; thomas@monjalon.net; Richardson,
> Bruce <bruce.richardson@intel.com>
> Subject: RE: [dpdk-dev] [PATCH v2] build: check functionality rather than binutils
> version
> 
> > -----Original Message-----
> > From: dev <dev-bounces@dpdk.org> On Behalf Of Bruce Richardson
> > Sent: Thursday, June 18, 2020 12:57 PM
> > To: dev@dpdk.org
> > Cc: Yigit, Ferruh <ferruh.yigit@intel.com>; thomas@monjalon.net; Richardson,
> > Bruce <bruce.richardson@intel.com>
> > Subject: [dpdk-dev] [PATCH v2] build: check functionality rather than binutils
> > version
> >
> > Rather than checking the binutils version number, which can lead to
> > unnecessary disabling of AVX512 if fixes have been backported to distro
> > versions, we can instead check the output of "as" from binutils to see if
> > it is correct.
> >
> > The check in the script uses the minimal assembly reproduction code posted
> > to the public bug tracker for gcc/binutils for those issues [1]. If the
> > binutils bug is present, the instruction parameters - specifically the
> > displacement parameter - will be different in the disassembled output
> > compared to the input. Therefore the check involves assembling a single
> > instruction and disassembling it again, checking that the two match.
> >
> > [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90028
> >
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> 
> Tested on binutils 2.30 without backported fixes, can confirm that __AVX512F__
> define is
> not present at meson configure time.

Re-tested with Ubuntu LTS version 18.04 with the proposed binutils backport fix:
https://bugs.launchpad.net/ubuntu/+source/binutils/+bug/1883880

With this fix, AVX512 gets enabled as it should after running the check:
Fetching value of define "__AVX512F__": 1

As before, still, and now even more so:
Tested-by: Harry van Haaren <harry.van.haaren@intel.com>

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2020-07-05 14:52 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-17 10:40 [dpdk-dev] [PATCH] build: check functionality rather than binutils version Bruce Richardson
2020-06-17 11:45 ` Thomas Monjalon
2020-06-17 14:32   ` Bruce Richardson
2020-06-18 11:56 ` [dpdk-dev] [PATCH v2] " Bruce Richardson
2020-06-18 12:05   ` Van Haaren, Harry
2020-07-02 21:28   ` Thomas Monjalon
2020-07-03 10:35     ` Bruce Richardson
2020-07-04 11:48 ` [dpdk-dev] [PATCH v3] " Bruce Richardson
2020-07-05 14:52   ` Thomas Monjalon
2020-07-02 17:56 [dpdk-dev] [PATCH v2] " Van Haaren, Harry

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git