New upstream version 18.11.2

[deb_dpdk.git] / config / arm / meson.build

diff --git a/config/arm/meson.build b/config/arm/meson.build
index 4e788a4..9feb54f 100644 (file)
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -6,9 +6,10 @@
 march_opt = '-march=@0@'.format(machine)
 
 arm_force_native_march = false
+arm_force_default_march = (machine == 'default')
 
 machine_args_generic = [
-       ['default', ['-march=armv8-a']],
+       ['default', ['-march=armv8-a+crc+crypto']],
        ['native', ['-march=native']],
        ['0xd03', ['-mcpu=cortex-a53']],
        ['0xd04', ['-mcpu=cortex-a35']],
@@ -46,6 +47,8 @@ flags_common_default = [
 
 flags_generic = [
        ['RTE_MACHINE', '"armv8a"'],
+       ['RTE_MAX_LCORE', 256],
+       ['RTE_USE_C11_MEM_MODEL', true],
        ['RTE_CACHE_LINE_SIZE', 128]]
 flags_cavium = [
        ['RTE_MACHINE', '"thunderx"'],
@@ -53,7 +56,20 @@ flags_cavium = [
        ['RTE_MAX_NUMA_NODES', 2],
        ['RTE_MAX_LCORE', 96],
        ['RTE_MAX_VFIO_GROUPS', 128],
-       ['RTE_RING_USE_C11_MEM_MODEL', false]]
+       ['RTE_USE_C11_MEM_MODEL', false]]
+flags_dpaa = [
+       ['RTE_MACHINE', '"dpaa"'],
+       ['RTE_USE_C11_MEM_MODEL', true],
+       ['RTE_CACHE_LINE_SIZE', 64],
+       ['RTE_MAX_NUMA_NODES', 1],
+       ['RTE_MAX_LCORE', 16]]
+flags_dpaa2 = [
+       ['RTE_MACHINE', '"dpaa2"'],
+       ['RTE_USE_C11_MEM_MODEL', true],
+       ['RTE_CACHE_LINE_SIZE', 64],
+       ['RTE_MAX_NUMA_NODES', 1],
+       ['RTE_MAX_LCORE', 16],
+       ['RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', false]]
 
 ## Arm implementer ID (ARM DDI 0487C.a, Section G7.2.106, Page G7-5321)
 impl_generic = ['Generic armv8', flags_generic, machine_args_generic]
@@ -69,15 +85,8 @@ impl_0x51 = ['Qualcomm', flags_generic, machine_args_generic]
 impl_0x53 = ['Samsung', flags_generic, machine_args_generic]
 impl_0x56 = ['Marvell', flags_generic, machine_args_generic]
 impl_0x69 = ['Intel', flags_generic, 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
+impl_dpaa = ['NXP DPAA', flags_dpaa, machine_args_generic]
+impl_dpaa2 = ['NXP DPAA2', flags_dpaa2, machine_args_generic]
 
 dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
 
@@ -85,6 +94,9 @@ if cc.sizeof('void *') != 8
        dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
        dpdk_conf.set('RTE_ARCH_ARM', 1)
        dpdk_conf.set('RTE_ARCH_ARMv7', 1)
+       # the minimum architecture supported, armv7-a, needs the following,
+       # mk/machine/armv7a/rte.vars.mk sets it too
+       machine_args += '-mfpu=neon'
 else
        dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128)
        dpdk_conf.set('RTE_ARCH_ARM64', 1)
@@ -94,7 +106,10 @@ else
        cmd_generic = ['generic', '', '', 'default', '']
        cmd_output = cmd_generic # Set generic by default
        machine_args = [] # Clear previous machine args
-       if not meson.is_cross_build()
+       if arm_force_default_march and not meson.is_cross_build()
+               machine = impl_generic
+               impl_pn = 'default'
+       elif not meson.is_cross_build()
                # The script returns ['Implementer', 'Variant', 'Architecture',
                # 'Primary Part number', 'Revision']
                detect_vendor = find_program(join_paths(
@@ -104,8 +119,8 @@ else
                        cmd_output = cmd.stdout().to_lower().strip().split(' ')
                endif
                # Set to generic if variable is not found
-               machine = get_variable('impl_' + cmd_output[0], 'generic')
-               if machine == 'generic'
+               machine = get_variable('impl_' + cmd_output[0], ['generic'])
+               if machine[0] == 'generic'
                        machine = impl_generic
                        cmd_output = cmd_generic
                endif
@@ -153,7 +168,8 @@ else
 endif
 message(machine_args)
 
-if cc.get_define('__ARM_NEON', args: machine_args) != ''
+if (cc.get_define('__ARM_NEON', args: machine_args) != '' or
+    cc.get_define('__aarch64__', args: machine_args) != '')
        dpdk_conf.set('RTE_MACHINE_CPUFLAG_NEON', 1)
        compile_time_cpuflags += ['RTE_CPUFLAG_NEON']
 endif