config/arm: rename variables

Rename Arm build variables and values so that they better conform to Arm
specifications. Also rename generically sounding variable to names that
better capture what the variables hold.

Rename machine_args_generic to part_number_config_arm since the
variable contains more than just the generic machine args and is used
mainly as the fallback arm configuration.
Rename the default machine args to generic machine args to reflect that.
The rest of the variables are self-explanatory.

Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
Tested-by: Jerin Jacob <jerinj@marvell.com>
Tested-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
Tested-by: Vimal Chungath <vcchunga@amazon.com>
Tested-by: Dharmik Thakkar <dharmik.thakkar@arm.com>

diff --git a/config/arm/arm64_armada_linux_gcc b/config/arm/arm64_armada_linux_gcc
index fa40c03..52c5f44 100644 (file)
--- a/config/arm/arm64_armada_linux_gcc
+++ b/config/arm/arm64_armada_linux_gcc
@@ -14,4 +14,4 @@ cpu = 'armv8-a'
 endian = 'little'
 
 [properties]
-implementor_id = '0x56'
+implementer_id = '0x56'

diff --git a/config/arm/arm64_armv8_linux_gcc b/config/arm/arm64_armv8_linux_gcc
index 88f0ff9..13ee8b2 100644 (file)
--- a/config/arm/arm64_armv8_linux_gcc
+++ b/config/arm/arm64_armv8_linux_gcc
@@ -13,10 +13,10 @@ cpu = 'armv8-a'
 endian = 'little'
 
 [properties]
-implementor_id = 'generic'
+implementer_id = 'generic'
 
-# Valid options for Arm's implementor_pn:
-# 'default': valid for all armv8-a architectures (default value)
+# Valid options for Arm's part_number:
+# 'generic': valid for all armv8-a architectures (default value)
 # '0xd03':   cortex-a53
 # '0xd04':   cortex-a35
 # '0xd05':   cortex-a55
@@ -25,4 +25,4 @@ implementor_id = 'generic'
 # '0xd09':   cortex-a73
 # '0xd0a':   cortex-a75
 # '0xd0b':   cortex-a76
-implementor_pn = 'default'
+part_number = 'generic'

diff --git a/config/arm/arm64_bluefield_linux_gcc b/config/arm/arm64_bluefield_linux_gcc
index 86797d2..b79389d 100644 (file)
--- a/config/arm/arm64_bluefield_linux_gcc
+++ b/config/arm/arm64_bluefield_linux_gcc
@@ -13,5 +13,5 @@ cpu = 'armv8-a'
 endian = 'little'
 
 [properties]
-implementor_id = '0x41'
-implementor_pn = '0xd08'
+implementer_id = '0x41'
+part_number = '0xd08'

diff --git a/config/arm/arm64_dpaa_linux_gcc b/config/arm/arm64_dpaa_linux_gcc
index 1a46821..573ae7e 100644 (file)
--- a/config/arm/arm64_dpaa_linux_gcc
+++ b/config/arm/arm64_dpaa_linux_gcc
@@ -14,4 +14,4 @@ cpu = 'armv8-a'
 endian = 'little'
 
 [properties]
-implementor_id = 'dpaa'
+implementer_id = 'dpaa'

diff --git a/config/arm/arm64_emag_linux_gcc b/config/arm/arm64_emag_linux_gcc
index 8edcd3e..24f3d53 100644 (file)
--- a/config/arm/arm64_emag_linux_gcc
+++ b/config/arm/arm64_emag_linux_gcc
@@ -13,4 +13,4 @@ cpu = 'armv8-a'
 endian = 'little'
 
 [properties]
-implementor_id = '0x50'
+implementer_id = '0x50'

diff --git a/config/arm/arm64_n1sdp_linux_gcc b/config/arm/arm64_n1sdp_linux_gcc
index 022e063..6fb3f02 100644 (file)
--- a/config/arm/arm64_n1sdp_linux_gcc
+++ b/config/arm/arm64_n1sdp_linux_gcc
@@ -13,5 +13,5 @@ cpu = 'armv8-a'
 endian = 'little'
 
 [properties]
-implementor_id = '0x41'
-implementor_pn = '0xd0c'
+implementer_id = '0x41'
+part_number = '0xd0c'

diff --git a/config/arm/arm64_n2_linux_gcc b/config/arm/arm64_n2_linux_gcc
index 78f6f3e..3de5a6e 100644 (file)
--- a/config/arm/arm64_n2_linux_gcc
+++ b/config/arm/arm64_n2_linux_gcc
@@ -13,5 +13,5 @@ cpu = 'armv8-a'
 endian = 'little'
 
 [properties]
-implementor_id = '0x41'
-implementor_pn = '0xd49'
+implementer_id = '0x41'
+part_number = '0xd49'

diff --git a/config/arm/arm64_octeontx2_linux_gcc b/config/arm/arm64_octeontx2_linux_gcc
index 365bd7c..ac10428 100644 (file)
--- a/config/arm/arm64_octeontx2_linux_gcc
+++ b/config/arm/arm64_octeontx2_linux_gcc
@@ -13,5 +13,5 @@ cpu = 'armv8-a'
 endian = 'little'
 
 [properties]
-implementor_id = '0x43'
-implementor_pn = '0xb2'
+implementer_id = '0x43'
+part_number = '0xb2'

diff --git a/config/arm/arm64_stingray_linux_gcc b/config/arm/arm64_stingray_linux_gcc
index 86797d2..b79389d 100644 (file)
--- a/config/arm/arm64_stingray_linux_gcc
+++ b/config/arm/arm64_stingray_linux_gcc
@@ -13,5 +13,5 @@ cpu = 'armv8-a'
 endian = 'little'
 
 [properties]
-implementor_id = '0x41'
-implementor_pn = '0xd08'
+implementer_id = '0x41'
+part_number = '0xd08'

diff --git a/config/arm/arm64_thunderx2_linux_gcc b/config/arm/arm64_thunderx2_linux_gcc
index 2b41acc..dd25774 100644 (file)
--- a/config/arm/arm64_thunderx2_linux_gcc
+++ b/config/arm/arm64_thunderx2_linux_gcc
@@ -13,5 +13,5 @@ cpu = 'armv8-a'
 endian = 'little'
 
 [properties]
-implementor_id = '0x43'
-implementor_pn = '0xaf'
+implementer_id = '0x43'
+part_number = '0xaf'

diff --git a/config/arm/arm64_thunderx_linux_gcc b/config/arm/arm64_thunderx_linux_gcc
index 6572ab6..6707644 100644 (file)
--- a/config/arm/arm64_thunderx_linux_gcc
+++ b/config/arm/arm64_thunderx_linux_gcc
@@ -13,4 +13,4 @@ cpu = 'armv8-a'
 endian = 'little'
 
 [properties]
-implementor_id = '0x43'
+implementer_id = '0x43'

diff --git a/config/arm/meson.build b/config/arm/meson.build
index 5fd1c40..20bb70a 100644 (file)
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -8,7 +8,7 @@ march_opt = '-march=@0@'.format(machine)
 arm_force_native_march = false
 arm_force_default_march = (machine == 'default')
 
-flags_common_default = [
+flags_common = [
        # 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/arm/include/rte_memcpy_64.h) for more info.
@@ -28,58 +28,58 @@ flags_common_default = [
        ['RTE_ARM_USE_WFE', false],
 ]
 
-flags_generic = [
+flags_implementer_generic = [
        ['RTE_MACHINE', '"armv8a"'],
        ['RTE_MAX_LCORE', 256],
        ['RTE_USE_C11_MEM_MODEL', true],
        ['RTE_CACHE_LINE_SIZE', 128]]
-flags_arm = [
+flags_implementer_arm = [
        ['RTE_MACHINE', '"armv8a"'],
        ['RTE_MAX_LCORE', 16],
        ['RTE_USE_C11_MEM_MODEL', true],
        ['RTE_CACHE_LINE_SIZE', 64]]
-flags_cavium = [
+flags_implementer_cavium = [
        ['RTE_CACHE_LINE_SIZE', 128],
        ['RTE_MAX_NUMA_NODES', 2],
        ['RTE_MAX_LCORE', 96],
        ['RTE_MAX_VFIO_GROUPS', 128]]
-flags_dpaa = [
+flags_implementer_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 = [
+flags_implementer_emag = [
        ['RTE_MACHINE', '"emag"'],
        ['RTE_CACHE_LINE_SIZE', 64],
        ['RTE_MAX_NUMA_NODES', 1],
        ['RTE_MAX_LCORE', 32]]
-flags_armada = [
+flags_implementer_armada = [
        ['RTE_MACHINE', '"armv8a"'],
        ['RTE_CACHE_LINE_SIZE', 64],
        ['RTE_MAX_NUMA_NODES', 1],
        ['RTE_MAX_LCORE', 16]]
 
-flags_default_extra = []
-flags_thunderx_extra = [
+flags_part_number_default = []
+flags_part_number_thunderx = [
        ['RTE_MACHINE', '"thunderx"'],
        ['RTE_USE_C11_MEM_MODEL', false]]
-flags_thunderx2_extra = [
+flags_part_number_thunderx2 = [
        ['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 = [
+flags_part_number_octeontx2 = [
        ['RTE_MACHINE', '"octeontx2"'],
        ['RTE_MAX_NUMA_NODES', 1],
        ['RTE_MAX_LCORE', 36],
        ['RTE_ARM_FEATURE_ATOMICS', true],
        ['RTE_EAL_IGB_UIO', false],
        ['RTE_USE_C11_MEM_MODEL', true]]
-flags_n1generic_extra = [
+flags_part_number_n1generic = [
        ['RTE_MACHINE', '"neoverse-n1"'],
        ['RTE_MAX_LCORE', 64],
        ['RTE_CACHE_LINE_SIZE', 64],
@@ -89,7 +89,7 @@ flags_n1generic_extra = [
        ['RTE_MAX_NUMA_NODES', 1],
        ['RTE_EAL_NUMA_AWARE_HUGEPAGES', false],
        ['RTE_LIBRTE_VHOST_NUMA', false]]
-flags_n2generic_extra = [
+flags_part_number_n2generic = [
        ['RTE_MACHINE', '"neoverse-n2"'],
        ['RTE_MAX_LCORE', 64],
        ['RTE_CACHE_LINE_SIZE', 64],
@@ -98,8 +98,8 @@ flags_n2generic_extra = [
        ['RTE_EAL_NUMA_AWARE_HUGEPAGES', false],
        ['RTE_LIBRTE_VHOST_NUMA', false]]
 
-machine_args_generic = [
-       ['default', ['-march=armv8-a+crc', '-moutline-atomics']],
+part_number_config_arm = [
+       ['generic', ['-march=armv8-a+crc', '-moutline-atomics']],
        ['native', ['-march=native']],
        ['0xd03', ['-mcpu=cortex-a53']],
        ['0xd04', ['-mcpu=cortex-a35']],
@@ -108,37 +108,37 @@ machine_args_generic = [
        ['0xd09', ['-mcpu=cortex-a73']],
        ['0xd0a', ['-mcpu=cortex-a75']],
        ['0xd0b', ['-mcpu=cortex-a76']],
-       ['0xd0c', ['-march=armv8.2-a+crypto', '-mcpu=neoverse-n1'], flags_n1generic_extra],
-       ['0xd49', ['-march=armv8.5-a+crypto+sve2'], flags_n2generic_extra]]
+       ['0xd0c', ['-march=armv8.2-a+crypto', '-mcpu=neoverse-n1'], flags_part_number_n1generic],
+       ['0xd49', ['-march=armv8.5-a+crypto+sve2'], flags_part_number_n2generic]]
 
-machine_args_cavium = [
-       ['default', ['-march=armv8-a+crc+crypto','-mcpu=thunderx']],
+part_number_config_cavium = [
+       ['generic', ['-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']],
+       ['0xa1', ['-mcpu=thunderxt88'], flags_part_number_thunderx],
+       ['0xa2', ['-mcpu=thunderxt81'], flags_part_number_thunderx],
+       ['0xa3', ['-mcpu=thunderxt83'], flags_part_number_thunderx],
+       ['0xaf', ['-march=armv8.1-a+crc+crypto','-mcpu=thunderx2t99'], flags_part_number_thunderx2],
+       ['0xb2', ['-march=armv8.2-a+crc+crypto+lse','-mcpu=octeontx2'], flags_part_number_octeontx2]]
+
+part_number_config_emag = [
+       ['generic', ['-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_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 = ['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 ARMADA', flags_armada, machine_args_generic]
-impl_0x69 = ['Intel', flags_generic, machine_args_generic]
-impl_dpaa = ['NXP DPAA', flags_dpaa, machine_args_generic]
+implementer_generic = ['Generic armv8', flags_implementer_generic, part_number_config_arm]
+implementer_0x41 = ['Arm', flags_implementer_arm, part_number_config_arm]
+implementer_0x42 = ['Broadcom', flags_implementer_generic, part_number_config_arm]
+implementer_0x43 = ['Cavium', flags_implementer_cavium, part_number_config_cavium]
+implementer_0x44 = ['DEC', flags_implementer_generic, part_number_config_arm]
+implementer_0x49 = ['Infineon', flags_implementer_generic, part_number_config_arm]
+implementer_0x4d = ['Motorola', flags_implementer_generic, part_number_config_arm]
+implementer_0x4e = ['NVIDIA', flags_implementer_generic, part_number_config_arm]
+implementer_0x50 = ['Ampere Computing', flags_implementer_emag, part_number_config_emag]
+implementer_0x51 = ['Qualcomm', flags_implementer_generic, part_number_config_arm]
+implementer_0x53 = ['Samsung', flags_implementer_generic, part_number_config_arm]
+implementer_0x56 = ['Marvell ARMADA', flags_implementer_armada, part_number_config_arm]
+implementer_0x69 = ['Intel', flags_implementer_generic, part_number_config_arm]
+implementer_dpaa = ['NXP DPAA', flags_implementer_dpaa, part_number_config_arm]
 
 dpdk_conf.set('RTE_ARCH_ARM', 1)
 dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
@@ -153,13 +153,13 @@ else
        dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128)
        dpdk_conf.set('RTE_ARCH_ARM64', 1)
 
-       machine = []
-       cmd_generic = ['generic', '', '', 'default', '']
+       implementer_config = []
+       cmd_generic = ['generic', '', '', 'generic', '']
        cmd_output = cmd_generic # Set generic by default
        machine_args = [] # Clear previous machine args
        if arm_force_default_march and not meson.is_cross_build()
-               machine = impl_generic
-               impl_pn = 'default'
+               implementer_config = implementer_generic
+               part_number = 'generic'
        elif not meson.is_cross_build()
                # The script returns ['Implementer', 'Variant', 'Architecture',
                # 'Primary Part number', 'Revision']
@@ -170,45 +170,45 @@ 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[0] == 'generic'
-                       machine = impl_generic
+               implementer_config = get_variable('implementer_' + cmd_output[0], ['generic'])
+               if implementer_config[0] == 'generic'
+                       implementer_config = implementer_generic
                        cmd_output = cmd_generic
                endif
-               impl_pn = cmd_output[3]
+               part_number = cmd_output[3]
                if arm_force_native_march == true
-                       impl_pn = 'native'
+                       part_number = 'native'
                endif
        else
-               impl_id = meson.get_cross_property('implementor_id', 'generic')
-               impl_pn = meson.get_cross_property('implementor_pn', 'default')
-               machine = get_variable('impl_' + impl_id)
+               implementer_id = meson.get_cross_property('implementer_id', 'generic')
+               part_number = meson.get_cross_property('part_number', 'generic')
+               implementer_config = get_variable('implementer_' + implementer_id)
        endif
 
        # Apply Common Defaults. These settings may be overwritten by machine
        # settings later.
-       foreach flag: flags_common_default
+       foreach flag: flags_common
                if flag.length() > 0
                        dpdk_conf.set(flag[0], flag[1])
                endif
        endforeach
 
-       message('Implementer : ' + machine[0])
-       foreach flag: machine[1]
+       message('Implementer : ' + implementer_config[0])
+       foreach flag: implementer_config[1]
                if flag.length() > 0
                        dpdk_conf.set(flag[0], flag[1])
                endif
        endforeach
 
-       foreach marg: machine[2]
-               if marg[0] == impl_pn
+       foreach marg: implementer_config[2]
+               if marg[0] == part_number
                        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)
+                       foreach flag: marg.get(2, flags_part_number_default)
                                if flag.length() > 0
                                        dpdk_conf.set(flag[0], flag[1])
                                endif