build: support ARM with meson
authorBruce Richardson <bruce.richardson@intel.com>
Mon, 22 Jan 2018 15:26:29 +0000 (20:56 +0530)
committerBruce Richardson <bruce.richardson@intel.com>
Tue, 30 Jan 2018 20:59:00 +0000 (21:59 +0100)
Add files to enable compiling for ARM native/cross builds.
This can be tested by doing a cross-compile for armv8-a type using
the linaro gcc toolchain.

        meson arm-build --cross-file aarch64_cross.txt
        ninja -C arm-build

where aarch64_cross.txt contained the following

        [binaries]
        c = 'aarch64-linux-gnu-gcc'
        cpp = 'aarch64-linux-gnu-cpp'
        ar = 'aarch64-linux-gnu-ar'

        [host_machine]
        system = 'linux'
        cpu_family = 'aarch64'
        cpu = 'armv8-a'
        endian = 'little'

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
config/arm/meson.build [new file with mode: 0644]
config/meson.build
lib/librte_eal/common/arch/arm/meson.build [new file with mode: 0644]
lib/librte_eal/common/include/arch/arm/meson.build [new file with mode: 0644]

diff --git a/config/arm/meson.build b/config/arm/meson.build
new file mode 100644 (file)
index 0000000..f05de4c
--- /dev/null
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Intel Corporation.
+# Copyright(c) 2017 Cavium, Inc
+
+# for checking defines we need to use the correct compiler flags
+march_opt = '-march=@0@'.format(machine)
+
+dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
+if cc.sizeof('void *') == 8
+       dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128)
+       dpdk_conf.set('RTE_ARCH_ARM64', 1)
+       dpdk_conf.set('RTE_ARCH_64', 1)
+else
+       dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
+       dpdk_conf.set('RTE_ARCH_ARM', 1)
+       dpdk_conf.set('RTE_ARCH_ARMv7', 1)
+endif
+
+if cc.get_define('__ARM_NEON', args: march_opt) != ''
+       dpdk_conf.set('RTE_MACHINE_CPUFLAG_NEON', 1)
+       compile_time_cpuflags += ['RTE_CPUFLAG_NEON']
+endif
+
+if cc.get_define('__ARM_FEATURE_CRC32', args: march_opt) != ''
+       dpdk_conf.set('RTE_MACHINE_CPUFLAG_CRC32', 1)
+       compile_time_cpuflags += ['RTE_CPUFLAG_CRC32']
+endif
+
+if cc.get_define('__ARM_FEATURE_CRYPTO', args: march_opt) != ''
+       dpdk_conf.set('RTE_MACHINE_CPUFLAG_AES', 1)
+       dpdk_conf.set('RTE_MACHINE_CPUFLAG_PMULL', 1)
+       dpdk_conf.set('RTE_MACHINE_CPUFLAG_SHA1', 1)
+       dpdk_conf.set('RTE_MACHINE_CPUFLAG_SHA2', 1)
+       compile_time_cpuflags += ['RTE_CPUFLAG_AES', 'RTE_CPUFLAG_PMULL',
+       'RTE_CPUFLAG_SHA1', 'RTE_CPUFLAG_SHA2']
+endif
index 9522304..fa55c53 100644 (file)
@@ -56,8 +56,10 @@ endforeach
 compile_time_cpuflags = []
 if host_machine.cpu_family().startswith('x86')
        arch_subdir = 'x86'
-       subdir(arch_subdir)
+elif host_machine.cpu_family().startswith('arm') or host_machine.cpu_family().startswith('aarch')
+       arch_subdir = 'arm'
 endif
+subdir(arch_subdir)
 dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags))
 
 # set the install path for the drivers
diff --git a/lib/librte_eal/common/arch/arm/meson.build b/lib/librte_eal/common/arch/arm/meson.build
new file mode 100644 (file)
index 0000000..c6bd922
--- /dev/null
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Intel Corporation.
+
+eal_common_arch_sources = files('rte_cpuflags.c',
+       'rte_cycles.c')
diff --git a/lib/librte_eal/common/include/arch/arm/meson.build b/lib/librte_eal/common/include/arch/arm/meson.build
new file mode 100644 (file)
index 0000000..77893fa
--- /dev/null
@@ -0,0 +1,29 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Intel Corporation.
+
+install_headers(
+       'rte_atomic_32.h',
+       'rte_atomic_64.h',
+       'rte_atomic.h',
+       'rte_byteorder.h',
+       'rte_cpuflags_32.h',
+       'rte_cpuflags_64.h',
+       'rte_cpuflags.h',
+       'rte_cycles_32.h',
+       'rte_cycles_64.h',
+       'rte_cycles.h',
+       'rte_io_64.h',
+       'rte_io.h',
+       'rte_memcpy_32.h',
+       'rte_memcpy_64.h',
+       'rte_memcpy.h',
+       'rte_pause_32.h',
+       'rte_pause_64.h',
+       'rte_pause.h',
+       'rte_prefetch_32.h',
+       'rte_prefetch_64.h',
+       'rte_prefetch.h',
+       'rte_rwlock.h',
+       'rte_spinlock.h',
+       'rte_vect.h',
+       subdir: get_option('include_subdir_arch'))