From: Steve Holden <steve@holdenweb.com>
Date: Fri, 26 May 2006 18:26:21 +0000 (+0000)
Subject: Revert tests to MAL's original round sizes to retiain comparability
X-Git-Tag: v2.5b1~444
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d05e5468501ff572a55349a584a28d09f9d7abb3;p=thirdparty%2FPython%2Fcpython.git

Revert tests to MAL's original round sizes to retiain comparability
from long ago and far away. Stop calling this pybench 1.4 because it
isn't. Remove the empty test, which was a bad idea.
---

diff --git a/Tools/pybench/Arithmetic.py b/Tools/pybench/Arithmetic.py
index 229396cfde14..4ed621940719 100644
--- a/Tools/pybench/Arithmetic.py
+++ b/Tools/pybench/Arithmetic.py
@@ -4,7 +4,7 @@ class SimpleIntegerArithmetic(Test):
 
     version = 0.3
     operations = 5 * (3 + 5 + 5 + 3 + 3 + 3)
-    rounds = 1200*21
+    rounds = 120000
 
     def test(self):
 
@@ -159,7 +159,7 @@ class SimpleFloatArithmetic(Test):
 
     version = 0.3
     operations = 5 * (3 + 5 + 5 + 3 + 3 + 3)
-    rounds = 1000*30
+    rounds = 100000
 
     def test(self):
 
@@ -314,7 +314,7 @@ class SimpleIntFloatArithmetic(Test):
 
     version = 0.3
     operations = 5 * (3 + 5 + 5 + 3 + 3 + 3)
-    rounds = 1200*30
+    rounds = 120000
 
     def test(self):
 
@@ -470,7 +470,7 @@ class SimpleLongArithmetic(Test):
 
     version = 0.3
     operations = 5 * (3 + 5 + 5 + 3 + 3 + 3)
-    rounds = 300*32
+    rounds = 30000
 
     def test(self):
 
@@ -625,7 +625,7 @@ class SimpleComplexArithmetic(Test):
 
     version = 0.3
     operations = 5 * (3 + 5 + 5 + 3 + 3 + 3)
-    rounds = 400*27
+    rounds = 40000
 
     def test(self):
 
diff --git a/Tools/pybench/Calls.py b/Tools/pybench/Calls.py
index a94887b4d269..e2952438d5ab 100644
--- a/Tools/pybench/Calls.py
+++ b/Tools/pybench/Calls.py
@@ -4,7 +4,7 @@ class PythonFunctionCalls(Test):
 
     version = 0.3
     operations = 5*(1+4+4+2)
-    rounds = 600*22
+    rounds = 60000
 
     def test(self):
 
@@ -113,7 +113,7 @@ class BuiltinFunctionCalls(Test):
 
     version = 0.4
     operations = 5*(2+5+5+5)
-    rounds = 300*24
+    rounds = 30000
 
     def test(self):
 
@@ -234,7 +234,7 @@ class PythonMethodCalls(Test):
 
     version = 0.3
     operations = 5*(6 + 5 + 4)
-    rounds = 200*27
+    rounds = 20000
 
     def test(self):
 
@@ -376,7 +376,7 @@ class Recursion(Test):
 
     version = 0.3
     operations = 5
-    rounds = 500*21
+    rounds = 50000
 
     def test(self):
 
diff --git a/Tools/pybench/Constructs.py b/Tools/pybench/Constructs.py
index f7ebe73d843f..00045bd73e3f 100644
--- a/Tools/pybench/Constructs.py
+++ b/Tools/pybench/Constructs.py
@@ -4,7 +4,7 @@ class IfThenElse(Test):
 
     version = 0.31
     operations = 30*3 # hard to say...
-    rounds = 1500*27
+    rounds = 150000
 
     def test(self):
 
@@ -471,7 +471,7 @@ class NestedForLoops(Test):
 
     version = 0.3
     operations = 1000*10*5
-    rounds = 100
+    rounds = 150
 
     def test(self):
 
@@ -496,7 +496,7 @@ class ForLoops(Test):
 
     version = 0.1
     operations = 5 * 5
-    rounds = 80*25
+    rounds = 8000
 
     def test(self):
 
diff --git a/Tools/pybench/Dict.py b/Tools/pybench/Dict.py
index d1b38339bdfe..54aeae716835 100644
--- a/Tools/pybench/Dict.py
+++ b/Tools/pybench/Dict.py
@@ -4,7 +4,7 @@ class DictCreation(Test):
 
     version = 0.3
     operations = 5*(5 + 5)
-    rounds = 600*24
+    rounds = 60000
 
     def test(self):
 
@@ -79,7 +79,7 @@ class DictWithStringKeys(Test):
 
     version = 0.1
     operations = 5*(6 + 6)
-    rounds = 2000*30
+    rounds = 200000
 
     def test(self):
 
@@ -168,7 +168,7 @@ class DictWithFloatKeys(Test):
 
     version = 0.1
     operations = 5*(6 + 6)
-    rounds = 20000
+    rounds = 200000
 
     def test(self):
 
@@ -257,7 +257,7 @@ class DictWithIntegerKeys(Test):
 
     version = 0.1
     operations = 5*(6 + 6)
-    rounds = 2000*19
+    rounds = 200000
 
     def test(self):
 
@@ -346,7 +346,7 @@ class SimpleDictManipulation(Test):
 
     version = 0.3
     operations = 5*(6 + 6 + 6 + 6)
-    rounds = 500*44
+    rounds = 50000
 
     def test(self):
 
diff --git a/Tools/pybench/Empty.py b/Tools/pybench/Empty.py
deleted file mode 100755
index 9cb34ac3b073..000000000000
--- a/Tools/pybench/Empty.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from pybench import Test
-
-class EmptyTest(Test):
-    """This is just here as a potential measure of repeatability."""
-
-    version = 0.3
-    operations = 1
-    rounds = 60000
-
-    def test(self):
-
-        l = []
-        for i in xrange(self.rounds):
-            pass
-
-
-    def calibrate(self):
-
-        l = []
-
-        for i in xrange(self.rounds):
-            pass
diff --git a/Tools/pybench/Exceptions.py b/Tools/pybench/Exceptions.py
index d6c89419118e..7e55708dfef1 100644
--- a/Tools/pybench/Exceptions.py
+++ b/Tools/pybench/Exceptions.py
@@ -4,7 +4,7 @@ class TryRaiseExcept(Test):
 
     version = 0.1
     operations = 2 + 3
-    rounds = 600*25
+    rounds = 60000
 
     def test(self):
 
@@ -44,7 +44,7 @@ class TryExcept(Test):
 
     version = 0.1
     operations = 15 * 10
-    rounds = 2000*16
+    rounds = 200000
 
     def test(self):
 
diff --git a/Tools/pybench/Imports.py b/Tools/pybench/Imports.py
index b953919c50c2..85eb604af539 100644
--- a/Tools/pybench/Imports.py
+++ b/Tools/pybench/Imports.py
@@ -8,7 +8,7 @@ class SecondImport(Test):
 
     version = 0.1
     operations = 5 * 5
-    rounds = 2000*15
+    rounds = 20000
 
     def test(self):
 
@@ -53,7 +53,7 @@ class SecondPackageImport(Test):
 
     version = 0.1
     operations = 5 * 5
-    rounds = 200*20
+    rounds = 20000
 
     def test(self):
 
@@ -97,7 +97,7 @@ class SecondSubmoduleImport(Test):
 
     version = 0.1
     operations = 5 * 5
-    rounds = 200*17
+    rounds = 20000
 
     def test(self):
 
diff --git a/Tools/pybench/Instances.py b/Tools/pybench/Instances.py
index 199b129bb77a..9b1929d16af9 100644
--- a/Tools/pybench/Instances.py
+++ b/Tools/pybench/Instances.py
@@ -4,7 +4,7 @@ class CreateInstances(Test):
 
     version = 0.2
     operations = 3 + 7 + 4
-    rounds = 600*17
+    rounds = 60000
 
     def test(self):
 
diff --git a/Tools/pybench/Lists.py b/Tools/pybench/Lists.py
index 844612f1e9fc..4c18e99a373e 100644
--- a/Tools/pybench/Lists.py
+++ b/Tools/pybench/Lists.py
@@ -4,7 +4,7 @@ class SimpleListManipulation(Test):
 
     version = 0.3
     operations = 5* (6 + 6 + 6)
-    rounds = 600*45
+    rounds = 60000
 
     def test(self):
 
@@ -132,7 +132,7 @@ class ListSlicing(Test):
 
     version = 0.4
     operations = 25*(3+1+2+1)
-    rounds = 4*45
+    rounds = 400
 
     def test(self):
 
@@ -169,7 +169,7 @@ class SmallLists(Test):
 
     version = 0.3
     operations = 5*(1+ 6 + 6 + 3 + 1)
-    rounds = 600*15
+    rounds = 60000
 
     def test(self):
 
diff --git a/Tools/pybench/Lookups.py b/Tools/pybench/Lookups.py
index 47ad94ae5454..e5529cd47864 100644
--- a/Tools/pybench/Lookups.py
+++ b/Tools/pybench/Lookups.py
@@ -4,7 +4,7 @@ class SpecialClassAttribute(Test):
 
     version = 0.3
     operations = 5*(12 + 12)
-    rounds = 1000*16
+    rounds = 100000
 
     def test(self):
 
@@ -185,7 +185,7 @@ class NormalClassAttribute(Test):
 
     version = 0.3
     operations = 5*(12 + 12)
-    rounds = 1000*20
+    rounds = 100000
 
     def test(self):
 
@@ -371,7 +371,7 @@ class SpecialInstanceAttribute(Test):
 
     version = 0.3
     operations = 5*(12 + 12)
-    rounds = 1000*14
+    rounds = 100000
 
     def test(self):
 
@@ -559,7 +559,7 @@ class NormalInstanceAttribute(Test):
 
     version = 0.3
     operations = 5*(12 + 12)
-    rounds = 1000*22
+    rounds = 100000
 
     def test(self):
 
@@ -747,7 +747,7 @@ class BuiltinMethodLookup(Test):
 
     version = 0.3
     operations = 5*(3*5 + 3*5)
-    rounds = 700*15
+    rounds = 70000
 
     def test(self):
 
diff --git a/Tools/pybench/NewInstances.py b/Tools/pybench/NewInstances.py
deleted file mode 100755
index a3526383483f..000000000000
--- a/Tools/pybench/NewInstances.py
+++ /dev/null
@@ -1,66 +0,0 @@
-from pybench import Test
-
-class CreateNewInstances(Test):
-
-    version = 0.1
-    operations = 3 + 7 + 4
-    rounds = 60000
-
-    def test(self):
-
-        class c(object):
-            pass
-
-        class d(object):
-            def __init__(self,a,b,c):
-                self.a = a
-                self.b = b
-                self.c = c
-
-        class e(object):
-            def __init__(self,a,b,c=4):
-                self.a = a
-                self.b = b
-                self.c = c
-                self.d = a
-                self.e = b
-                self.f = c
-
-        for i in xrange(self.rounds):
-            o = c()
-            o1 = c()
-            o2 = c()
-            p = d(i,i,3)
-            p1 = d(i,i,3)
-            p2 = d(i,3,3)
-            p3 = d(3,i,3)
-            p4 = d(i,i,i)
-            p5 = d(3,i,3)
-            p6 = d(i,i,i)
-            q = e(i,i,3)
-            q1 = e(i,i,3)
-            q2 = e(i,i,3)
-            q3 = e(i,i)
-
-    def calibrate(self):
-
-        class c(object):
-            pass
-
-        class d(object):
-            def __init__(self,a,b,c):
-                self.a = a
-                self.b = b
-                self.c = c
-
-        class e(object):
-            def __init__(self,a,b,c=4):
-                self.a = a
-                self.b = b
-                self.c = c
-                self.d = a
-                self.e = b
-                self.f = c
-
-        for i in xrange(self.rounds):
-            pass
diff --git a/Tools/pybench/Numbers.py b/Tools/pybench/Numbers.py
index e89d00f05a52..a6aea3317aff 100644
--- a/Tools/pybench/Numbers.py
+++ b/Tools/pybench/Numbers.py
@@ -4,7 +4,7 @@ class CompareIntegers(Test):
 
     version = 0.1
     operations = 30 * 5
-    rounds = 1200*21
+    rounds = 120000
 
     def test(self):
 
@@ -200,7 +200,7 @@ class CompareFloats(Test):
 
     version = 0.1
     operations = 30 * 5
-    rounds = 600*27
+    rounds = 60000
 
     def test(self):
 
@@ -396,7 +396,7 @@ class CompareFloatsIntegers(Test):
 
     version = 0.1
     operations = 30 * 5
-    rounds = 600*16
+    rounds = 60000
 
     def test(self):
 
@@ -592,7 +592,7 @@ class CompareLongs(Test):
 
     version = 0.1
     operations = 30 * 5
-    rounds = 600*24
+    rounds = 60000
 
     def test(self):
 
diff --git a/Tools/pybench/Setup.py b/Tools/pybench/Setup.py
index 1f2f45474fe7..f5c519047e42 100644
--- a/Tools/pybench/Setup.py
+++ b/Tools/pybench/Setup.py
@@ -17,7 +17,6 @@ Number_of_rounds = 10
 Warp_factor = 20
 
 # Import tests
-#from Empty import *
 from Arithmetic import *
 from Calls import *
 from Constructs import *
diff --git a/Tools/pybench/Strings.py b/Tools/pybench/Strings.py
index 43309dabab6c..b01843afaa51 100644
--- a/Tools/pybench/Strings.py
+++ b/Tools/pybench/Strings.py
@@ -5,7 +5,7 @@ class ConcatStrings(Test):
 
     version = 0.1
     operations = 10 * 5
-    rounds = 6000
+    rounds = 60000
 
     def test(self):
 
@@ -87,7 +87,7 @@ class CompareStrings(Test):
 
     version = 0.2
     operations = 10 * 5
-    rounds = 2000*22
+    rounds = 200000
 
     def test(self):
 
@@ -169,7 +169,7 @@ class CompareInternedStrings(Test):
 
     version = 0.1
     operations = 10 * 5
-    rounds = 2000*28
+    rounds = 200000
 
     def test(self):
 
@@ -251,7 +251,7 @@ class CreateStringsWithConcat(Test):
 
     version = 0.1
     operations = 10 * 5
-    rounds = 800*32
+    rounds = 80000
 
     def test(self):
 
@@ -326,7 +326,7 @@ class StringSlicing(Test):
 
     version = 0.1
     operations = 5 * 7
-    rounds = 1000*15
+    rounds = 100000
 
     def test(self):
 
@@ -389,7 +389,7 @@ if hasattr('', 'lower'):
 
         version = 0.1
         operations = 3 * (5 + 4 + 2 + 1)
-        rounds = 14000
+        rounds = 70000
 
         def test(self):
 
@@ -462,7 +462,7 @@ if hasattr('', 'lower'):
 
         version = 0.1
         operations = 10 * 7
-        rounds = 800*24
+        rounds = 80000
 
         def test(self):
 
diff --git a/Tools/pybench/Tuples.py b/Tools/pybench/Tuples.py
index 842fa3e2a92a..e84ea53d1dcf 100644
--- a/Tools/pybench/Tuples.py
+++ b/Tools/pybench/Tuples.py
@@ -4,7 +4,7 @@ class TupleSlicing(Test):
 
     version = 0.31
     operations = 3 * 25 * 10 * 7
-    rounds = 100
+    rounds = 400
 
     def test(self):
 
@@ -272,7 +272,7 @@ class SmallTuples(Test):
 
     version = 0.3
     operations = 5*(1 + 3 + 6 + 2)
-    rounds = 800*16
+    rounds = 80000
 
     def test(self):
 
diff --git a/Tools/pybench/Unicode.py b/Tools/pybench/Unicode.py
index 86839b5c69ca..366f171bd904 100644
--- a/Tools/pybench/Unicode.py
+++ b/Tools/pybench/Unicode.py
@@ -10,7 +10,7 @@ class ConcatUnicode(Test):
 
     version = 0.1
     operations = 10 * 5
-    rounds = 600*7
+    rounds = 60000
 
     def test(self):
 
@@ -92,7 +92,7 @@ class CompareUnicode(Test):
 
     version = 0.1
     operations = 10 * 5
-    rounds = 1500*17
+    rounds = 150000
 
     def test(self):
 
@@ -174,7 +174,7 @@ class CreateUnicodeWithConcat(Test):
 
     version = 0.1
     operations = 10 * 5
-    rounds = 800*12
+    rounds = 80000
 
     def test(self):
 
@@ -249,7 +249,7 @@ class UnicodeSlicing(Test):
 
     version = 0.1
     operations = 5 * 7
-    rounds = 10000
+    rounds = 100000
 
     def test(self):
 
@@ -310,7 +310,7 @@ class UnicodeMappings(Test):
 
     version = 0.1
     operations = 3 * (5 + 4 + 2 + 1)
-    rounds = 100*15
+    rounds = 10000
 
     def test(self):
 
@@ -383,7 +383,7 @@ class UnicodePredicates(Test):
 
     version = 0.1
     operations = 5 * 9
-    rounds = 1000*25
+    rounds = 100000
 
     def test(self):
 
@@ -460,7 +460,7 @@ else:
 
         version = 0.1
         operations = 5 * 8
-        rounds = 1000*15
+        rounds = 100000
 
         def test(self):
 
diff --git a/Tools/pybench/pybench.py b/Tools/pybench/pybench.py
index 8df0025f2e6b..f803dc43e011 100755
--- a/Tools/pybench/pybench.py
+++ b/Tools/pybench/pybench.py
@@ -35,7 +35,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE !
 """
 
 # Version number
-__version__ = '1.4'
+__version__ = '1.3'
 
 #
 # NOTE: Use xrange for all test loops unless you want to face