From: Juraj Linkeš <juraj.linkes@pantheon.tech> To: thomas@monjalon.net, david.marchand@redhat.com, bruce.richardson@intel.com, Honnappa.Nagarahalli@arm.com Cc: dev@dpdk.org, Juraj Linkeš <juraj.linkes@pantheon.tech> Subject: [dpdk-dev] [PATCH v3] build: add platform meson option Date: Mon, 29 Mar 2021 13:03:38 +0200 Message-ID: <1617015818-13240-1-git-send-email-juraj.linkes@pantheon.tech> (raw) In-Reply-To: <1609761130-4627-1-git-send-email-juraj.linkes@pantheon.tech> The current meson option 'machine' should only specify the ISA, which is not sufficient for Arm, where setting ISA implies other setting as well. Add a new meson option, 'platform', which differentiates the type of the build (native/generic) and sets machine accordingly, unless the user chooses to override it. The 'machine' option also doesn't describe very well what it sets, so introduce a new option 'cpu_instruction_set', but keep 'machine' for backwards compatibility. These two new variables, taken together, achieve what 'machine' was setting per architecture - setting the ISA in x86 build and setting native/default 'build type' in aarch64 build - is now properly being set for all architectures in a uniform manner. Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech> --- config/meson.build | 47 +++++++++++++++++++++++++---------- devtools/test-meson-builds.sh | 9 ++++--- meson_options.txt | 8 ++++-- 3 files changed, 45 insertions(+), 19 deletions(-) diff --git a/config/meson.build b/config/meson.build index 66a2edcc47..32c9e18c17 100644 --- a/config/meson.build +++ b/config/meson.build @@ -63,42 +63,63 @@ if not is_windows pmd_subdir_opt) endif -# set the machine type and cflags for it +platform = get_option('platform') + +# set the cpu_instruction_set type and cflags for it if meson.is_cross_build() - machine = host_machine.cpu() + cpu_instruction_set = host_machine.cpu() else - machine = get_option('machine') + cpu_instruction_set = get_option('cpu_instruction_set') + if get_option('machine') != 'auto' + warning('The "machine" option is deprecated. ' + + 'Please use "cpu_instruction_set" instead.') + if cpu_instruction_set != 'auto' + error('Setting both "machine" and ' + + '"cpu_instruction_set" is unsupported.') + endif + cpu_instruction_set = get_option('machine') + endif +endif + +if platform == 'native' + if cpu_instruction_set == 'auto' + cpu_instruction_set = 'native' + endif +elif platform == 'generic' + if cpu_instruction_set == 'auto' + cpu_instruction_set = 'default' + endif endif -# machine type 'default' is special, it defaults to the per arch agreed common +if cpu_instruction_set == 'default' +# cpu_instruction_set type 'default' is special, it defaults to the per arch agreed common # minimal baseline needed for DPDK. # That might not be the most optimized, but the most portable version while # still being able to support the CPU features required for DPDK. # This can be bumped up by the DPDK project, but it can never be an # invariant like 'native' -if machine == 'default' if host_machine.cpu_family().startswith('x86') # matches the old pre-meson build systems default - machine = 'corei7' + cpu_instruction_set = 'corei7' elif host_machine.cpu_family().startswith('arm') - machine = 'armv7-a' + cpu_instruction_set = 'armv7-a' elif host_machine.cpu_family().startswith('aarch') # arm64 manages defaults in config/arm/meson.build - machine = 'default' + cpu_instruction_set = 'default' elif host_machine.cpu_family().startswith('ppc') - machine = 'power8' + cpu_instruction_set = 'power8' endif endif -dpdk_conf.set('RTE_MACHINE', machine) +dpdk_conf.set('RTE_MACHINE', cpu_instruction_set) machine_args = [] # ppc64 does not support -march= at all, use -mcpu and -mtune for that if host_machine.cpu_family().startswith('ppc') - machine_args += '-mcpu=' + machine - machine_args += '-mtune=' + machine + machine_args += '-mcpu=' + cpu_instruction_set + machine_args += '-mtune=' + cpu_instruction_set else - machine_args += '-march=' + machine + machine_args += '-march=' + cpu_instruction_set endif toolchain = cc.get_id() diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index c11ae87e0d..b413b9e96a 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -223,12 +223,13 @@ done # test compilation with minimal x86 instruction set # Set the install path for libraries to "lib" explicitly to prevent problems # with pkg-config prefixes if installed in "lib/x86_64-linux-gnu" later. -default_machine='nehalem' -if ! check_cc_flags "-march=$default_machine" ; then - default_machine='corei7' +default_isa='nehalem' +if ! check_cc_flags "-march=$default_isa" ; then + default_isa='corei7' fi build build-x86-default cc skipABI -Dcheck_includes=true \ - -Dlibdir=lib -Dmachine=$default_machine $use_shared + -Dlibdir=lib -Dcpu_instruction_set=$default_isa \ + $use_shared # 32-bit with default compiler if check_cc_flags '-m32' ; then diff --git a/meson_options.txt b/meson_options.txt index 3b8c5d316d..c6047f3405 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,6 +2,8 @@ option('check_includes', type: 'boolean', value: false, description: 'build "chkincs" to verify each header file can compile alone') +option('cpu_instruction_set', type: 'string', value: 'auto', + description: 'Set the target machine ISA (instruction set architecture). Will be set according to the platform option by default.') option('disable_drivers', type: 'string', value: '', description: 'Comma-separated list of drivers to explicitly disable.') option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>', @@ -20,14 +22,16 @@ option('include_subdir_arch', type: 'string', value: '', description: 'subdirectory where to install arch-dependent headers') option('kernel_dir', type: 'string', value: '', description: 'Path to the kernel for building kernel modules. Headers must be in $kernel_dir or $kernel_dir/build. Modules will be installed in /lib/modules.') -option('machine', type: 'string', value: 'native', - description: 'set the target machine type') +option('machine', type: 'string', value: 'auto', + description: 'Set the target machine ISA (instruction set architecture).') option('max_ethports', type: 'integer', value: 32, description: 'maximum number of Ethernet devices') option('max_lcores', type: 'integer', value: 128, description: 'maximum number of cores/threads supported by EAL') option('max_numa_nodes', type: 'integer', value: 32, description: 'maximum number of NUMA nodes supported by EAL') +option('platform', type: 'string', value: 'generic', + description: 'Platform to build, either "native" or "generic".') option('enable_trace_fp', type: 'boolean', value: false, description: 'enable fast path trace points.') option('tests', type: 'boolean', value: true, -- 2.20.1
next prev parent reply other threads:[~2021-03-29 11:03 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-26 15:47 [dpdk-dev] [RFC PATCH v1] " Juraj Linkeš 2020-11-26 16:02 ` Bruce Richardson 2020-11-27 8:31 ` Juraj Linkeš 2020-11-27 14:07 ` Bruce Richardson 2020-12-23 11:23 ` Juraj Linkeš 2021-01-04 11:52 ` [dpdk-dev] [RFC PATCH v2] " Juraj Linkeš 2021-01-04 11:59 ` Juraj Linkeš 2021-01-05 22:17 ` David Christensen 2021-01-06 14:42 ` Bruce Richardson 2021-02-19 9:11 ` Juraj Linkeš 2021-02-22 21:25 ` David Christensen 2021-02-23 8:45 ` Juraj Linkeš 2021-02-23 9:43 ` Bruce Richardson 2021-02-25 12:51 ` Juraj Linkeš 2021-02-25 12:54 ` Bruce Richardson 2021-02-25 12:57 ` Juraj Linkeš 2021-03-29 11:03 ` Juraj Linkeš [this message] 2021-03-29 12:50 ` [dpdk-dev] [PATCH v4] " Juraj Linkeš 2021-03-31 12:16 ` Juraj Linkeš 2021-03-31 12:19 ` Juraj Linkeš 2021-03-31 12:39 ` Bruce Richardson 2021-04-15 13:32 ` Juraj Linkeš 2021-04-15 13:51 ` Bruce Richardson 2021-04-20 8:08 ` [dpdk-dev] [PATCH v5] build: use platform option for generic and native Juraj Linkeš 2021-04-20 8:16 ` Juraj Linkeš 2021-04-20 8:36 ` Thomas Monjalon 2021-04-21 8:37 ` Juraj Linkeš 2021-04-22 8:34 ` Wang, Yinan 2021-06-30 13:09 ` [dpdk-dev] [PATCH v6] build: use platform for generic and native builds Juraj Linkeš 2021-07-06 9:44 ` [dpdk-dev] [PATCH v7] " Juraj Linkeš 2021-07-07 13:59 ` Bruce Richardson 2021-07-09 12:30 ` Thomas Monjalon 2021-07-09 13:55 ` Juraj Linkeš
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=1617015818-13240-1-git-send-email-juraj.linkes@pantheon.tech \ --to=juraj.linkes@pantheon.tech \ --cc=Honnappa.Nagarahalli@arm.com \ --cc=bruce.richardson@intel.com \ --cc=david.marchand@redhat.com \ --cc=dev@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
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