* Re: [dpdk-dev] [PATCH] build: meson set toolchain info during config init
2018-04-02 18:28 [dpdk-dev] [PATCH] build: meson set toolchain info during config init Pavan Nikhilesh
@ 2018-04-03 9:55 ` Bruce Richardson
2018-04-03 10:07 ` Pavan Nikhilesh
2018-04-03 10:21 ` [dpdk-dev] [PATCH v2] " Pavan Nikhilesh
2018-04-03 11:24 ` [dpdk-dev] [PATCH v3] " Pavan Nikhilesh
2 siblings, 1 reply; 9+ messages in thread
From: Bruce Richardson @ 2018-04-03 9:55 UTC (permalink / raw)
To: Pavan Nikhilesh; +Cc: thomas, jerin.jacob, dev
On Mon, Apr 02, 2018 at 11:58:23PM +0530, Pavan Nikhilesh wrote:
> Meson set RTE_TOOLCHAIN to clang/gcc and set RTE_TOOLCHAIN_CLANG/GCC to
> 1 during initilizing dpdk_conf so that it can be used by both x86 and arm.
>
> Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
> ---
> config/arm/meson.build | 9 ---------
> config/meson.build | 8 ++++++++
> 2 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/config/arm/meson.build b/config/arm/meson.build
> index c1ab6ed01..e9c9eb1a5 100644
> --- a/config/arm/meson.build
> +++ b/config/arm/meson.build
> @@ -83,15 +83,6 @@ impl_0x69 = ['Intel', flags_generic, machine_args_generic]
> impl_dpaa = ['NXP DPAA', flags_dpaa, machine_args_generic]
> impl_dpaa2 = ['NXP DPAA2', flags_dpaa2, machine_args_generic]
>
> -
> -if cc.get_define('__clang__') != ''
> - dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'clang')
> - dpdk_conf.set('RTE_TOOLCHAIN_CLANG', 1)
> -else
> - dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'gcc')
> - dpdk_conf.set('RTE_TOOLCHAIN_GCC', 1)
> -endif
> -
> dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
>
> if cc.sizeof('void *') != 8
> diff --git a/config/meson.build b/config/meson.build
> index f8c67578d..5994d7b7b 100644
> --- a/config/meson.build
> +++ b/config/meson.build
> @@ -11,6 +11,14 @@ dpdk_conf.set('RTE_MACHINE', machine)
> machine_args = []
> machine_args += '-march=' + machine
>
> +if cc.get_define('__clang__') != ''
> + dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'clang')
> + dpdk_conf.set('RTE_TOOLCHAIN_CLANG', 1)
> +else
> + dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'gcc')
> + dpdk_conf.set('RTE_TOOLCHAIN_GCC', 1)
> +endif
> +
Never thought to look this up on the original patchset, but looking at the
meson docs, the compiler object already had a "get_id" method to identify
the compiler. We can use it rather than use checking for explicit defines
ourselves. Using get_id() also allows us to identify icc and possibly
visual studio compiler for future windows compilation too.
http://mesonbuild.com/Reference-tables.html#compiler-ids
Regards,
/Bruce
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [dpdk-dev] [PATCH] build: meson set toolchain info during config init
2018-04-03 9:55 ` Bruce Richardson
@ 2018-04-03 10:07 ` Pavan Nikhilesh
0 siblings, 0 replies; 9+ messages in thread
From: Pavan Nikhilesh @ 2018-04-03 10:07 UTC (permalink / raw)
To: Bruce Richardson, thomas, jerin.jacob; +Cc: dev
On Tue, Apr 03, 2018 at 10:55:08AM +0100, Bruce Richardson wrote:
> On Mon, Apr 02, 2018 at 11:58:23PM +0530, Pavan Nikhilesh wrote:
> > Meson set RTE_TOOLCHAIN to clang/gcc and set RTE_TOOLCHAIN_CLANG/GCC to
> > 1 during initilizing dpdk_conf so that it can be used by both x86 and arm.
> >
> > Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
> > ---
> > config/arm/meson.build | 9 ---------
> > config/meson.build | 8 ++++++++
> > 2 files changed, 8 insertions(+), 9 deletions(-)
> >
> > diff --git a/config/arm/meson.build b/config/arm/meson.build
> > index c1ab6ed01..e9c9eb1a5 100644
> > --- a/config/arm/meson.build
> > +++ b/config/arm/meson.build
> > @@ -83,15 +83,6 @@ impl_0x69 = ['Intel', flags_generic, machine_args_generic]
> > impl_dpaa = ['NXP DPAA', flags_dpaa, machine_args_generic]
> > impl_dpaa2 = ['NXP DPAA2', flags_dpaa2, machine_args_generic]
> >
> > -
> > -if cc.get_define('__clang__') != ''
> > - dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'clang')
> > - dpdk_conf.set('RTE_TOOLCHAIN_CLANG', 1)
> > -else
> > - dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'gcc')
> > - dpdk_conf.set('RTE_TOOLCHAIN_GCC', 1)
> > -endif
> > -
> > dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
> >
> > if cc.sizeof('void *') != 8
> > diff --git a/config/meson.build b/config/meson.build
> > index f8c67578d..5994d7b7b 100644
> > --- a/config/meson.build
> > +++ b/config/meson.build
> > @@ -11,6 +11,14 @@ dpdk_conf.set('RTE_MACHINE', machine)
> > machine_args = []
> > machine_args += '-march=' + machine
> >
> > +if cc.get_define('__clang__') != ''
> > + dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'clang')
> > + dpdk_conf.set('RTE_TOOLCHAIN_CLANG', 1)
> > +else
> > + dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'gcc')
> > + dpdk_conf.set('RTE_TOOLCHAIN_GCC', 1)
> > +endif
> > +
>
> Never thought to look this up on the original patchset, but looking at the
> meson docs, the compiler object already had a "get_id" method to identify
> the compiler. We can use it rather than use checking for explicit defines
> ourselves. Using get_id() also allows us to identify icc and possibly
> visual studio compiler for future windows compilation too.
>
> http://mesonbuild.com/Reference-tables.html#compiler-ids
Good point will send v2 using get_id and multiple checks instead of else
so that we can extend it in future.
>
> Regards,
> /Bruce
Thanks,
Pavan.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [dpdk-dev] [PATCH v2] build: meson set toolchain info during config init
2018-04-02 18:28 [dpdk-dev] [PATCH] build: meson set toolchain info during config init Pavan Nikhilesh
2018-04-03 9:55 ` Bruce Richardson
@ 2018-04-03 10:21 ` Pavan Nikhilesh
2018-04-03 10:55 ` Bruce Richardson
2018-04-03 11:24 ` [dpdk-dev] [PATCH v3] " Pavan Nikhilesh
2 siblings, 1 reply; 9+ messages in thread
From: Pavan Nikhilesh @ 2018-04-03 10:21 UTC (permalink / raw)
To: thomas, jerin.jacob, bruce.richardson; +Cc: dev, Pavan Nikhilesh
Meson set RTE_TOOLCHAIN to clang/gcc and set RTE_TOOLCHAIN_CLANG/GCC to
1 during initilizing dpdk_conf so that it can be used by both x86 and arm.
Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
---
v2 Changes:
- Use get_id for identifying compiler instead of checking for compiler defines
manually.(Bruce)
config/arm/meson.build | 9 ---------
config/meson.build | 8 ++++++++
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/config/arm/meson.build b/config/arm/meson.build
index c1ab6ed01..e9c9eb1a5 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -83,15 +83,6 @@ impl_0x69 = ['Intel', flags_generic, machine_args_generic]
impl_dpaa = ['NXP DPAA', flags_dpaa, machine_args_generic]
impl_dpaa2 = ['NXP DPAA2', flags_dpaa2, machine_args_generic]
-
-if cc.get_define('__clang__') != ''
- dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'clang')
- dpdk_conf.set('RTE_TOOLCHAIN_CLANG', 1)
-else
- dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'gcc')
- dpdk_conf.set('RTE_TOOLCHAIN_GCC', 1)
-endif
-
dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
if cc.sizeof('void *') != 8
diff --git a/config/meson.build b/config/meson.build
index f8c67578d..b8f953b54 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -11,6 +11,14 @@ dpdk_conf.set('RTE_MACHINE', machine)
machine_args = []
machine_args += '-march=' + machine
+if cc.get_id() == 'clang'
+ dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'clang')
+ dpdk_conf.set('RTE_TOOLCHAIN_CLANG', 1)
+elif cc.get_id() == 'gcc'
+ dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'gcc')
+ dpdk_conf.set('RTE_TOOLCHAIN_GCC', 1)
+endif
+
# use pthreads
add_project_link_arguments('-pthread', language: 'c')
dpdk_extra_ldflags += '-pthread'
--
2.16.3
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [dpdk-dev] [PATCH v2] build: meson set toolchain info during config init
2018-04-03 10:21 ` [dpdk-dev] [PATCH v2] " Pavan Nikhilesh
@ 2018-04-03 10:55 ` Bruce Richardson
2018-04-03 11:11 ` Pavan Nikhilesh
0 siblings, 1 reply; 9+ messages in thread
From: Bruce Richardson @ 2018-04-03 10:55 UTC (permalink / raw)
To: Pavan Nikhilesh; +Cc: thomas, jerin.jacob, dev
On Tue, Apr 03, 2018 at 03:51:10PM +0530, Pavan Nikhilesh wrote:
> Meson set RTE_TOOLCHAIN to clang/gcc and set RTE_TOOLCHAIN_CLANG/GCC to
> 1 during initilizing dpdk_conf so that it can be used by both x86 and arm.
>
> Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
> ---
>
> v2 Changes:
> - Use get_id for identifying compiler instead of checking for compiler defines
> manually.(Bruce)
>
> config/arm/meson.build | 9 ---------
> config/meson.build | 8 ++++++++
> 2 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/config/arm/meson.build b/config/arm/meson.build
> index c1ab6ed01..e9c9eb1a5 100644
> --- a/config/arm/meson.build
> +++ b/config/arm/meson.build
> @@ -83,15 +83,6 @@ impl_0x69 = ['Intel', flags_generic, machine_args_generic]
> impl_dpaa = ['NXP DPAA', flags_dpaa, machine_args_generic]
> impl_dpaa2 = ['NXP DPAA2', flags_dpaa2, machine_args_generic]
>
> -
> -if cc.get_define('__clang__') != ''
> - dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'clang')
> - dpdk_conf.set('RTE_TOOLCHAIN_CLANG', 1)
> -else
> - dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'gcc')
> - dpdk_conf.set('RTE_TOOLCHAIN_GCC', 1)
> -endif
> -
> dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
>
> if cc.sizeof('void *') != 8
> diff --git a/config/meson.build b/config/meson.build
> index f8c67578d..b8f953b54 100644
> --- a/config/meson.build
> +++ b/config/meson.build
> @@ -11,6 +11,14 @@ dpdk_conf.set('RTE_MACHINE', machine)
> machine_args = []
> machine_args += '-march=' + machine
>
> +if cc.get_id() == 'clang'
> + dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'clang')
> + dpdk_conf.set('RTE_TOOLCHAIN_CLANG', 1)
> +elif cc.get_id() == 'gcc'
> + dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'gcc')
> + dpdk_conf.set('RTE_TOOLCHAIN_GCC', 1)
> +endif
> +
What about:
toolchain = cc.get_id()
dpdk_conf.set_quoted('RTE_TOOLCHAIN', toolchain)
dpdk_conf.set('RTE_TOOLCHAIN_' + toolchain.to_upper())
It will give the exact same result for GCC and CLANG and save us having to
update in future for other compilers. The one potential gotcha is that for
ICC, it's going to report "intel" instead of "icc". However, from use of
grep, it appears that we don't ever check for icc except in the makefiles,
so having it reported as "intel" for meson builds should not be a problem.
[If it is a problem later on we can always put in a special case: if
toolchain == 'intel'; toolchain = 'icc'].
/Bruce
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [dpdk-dev] [PATCH v2] build: meson set toolchain info during config init
2018-04-03 10:55 ` Bruce Richardson
@ 2018-04-03 11:11 ` Pavan Nikhilesh
0 siblings, 0 replies; 9+ messages in thread
From: Pavan Nikhilesh @ 2018-04-03 11:11 UTC (permalink / raw)
To: Bruce Richardson, thomas, jerin.jacob; +Cc: dev
On Tue, Apr 03, 2018 at 11:55:24AM +0100, Bruce Richardson wrote:
> On Tue, Apr 03, 2018 at 03:51:10PM +0530, Pavan Nikhilesh wrote:
> > Meson set RTE_TOOLCHAIN to clang/gcc and set RTE_TOOLCHAIN_CLANG/GCC to
> > 1 during initilizing dpdk_conf so that it can be used by both x86 and arm.
> >
> > Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
> > ---
> >
> > v2 Changes:
> > - Use get_id for identifying compiler instead of checking for compiler defines
> > manually.(Bruce)
> >
> > config/arm/meson.build | 9 ---------
> > config/meson.build | 8 ++++++++
> > 2 files changed, 8 insertions(+), 9 deletions(-)
> >
> > diff --git a/config/arm/meson.build b/config/arm/meson.build
> > index c1ab6ed01..e9c9eb1a5 100644
> > --- a/config/arm/meson.build
> > +++ b/config/arm/meson.build
> > @@ -83,15 +83,6 @@ impl_0x69 = ['Intel', flags_generic, machine_args_generic]
> > impl_dpaa = ['NXP DPAA', flags_dpaa, machine_args_generic]
> > impl_dpaa2 = ['NXP DPAA2', flags_dpaa2, machine_args_generic]
> >
> > -
> > -if cc.get_define('__clang__') != ''
> > - dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'clang')
> > - dpdk_conf.set('RTE_TOOLCHAIN_CLANG', 1)
> > -else
> > - dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'gcc')
> > - dpdk_conf.set('RTE_TOOLCHAIN_GCC', 1)
> > -endif
> > -
> > dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
> >
> > if cc.sizeof('void *') != 8
> > diff --git a/config/meson.build b/config/meson.build
> > index f8c67578d..b8f953b54 100644
> > --- a/config/meson.build
> > +++ b/config/meson.build
> > @@ -11,6 +11,14 @@ dpdk_conf.set('RTE_MACHINE', machine)
> > machine_args = []
> > machine_args += '-march=' + machine
> >
> > +if cc.get_id() == 'clang'
> > + dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'clang')
> > + dpdk_conf.set('RTE_TOOLCHAIN_CLANG', 1)
> > +elif cc.get_id() == 'gcc'
> > + dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'gcc')
> > + dpdk_conf.set('RTE_TOOLCHAIN_GCC', 1)
> > +endif
> > +
>
> What about:
> toolchain = cc.get_id()
> dpdk_conf.set_quoted('RTE_TOOLCHAIN', toolchain)
> dpdk_conf.set('RTE_TOOLCHAIN_' + toolchain.to_upper())
>
Agreed, will send out v3.
> It will give the exact same result for GCC and CLANG and save us having to
> update in future for other compilers. The one potential gotcha is that for
> ICC, it's going to report "intel" instead of "icc". However, from use of
> grep, it appears that we don't ever check for icc except in the makefiles,
> so having it reported as "intel" for meson builds should not be a problem.
> [If it is a problem later on we can always put in a special case: if
> toolchain == 'intel'; toolchain = 'icc'].
>
> /Bruce
^ permalink raw reply [flat|nested] 9+ messages in thread
* [dpdk-dev] [PATCH v3] build: meson set toolchain info during config init
2018-04-02 18:28 [dpdk-dev] [PATCH] build: meson set toolchain info during config init Pavan Nikhilesh
2018-04-03 9:55 ` Bruce Richardson
2018-04-03 10:21 ` [dpdk-dev] [PATCH v2] " Pavan Nikhilesh
@ 2018-04-03 11:24 ` Pavan Nikhilesh
2018-04-03 11:58 ` Bruce Richardson
2 siblings, 1 reply; 9+ messages in thread
From: Pavan Nikhilesh @ 2018-04-03 11:24 UTC (permalink / raw)
To: thomas, jerin.jacob, bruce.richardson; +Cc: dev, Pavan Nikhilesh
Meson identify toolchain using cc.get_id and set RTE_TOOLCHAIN,
RTE_TOOLCHAIN_X during initializing dpdk_conf so that it can be used by
both x86 and arm.
Suggested-by: Bruce Richardson <bruce.richardson@intel.com>
Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
---
v3 Changes:
- Use a generic way of setting toolchain instead of chaining conditions.(Bruce)
v2 Changes:
- Use get_id for identifying compiler instead of checking for compiler defines
manually.(Bruce)
config/arm/meson.build | 9 ---------
config/meson.build | 4 ++++
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/config/arm/meson.build b/config/arm/meson.build
index c1ab6ed01..e9c9eb1a5 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -83,15 +83,6 @@ impl_0x69 = ['Intel', flags_generic, machine_args_generic]
impl_dpaa = ['NXP DPAA', flags_dpaa, machine_args_generic]
impl_dpaa2 = ['NXP DPAA2', flags_dpaa2, machine_args_generic]
-
-if cc.get_define('__clang__') != ''
- dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'clang')
- dpdk_conf.set('RTE_TOOLCHAIN_CLANG', 1)
-else
- dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'gcc')
- dpdk_conf.set('RTE_TOOLCHAIN_GCC', 1)
-endif
-
dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
if cc.sizeof('void *') != 8
diff --git a/config/meson.build b/config/meson.build
index f8c67578d..d4df36cd0 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -11,6 +11,10 @@ dpdk_conf.set('RTE_MACHINE', machine)
machine_args = []
machine_args += '-march=' + machine
+toolchain = cc.get_id()
+dpdk_conf.set_quoted('RTE_TOOLCHAIN', toolchain)
+dpdk_conf.set('RTE_TOOLCHAIN_' + toolchain.to_upper(), 1)
+
# use pthreads
add_project_link_arguments('-pthread', language: 'c')
dpdk_extra_ldflags += '-pthread'
--
2.16.3
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [dpdk-dev] [PATCH v3] build: meson set toolchain info during config init
2018-04-03 11:24 ` [dpdk-dev] [PATCH v3] " Pavan Nikhilesh
@ 2018-04-03 11:58 ` Bruce Richardson
2018-04-03 13:05 ` Bruce Richardson
0 siblings, 1 reply; 9+ messages in thread
From: Bruce Richardson @ 2018-04-03 11:58 UTC (permalink / raw)
To: Pavan Nikhilesh; +Cc: thomas, jerin.jacob, dev
On Tue, Apr 03, 2018 at 04:54:52PM +0530, Pavan Nikhilesh wrote:
> Meson identify toolchain using cc.get_id and set RTE_TOOLCHAIN,
> RTE_TOOLCHAIN_X during initializing dpdk_conf so that it can be used by
> both x86 and arm.
>
> Suggested-by: Bruce Richardson <bruce.richardson@intel.com>
> Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
> ---
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [dpdk-dev] [PATCH v3] build: meson set toolchain info during config init
2018-04-03 11:58 ` Bruce Richardson
@ 2018-04-03 13:05 ` Bruce Richardson
0 siblings, 0 replies; 9+ messages in thread
From: Bruce Richardson @ 2018-04-03 13:05 UTC (permalink / raw)
To: Pavan Nikhilesh; +Cc: thomas, jerin.jacob, dev
On Tue, Apr 03, 2018 at 12:58:16PM +0100, Bruce Richardson wrote:
> On Tue, Apr 03, 2018 at 04:54:52PM +0530, Pavan Nikhilesh wrote:
> > Meson identify toolchain using cc.get_id and set RTE_TOOLCHAIN,
> > RTE_TOOLCHAIN_X during initializing dpdk_conf so that it can be used by
> > both x86 and arm.
> >
> > Suggested-by: Bruce Richardson <bruce.richardson@intel.com>
> > Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
> > ---
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
>
Pushed to dpdk-next-build with some minor commit log changes
^ permalink raw reply [flat|nested] 9+ messages in thread