DPDK patches and discussions
 help / color / mirror / Atom feed
From: Ferruh Yigit <ferruh.yigit@intel.com>
To: Thomas Monjalon <thomas@monjalon.net>
Cc: dev@dpdk.org, stable@dpdk.org, harry.van.haaren@intel.com
Subject: [dpdk-dev] [PATCH 1/2] build: fix meson binutils workaround
Date: Wed, 10 Apr 2019 15:00:57 +0100	[thread overview]
Message-ID: <20190410140058.26782-1-ferruh.yigit@intel.com> (raw)
Message-ID: <20190410140057.rysEhNK8eKTmwLa-60j9u2rqTOto78CPDff44mnx4Dw@z> (raw)

The '-mno-avx512f' compiler flag is not passed to the compiler,
detection of the binutils and setting flags works fine, but the flag
itself not used by compiler.

Removing the interim 'march_opt' variable and using directly
'machine_args' and setting '-mno-avx512f' to 'machine_args'

Fixes: 566b4d7a968f ("build: fix meson check for binutils 2.30")
Cc: stable@dpdk.org

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
Cc: harry.van.haaren@intel.com
---
 config/x86/meson.build | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/config/x86/meson.build b/config/x86/meson.build
index 558edfda9..692aebe7a 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -1,15 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017-2019 Intel Corporation
 
-# for checking defines we need to use the correct compiler flags
-march_opt = ['-march=@0@'.format(machine)]
-
 # get binutils version for the workaround of Bug 97
 if host_machine.system() != 'windows'
 	ldver = run_command('ld', '-v').stdout().strip()
 	if ldver.contains('2.30')
 		if cc.has_argument('-mno-avx512f')
-			march_opt += '-mno-avx512f'
+			machine_args += '-mno-avx512f'
 			message('Binutils 2.30 detected, disabling AVX512 support as workaround for bug #97')
 		endif
 	endif
@@ -19,7 +16,7 @@ endif
 sse_errormsg = '''SSE4.2 instruction set is required for DPDK.
 Please set the machine type to "nehalem" or "corei7" or higher value'''
 
-if cc.get_define('__SSE4_2__', args: march_opt) == ''
+if cc.get_define('__SSE4_2__', args: machine_args) == ''
 	error(sse_errormsg)
 endif
 
@@ -38,23 +35,23 @@ else
 	dpdk_conf.set('RTE_ARCH', 'i686')
 endif
 
-if cc.get_define('__AES__', args: march_opt) != ''
+if cc.get_define('__AES__', args: machine_args) != ''
 	dpdk_conf.set('RTE_MACHINE_CPUFLAG_AES', 1)
 	compile_time_cpuflags += ['RTE_CPUFLAG_AES']
 endif
-if cc.get_define('__PCLMUL__', args: march_opt) != ''
+if cc.get_define('__PCLMUL__', args: machine_args) != ''
 	dpdk_conf.set('RTE_MACHINE_CPUFLAG_PCLMULQDQ', 1)
 	compile_time_cpuflags += ['RTE_CPUFLAG_PCLMULQDQ']
 endif
-if cc.get_define('__AVX__', args: march_opt) != ''
+if cc.get_define('__AVX__', args: machine_args) != ''
 	dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX', 1)
 	compile_time_cpuflags += ['RTE_CPUFLAG_AVX']
 endif
-if cc.get_define('__AVX2__', args: march_opt) != ''
+if cc.get_define('__AVX2__', args: machine_args) != ''
 	dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX2', 1)
 	compile_time_cpuflags += ['RTE_CPUFLAG_AVX2']
 endif
-if cc.get_define('__AVX512F__', args: march_opt) != ''
+if cc.get_define('__AVX512F__', args: machine_args) != ''
 	dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX512F', 1)
 	compile_time_cpuflags += ['RTE_CPUFLAG_AVX512F']
 endif
-- 
2.20.1


             reply	other threads:[~2019-04-10 14:01 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-10 14:00 Ferruh Yigit [this message]
2019-04-10 14:00 ` Ferruh Yigit
2019-04-10 14:00 ` [dpdk-dev] [PATCH 2/2] build: fix crash by disabling AVX512 with binutils 2.31 Ferruh Yigit
2019-04-10 14:00   ` Ferruh Yigit
2019-04-16 15:39 ` [dpdk-dev] [PATCH v2 1/2] build: fix meson binutils workaround Ferruh Yigit
2019-04-16 15:39   ` Ferruh Yigit
2019-04-16 15:39   ` [dpdk-dev] [PATCH v2 2/2] build: fix crash by disabling AVX512 with binutils 2.31 Ferruh Yigit
2019-04-16 15:39     ` Ferruh Yigit
2019-04-16 15:47     ` Bruce Richardson
2019-04-16 15:47       ` Bruce Richardson
2019-04-16 15:47   ` [dpdk-dev] [PATCH v2 1/2] build: fix meson binutils workaround Bruce Richardson
2019-04-16 15:47     ` Bruce Richardson
2019-05-02 13:35   ` [dpdk-dev] [PATCH v3 1/3] " Ferruh Yigit
2019-05-02 13:35     ` Ferruh Yigit
2019-05-02 13:35     ` [dpdk-dev] [PATCH v3 2/3] build: fix crash by disabling AVX512 with binutils 2.31 Ferruh Yigit
2019-05-02 13:35       ` Ferruh Yigit
2019-05-02 13:35     ` [dpdk-dev] [PATCH v3 3/3] build: reduce indentation in meson check Ferruh Yigit
2019-05-02 13:35       ` Ferruh Yigit
2019-05-02 13:44     ` [dpdk-dev] [dpdk-stable] [PATCH v3 1/3] build: fix meson binutils workaround Ferruh Yigit
2019-05-02 13:44       ` Ferruh Yigit
2019-05-02 15:48       ` Thomas Monjalon
2019-05-02 15:48         ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190410140058.26782-1-ferruh.yigit@intel.com \
    --to=ferruh.yigit@intel.com \
    --cc=dev@dpdk.org \
    --cc=harry.van.haaren@intel.com \
    --cc=stable@dpdk.org \
    --cc=thomas@monjalon.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).