build: alias default build as generic

The current machine='default' build name is not descriptive. The actual
default build is machine='native'. Add an alternative string which does
the same build and better describes what we're building:
machine='generic'. Leave machine='default' for backwards compatibility.

Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index 91e43a975b8193489a3b46e1f1be5dcb7ca10256..3cbeb193a1b27b2ef4303565a2fccb9c2e1bfa57 100755 (executable)
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -77,7 +77,7 @@ else
     OPTS="$OPTS -Dexamples=all"
 fi
 
-OPTS="$OPTS -Dmachine=default"
+OPTS="$OPTS -Dmachine=generic"
 OPTS="$OPTS --default-library=$DEF_LIB"
 OPTS="$OPTS --buildtype=debugoptimized"
 OPTS="$OPTS -Dcheck_includes=true"

diff --git a/config/arm/meson.build b/config/arm/meson.build
index 00bc4610a3053f8980ac52c5376f4bb2f4c5ebaa..aaed89bd5b1034b56d99cf3ff76ed2cf659dc9af 100644 (file)
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation.
 # Copyright(c) 2017 Cavium, Inc
+# Copyright(c) 2021 PANTHEON.tech s.r.o.
 
 # common flags to all aarch64 builds, with lowest priority
 flags_common = [
@@ -208,8 +209,8 @@ if dpdk_conf.get('RTE_ARCH_32')
 else
        # aarch64 build
        if not meson.is_cross_build()
-               if machine == 'default'
-                       # default build
+               if machine == 'generic'
+                       # generic build
                        implementer_id = 'generic'
                        part_number = 'generic'
                else
@@ -256,7 +257,7 @@ else
                      '(-Dmachine=generic) build.')
        endif
 
-       # use default flags with implementer flags
+       # use common flags with implementer flags
        dpdk_flags = flags_common + implementer_config['flags'] + part_number_config.get('flags', [])
 
        # apply supported machine args

diff --git a/config/meson.build b/config/meson.build
index 66a2edcc47f5b7f6637df5e2247efa40f788a212..3268cf68049508054afb228e6d64827a2035d1bc 100644 (file)
--- a/config/meson.build
+++ b/config/meson.build
@@ -70,21 +70,22 @@ else
        machine = get_option('machine')
 endif
 
-# machine type 'default' is special, it defaults to the per arch agreed common
-# minimal baseline needed for DPDK.
+# machine type 'generic' is special, it selects the per arch agreed common
+# minimal baseline needed for DPDK. Machine type 'default' is also supported
+# with the same meaning for backwards compatibility.
 # 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 machine == 'default' or machine == 'generic'
        if host_machine.cpu_family().startswith('x86')
-               # matches the old pre-meson build systems default
+               # matches the old pre-meson build systems generic machine
                machine = 'corei7'
        elif host_machine.cpu_family().startswith('arm')
                machine = 'armv7-a'
        elif host_machine.cpu_family().startswith('aarch')
-               # arm64 manages defaults in config/arm/meson.build
-               machine = 'default'
+               # arm64 manages generic config in config/arm/meson.build
+               machine = 'generic'
        elif host_machine.cpu_family().startswith('ppc')
                machine = 'power8'
        endif

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index c11ae87e0dfde5f7fca7fff939b21aaea616d207..daf817ac3e57fa3ac7137110b551d4ce050f6dba 100755 (executable)
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -223,12 +223,12 @@ 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'
+generic_machine='nehalem'
+if ! check_cc_flags "-march=$generic_machine" ; then
+       generic_machine='corei7'
 fi
-build build-x86-default cc skipABI -Dcheck_includes=true \
-       -Dlibdir=lib -Dmachine=$default_machine $use_shared
+build build-x86-generic cc skipABI -Dcheck_includes=true \
+       -Dlibdir=lib -Dmachine=$generic_machine $use_shared
 
 # 32-bit with default compiler
 if check_cc_flags '-m32' ; then
@@ -271,10 +271,10 @@ for f in $srcdir/config/ppc/ppc* ; do
        build $targetdir $f ABI $use_shared
 done
 
-# Test installation of the x86-default target, to be used for checking
+# Test installation of the x86-generic target, to be used for checking
 # the sample apps build using the pkg-config file for cflags and libs
 load_env cc
-build_path=$(readlink -f $builds_dir/build-x86-default)
+build_path=$(readlink -f $builds_dir/build-x86-generic)
 export DESTDIR=$build_path/install
 install_target $build_path $DESTDIR
 pc_file=$(find $DESTDIR -name libdpdk.pc)

diff --git a/doc/guides/prog_guide/build-sdk-meson.rst b/doc/guides/prog_guide/build-sdk-meson.rst
index 3429e264797d6c4d3f2f9e61431cdf570ab474cd..c7e12eedfbf1847c8a65d48cac71045400663620 100644 (file)
--- a/doc/guides/prog_guide/build-sdk-meson.rst
+++ b/doc/guides/prog_guide/build-sdk-meson.rst
@@ -85,7 +85,7 @@ Project-specific options are passed used -Doption=value::
 
        meson -Denable_docs=true fullbuild  # build and install docs
 
-       meson -Dmachine=default  # use builder-independent baseline -march
+       meson -Dmachine=generic  # use builder-independent baseline -march
 
        meson -Ddisable_drivers=event/*,net/tap  # disable tap driver and all
                                        # eventdev PMDs for a smaller build
@@ -114,7 +114,7 @@ Examples of setting some of the same options using meson configure::
         re-scan from meson.
 
 .. note::
-        machine=default uses a config that works on all supported architectures
+        machine=generic uses a config that works on all supported architectures
         regardless of the capabilities of the machine where the build is happening.
 
 As well as those settings taken from ``meson configure``, other options

diff --git a/meson_options.txt b/meson_options.txt
index c53011d2461df56d75b6e84235a2e0a6e48b77f1..fa207cbada750c40e8ff285582a88d23ff37c21b 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -25,7 +25,7 @@ option('include_subdir_arch', type: 'string', value: '',
 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')
+       description: 'set the target machine type or "generic", a build usable on all machines of the build machine architecture or "native", which lets the compiler pick the architecture of the build machine.')
 option('max_ethports', type: 'integer', value: 32,
        description: 'maximum number of Ethernet devices')
 option('max_lcores', type: 'integer', value: 128,