StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update benchmarks to handle cog workflows

Browse Source 
Test: run ./build/make/tools/benchmarks in a cog workspace
Change-Id: I421d1d08b4e90a79b8416486025229d4f3263fbe
This commit is contained in:
Liz Kammer
2024-01-24 14:09:11 -05:00
parent f67a6e8114
commit 864dd43c07
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/perf/benchmarks
View File

@@ -131,8 +131,14 @@ def Clean():
"""Remove the out directory.""" """Remove the out directory."""
def remove_out(): def remove_out():
out_dir = utils.get_out_dir() out_dir = utils.get_out_dir()
#only remove actual contents, in case out is a symlink (as is the case for cog)
if os.path.exists(out_dir): if os.path.exists(out_dir):
shutil.rmtree(out_dir) for filename in os.listdir(out_dir):
p = os.path.join(out_dir, filename)
if os.path.isfile(p) or os.path.islink(p):
os.remove(p)
elif os.path.isdir(p):
shutil.rmtree(p)
return Change(label="Remove out", change=remove_out, undo=lambda: None) return Change(label="Remove out", change=remove_out, undo=lambda: None)

6
tools/perf/utils.py
View File

@@ -19,9 +19,11 @@ DEFAULT_REPORT_DIR = "benchmarks"
def get_root(): def get_root():
top_dir = os.environ.get("ANDROID_BUILD_TOP") top_dir = os.environ.get("ANDROID_BUILD_TOP")
if top_dir:
return pathlib.Path(top_dir).resolve()
d = pathlib.Path.cwd() d = pathlib.Path.cwd()
# with cog, someone may have a new workspace and new source tree top, but
# not run lunch yet, resulting in a misleading ANDROID_BUILD_TOP value
if top_dir and d.is_relative_to(top_dir):
return pathlib.Path(top_dir).resolve()
while True: while True:
if d.joinpath("build", "soong", "soong_ui.bash").exists(): if d.joinpath("build", "soong", "soong_ui.bash").exists():
return d.resolve().absolute() return d.resolve().absolute()