From ddde50532281f7f796dd7dc44b562b29d25ab381 Mon Sep 17 00:00:00 2001 From: Caroline Tice Date: Wed, 23 Sep 2015 09:43:35 -0700 Subject: Add compiler info to experiment data. Check the build label to see which compiler was used. Store the compiler in the label, and add it to the json filename and output. Also update nightly buildbot script to add 'compiler' field to labels. BUG=None TEST=Tested in my directory. Change-Id: I124c4910cce1145708bb2a52e3a6d6dff93777c3 Reviewed-on: https://chrome-internal-review.googlesource.com/231811 Commit-Ready: Caroline Tice Tested-by: Caroline Tice Reviewed-by: Caroline Tice --- crosperf/results_report.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'crosperf/results_report.py') diff --git a/crosperf/results_report.py b/crosperf/results_report.py index 9b493fd4..9e1e6baa 100644 --- a/crosperf/results_report.py +++ b/crosperf/results_report.py @@ -596,12 +596,18 @@ class JSONResultsReport(ResultsReport): json_results['label'] = label common_checksum = '' common_string = '' + compiler_string = 'gcc' for l in self.experiment.labels: if l.name == label: ver, img = ParseChromeosImage(l.chromeos_image) json_results['chromeos_image'] = img json_results['chromeos_version'] = ver json_results['chrome_version'] = l.chrome_version + json_results['compiler'] = l.compiler + # If any of the labels used the LLVM compiler, we will add + # ".llvm" to the json report filename. (Otherwise we use .gcc). + if 'llvm' in l.compiler: + compiler_string = 'llvm' common_checksum = \ self.experiment.machine_manager.machine_checksum[l.name] common_string = \ @@ -642,8 +648,9 @@ class JSONResultsReport(ResultsReport): json_results['detailed_results'] = detail_results final_results.append(json_results) - filename = "report_%s_%s_%s.json" % (board, self.date, - self.time.replace(':','.')) + filename = "report_%s_%s_%s.%s.json" % (board, self.date, + self.time.replace(':','.'), + compiler_string) fullname = os.path.join(results_dir, filename) with open(fullname, "w") as fp: json.dump(final_results, fp, indent=2) -- cgit v1.2.3