[pypy-svn] r71330 - in codespeed: pyspeed/codespeed tools

tobami at codespeak.net tobami at codespeak.net
Fri Feb 19 16:04:34 CET 2010


Author: tobami
Date: Fri Feb 19 16:04:33 2010
New Revision: 71330

Modified:
   codespeed/pyspeed/codespeed/views.py
   codespeed/tools/import_from_json.py
   codespeed/tools/saveresults.py
   codespeed/tools/test.py
Log:
fix trend. Add interpreter var to saveresults

Modified: codespeed/pyspeed/codespeed/views.py
==============================================================================
--- codespeed/pyspeed/codespeed/views.py	(original)
+++ codespeed/pyspeed/codespeed/views.py	Fri Feb 19 16:04:33 2010
@@ -15,9 +15,10 @@
 def overviewtable(request):
     #sleep(2)
     trendconfig = int(request.GET["trend"])
+    revision = int(request.GET["revision"])
     lastrevisions = Revision.objects.filter(
         project=settings.PROJECT_NAME
-    ).order_by('-number')[:11]
+    ).filter(number__lte=revision).order_by('-number')[:11]
     lastrevision = lastrevisions[0].number
     changerevision = lastrevisions[1].number    
     pastrevisions = lastrevisions[trendconfig-2:trendconfig+1]
@@ -50,21 +51,23 @@
         
         #calculate past average
         average = 0
-        if len(pastrevisions):
-            for rev in pastrevisions:
-                past_rev = Result.objects.filter(
-                    revision__number=rev.number
-                ).filter(
-                    revision__project=settings.PROJECT_NAME
-                ).filter(benchmark=bench)
-                if past_rev.count():
-                    average += past_rev[0].value
-        else: average = "-"
+        averagecount = 0
+        for rev in pastrevisions:
+            past_rev = Result.objects.filter(
+                revision__number=rev.number
+            ).filter(
+                revision__project=settings.PROJECT_NAME
+            ).filter(benchmark=bench)
+            if past_rev.count():
+                average += past_rev[0].value
+                averagecount += 1
         trend = 0
-        if average and average != "-":
-            average = average / len(pastrevisions)
+        if average:
+            average = average / averagecount
             trend =  (result - average)*100/average
-        
+        else:
+            average = "-"
+
         relative = 0
         c = base_list.filter(benchmark=bench)
         if c.count():
@@ -92,7 +95,7 @@
     interpreters = Interpreter.objects.filter(name__startswith=settings.PROJECT_NAME)
     lastrevisions = Revision.objects.filter(
         project=settings.PROJECT_NAME
-    ).order_by('-number')[:10]
+    ).order_by('-number')[:15]
     selectedrevision = lastrevisions[0].number
     if data.has_key("revision"):
         if data["revision"] > 0:

Modified: codespeed/tools/import_from_json.py
==============================================================================
--- codespeed/tools/import_from_json.py	(original)
+++ codespeed/tools/import_from_json.py	Fri Feb 19 16:04:33 2010
@@ -7,7 +7,7 @@
 RESULTS_URL = 'http://buildbot.pypy.org/bench_results/'
 SPEEDURL = 'http://localhost:8080/'# This will be pyspeed.pypy.org/
 SAVE_CPYTHON = False
-START_REV = 71212
+START_REV = 71154
 
 def saveresult(data):
     params = urllib.urlencode(data)
@@ -98,7 +98,7 @@
             'interpreter_name': interpreter,
             'interpreter_coptions': int_options,
             'benchmark_name': bench_name,
-            'environment': "Dual Core Linux",
+            'environment': "bigdog",
             'result_value': value,
             'result_date': current_date,
         }

Modified: codespeed/tools/saveresults.py
==============================================================================
--- codespeed/tools/saveresults.py	(original)
+++ codespeed/tools/saveresults.py	Fri Feb 19 16:04:33 2010
@@ -16,12 +16,12 @@
 SPEEDURL = "http://localhost:8080/"# This will be pyspeed.pypy.org/
 HOST = "Dual Core Linux"
 
-def save(revision, results, options, branch):
+def save(revision, results, options, branch, interpreter):
     #Parse data
     data = {}
     current_date = datetime.today()
     proj = "pypy"
-    interpreter = "pypy-c-jit"
+    #interpreter = "pypy-c-jit"
     int_options = "gc=hybrid"
     if branch != "" and branch != "trunk":
         interpreter = branch

Modified: codespeed/tools/test.py
==============================================================================
--- codespeed/tools/test.py	(original)
+++ codespeed/tools/test.py	Fri Feb 19 16:04:33 2010
@@ -3,4 +3,4 @@
 
 results = [['ai', 'ComparisonResult', {'avg_base': 0.42950453758219992, 'timeline_link': None, 'avg_changed': 0.43322672843939997, 'min_base': 0.42631793022199999, 'delta_min': '1.0065x faster', 'delta_avg': '1.0087x slower', 'std_changed': 0.0094009621054567376, 'min_changed': 0.423564910889, 'delta_std': '2.7513x larger', 'std_base': 0.0034169249420902843, 't_msg': 'Not significant\n'}], ['chaos', 'ComparisonResult', {'avg_base': 0.41804099082939999, 'timeline_link': None, 'avg_changed': 0.11744904518135998, 'min_base': 0.41700506210299998, 'delta_min': '9.0148x faster', 'delta_avg': '3.5593x faster', 'std_changed': 0.14350186143481433, 'min_changed': 0.046257972717299999, 'delta_std': '108.8162x larger', 'std_base': 0.0013187546718754512, 't_msg': 'Significant (t=4.683672, a=0.95)\n'}], ['django', 'ComparisonResult', {'avg_base': 0.83651852607739996, 'timeline_link': None, 'avg_changed': 0.48571481704719999, 'min_base': 0.82990884780899998, 'delta_min': '1.7315x faster', 'delta_avg': '1.7222x faster', 'std_changed': 0.006386606999421761, 'min_changed': 0.47929787635799997, 'delta_std': '1.7229x smaller', 'std_base': 0.011003382690633789, 't_msg': 'Significant (t=61.655971, a=0.95)\n'}], ['fannkuch', 'ComparisonResult', {'avg_base': 1.8561528205879998, 'timeline_link': None, 'avg_changed': 0.38401727676399999, 'min_base': 1.84801197052, 'delta_min': '5.0064x faster', 'delta_avg': '4.8335x faster', 'std_changed': 0.029594360755246251, 'min_changed': 0.36913013458299998, 'delta_std': '3.2353x larger', 'std_base': 0.0091472519207758066, 't_msg': 'Significant (t=106.269998, a=0.95)\n'}], ['float', 'ComparisonResult', {'avg_base': 0.50523018836940004, 'timeline_link': None, 'avg_changed': 0.15490598678593998, 'min_base': 0.49911379814099999, 'delta_min': '6.2651x faster', 'delta_avg': '3.2615x faster', 'std_changed': 0.057739598339608837, 'min_changed': 0.079665899276699995, 'delta_std': '7.7119x larger', 'std_base': 0.007487037523761327, 't_msg': 'Significant (t=13.454285, a=0.95)\n'}], ['gcbench', 'SimpleComparisonResult', {'base_time': 27.236408948899999, 'changed_time': 5.3500790595999996, 'time_delta': '5.0908x faster'}], ['html5lib', 'SimpleComparisonResult', {'base_time': 11.666918992999999, 'changed_time': 12.6703209877, 'time_delta': '1.0860x slower'}], ['meteor-contest', 'ComparisonResult', {'avg_base': 0.31436119079579999, 'timeline_link': None, 'avg_changed': 0.38782238960260002, 'min_base': 0.30970501899699998, 'delta_min': '1.1797x slower', 'delta_avg': '1.2337x slower', 'std_changed': 0.031661664106086736, 'min_changed': 0.36536192894000002, 'delta_std': '5.8221x larger', 'std_base': 0.0054382066306700701, 't_msg': 'Significant (t=-5.113235, a=0.95)\n'}], ['nbody_modified', 'ComparisonResult', {'avg_base': 0.53968458175659995, 'timeline_link': None, 'avg_changed': 0.078919744491499993, 'min_base': 0.53349304199199998, 'delta_min': '7.4887x faster', 'delta_avg': '6.8384x faster', 'std_changed': 0.012773911876380514, 'min_changed': 0.071239948272699999, 'delta_std': '3.3435x larger', 'std_base': 0.0038204885103676109, 't_msg': 'Significant (t=77.274529, a=0.95)\n'}], ['richards', 'ComparisonResult', {'avg_base': 0.29083266258220003, 'timeline_link': None, 'avg_changed': 0.029299402236939998, 'min_base': 0.29025602340700002, 'delta_min': '10.7327x faster', 'delta_avg': '9.9262x faster', 'std_changed': 0.0033452973342946888, 'min_changed': 0.027044057846099999, 'delta_std': '5.6668x larger', 'std_base': 0.00059033067516221327, 't_msg': 'Significant (t=172.154488, a=0.95)\n'}], ['rietveld', 'ComparisonResult', {'avg_base': 0.46909418106079998, 'timeline_link': None, 'avg_changed': 1.312631273269, 'min_base': 0.46490097045899997, 'delta_min': '2.1137x slower', 'delta_avg': '2.7982x slower', 'std_changed': 0.44401595627955542, 'min_changed': 0.98267102241500004, 'delta_std': '76.0238x larger', 'std_base': 0.0058404831974135556, 't_msg': 'Significant (t=-4.247692, a=0.95)\n'}], ['slowspitfire', 'ComparisonResult', {'avg_base': 0.66740002632140005, 'timeline_link': None, 'avg_changed': 1.6204295635219998, 'min_base': 0.65965509414699997, 'delta_min': '1.9126x slower', 'delta_avg': '2.4280x slower', 'std_changed': 0.27415559151786589, 'min_changed': 1.26167798042, 'delta_std': '20.1860x larger', 'std_base': 0.013581457669479846, 't_msg': 'Significant (t=-7.763579, a=0.95)\n'}], ['spambayes', 'ComparisonResult', {'avg_base': 0.279049730301, 'timeline_link': None, 'avg_changed': 1.0178018569945999, 'min_base': 0.27623891830399999, 'delta_min': '3.3032x slower', 'delta_avg': '3.6474x slower', 'std_changed': 0.064953583956645466, 'min_changed': 0.91246294975300002, 'delta_std': '28.9417x larger', 'std_base': 0.0022442880892229711, 't_msg': 'Significant (t=-25.416839, a=0.95)\n'}], ['spectral-norm', 'ComparisonResult', {'avg_base': 0.48315834999099999, 'timeline_link': None, 'avg_changed': 0.066225481033300004, 'min_base': 0.476922035217, 'delta_min': '8.0344x faster', 'delta_avg': '7.2957x faster', 'std_changed': 0.013425108838933627, 'min_changed': 0.059360027313200003, 'delta_std': '1.9393x larger', 'std_base': 0.0069225510731835901, 't_msg': 'Significant (t=61.721418, a=0.95)\n'}], ['spitfire', 'ComparisonResult', {'avg_base': 7.1179999999999994, 'timeline_link': None, 'avg_changed': 7.2780000000000005, 'min_base': 7.04, 'delta_min': '1.0072x faster', 'delta_avg': '1.0225x slower', 'std_changed': 0.30507376157250898, 'min_changed': 6.9900000000000002, 'delta_std': '3.4948x larger', 'std_base': 0.08729261137118062, 't_msg': 'Not significant\n'}], ['spitfire_cstringio', 'ComparisonResult', {'avg_base': 8.4520000000000017, 'timeline_link': None, 'avg_changed': 4.306, 'min_base': 8.4199999999999999, 'delta_min': '2.0637x faster', 'delta_avg': '1.9628x faster', 'std_changed': 0.3298181317029128, 'min_changed': 4.0800000000000001, 'delta_std': '9.8552x larger', 'std_base': 0.033466401061363157, 't_msg': 'Significant (t=27.965041, a=0.95)\n'}], ['telco', 'ComparisonResult', {'avg_base': 0.99600000000000011, 'timeline_link': None, 'avg_changed': 0.42199999999999999, 'min_base': 0.98999999999999999, 'delta_min': '2.4146x faster', 'delta_avg': '2.3602x faster', 'std_changed': 0.010954451150103331, 'min_changed': 0.40999999999999998, 'delta_std': '2.0000x larger', 'std_base': 0.0054772255750516665, 't_msg': 'Significant (t=104.797583, a=0.95)\n'}], ['twisted_iteration', 'SimpleComparisonResult', {'base_time': 0.148289627437, 'changed_time': 0.035354803126799998, 'time_delta': '4.1943x faster'}], ['twisted_web', 'SimpleComparisonResult', {'base_time': 0.11312217194599999, 'changed_time': 0.625, 'time_delta': '5.5250x slower'}]]
 
-saveresults.save(71212, results, "", "trunk")
+saveresults.save(71212, results, "", "trunk", "pypy-c-jit")



More information about the Pypy-commit mailing list