From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0043.outbound.protection.outlook.com [104.47.34.43]) by dpdk.org (Postfix) with ESMTP id 681A54B4B for ; Mon, 22 Jan 2018 12:47:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Ah5qXeYvs9qwSY4iJYHA94ZcAjclDfrtilU8LDKyFmw=; b=fFCfyV5YdT/9Qj4CNwRQwkmflDqJ5uPge73CJykzpMz1Innsg4M+TJvDBzpoKKwWl5EnG+bDWSgdvWsYRMvlLxyF7lBDaTldiw83d5udSqwJ6SZ/luLdvV8ymx17PPnUvb0IQUGp8YqxtVeW8JlBaB0urylq8TEM91VGEh/MSvk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavan.Bhagavatula@cavium.com; Received: from localhost.localdomain (111.93.218.67) by CY4PR07MB3464.namprd07.prod.outlook.com (10.171.252.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Mon, 22 Jan 2018 11:47:49 +0000 From: Pavan Nikhilesh To: jerin.jacob@caviumnetworks.com, bruce.richardson@intel.com, harry.van.haaren@intel.com, herbert.guan@arm.com, hemant.agrawal@nxp.com Cc: dev@dpdk.org, Pavan Nikhilesh Date: Mon, 22 Jan 2018 17:16:49 +0530 Message-Id: <20180122114649.5907-2-pbhagavatula@caviumnetworks.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180122114649.5907-1-pbhagavatula@caviumnetworks.com> References: <20171219105338.198727-1-bruce.richardson@intel.com> <20180122114649.5907-1-pbhagavatula@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: SG2PR0302CA0011.apcprd03.prod.outlook.com (10.170.129.21) To CY4PR07MB3464.namprd07.prod.outlook.com (10.171.252.145) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f9ec61f9-b340-43f9-cd3a-08d5618df7b9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:CY4PR07MB3464; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3464; 3:9Na7RCF3uNy/H/Ie8mDjPV/niMmAPOblkOK/bPU9su7D0z4v2Nlk4A6PpSvVLTlLjOap9gNINtXwPkW2oqLOSK23P3O9DPSY61s0S2Vry5boIDR3hbiIy7e8wBzW9nwftGQp6OSUlWs2rhnRKDLqYb1r6wbrAEg+W0rycgDnz3GFnRAICv3quoxB8tkSgLvjFgxSFN/rQgrQpvUoY7pwBAMi4MvCMC6inv2/RQjv5epBzVMcNPKycK3hLzsqhPxS; 25:0qJ13sNGrATLmT9RNO054uzqLcz8YlW4v1wH9N5o+nCJlSrz4ewJijTFuG8dYNX5K0Bsprju/9/reqmCfIOe2ldah6XgXVfiY8RulTRWQaqe0p6F+yQp08fRu+xXs7SnDtTBR6HhsF0ty1k6vK8SveOREVsSPrb8qRIDahSXKBoYNEUPVqE266S494nU3q/T9CN4u5pi21Dn5oUJxurcrautIUH5S1tv1ygJZI5AsOL0NhAtALymInd5F+VPwESKw35SAMJD1UbhOAHd4+KmDZcmi4FvpoLpkf7z68vWzf7AtvglRTx4BrOjQemrDmhYdo4K1sJDoHVQ1iL+bZrEOw==; 31:mSMqKSOAcHv+aFz6MsSUu8WP+62DI54kZKbDQ9IYnsN4Uf3gNjjPKtpHn7M9aZYQqWNRyUc1N7C8bnKT+sMAjdz/NxFu2g+NsD8GEh/21GrKxy0elM9sll+jtZjHeOSKFmZyGB4bov5jJPfHB+hRh3ypLiY5yLYXmHCzoTud6jSCrIlUyPMnqiUtYo34jmL1iYoJvTYhuATmBE6sNtueHX3JEBt8rVHUj5BzDWOrmlI= X-MS-TrafficTypeDiagnostic: CY4PR07MB3464: X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3464; 20:G+cTn9e/s7T032Lta+YIbiz6Zaq7ncEck5YekwbWu2FkjRxP1jTi0ub1QJi+PjnkbikAPMS+P1En769tAl9SCWIYv1BCp8sNkrwYqgI7O7zZjK34VSNK5hAFHWlAI7G+QQbFATtLeKBThyAri1RpmUyF6LzB2nE+o8pm+yYA4ya/8+darXHa0DS+FCW9hdBIApbTeHg0l2dKHVFEq5ixJiWkn6L1WD6tN1isbVKjmb4eECSg4EEtI5vnLZiTEnN3lzfPCLf4l6mr0S8tF9tT4QiaJQrFOAAarRQzr2iKdOQ8TwxuVnydK1Q16GqhMaapC9Y0+qIHdPqGtgUcSG9fs7cEOzbpi9mjEjoDuH6GYCNPCjmsbg1ifiHwZXfquQxRCJEehGc5nIRSb4X19Cgi43iFaGmjwJIGJjg42J09yAXNEZ6q10I/vu00FDxXbZ6DQvktSIeM31cjYPysDxgBzfcCcHKYu/JKbiRFLai4/3qO0Wgc0WQgBR6UEzhkk8CZ3CUVwUDxcC6hrL7DRzJbzB9t1Y7pSTkWek72a164l1D7atYob0t6SfHERtYwBXVU7ft7qklLEuB+7y7wEGQgmzIDtq5sm/vVwR/MofAjP1c=; 4:v/sF//j3YRmGJ1wSCMQiWlx5YwFd/wqBpzK+KM8RkfWR29+FCWnsU88gH2nz8g8IaIbcwFIsDEC18I5ZGqj0c0Aa60wD6xnFZZ7rKRl6Pi0Hjxo322JMqC1ZkOY8o7u3bQFphE+0EacplQgS5174E+DTcIrHw5RIkXXfk6HMV1kFJvBnE3fNWxPCa23hWO6TQVwqh94vl+4U7pxhPHuuC6Zuf2OGOrrevN+EZ1vXS5rmICGlAZ6Fg/nxM2iOXK5FY2LHgbLeza9fOrSKr0VFIw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(3231023)(2400081)(944501161)(6041288)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:CY4PR07MB3464; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:CY4PR07MB3464; X-Forefront-PRVS: 0560A2214D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(346002)(376002)(39850400004)(366004)(39380400002)(396003)(199004)(189003)(106356001)(47776003)(66066001)(7736002)(6116002)(8676002)(81156014)(3846002)(26005)(6486002)(2906002)(8936002)(5009440100003)(50226002)(1076002)(575784001)(25786009)(305945005)(81166006)(68736007)(53936002)(36756003)(107886003)(6512007)(4326008)(2950100002)(8656006)(42882006)(48376002)(72206003)(52116002)(16526018)(97736004)(76176011)(51416003)(50466002)(59450400001)(386003)(6506007)(316002)(105586002)(478600001)(16586007)(5660300001)(42262002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3464; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR07MB3464; 23:/5G8GOp1Zq9r553xZA70eCn3QVdeGxk55lTVJncTB?= =?us-ascii?Q?SzBElf2M9H+u5BO9gn3xIQliUrGejoaeJ4FT1qIb0XIHYZlzUC6Jh/dnn3Bj?= =?us-ascii?Q?PiMYcA9ftI0kw0rnCc+jBEdphnshre2b/4BHw39NVn2tzBpYKFNQKQRbc2HW?= =?us-ascii?Q?ZFrh1aJd6gYP4m0uWnMVXfNhOQWuMt0nNlo7L0JjwaY/LvgYS0YBUKaGvA5Y?= =?us-ascii?Q?5WBjEPR9IohKz4FDmd6gXh3nkSJn1vQS+B8Nr17bG3bHMJYsosI58+9/S8Dp?= =?us-ascii?Q?G8O9zvDF/jBX/kQx14CXmjMHCFrv2W5Ph5mVfmxkci4ppijSN3a9/kvkrAE+?= =?us-ascii?Q?eRNfMM9WS/9wTTGb1ofxIlqtWXIG0ckOzMBHwL3dMmBEctG1oq6Yb1wmzYSa?= =?us-ascii?Q?FE/eI73vUI/8LrNvDj6M1GUutwW3NBFjnqQ6z6VAFGQeRRyFL/Nu6mHRMhlH?= =?us-ascii?Q?dKBXG6/wrl4/h3OzyuVtT1loCm+u9WaBRZbA/N49GturLGZX6O18vktSasXV?= =?us-ascii?Q?yWxd6Jlj4nZUbcED3cYNCrFOwD5aVueqhimeGBzFxEQk01xpGTBEUWcdOMSU?= =?us-ascii?Q?RdBCASXF9ctUcs2XB4ktLasDRZApkYzPV5cWX87CFrZWGHTH/Da41rnTXGbV?= =?us-ascii?Q?VBD0iVXEi5i+if+lnI1GVSYO8lqa5xPv79hzqUBEzfBL5U+uYPfb6M1agKh4?= =?us-ascii?Q?OhGMMuBeZqxt5aVtMCaxQfXrUfZ11bMYhg+SfalNHUsF18cp7itS8UYTZqPI?= =?us-ascii?Q?Q72OoZeMYtj+VmtQXJC6CWCt87KsYF7wodQrw2X103wscq6bGvUolGQulqGH?= =?us-ascii?Q?FPO4CjP3SjtcpPSPaR3xcMssFh7zTIPrczhpH5q8wfVHkkNRzWpvEMCPp4aC?= =?us-ascii?Q?KVWBxKGlO6EsjdFJbGOhDFCRa7eZyN0uGTa9NdBEutptO2mJ9z/72GsJJTXK?= =?us-ascii?Q?SVGhVmYvLXfXaoj1grnPf4ldbXYjgG85CX1pt0zIIJPgbeGF/YRwDDTiNtZf?= =?us-ascii?Q?ipn1JhNPTs4Sjnwbh1z0ACFqp95odqQU5NbaRqAsgcxSNA2JafeByL/9QnZ8?= =?us-ascii?Q?TpjGd+4Qk0Bkqa3dU2IPrKhLPdRdPcCLvFGpbwN1AVdiByVeAVqKQCS5wIgB?= =?us-ascii?Q?DwmDkjo/zMLIfuyfMhCjbz6tr+Dn7gldtT8DyyIHUnU476Ez1cMglYIgpak4?= =?us-ascii?Q?5xUlMQyw23EMoXusVrMT9fIQabybKyk2mvzb/H39j5kz0+AmiBV0+HAvmCWf?= =?us-ascii?Q?imGfxpciOcx43egNqI=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3464; 6:vcjqVUk06Cd+jhiUOll3qhiRPRdHS/PxAwIAA55m6s0vVS3t5G3cmSOmrJ83m5VQcN94TnI6e6sqPW3ndLOQLPTClbl/j06aX9CXGVPEqGTK9rJ8MydFWdmzoicgMVj+E7eLeXeCDovax7kydffMkSjNXYIOHz3U0rkko4m8dOWNN//26P8iVn7zAwrdEyTus1SvoJuHVoKdPnapLCG9E+fIMXcRslxynn8SQvv+dW7D01XukbfMLkyy6amsDlO/FP2wcFp5xNHzYC8mJq2xSFxYyqmd2vz7xH5/NvK7MKCukgYRqtk6f57MLzYtPpwXPpgPtkzz/hDaTgVgqnhEOxrT8QzNHwEC8Z+GLSiUVeI=; 5:9PwNnsdhpRy1kljXPwmMMseJHzGr7pMZj1J9axku76NtAXAVGRS6ZdO/W+x2yIG8o5NpsZ1PELK0Wu0PZAL3eO8l5qY+Lb5E1eS8NQzpJCJQ6POVqnRU62vUNEL7MrS1Pvi4Kho9+8Xdk8JC24q+TG9Hw1siIKzuktSpKctXVm8=; 24:lWHgltTw+FnPDfYbrm5RbKZy15f9gUOv0vPBtuw0Wi2XDl5Hz5r3l1/paphTeZ0Bl6etMRiZdp92RX+W2Y7TMAllWaF8O2k318hvu9m3Cis=; 7:kXmYl3kBdMBRvEzCN57/72+tjYklOV1YU8Ap2QnfhdfornXaoagInLtQ5+EWmEcLEJK9GO5hjYbfLdCfSnO/lQoPZP9YaC0RbCKUSMagctZLXrogQwJwVTKdrM+ucQxwTrjWB3izE2T7Oh5FASAet7N4vG8wnh6MsUTmZBeTS/Q16jlASJchsMELKPu2O/rzmZWWavXxm/7bD2Od0E6eez/A6tWlmeCXc8iJhCU4aCJXlWOBad+Aww9Zn5Z8j+sh SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2018 11:47:49.2537 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f9ec61f9-b340-43f9-cd3a-08d5618df7b9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR07MB3464 Subject: [dpdk-dev] [PATCH v5 2/2] build: add support for detecting march on ARM X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jan 2018 11:47:54 -0000 Added support for detecting march and mcpu by reading midr_el1 register. The implementer, primary part number values read can be used to figure out the underlying arm cpu. Signed-off-by: Pavan Nikhilesh --- app/test-pmd/meson.build | 2 +- config/arm/armv8_machine.py | 18 +++++++++ config/arm/meson.build | 95 +++++++++++++++++++++++++++++++++++++++++---- config/meson.build | 19 ++++----- drivers/meson.build | 2 +- examples/meson.build | 2 +- lib/meson.build | 2 +- meson.build | 2 +- test/test/meson.build | 2 +- 9 files changed, 121 insertions(+), 23 deletions(-) create mode 100755 config/arm/armv8_machine.py diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index e819677a5..2a3f0ba1f 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -45,7 +45,7 @@ endif executable('dpdk-testpmd', sources, - c_args: machine_arg, + c_args: machine_args, link_whole: link_libs, dependencies: dep_objs, install_rpath: join_paths(get_option('prefix'), driver_install_path), diff --git a/config/arm/armv8_machine.py b/config/arm/armv8_machine.py new file mode 100755 index 000000000..404866d2f --- /dev/null +++ b/config/arm/armv8_machine.py @@ -0,0 +1,18 @@ +#!/usr/bin/python +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2017 Cavium, Inc + +ident = [] +fname = '/sys/devices/system/cpu/cpu0/regs/identification/midr_el1' +with open(fname) as f: + content = f.read() + +midr_el1 = (int(content.rstrip('\n'), 16)) + +ident.append(hex((midr_el1 >> 24) & 0xFF)) # Implementer +ident.append(hex((midr_el1 >> 20) & 0xF)) # Variant +ident.append(hex((midr_el1 >> 16) & 0XF)) # Architecture +ident.append(hex((midr_el1 >> 4) & 0xFFF)) # Primary Part number +ident.append(hex(midr_el1 & 0xF)) # Revision + +print(' '.join(ident)) diff --git a/config/arm/meson.build b/config/arm/meson.build index f05de4c2c..212b94499 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -5,28 +5,107 @@ # for checking defines we need to use the correct compiler flags march_opt = '-march=@0@'.format(machine) -dpdk_conf.set('RTE_FORCE_INTRINSICS', 1) -if cc.sizeof('void *') == 8 - dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128) - dpdk_conf.set('RTE_ARCH_ARM64', 1) - dpdk_conf.set('RTE_ARCH_64', 1) +machine_args_generic = [ + ['default', ['-march=armv8-a+crc+crypto']]] +machine_args_cavium = [ + ['default', ['-march=armv8-a+crc+crypto','-mcpu=thunderx']], + ['0xa1', ['-mcpu=thunderxt88']], + ['0xa2', ['-mcpu=thunderxt81']], + ['0xa3', ['-mcpu=thunderxt83']]] + +flags_generic = [[]] +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]] + +impl_generic = ['Generic armv8', flags_generic, machine_args_generic] +impl_0x43 = ['Cavium', flags_cavium, machine_args_cavium] + +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 + +dpdk_conf.set('RTE_FORCE_INTRINSICS', 1) + +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) +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() + # The script returns ['Implementer', 'Variant', 'Architecture', + # 'Primary Part number', 'Revision'] + detect_vendor = find_program(join_paths( + meson.current_source_dir(), 'armv8_machine.py')) + cmd = run_command(detect_vendor.path()) + if cmd.returncode() == 0 + cmd_output = cmd.stdout().strip().split(' ') + endif + # Set to generic if variable is not found + machine = get_variable('impl_' + cmd_output[0], 'generic') + endif + + if machine == 'generic' + machine = impl_generic + cmd_output = cmd_generic + endif + + message('Implementer : ' + machine[0]) + foreach flag: machine[1] + if flag.length() > 0 + 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 + foreach marg: machine[2] + if marg[0] == 'default' + foreach f: marg[1] + machine_args += f + endforeach + endif + endforeach + else + foreach marg: machine[2] + if marg[0] == cmd_output[3] + foreach f: marg[1] + machine_args += f + endforeach + endif + endforeach + endif endif +message(machine_args) -if cc.get_define('__ARM_NEON', args: march_opt) != '' +if cc.get_define('__ARM_NEON', args: machine_args) != '' dpdk_conf.set('RTE_MACHINE_CPUFLAG_NEON', 1) compile_time_cpuflags += ['RTE_CPUFLAG_NEON'] endif -if cc.get_define('__ARM_FEATURE_CRC32', args: march_opt) != '' +if cc.get_define('__ARM_FEATURE_CRC32', args: machine_args) != '' dpdk_conf.set('RTE_MACHINE_CPUFLAG_CRC32', 1) compile_time_cpuflags += ['RTE_CPUFLAG_CRC32'] endif -if cc.get_define('__ARM_FEATURE_CRYPTO', args: march_opt) != '' +if cc.get_define('__ARM_FEATURE_CRYPTO', args: machine_args) != '' dpdk_conf.set('RTE_MACHINE_CPUFLAG_AES', 1) dpdk_conf.set('RTE_MACHINE_CPUFLAG_PMULL', 1) dpdk_conf.set('RTE_MACHINE_CPUFLAG_SHA1', 1) diff --git a/config/meson.build b/config/meson.build index fa55c53a5..f8c67578d 100644 --- a/config/meson.build +++ b/config/meson.build @@ -8,7 +8,8 @@ else machine = get_option('machine') endif dpdk_conf.set('RTE_MACHINE', machine) -machine_arg = '-march=' + machine +machine_args = [] +machine_args += '-march=' + machine # use pthreads add_project_link_arguments('-pthread', language: 'c') @@ -53,6 +54,14 @@ foreach arg: warning_flags endif endforeach +# set other values pulled from the build options +dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores')) +dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes')) +dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet')) +dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id')) +# values which have defaults which may be overridden +dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64) + compile_time_cpuflags = [] if host_machine.cpu_family().startswith('x86') arch_subdir = 'x86' @@ -65,12 +74,4 @@ dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags)) # set the install path for the drivers dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path) -# set other values pulled from the build options -dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores')) -dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes')) -dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet')) -dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id')) -# values which have defaults which may be overridden -dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64) - install_headers('rte_config.h', subdir: get_option('include_subdir_arch')) diff --git a/drivers/meson.build b/drivers/meson.build index 9b5039847..1d6430bfe 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -22,7 +22,7 @@ foreach class:driver_classes version = 1 sources = [] objs = [] - cflags = [machine_arg] + cflags = machine_args includes = [include_directories(drv_path)] # set up internal deps. Drivers can append/override as necessary deps = std_deps diff --git a/examples/meson.build b/examples/meson.build index 0abed7169..b3f997242 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -9,7 +9,7 @@ endif foreach example: get_option('examples').split(',') name = example sources = [] - cflags = [machine_arg] + cflags = machine_args ext_deps = [] includes = [include_directories(example)] deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline'] diff --git a/lib/meson.build b/lib/meson.build index 0c94d74b9..b9ea6f61b 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -31,7 +31,7 @@ foreach l:libraries sources = [] headers = [] includes = [] - cflags = [machine_arg] + cflags = machine_args objs = [] # other object files to link against, used e.g. for # instruction-set optimized versions of code diff --git a/meson.build b/meson.build index 3dce8579e..326fbc7d1 100644 --- a/meson.build +++ b/meson.build @@ -66,5 +66,5 @@ pkg.generate(name: meson.project_name(), ['-Wl,-Bdynamic'] + dpdk_extra_ldflags, description: 'The Data Plane Development Kit (DPDK)', subdirs: [get_option('include_subdir_arch'), '.'], - extra_cflags: ['-include "rte_config.h"', machine_arg] + extra_cflags: ['-include "rte_config.h"'] + machine_args ) diff --git a/test/test/meson.build b/test/test/meson.build index 1863c603c..873efbc07 100644 --- a/test/test/meson.build +++ b/test/test/meson.build @@ -204,7 +204,7 @@ if get_option('tests') test_sources, link_whole: link_libs, dependencies: test_dep_objs, - c_args: machine_arg, + c_args: machine_args, install_rpath: driver_install_path, install: false) -- 2.16.0