mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-25 09:02:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

code_size_compare.py: fix make command logic in default config

Browse Source 
If system architecture doesn't match architecture of input argument
for default configuration, it's reported as an error.

Additionally, it prints out help message to show which architecture
and configuration option should be used.

Signed-off-by: Yanray Wang <yanray.wang@arm.com>
This commit is contained in:
Yanray Wang 2023-06-01 11:29:06 +08:00
parent 502c54f8c1
commit 21f1744d76
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/code_size_compare.py
View File

@ -77,7 +77,7 @@ class CodeSizeInfo: # pylint: disable=too-few-public-methods
"-a " + SupportedArch.ARMV8_M.value + " -c " + SupportedConfig.TFM_MEDIUM.value, "-a " + SupportedArch.ARMV8_M.value + " -c " + SupportedConfig.TFM_MEDIUM.value,
] ]
def __init__(self, arch: str, config: str) -> None: def __init__(self, arch: str, config: str, sys_arch: str) -> None:
""" """
arch: architecture to measure code size on. arch: architecture to measure code size on.
config: configuration type to measure code size with. config: configuration type to measure code size with.
@ -85,12 +85,14 @@ class CodeSizeInfo: # pylint: disable=too-few-public-methods
""" """
self.arch = arch self.arch = arch
self.config = config self.config = config
self.sys_arch = sys_arch
self.make_command = self.set_make_command() self.make_command = self.set_make_command()
def set_make_command(self) -> str: def set_make_command(self) -> str:
"""Infer build command based on architecture and configuration.""" """Infer build command based on architecture and configuration."""
if self.config == SupportedConfig.DEFAULT.value: if self.config == SupportedConfig.DEFAULT.value and \
self.arch == self.sys_arch:
return 'make -j lib CFLAGS=\'-Os \' ' return 'make -j lib CFLAGS=\'-Os \' '
elif self.arch == SupportedArch.ARMV8_M.value and \ elif self.arch == SupportedArch.ARMV8_M.value and \
self.config == SupportedConfig.TFM_MEDIUM.value: self.config == SupportedConfig.TFM_MEDIUM.value:
@ -100,11 +102,16 @@ class CodeSizeInfo: # pylint: disable=too-few-public-methods
-DMBEDTLS_CONFIG_FILE=\\\"' + CONFIG_TFM_MEDIUM_MBEDCRYPTO_H + '\\\" \ -DMBEDTLS_CONFIG_FILE=\\\"' + CONFIG_TFM_MEDIUM_MBEDCRYPTO_H + '\\\" \
-DMBEDTLS_PSA_CRYPTO_CONFIG_FILE=\\\"' + CONFIG_TFM_MEDIUM_PSA_CRYPTO_H + '\\\" \'' -DMBEDTLS_PSA_CRYPTO_CONFIG_FILE=\\\"' + CONFIG_TFM_MEDIUM_PSA_CRYPTO_H + '\\\" \''
else: else:
print("Unsupported architecture: {} and configurations: {}" print("Unsupported combination of architecture: {} and configuration: {}"
.format(self.arch, self.config)) .format(self.arch, self.config))
print("\nPlease use supported combination of architecture and configuration:") print("\nPlease use supported combination of architecture and configuration:")
for comb in CodeSizeInfo.SupportedArchConfig: for comb in CodeSizeInfo.SupportedArchConfig:
print(comb) print(comb)
print("\nFor your system, please use:")
for comb in CodeSizeInfo.SupportedArchConfig:
if "default" in comb and self.sys_arch not in comb:
continue
print(comb)
sys.exit(1) sys.exit(1)
@ -320,7 +327,8 @@ def main():
else: else:
new_revision = "current" new_revision = "current"
code_size_info = CodeSizeInfo(comp_args.arch, comp_args.config) code_size_info = CodeSizeInfo(comp_args.arch, comp_args.config,
detect_arch())
print("Measure code size for architecture: {}, configuration: {}" print("Measure code size for architecture: {}, configuration: {}"
.format(code_size_info.arch, code_size_info.config)) .format(code_size_info.arch, code_size_info.config))
result_dir = comp_args.result_dir result_dir = comp_args.result_dir