From: Juraj Linkeš <juraj.linkes@pantheon.tech> To: thomas@monjalon.net, bruce.richardson@intel.com, Honnappa.Nagarahalli@arm.com Cc: dev@dpdk.org, Juraj Linkeš <juraj.linkes@pantheon.tech> Subject: [dpdk-dev] [RFC PATCH v1] build: add platform meson option Date: Thu, 26 Nov 2020 16:47:29 +0100 Message-ID: <1606405649-4308-1-git-send-email-juraj.linkes@pantheon.tech> (raw) 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. Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech> --- config/arm/meson.build | 2 +- config/meson.build | 14 +++++++++++++- meson_options.txt | 6 ++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/config/arm/meson.build b/config/arm/meson.build index 42b4e43c7..ac680956f 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -6,7 +6,7 @@ march_opt = '-march=@0@'.format(machine) arm_force_native_march = false -arm_force_default_march = (machine == 'default') +arm_force_default_march = (platform == 'generic') flags_common_default = [ # Accelarate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest) diff --git a/config/meson.build b/config/meson.build index c02802c18..41d32e63e 100644 --- a/config/meson.build +++ b/config/meson.build @@ -63,6 +63,8 @@ if not is_windows pmd_subdir_opt) endif +platform = get_option('platform') + # set the machine type and cflags for it if meson.is_cross_build() machine = host_machine.cpu() @@ -70,13 +72,23 @@ else machine = get_option('machine') endif +if platform == 'native' + if machine == 'auto' + machine = 'native' + endif +elif platform == 'generic' + if machine == 'auto' + machine = 'default' + endif +endif + +if machine == 'default' # machine 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' diff --git a/meson_options.txt b/meson_options.txt index e384e6dbb..1a5e47fd3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -20,14 +20,16 @@ option('kernel_dir', type: 'string', value: '', description: 'Path to the kernel for building kernel modules. Headers must be in $kernel_dir/build. Modules will be installed in $DEST_DIR/$kernel_dir/extra/dpdk.') option('lib_musdk_dir', type: 'string', value: '', description: 'path to the MUSDK library installation directory') -option('machine', type: 'string', value: 'native', - description: 'set the target machine type') +option('machine', type: 'string', value: 'auto', + description: 'set the target machine type/ISA') 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: 4, description: 'maximum number of NUMA nodes supported by EAL') +option('platform', type: 'string', value: 'generic', + description: 'Platform to build for, 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 reply other threads:[~2020-11-26 15:47 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-26 15:47 Juraj Linkeš [this message] 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 ` [dpdk-dev] [PATCH v3] " Juraj Linkeš 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=1606405649-4308-1-git-send-email-juraj.linkes@pantheon.tech \ --to=juraj.linkes@pantheon.tech \ --cc=Honnappa.Nagarahalli@arm.com \ --cc=bruce.richardson@intel.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