also allow multiple baselines

Author: mattip

codespeed/views.py

@@ -69,14 +69,14 @@ def get_context_data(self, **kwargs):
         context = super(HomeView, self).get_context_data(**kwargs)
         context['show_reports'] = settings.SHOW_REPORTS
         context['show_historical'] = settings.SHOW_HISTORICAL
-        historical_settings = ['SHOW_HISTORICAL', 'DEF_BASELINE', 'DEF_EXECUTABLES']
+        historical_settings = ['SHOW_HISTORICAL', 'DEF_BASELINES', 'DEF_EXECUTABLES']
         if not all(getattr(settings, var) for var in historical_settings):
             context['show_historical'] = False
             return context
 
         try:
             baseline_exe = Executable.objects.get(
-                name=settings.DEF_BASELINE['executable'])
+                name=settings.DEF_BASELINES[0]['executable'])
             context['baseline'] = baseline_exe
             def_name = settings.DEF_EXECUTABLES[0]['name']
             def_project = Project.objects.get(name=settings.DEF_EXECUTABLES[0]['project'])
@@ -101,22 +101,23 @@ def gethistoricaldata(request):
         env = env.first()
 
     # Fetch Baseline data, filter by executable
-    baseline_exe = Executable.objects.get(
-        name=settings.DEF_BASELINE['executable'])
-    tag=settings.DEF_BASELINE['revision']
-    rev = Revision.objects.filter(branch__project=baseline_exe.project, tag=tag)
-    if len(rev) < 1:
-        return HttpResponse(json.dumps(
-            f"Could not find {tag=} for {settings.DEF_BASELINE['executable']} in database")
-        )
-    rev0 = rev[0]
-    baseline_results = Result.objects.filter(
-        executable=baseline_exe, revision=rev0, environment=env)
-    if not baseline_results:
-        logger.error('Could not find results for {} rev="{}" env="{}"'.format(
-                baseline_exe, rev0, env))
-    data['baseline'] = '{} {}'.format(
-        settings.DEF_BASELINE['executable'], rev0.tag)
+    baseline_results = []
+    for b in settings.DEF_BASELINES:
+        baseline_exe = Executable.objects.get(
+            name=b['executable'])
+        tag=b['revision']
+        rev = Revision.objects.filter(branch__project=baseline_exe.project, tag=tag)
+        if len(rev) < 1:
+            return HttpResponse(json.dumps(
+                f"Could not find {tag=} for {b['executable']} in database")
+            )
+        rev0 = rev[0]
+        resname = '{} {}'.format(b['executable'], rev0.tag)
+        baseline_results.append((resname, Result.objects.filter(
+            executable=baseline_exe, revision=rev0, environment=env)))
+        if not baseline_results[-1][1]:
+            logger.error('Could not find results for {} rev="{}" env="{}"'.format(
+                    baseline_exe, rev0, env))
 
     default_results = {}
     all_taggedrevs = []
@@ -163,17 +164,30 @@ def gethistoricaldata(request):
 
     # Collect data
     benchmarks = []
-    for res in baseline_results:
+    # Collate first baseline and all the default_results
+    resset = baseline_results[0][1]
+    resname = baseline_results[0][0]
+    data['baseline'] = resname
+    for res in resset:
         if res == 0:
             continue
         benchmarks.append(res.benchmark.name)
-        data['results'][res.benchmark.name] = {data['baseline']: res.value}
+        data['results'][res.benchmark.name] = {resname: res.value}
         for rev_name in default_results:
             val = 0
             for default_res in default_results[rev_name]:
                 if default_res.benchmark.name == res.benchmark.name:
                     val = default_res.value
-            data['results'][res.benchmark.name][rev_name] = val
+                data['results'][res.benchmark.name][rev_name] = val
+    # Collate other baseline
+    for resname, resset in baseline_results[1:]:
+        for res in resset:
+            if res == 0:
+                continue
+            if not res.benchmark.name in data['results']:
+                continue
+            data['results'][res.benchmark.name][resname] = res.value
+        data['tagged_revs'].insert(0, resname)
     benchmarks.sort()
     data['benchmarks'] = benchmarks
     return HttpResponse(json.dumps(data))

codespeed/views_data.py

@@ -83,10 +83,10 @@ def getbaselineexecutables(include_tags=None):
                 'name': name,
             })
     # move default to first place
-    if hasattr(settings, 'DEF_BASELINE') and settings.DEF_BASELINE is not None:
+    if hasattr(settings, 'DEF_BASELINES') and settings.DEF_BASELINES is not None:
         try:
-            exename = settings.DEF_BASELINE['executable']
-            commitid = settings.DEF_BASELINE['revision']
+            exename = settings.DEF_BASELINES[0]['executable']
+            commitid = settings.DEF_BASELINES[0]['revision']
             for base in baseline:
                 if base['key'] == "none":
                     continue

speed_pypy/settings.py

@@ -89,7 +89,10 @@
 
 SHOW_REPORTS = False
 SHOW_HISTORICAL = True
-DEF_BASELINE = {'executable': 'cpython', 'revision': '3.7.6'}
+DEF_BASELINES = [
+                 {'executable': 'cpython', 'revision': '3.7.19'},
+                 {'executable': 'cpython', 'revision': '3.11.9'},
+                ]
 DEF_EXECUTABLES = [
                    {'name': 'pypy3.10-jit-64', 'project': 'PyPy3.10'},
                    {'name': 'pypy3.9-jit-64', 'project': 'PyPy3.9'},

speed_pypy/templates/home.html

@@ -112,7 +112,7 @@ <h3>How has PyPy performance evolved over time?</h3>
             plotdata[0].push(relative_value);
             plotdata[1].push(1.0);
             labels.push(relative_value.toFixed(2));
-            if (relative_value > 0) {
+            if (relative_value > 0 && !isNaN(relative_value)) {
                 trunk_geomean *= relative_value;
             }
         }
@@ -162,7 +162,10 @@ <h3>How has PyPy performance evolved over time?</h3>
             num_of_benchs = tagged_data[i].length;
             var tempgeo = 1;
             for (var j in tagged_data[i]) {
-                tempgeo *= tagged_data[i][j];
+				value = tagged_data[i][j];
+				if (value > 0 && !isNaN(value)) {
+					tempgeo *= value;
+				}
             }
             tempgeo = Math.pow(tempgeo, 1/tagged_data[i].length);
             tempgeo = 1/tempgeo;