git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sched: remove vector functions
[dpdk.git]
/
config
/
arm
/
meson.build
diff --git
a/config/arm/meson.build
b/config/arm/meson.build
index
213324d
..
8aead74
100644
(file)
--- a/
config/arm/meson.build
+++ b/
config/arm/meson.build
@@
-17,7
+17,6
@@
flags_common = [
# ['RTE_ARM64_MEMCPY_ALIGN_MASK', 0xF],
# ['RTE_ARM64_MEMCPY_STRICT_ALIGN', false],
# ['RTE_ARM64_MEMCPY_ALIGN_MASK', 0xF],
# ['RTE_ARM64_MEMCPY_STRICT_ALIGN', false],
- ['RTE_SCHED_VECTOR', false],
['RTE_ARM_USE_WFE', false],
['RTE_ARCH_ARM64', true],
['RTE_CACHE_LINE_SIZE', 128]
['RTE_ARM_USE_WFE', false],
['RTE_ARCH_ARM64', true],
['RTE_CACHE_LINE_SIZE', 128]
@@
-49,6
+48,7
@@
implementer_generic = {
['RTE_ARCH_ARM_NEON_MEMCPY', false],
['RTE_ARCH_STRICT_ALIGN', true],
['RTE_ARCH_ARMv8_AARCH32', true],
['RTE_ARCH_ARM_NEON_MEMCPY', false],
['RTE_ARCH_STRICT_ALIGN', true],
['RTE_ARCH_ARMv8_AARCH32', true],
+ ['RTE_ARCH', 'armv8_aarch32'],
['RTE_CACHE_LINE_SIZE', 64]
]
}
['RTE_CACHE_LINE_SIZE', 64]
]
}
@@
-139,7
+139,7
@@
implementer_cavium = {
'march_features': ['crc', 'crypto', 'lse'],
'compiler_options': ['-mcpu=octeontx2'],
'flags': [
'march_features': ['crc', 'crypto', 'lse'],
'compiler_options': ['-mcpu=octeontx2'],
'flags': [
- ['RTE_MACHINE', '"
octeontx2
"'],
+ ['RTE_MACHINE', '"
cn9k
"'],
['RTE_ARM_FEATURE_ATOMICS', true],
['RTE_USE_C11_MEM_MODEL', true],
['RTE_MAX_LCORE', 36],
['RTE_ARM_FEATURE_ATOMICS', true],
['RTE_USE_C11_MEM_MODEL', true],
['RTE_MAX_LCORE', 36],
@@
-276,7
+276,8
@@
soc_cn10k = {
'implementer' : '0x41',
'flags': [
['RTE_MAX_LCORE', 24],
'implementer' : '0x41',
'flags': [
['RTE_MAX_LCORE', 24],
- ['RTE_MAX_NUMA_NODES', 1]
+ ['RTE_MAX_NUMA_NODES', 1],
+ ['RTE_MEMPOOL_ALIGN', 128]
],
'part_number': '0xd49',
'extra_march_features': ['crypto'],
],
'part_number': '0xd49',
'extra_march_features': ['crypto'],
@@
-340,8
+341,8
@@
soc_n2 = {
'numa': false
}
'numa': false
}
-soc_
octeontx2
= {
- 'description': 'Marvell OCTEON
TX2
',
+soc_
cn9k
= {
+ 'description': 'Marvell OCTEON
9
',
'implementer': '0x43',
'part_number': '0xb2',
'numa': false
'implementer': '0x43',
'part_number': '0xb2',
'numa': false
@@
-377,6
+378,7
@@
generic_aarch32: Generic un-optimized build for armv8 aarch32 execution mode.
armada: Marvell ARMADA
bluefield: NVIDIA BlueField
centriq2400: Qualcomm Centriq 2400
armada: Marvell ARMADA
bluefield: NVIDIA BlueField
centriq2400: Qualcomm Centriq 2400
+cn9k: Marvell OCTEON 9
cn10k: Marvell OCTEON 10
dpaa: NXP DPAA
emag: Ampere eMAG
cn10k: Marvell OCTEON 10
dpaa: NXP DPAA
emag: Ampere eMAG
@@
-385,7
+387,6
@@
kunpeng920: HiSilicon Kunpeng 920
kunpeng930: HiSilicon Kunpeng 930
n1sdp: Arm Neoverse N1SDP
n2: Arm Neoverse N2
kunpeng930: HiSilicon Kunpeng 930
n1sdp: Arm Neoverse N1SDP
n2: Arm Neoverse N2
-octeontx2: Marvell OCTEON TX2
stingray: Broadcom Stingray
thunderx2: Marvell ThunderX2 T99
thunderxt88: Marvell ThunderX T88
stingray: Broadcom Stingray
thunderx2: Marvell ThunderX2 T99
thunderxt88: Marvell ThunderX T88
@@
-399,6
+400,7
@@
socs = {
'armada': soc_armada,
'bluefield': soc_bluefield,
'centriq2400': soc_centriq2400,
'armada': soc_armada,
'bluefield': soc_bluefield,
'centriq2400': soc_centriq2400,
+ 'cn9k': soc_cn9k,
'cn10k' : soc_cn10k,
'dpaa': soc_dpaa,
'emag': soc_emag,
'cn10k' : soc_cn10k,
'dpaa': soc_dpaa,
'emag': soc_emag,
@@
-407,7
+409,6
@@
socs = {
'kunpeng930': soc_kunpeng930,
'n1sdp': soc_n1sdp,
'n2': soc_n2,
'kunpeng930': soc_kunpeng930,
'n1sdp': soc_n1sdp,
'n2': soc_n2,
- 'octeontx2': soc_octeontx2,
'stingray': soc_stingray,
'thunderx2': soc_thunderx2,
'thunderxt88': soc_thunderxt88
'stingray': soc_stingray,
'thunderx2': soc_thunderx2,
'thunderxt88': soc_thunderxt88
@@
-432,11
+433,15
@@
if dpdk_conf.get('RTE_ARCH_32')
else
# armv7 build
dpdk_conf.set('RTE_ARCH_ARMv7', true)
else
# armv7 build
dpdk_conf.set('RTE_ARCH_ARMv7', true)
+ dpdk_conf.set('RTE_ARCH', 'armv7')
+ dpdk_conf.set('RTE_MAX_LCORE', 128)
+ dpdk_conf.set('RTE_MAX_NUMA_NODES', 1)
# the minimum architecture supported, armv7-a, needs the following,
machine_args += '-mfpu=neon'
endif
else
# armv8 build
# the minimum architecture supported, armv7-a, needs the following,
machine_args += '-mfpu=neon'
endif
else
# armv8 build
+ dpdk_conf.set('RTE_ARCH', 'armv8')
update_flags = true
soc_config = {}
if not meson.is_cross_build()
update_flags = true
soc_config = {}
if not meson.is_cross_build()
@@
-460,7
+465,7
@@
else
# 'Primary Part number', 'Revision']
detect_vendor = find_program(join_paths(meson.current_source_dir(),
'armv8_machine.py'))
# 'Primary Part number', 'Revision']
detect_vendor = find_program(join_paths(meson.current_source_dir(),
'armv8_machine.py'))
- cmd = run_command(detect_vendor.path())
+ cmd = run_command(detect_vendor.path()
, check: false
)
if cmd.returncode() == 0
cmd_output = cmd.stdout().to_lower().strip().split(' ')
implementer_id = cmd_output[0]
if cmd.returncode() == 0
cmd_output = cmd.stdout().to_lower().strip().split(' ')
implementer_id = cmd_output[0]