From bb250456b1894aa17ced72221a80f5f286114408 Mon Sep 17 00:00:00 2001 From: Vincent Guittot Date: Wed, 16 May 2018 20:22:52 +0200 Subject: [PATCH 1/2] WaResultsCollector: support new jankbench parameter Jankbench workload of WA v3 uses now 'test_ids' instead of 'test' as parameters. Add the support of this new parameter name Signed-off-by: Vincent Guittot --- libs/utils/wa_results_collector.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/utils/wa_results_collector.py b/libs/utils/wa_results_collector.py index 77474b7b6..47b9b770b 100644 --- a/libs/utils/wa_results_collector.py +++ b/libs/utils/wa_results_collector.py @@ -254,6 +254,10 @@ class WaResultsCollector(object): # If not, some workloads have a 'test' workload_parameter, try # using that test = job['workload_parameters']['test'] + elif 'test_ids' in job['workload_parameters']: + # If not, some workloads have a 'test_ids' workload_parameter, try + # using that + test = job['workload_parameters']['test_ids'] else: # Otherwise just use the workload name. # This isn't ideal because it means the results from jobs with -- GitLab From 85b50d2460344798b964c6010cf8ac80584c60db Mon Sep 17 00:00:00 2001 From: Vincent Guittot Date: Wed, 16 May 2018 20:24:05 +0200 Subject: [PATCH 2/2] WaResultsCollector: support jankbench sqlite file Latest version of Jankbench workload of WA v3 provides frame_total_duration results only in sqlite format. Add the support of sqlite file format for adding extra jankbench results. Signed-off-by: Vincent Guittot --- libs/utils/wa_results_collector.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/utils/wa_results_collector.py b/libs/utils/wa_results_collector.py index 47b9b770b..a1a4eeaaf 100644 --- a/libs/utils/wa_results_collector.py +++ b/libs/utils/wa_results_collector.py @@ -23,6 +23,7 @@ import pandas as pd import subprocess import logging import warnings +import sqlite3 from scipy.stats import ttest_ind import matplotlib.cm as cm @@ -450,6 +451,14 @@ class WaResultsCollector(object): df.loc[:, 'metric'] = 'frame_total_duration' df.loc[:, 'units'] = 'ms' + extra_metric_list.append(df) + elif 'jankbench-results' in artifacts: + con = sqlite3.connect(artifacts['jankbench-results']) + df = pd.read_sql_query("SELECT _id, name, run_id, iteration, total_duration, jank_frame from ui_results", con) + df = pd.DataFrame({'value': df['total_duration']}) + df.loc[:, 'metric'] = 'frame_total_duration' + df.loc[:, 'units'] = 'ms' + extra_metric_list.append(df) # WA's metrics model just exports overall energy metrics, not individual -- GitLab