From: <pbhagavatula@marvell.com>
To: <jerinj@marvell.com>, <juraj.linkes@pantheon.tech>, <nd@arm.com>,
"Ruifeng Wang" <ruifeng.wang@arm.com>,
Bruce Richardson <bruce.richardson@intel.com>
Cc: <dev@dpdk.org>, Pavan Nikhilesh <pbhagavatula@marvell.com>
Subject: [PATCH v3 1/3] config/arm: avoid mcpu and march conflicts
Date: Fri, 2 Feb 2024 14:20:29 +0530 [thread overview]
Message-ID: <20240202085031.10237-1-pbhagavatula@marvell.com> (raw)
In-Reply-To: <20240201215731.4543-1-pbhagavatula@marvell.com>
From: Pavan Nikhilesh <pbhagavatula@marvell.com>
The compiler options march and mtune are a subset
of mcpu and will lead to conflicts if improper march
is chosen for a given mcpu.
To avoid conflicts, force part number march when
mcpu is available and is supported by the compiler.
Example:
march = armv9-a
mcpu = neoverse-n2
mcpu supported, march supported
machine_args = ['-mcpu=neoverse-n2', '-march=armv9-a']
mcpu supported, march not supported
machine_args = ['-mcpu=neoverse-n2']
mcpu not supported, march supported
machine_args = ['-march=armv9-a']
mcpu not supported, march not supported
machine_args = ['-march=armv8.6-a']
Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
---
v2 Changes:
- Cleanup march inconsistencies. (Juraj Linkes)
- Unify fallback march selection. (Juraj Linkes)
- Tag along ARM WFE patch.
v3 Changes:
- Fix missing 'fallback_march' key check.
config/arm/meson.build | 108 +++++++++++++++++++++++++----------------
1 file changed, 66 insertions(+), 42 deletions(-)
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 36f21d22599a..ba859bd060b5 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -58,18 +58,18 @@ implementer_generic = {
}
part_number_config_arm = {
- '0xd03': {'compiler_options': ['-mcpu=cortex-a53']},
- '0xd04': {'compiler_options': ['-mcpu=cortex-a35']},
- '0xd05': {'compiler_options': ['-mcpu=cortex-a55']},
- '0xd07': {'compiler_options': ['-mcpu=cortex-a57']},
- '0xd08': {'compiler_options': ['-mcpu=cortex-a72']},
- '0xd09': {'compiler_options': ['-mcpu=cortex-a73']},
- '0xd0a': {'compiler_options': ['-mcpu=cortex-a75']},
- '0xd0b': {'compiler_options': ['-mcpu=cortex-a76']},
+ '0xd03': {'mcpu': 'cortex-a53'},
+ '0xd04': {'mcpu': 'cortex-a35'},
+ '0xd05': {'mcpu': 'cortex-a55'},
+ '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',
'march_features': ['crypto', 'rcpc'],
- 'compiler_options': ['-mcpu=neoverse-n1'],
+ 'mcpu': 'neoverse-n1',
'flags': [
['RTE_MACHINE', '"neoverse-n1"'],
['RTE_ARM_FEATURE_ATOMICS', true],
@@ -81,7 +81,7 @@ part_number_config_arm = {
'0xd40': {
'march': 'armv8.4-a',
'march_features': ['sve'],
- 'compiler_options': ['-mcpu=neoverse-v1'],
+ 'mcpu': 'neoverse-v1',
'flags': [
['RTE_MACHINE', '"neoverse-v1"'],
['RTE_ARM_FEATURE_ATOMICS', true],
@@ -92,8 +92,9 @@ part_number_config_arm = {
'march': 'armv8.4-a',
},
'0xd49': {
+ 'march': 'armv9-a',
'march_features': ['sve2'],
- 'compiler_options': ['-mcpu=neoverse-n2'],
+ 'mcpu': 'neoverse-n2',
'flags': [
['RTE_MACHINE', '"neoverse-n2"'],
['RTE_ARM_FEATURE_ATOMICS', true],
@@ -127,21 +128,23 @@ implementer_cavium = {
],
'part_number_config': {
'0xa1': {
- 'compiler_options': ['-mcpu=thunderxt88'],
+ 'mcpu': 'thunderxt88',
'flags': flags_part_number_thunderx
},
'0xa2': {
- 'compiler_options': ['-mcpu=thunderxt81'],
+ 'mcpu': 'thunderxt81',
'flags': flags_part_number_thunderx
},
'0xa3': {
- 'compiler_options': ['-march=armv8-a+crc', '-mcpu=thunderxt83'],
+ 'march': 'armv8-a',
+ 'march_features': ['crc'],
+ 'mcpu': 'thunderxt83',
'flags': flags_part_number_thunderx
},
'0xaf': {
'march': 'armv8.1-a',
'march_features': ['crc', 'crypto'],
- 'compiler_options': ['-mcpu=thunderx2t99'],
+ 'mcpu': 'thunderx2t99',
'flags': [
['RTE_MACHINE', '"thunderx2"'],
['RTE_ARM_FEATURE_ATOMICS', true],
@@ -153,7 +156,7 @@ implementer_cavium = {
'0xb2': {
'march': 'armv8.2-a',
'march_features': ['crc', 'crypto', 'lse'],
- 'compiler_options': ['-mcpu=octeontx2'],
+ 'mcpu': 'octeontx2',
'flags': [
['RTE_MACHINE', '"cn9k"'],
['RTE_ARM_FEATURE_ATOMICS', true],
@@ -176,7 +179,7 @@ implementer_ampere = {
'0x0': {
'march': 'armv8-a',
'march_features': ['crc', 'crypto'],
- 'compiler_options': ['-mtune=emag'],
+ 'mcpu': 'emag',
'flags': [
['RTE_MACHINE', '"eMAG"'],
['RTE_MAX_LCORE', 32],
@@ -186,7 +189,7 @@ implementer_ampere = {
'0xac3': {
'march': 'armv8.6-a',
'march_features': ['crc', 'crypto'],
- 'compiler_options': ['-mcpu=ampere1'],
+ 'mcpu': 'ampere1',
'flags': [
['RTE_MACHINE', '"AmpereOne"'],
['RTE_MAX_LCORE', 320],
@@ -206,7 +209,7 @@ implementer_hisilicon = {
'0xd01': {
'march': 'armv8.2-a',
'march_features': ['crypto'],
- 'compiler_options': ['-mtune=tsv110'],
+ 'mcpu': 'tsv110',
'flags': [
['RTE_MACHINE', '"Kunpeng 920"'],
['RTE_ARM_FEATURE_ATOMICS', true],
@@ -695,11 +698,21 @@ if update_flags
machine_args = [] # Clear previous machine args
+ candidate_mcpu = ''
+ if part_number_config.has_key('mcpu')
+ mcpu = part_number_config['mcpu']
+ if (cc.has_argument('-mcpu=' + mcpu))
+ candidate_mcpu = mcpu
+ endif
+ endif
+
# probe supported archs and their features
candidate_march = ''
if part_number_config.has_key('march')
- if part_number_config.get('force_march', false)
- candidate_march = part_number_config['march']
+ if part_number_config.get('force_march', false) or candidate_mcpu != ''
+ if cc.has_argument('-march=' + part_number_config['march'])
+ candidate_march = part_number_config['march']
+ endif
else
supported_marchs = ['armv8.6-a', 'armv8.5-a', 'armv8.4-a', 'armv8.3-a',
'armv8.2-a', 'armv8.1-a', 'armv8-a']
@@ -717,32 +730,43 @@ if update_flags
endif
endforeach
endif
- if candidate_march == ''
- error('No suitable armv8 march version found.')
- endif
+
if candidate_march != part_number_config['march']
- warning('Configuration march version is ' +
- '@0@, but the compiler supports only @1@.'
- .format(part_number_config['march'], candidate_march))
+ warning('Configuration march version is @0@, not supported.'
+ .format(part_number_config['march']))
+ if candidate_march != ''
+ warning('Using march version @0@.'.format(candidate_march))
+ endif
endif
- candidate_march = '-march=' + candidate_march
- march_features = []
- if part_number_config.has_key('march_features')
- march_features += part_number_config['march_features']
- endif
- if soc_config.has_key('extra_march_features')
- march_features += soc_config['extra_march_features']
+ if candidate_march == '' and candidate_mcpu == ''
+ error('No suitable ARM march/mcpu version found.')
endif
- foreach feature: march_features
- if cc.has_argument('+'.join([candidate_march, feature]))
- candidate_march = '+'.join([candidate_march, feature])
- else
- warning('The compiler does not support feature @0@'
- .format(feature))
+
+ if candidate_march != ''
+ candidate_march = '-march=' + candidate_march
+ march_features = []
+ if part_number_config.has_key('march_features')
+ march_features += part_number_config['march_features']
endif
- endforeach
- machine_args += candidate_march
+ if soc_config.has_key('extra_march_features')
+ march_features += soc_config['extra_march_features']
+ endif
+ foreach feature: march_features
+ if cc.has_argument('+'.join([candidate_march, feature]))
+ candidate_march = '+'.join([candidate_march, feature])
+ else
+ warning('The compiler does not support feature @0@'
+ .format(feature))
+ endif
+ endforeach
+ machine_args += candidate_march
+ endif
+ endif
+
+ if candidate_mcpu != ''
+ candidate_mcpu = '-mcpu=' + candidate_mcpu
+ machine_args += candidate_mcpu
endif
# apply supported compiler options
--
2.43.0
next prev parent reply other threads:[~2024-02-02 9:09 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-21 9:36 [PATCH 1/2] " pbhagavatula
2024-01-21 9:36 ` [PATCH 2/2] config/arm: add support for fallback march pbhagavatula
2024-01-22 6:30 ` Ruifeng Wang
2024-01-22 11:04 ` Juraj Linkeš
2024-01-22 12:16 ` [EXT] " Pavan Nikhilesh Bhagavatula
2024-01-22 16:29 ` Juraj Linkeš
2024-01-24 15:25 ` Pavan Nikhilesh Bhagavatula
2024-01-22 6:29 ` [PATCH 1/2] config/arm: avoid mcpu and march conflicts Ruifeng Wang
2024-01-22 10:55 ` Juraj Linkeš
2024-01-22 11:54 ` [EXT] " Pavan Nikhilesh Bhagavatula
2024-01-22 16:26 ` Juraj Linkeš
2024-01-24 15:21 ` Pavan Nikhilesh Bhagavatula
2024-01-29 8:44 ` Juraj Linkeš
2024-01-30 16:16 ` Pavan Nikhilesh Bhagavatula
2024-01-31 9:03 ` Juraj Linkeš
2024-02-01 21:57 ` [PATCH v2 1/3] " pbhagavatula
2024-02-01 21:57 ` [PATCH v2 2/3] config/arm: add support for fallback march pbhagavatula
2024-02-01 21:57 ` [PATCH v2 3/3] config/arm: allow WFE to be enabled config time pbhagavatula
2024-02-07 2:55 ` Honnappa Nagarahalli
2024-02-10 6:47 ` Pavan Nikhilesh Bhagavatula
2024-02-10 16:36 ` Honnappa Nagarahalli
2024-02-10 16:40 ` Pavan Nikhilesh Bhagavatula
2024-02-02 8:50 ` pbhagavatula [this message]
2024-02-02 8:50 ` [PATCH v3 2/3] config/arm: add support for fallback march pbhagavatula
2024-02-07 20:24 ` Wathsala Wathawana Vithanage
2024-02-02 8:50 ` [PATCH v3 3/3] config/arm: allow WFE to be enabled config time pbhagavatula
2024-02-10 16:56 ` Honnappa Nagarahalli
2024-02-12 19:21 ` Wathsala Wathawana Vithanage
2024-02-06 4:10 ` [PATCH v3 1/3] config/arm: avoid mcpu and march conflicts Wathsala Wathawana Vithanage
2024-02-06 4:44 ` Honnappa Nagarahalli
2024-02-06 10:21 ` Pavan Nikhilesh Bhagavatula
2024-02-07 0:01 ` Wathsala Wathawana Vithanage
2024-02-10 6:49 ` Pavan Nikhilesh Bhagavatula
2024-02-10 15:20 ` Honnappa Nagarahalli
2024-02-10 17:21 ` Honnappa Nagarahalli
2024-02-21 20:20 ` [PATCH v4 " pbhagavatula
2024-02-21 20:20 ` [PATCH v4 2/3] config/arm: add support for fallback march pbhagavatula
2024-02-22 10:47 ` Juraj Linkeš
2024-02-22 12:32 ` [EXT] " Pavan Nikhilesh Bhagavatula
2024-02-21 20:20 ` [PATCH v4 3/3] config/arm: allow WFE to be enabled config time pbhagavatula
2024-02-22 9:37 ` [PATCH v4 1/3] config/arm: avoid mcpu and march conflicts Juraj Linkeš
2024-02-22 9:49 ` [EXT] " Pavan Nikhilesh Bhagavatula
2024-02-22 12:45 ` [PATCH v5 " pbhagavatula
2024-02-22 12:45 ` [PATCH v5 2/3] config/arm: add support for fallback march pbhagavatula
2024-02-23 11:49 ` Juraj Linkeš
2024-02-26 7:11 ` [EXT] " Pavan Nikhilesh Bhagavatula
2024-02-26 7:31 ` Juraj Linkeš
2024-02-26 7:34 ` Juraj Linkeš
2024-02-22 12:45 ` [PATCH v5 3/3] config/arm: allow WFE to be enabled config time pbhagavatula
2024-02-23 11:19 ` [PATCH v5 1/3] config/arm: avoid mcpu and march conflicts Juraj Linkeš
2024-02-26 7:08 ` [EXT] " Pavan Nikhilesh Bhagavatula
2024-02-26 7:38 ` [PATCH v6 " pbhagavatula
2024-02-26 7:38 ` [PATCH v6 2/3] config/arm: add support for fallback march pbhagavatula
2024-02-26 7:38 ` [PATCH v6 3/3] config/arm: allow WFE to be enabled config time pbhagavatula
2024-03-06 15:49 ` [PATCH v7 1/3] config/arm: avoid mcpu and march conflicts pbhagavatula
2024-03-06 15:49 ` [PATCH v7 2/3] config/arm: add support for fallback march pbhagavatula
2024-03-06 15:49 ` [PATCH v7 3/3] config/arm: allow WFE to be enabled config time pbhagavatula
2024-03-07 3:57 ` [PATCH v7 1/3] config/arm: avoid mcpu and march conflicts Pavan Nikhilesh Bhagavatula
2024-03-14 11:38 ` [PATCH v8 1/5] " pbhagavatula
2024-03-14 11:38 ` [PATCH v8 2/5] config/arm: add armv9-a march support pbhagavatula
2024-03-14 11:38 ` [PATCH v8 3/5] config/arm: add crypto march feature to thunderxt83 pbhagavatula
2024-03-14 12:00 ` Jerin Jacob
2024-03-14 11:38 ` [PATCH v8 4/5] config/arm: add support for fallback march pbhagavatula
2024-03-14 11:38 ` [PATCH v8 5/5] config/arm: allow WFE to be enabled config time pbhagavatula
2024-03-15 11:17 ` [PATCH v8 1/5] config/arm: avoid mcpu and march conflicts Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240202085031.10237-1-pbhagavatula@marvell.com \
--to=pbhagavatula@marvell.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=jerinj@marvell.com \
--cc=juraj.linkes@pantheon.tech \
--cc=nd@arm.com \
--cc=ruifeng.wang@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).