eal: move arch-specific header files
[dpdk.git] / config / arm / meson.build
index 5ad926e..6e75e6d 100644 (file)
@@ -6,28 +6,12 @@
 march_opt = '-march=@0@'.format(machine)
 
 arm_force_native_march = false
-
-machine_args_generic = [
-       ['default', ['-march=armv8-a+crc+crypto']],
-       ['native', ['-march=native']],
-       ['0xd03', ['-mcpu=cortex-a53']],
-       ['0xd04', ['-mcpu=cortex-a35']],
-       ['0xd07', ['-mcpu=cortex-a57']],
-       ['0xd08', ['-mcpu=cortex-a72']],
-       ['0xd09', ['-mcpu=cortex-a73']],
-       ['0xd0a', ['-mcpu=cortex-a75']],
-]
-machine_args_cavium = [
-       ['default', ['-march=armv8-a+crc+crypto','-mcpu=thunderx']],
-       ['native', ['-march=native']],
-       ['0xa1', ['-mcpu=thunderxt88']],
-       ['0xa2', ['-mcpu=thunderxt81']],
-       ['0xa3', ['-mcpu=thunderxt83']]]
+arm_force_default_march = (machine == 'default')
 
 flags_common_default = [
        # Accelarate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest)
        # to determine the best threshold in code. Refer to notes in source file
-       # (lib/librte_eal/common/include/arch/arm/rte_memcpy_64.h) for more info.
+       # (lib/librte_eal/arm/include/rte_memcpy_64.h) for more info.
        ['RTE_ARCH_ARM64_MEMCPY', false],
        #       ['RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD', 2048],
        #       ['RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD', 512],
@@ -42,63 +26,129 @@ flags_common_default = [
        ['RTE_LIBRTE_AVP_PMD', false],
 
        ['RTE_SCHED_VECTOR', false],
+       ['RTE_ARM_USE_WFE', false],
 ]
 
 flags_generic = [
        ['RTE_MACHINE', '"armv8a"'],
+       ['RTE_MAX_LCORE', 256],
+       ['RTE_USE_C11_MEM_MODEL', true],
        ['RTE_CACHE_LINE_SIZE', 128]]
+flags_arm = [
+       ['RTE_MACHINE', '"armv8a"'],
+       ['RTE_MAX_LCORE', 16],
+       ['RTE_USE_C11_MEM_MODEL', true],
+       ['RTE_CACHE_LINE_SIZE', 64]]
 flags_cavium = [
-       ['RTE_MACHINE', '"thunderx"'],
        ['RTE_CACHE_LINE_SIZE', 128],
        ['RTE_MAX_NUMA_NODES', 2],
        ['RTE_MAX_LCORE', 96],
-       ['RTE_MAX_VFIO_GROUPS', 128],
-       ['RTE_RING_USE_C11_MEM_MODEL', false]]
+       ['RTE_MAX_VFIO_GROUPS', 128]]
 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],
+       ['RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', false]]
+flags_emag = [
+       ['RTE_MACHINE', '"emag"'],
+       ['RTE_CACHE_LINE_SIZE', 64],
+       ['RTE_MAX_NUMA_NODES', 1],
+       ['RTE_MAX_LCORE', 32]]
+flags_armada = [
+       ['RTE_MACHINE', '"armv8a"'],
        ['RTE_CACHE_LINE_SIZE', 64],
        ['RTE_MAX_NUMA_NODES', 1],
        ['RTE_MAX_LCORE', 16]]
-flags_dpaa2 = [
-       ['RTE_MACHINE', '"dpaa2"'],
+
+flags_default_extra = []
+flags_n1sdp_extra = [
+       ['RTE_MACHINE', '"n1sdp"'],
+       ['RTE_MAX_NUMA_NODES', 1],
+       ['RTE_MAX_LCORE', 4],
+       ['RTE_EAL_NUMA_AWARE_HUGEPAGES', false],
+       ['RTE_LIBRTE_VHOST_NUMA', false]]
+flags_thunderx_extra = [
+       ['RTE_MACHINE', '"thunderx"'],
+       ['RTE_USE_C11_MEM_MODEL', false]]
+flags_thunderx2_extra = [
+       ['RTE_MACHINE', '"thunderx2"'],
        ['RTE_CACHE_LINE_SIZE', 64],
+       ['RTE_MAX_NUMA_NODES', 2],
+       ['RTE_MAX_LCORE', 256],
+       ['RTE_ARM_FEATURE_ATOMICS', true],
+       ['RTE_USE_C11_MEM_MODEL', true]]
+flags_octeontx2_extra = [
+       ['RTE_MACHINE', '"octeontx2"'],
        ['RTE_MAX_NUMA_NODES', 1],
-       ['RTE_MAX_LCORE', 16],
-       ['RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', 'n']]
+       ['RTE_MAX_LCORE', 24],
+       ['RTE_ARM_FEATURE_ATOMICS', true],
+       ['RTE_EAL_IGB_UIO', false],
+       ['RTE_USE_C11_MEM_MODEL', true]]
+
+machine_args_generic = [
+       ['default', ['-march=armv8-a+crc']],
+       ['native', ['-march=native']],
+       ['0xd03', ['-mcpu=cortex-a53']],
+       ['0xd04', ['-mcpu=cortex-a35']],
+       ['0xd07', ['-mcpu=cortex-a57']],
+       ['0xd08', ['-mcpu=cortex-a72']],
+       ['0xd09', ['-mcpu=cortex-a73']],
+       ['0xd0a', ['-mcpu=cortex-a75']],
+       ['0xd0b', ['-mcpu=cortex-a76']],
+       ['0xd0c', ['-march=armv8.2-a+crc+crypto', '-mcpu=neoverse-n1'], flags_n1sdp_extra]]
+
+machine_args_cavium = [
+       ['default', ['-march=armv8-a+crc+crypto','-mcpu=thunderx']],
+       ['native', ['-march=native']],
+       ['0xa1', ['-mcpu=thunderxt88'], flags_thunderx_extra],
+       ['0xa2', ['-mcpu=thunderxt81'], flags_thunderx_extra],
+       ['0xa3', ['-mcpu=thunderxt83'], flags_thunderx_extra],
+       ['0xaf', ['-march=armv8.1-a+crc+crypto','-mcpu=thunderx2t99'], flags_thunderx2_extra],
+       ['0xb2', ['-march=armv8.2-a+crc+crypto+lse','-mcpu=octeontx2'], flags_octeontx2_extra]]
+
+machine_args_emag = [
+       ['default', ['-march=armv8-a+crc+crypto', '-mtune=emag']],
+       ['native', ['-march=native']]]
 
 ## Arm implementer ID (ARM DDI 0487C.a, Section G7.2.106, Page G7-5321)
 impl_generic = ['Generic armv8', flags_generic, machine_args_generic]
-impl_0x41 = ['Arm', flags_generic, machine_args_generic]
+impl_0x41 = ['Arm', flags_arm, machine_args_generic]
 impl_0x42 = ['Broadcom', flags_generic, machine_args_generic]
 impl_0x43 = ['Cavium', flags_cavium, machine_args_cavium]
 impl_0x44 = ['DEC', flags_generic, machine_args_generic]
 impl_0x49 = ['Infineon', flags_generic, machine_args_generic]
 impl_0x4d = ['Motorola', flags_generic, machine_args_generic]
 impl_0x4e = ['NVIDIA', flags_generic, machine_args_generic]
-impl_0x50 = ['AppliedMicro', flags_generic, machine_args_generic]
+impl_0x50 = ['Ampere Computing', flags_emag, machine_args_emag]
 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_0x56 = ['Marvell ARMADA', flags_armada, machine_args_generic]
 impl_0x69 = ['Intel', flags_generic, machine_args_generic]
 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)
 
-if cc.sizeof('void *') != 8
+if not dpdk_conf.get('RTE_ARCH_64')
        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)
-       dpdk_conf.set('RTE_ARCH_64', 1)
 
        machine = []
        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(
@@ -108,8 +158,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
@@ -137,27 +187,27 @@ else
                        dpdk_conf.set(flag[0], flag[1])
                endif
        endforeach
-       # Primary part number based mcpu flags are supported
-       # for gcc versions > 7
-       if cc.version().version_compare(
-                       '<7.0') or cmd_output.length() == 0
-               if not meson.is_cross_build() and arm_force_native_march == true
-                       impl_pn = 'native'
-               else
-                       impl_pn = 'default'
-               endif
-       endif
+
        foreach marg: machine[2]
                if marg[0] == impl_pn
-                       foreach f: marg[1]
-                               machine_args += f
+                       foreach flag: marg[1]
+                               if cc.has_argument(flag)
+                                       machine_args += flag
+                               endif
+                       endforeach
+                       # Apply any extra machine specific flags.
+                       foreach flag: marg.get(2, flags_default_extra)
+                               if flag.length() > 0
+                                       dpdk_conf.set(flag[0], flag[1])
+                               endif
                        endforeach
                endif
        endforeach
 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