X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=config%2Fppc%2Fmeson.build;h=aa1327a595011639dc058bbdd01bade700470b60;hb=2a6d9fa8bce4a6c32dfd06c504104f579b76314c;hp=0d8da87e6fce58d8b7257badbe031b7a6c5d846a;hpb=84fb33fec179ea96f814aed9f658d5a2df20745d;p=dpdk.git

diff --git a/config/ppc/meson.build b/config/ppc/meson.build
index 0d8da87e6f..aa1327a595 100644
--- a/config/ppc/meson.build
+++ b/config/ppc/meson.build
@@ -1,8 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
+# Copyright(c) 2021 IBM Corporation
 
 if not dpdk_conf.get('RTE_ARCH_64')
-	error('Only 64-bit compiles are supported for this platform type')
+    error('Only 64-bit compiles are supported for this platform type')
 endif
 dpdk_conf.set('RTE_ARCH', 'ppc_64')
 dpdk_conf.set('RTE_ARCH_PPC_64', 1)
@@ -12,12 +13,30 @@ dpdk_conf.set('RTE_ARCH_PPC_64', 1)
 # is used, resulting in a build failure.
 power9_supported = cc.has_argument('-mcpu=power9')
 if not power9_supported
-	machine = 'power8'
-	machine_args = ['-mcpu=power8', '-mtune=power8']
-	dpdk_conf.set('RTE_MACHINE','power8')
+    cpu_instruction_set = 'power8'
+    machine_args = ['-mcpu=power8', '-mtune=power8']
+    dpdk_conf.set('RTE_MACHINE','power8')
 endif
 
-# overrides specific to ppc64
-dpdk_conf.set('RTE_MAX_LCORE', 1536)
-dpdk_conf.set('RTE_MAX_NUMA_NODES', 32)
+# Suppress the gcc warning "note: the layout of aggregates containing
+# vectors with 4-byte alignment has changed in GCC 5".
+if (cc.get_id() == 'gcc' and cc.version().version_compare('>=10.0') and
+        cc.version().version_compare('<12.0') and cc.has_argument('-Wno-psabi'))
+    add_project_arguments('-Wno-psabi', language: 'c')
+endif
+
+# Certain POWER9 systems can scale as high as 1536 LCORES, but setting such a
+# high value can waste memory, cause timeouts in time limited autotests, and is
+# unlikely to be used in many production situations.  Similarly, keeping the
+# default 64 LCORES seems too small as most POWER9 dual socket systems will have
+# at least 128 LCORES available.  Set RTE_MAX_LCORE to 128 for POWER systems as
+# a compromise.
+dpdk_conf.set('RTE_MAX_LCORE', 128)
+
+# POWER systems do not allocate NUMA nodes sequentially.  A dual socket system
+# will have CPUs associated with NUMA nodes 0 & 8, so ensure that the second
+# NUMA node will be supported by setting RTE_MAX_NUMA_NODES to 16. High end
+# systems can scale even higher with as many as 32 NUMA nodes.
+dpdk_conf.set('RTE_MAX_NUMA_NODES', 16)
+
 dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128)