eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

code_size_compare: simplify methods in CodeSizeComparison

Browse source 
Signed-off-by: Yanray Wang <yanray.wang@arm.com>
This commit is contained in:
Yanray Wang 2023-07-17 11:55:54 +08:00
parent e0e276046b
commit 5e9130a5e9
1 changed files with 22 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

52
scripts/code_size_compare.py
View file

@ -92,12 +92,11 @@ class CodeSizeInfo: # pylint: disable=too-few-public-methods
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.
sys_arch: host architecture. sys_arch: host architecture.
make_command: command to build library (Inferred from arch and config).
""" """
self.arch = arch self.arch = arch
self.config = config self.config = config
self.sys_arch = sys_arch self.sys_arch = sys_arch
self.make_command = self.set_make_command() self.make_cmd = 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."""
@ -456,63 +455,52 @@ class CodeSizeComparison:
self.new_rev = new_revision self.new_rev = new_revision
self.git_command = "git" self.git_command = "git"
self.make_clean = 'make clean' self.make_clean = 'make clean'
self.make_command = code_size_info.make_command self.make_cmd = code_size_info.make_cmd
self.fname_suffix = "-" + code_size_info.arch + "-" +\ self.fname_suffix = "-" + code_size_info.arch + "-" +\
code_size_info.config code_size_info.config
self.code_size_generator = CodeSizeGeneratorWithSize() self.code_size_generator = CodeSizeGeneratorWithSize()
def _gen_code_size_csv(self, revision: str) -> None: def cal_code_size(self, revision: str):
"""Generate code size csv file.""" """Calculate code size of library objects in a UTF-8 encoding"""
if revision == "current": return CodeSizeCalculator(revision, self.make_cmd).\
print("Measuring code size in current work directory")
else:
print("Measuring code size for", revision)
code_size_text = CodeSizeCalculator(revision, self.make_command).\
cal_libraries_code_size() cal_libraries_code_size()
csv_file = os.path.join(self.csv_dir, revision + def gen_code_size_report(self, revision):
self.fname_suffix + ".csv") """Generate code size record and write it into a file."""
self.code_size_generator.size_generator_write_record(revision,\
code_size_text, csv_file)
def _get_code_size_for_rev(self, revision: str) -> None:
"""Generate code size csv file for the specified git revision."""
output_file = os.path.join(self.csv_dir,\
revision + self.fname_suffix + ".csv")
# Check if the corresponding record exists # Check if the corresponding record exists
csv_fname = revision + self.fname_suffix + ".csv" if (revision != "current") and os.path.exists(output_file):
if (revision != "current") and \
os.path.exists(os.path.join(self.csv_dir, csv_fname)):
print("Code size csv file for", revision, "already exists.") print("Code size csv file for", revision, "already exists.")
self.code_size_generator.read_size_record(revision,\ self.code_size_generator.read_size_record(revision, output_file)
os.path.join(self.csv_dir, csv_fname))
else: else:
self._gen_code_size_csv(revision) self.code_size_generator.size_generator_write_record(revision,\
self.cal_code_size(revision), output_file)
def _gen_code_size_comparison(self) -> int: def gen_code_size_comparison(self) -> int:
"""Generate results of the size changes between two revisions, """Generate results of code size changes between two revisions,
old and new. Measured code size results of these two revisions old and new. Measured code size results of these two revisions
must be available.""" must be available."""
res_file = os.path.join(self.result_dir, "compare-" + output_file = os.path.join(self.result_dir, "compare-" +
self.old_rev + "-" + self.new_rev + self.old_rev + "-" + self.new_rev +
self.fname_suffix + ".csv") self.fname_suffix + ".csv")
print("\nGenerating comparison results between",\ print("\nGenerating comparison results between",\
self.old_rev, "and", self.new_rev) self.old_rev, "and", self.new_rev)
self.code_size_generator.size_generator_write_comparison(\ self.code_size_generator.size_generator_write_comparison(\
self.old_rev, self.new_rev, res_file) self.old_rev, self.new_rev, output_file)
return 0 return 0
def get_comparision_results(self) -> int: def get_comparision_results(self) -> int:
"""Compare size of library/*.o between self.old_rev and self.new_rev, """Compare size of library/*.o between self.old_rev and self.new_rev,
and generate the result file.""" and generate the result file."""
build_tree.check_repo_path() build_tree.check_repo_path()
self._get_code_size_for_rev(self.old_rev) self.gen_code_size_report(self.old_rev)
self._get_code_size_for_rev(self.new_rev) self.gen_code_size_report(self.new_rev)
return self._gen_code_size_comparison() return self.gen_code_size_comparison()
def main(): def main():
parser = argparse.ArgumentParser(description=(__doc__)) parser = argparse.ArgumentParser(description=(__doc__))