isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-30 19:51:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use bisect for performance

Browse Source
This commit is contained in:
disinvite 2024-01-30 22:33:15 -05:00
parent 45178f5591
commit b656183873
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/roadmap/roadmap.py
View File

@ -6,6 +6,7 @@
import argparse import argparse
import logging import logging
import statistics import statistics
import bisect
from typing import Iterator, List, Optional, Tuple from typing import Iterator, List, Optional, Tuple
from collections import namedtuple from collections import namedtuple
from isledecomp import Bin as IsleBin from isledecomp import Bin as IsleBin
@ -40,6 +41,9 @@ def __init__(self, pdb, binfile) -> None:
if binfile.is_valid_section(sizeref.section) if binfile.is_valid_section(sizeref.section)
] ]
# For bisect performance enhancement
self.contrib_starts = [start for (start, _, __) in self.section_contrib]
def get_lib_for_module(self, module: str) -> Optional[str]: def get_lib_for_module(self, module: str) -> Optional[str]:
return self.library_lookup.get(module) return self.library_lookup.get(module)
@ -51,10 +55,16 @@ def get_all_cmake_modules(self) -> List[str]:
] ]
def get_module(self, addr: int) -> Optional[str]: def get_module(self, addr: int) -> Optional[str]:
for start, size, module_id in self.section_contrib: i = bisect.bisect_left(self.contrib_starts, addr)
if start <= addr < start + size:
if (module := self.module_lookup.get(module_id)) is not None: # Clamp to final section contribution for a very high address
return module if i >= len(self.section_contrib):
i = len(self.section_contrib) - 1
(start, size, module_id) = self.section_contrib[i]
if start <= addr < start + size:
if (module := self.module_lookup.get(module_id)) is not None:
return module
return None return None
@ -262,7 +272,7 @@ def suggest_order(results: List[RoadmapRow], module_map: ModuleMap, match_type:
if start < library_order.get(lib, 0xFFFFFFFFF): if start < library_order.get(lib, 0xFFFFFFFFF):
library_order[lib] = start library_order[lib] = start
print("Library order (average address shown):") print("Library order (earliest address shown):")
for lib, start in sorted(library_order.items(), key=lambda x: x[1]): for lib, start in sorted(library_order.items(), key=lambda x: x[1]):
# Strip off any OS path for brevity # Strip off any OS path for brevity
if not lib.startswith("CMakeFiles"): if not lib.startswith("CMakeFiles"):