From b47f67ca72a7911674738d0017d4dd2e8720daac Mon Sep 17 00:00:00 2001 From: Scott Date: Fri, 22 May 2020 18:48:19 +0100 Subject: [PATCH 1/3] Update __init__.py --- wa/workloads/spec2006/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wa/workloads/spec2006/__init__.py b/wa/workloads/spec2006/__init__.py index 0e8070cb6..83071a426 100644 --- a/wa/workloads/spec2006/__init__.py +++ b/wa/workloads/spec2006/__init__.py @@ -279,9 +279,10 @@ def run(self, target): target.execute('perfetto --background --txt -c - -o /sdcard/devlib-target/spec.pftrace < /sdcard/devlib-target/trigger.cfg') command = 'sh {} {} {} 2>&1 | tee -a {}'.format(self.run_spec_script, test_name, test_target_output_dir, timing_output_file_path) target.execute(command, as_root=True) - target.execute('perfetto --background --txt -c - < /sdcard/devlib-target/stop.cfg') + #target.execute('perfetto --background --txt -c - < /sdcard/devlib-target/stop.cfg') def update_output(self, context): + target.execute('perfetto --background --txt -c - < /sdcard/devlib-target/stop.cfg') super().update_output(context) for test_name in self.tests: if test_name in self.incomplete_tests: From c10ff78a859421fd01ef86c2cf1c89341e0ced80 Mon Sep 17 00:00:00 2001 From: Scott Date: Fri, 22 May 2020 19:14:53 +0100 Subject: [PATCH 2/3] Update __init__.py --- wa/workloads/spec2006/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wa/workloads/spec2006/__init__.py b/wa/workloads/spec2006/__init__.py index 83071a426..ba0ca73ec 100644 --- a/wa/workloads/spec2006/__init__.py +++ b/wa/workloads/spec2006/__init__.py @@ -281,7 +281,7 @@ def run(self, target): target.execute(command, as_root=True) #target.execute('perfetto --background --txt -c - < /sdcard/devlib-target/stop.cfg') - def update_output(self, context): + def update_output(self, target, context): target.execute('perfetto --background --txt -c - < /sdcard/devlib-target/stop.cfg') super().update_output(context) for test_name in self.tests: From 12f24b213270363ca11fb6b1ed3fc9ce51e6860b Mon Sep 17 00:00:00 2001 From: Scott Date: Fri, 22 May 2020 19:31:11 +0100 Subject: [PATCH 3/3] Update __init__.py --- wa/workloads/spec2006/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wa/workloads/spec2006/__init__.py b/wa/workloads/spec2006/__init__.py index ba0ca73ec..8a853f34e 100644 --- a/wa/workloads/spec2006/__init__.py +++ b/wa/workloads/spec2006/__init__.py @@ -281,8 +281,7 @@ def run(self, target): target.execute(command, as_root=True) #target.execute('perfetto --background --txt -c - < /sdcard/devlib-target/stop.cfg') - def update_output(self, target, context): - target.execute('perfetto --background --txt -c - < /sdcard/devlib-target/stop.cfg') + def update_output(self, context): super().update_output(context) for test_name in self.tests: if test_name in self.incomplete_tests: @@ -330,6 +329,9 @@ def _write_to_group_file(self, context, filepath, group, test_name): group_timing_file.write('{}:\n'.format(test_name)) for line in lines: group_timing_file.write(line) + + def _finish_perfetto(self, target): + target.execute('perfetto --background --txt -c - < /sdcard/devlib-target/stop.cfg') @staticmethod def _calculate_test_benchmark_ratio(test_name, elapsed_time):