adapt micros to harness

- bump number of iterations to 25 for warmup curves

Author: cosminbasca

.gitignore

@@ -50,6 +50,7 @@ language
 Python3.g4.stamp
 *.orig
 /graalpython/com.oracle.graal.python.test/src/tests/cpyext/Py*.c
+/graalpython/com.oracle.graal.python.test/src/tests/cpyext/Test*.c
 /*.diff
 ## generated from: pyhocon -i ci.hocon -f json -o ci.json
 /ci.json

graalpython/benchmarks/src/micro/arith-modulo.py

@@ -22,7 +22,6 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 # modulo ops
-import time
 
 
 def docompute(num):
@@ -42,20 +41,11 @@ def docompute(num):
 
 
 def measure(num):
-    print("Start timing...")
-    start = time.time()
-
     for run in range(num):
         sum = docompute(5000)  # 5000
 
     print("sum", sum)
 
-    duration = "%.3f\n" % (time.time() - start)
-    print("arith-modulo: " + duration)
-
-
-print('warming up ...')
-for run in range(2000):
-    docompute(10)  # 1000
 
-measure(50)
+def __benchmark__(num=50):
+    measure(50)

graalpython/benchmarks/src/micro/attribute-access-polymorphic.py

@@ -22,7 +22,6 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 # micro benchmark: attribute access polymorphic inspired by richards
-import time
 
 iteration = 20000  # 50000
 
@@ -73,23 +72,11 @@ def do_stuff():
 
 
 def measure(num):
-    for i in range(3):
-        do_stuff()
-
-    print("Start timing...")
-    start = time.time()
-
     for i in range(num):  # 50000
         result = do_stuff()
 
     print(result)
-    duration = "%.3f\n" % (time.time() - start)
-    print("attribute-access-polymorphic: " + duration)
-
 
-# warm up
-print('warming up ...')
-for i in range(1000):
-    do_stuff()
 
-measure(1000)
+def __benchmark__(num=1000):
+    measure(num)

graalpython/benchmarks/src/micro/attribute-access.py

@@ -22,7 +22,6 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 # micro benchmark: attribute access
-import time
 
 iteration = 50000  # 50000
 
@@ -41,20 +40,11 @@ def do_stuff(foo):
 
 
 def measure(num):
-    print("Start timing...")
-    start = time.time()
-
     for i in range(num):  # 50000
         result = do_stuff(Foo(42))
 
     print(result)
-    duration = "%.3f\n" % (time.time() - start)
-    print("attribute-access: " + duration)
-
-
-# warm up
-print('warming up ...')
-for i in range(2000):
-    do_stuff(Foo(42))
+    
 
-measure(5000)
+def __benchmark__(num=5000):
+    measure(num)

graalpython/benchmarks/src/micro/attribute-bool.py

@@ -22,7 +22,6 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 # micro benchmark: boolean attribute access
-import time
 
 iteration = 500000
 
@@ -66,20 +65,11 @@ def do_stuff():
 
 
 def measure(num):
-    print("Start timing...")
-    start = time.time()
-
     for i in range(num):
         result = do_stuff()
 
     print(result)
-    duration = "%.3f\n" % (time.time() - start)
-    print("attribute-bool: " + duration)
-
 
-# warm up
-print('warming up ...')
-for i in range(2000):
-    do_stuff()
 
-measure(3000)
+def __benchmark__(num=3000):
+    measure(num)

graalpython/benchmarks/src/micro/boolean-logic.py

@@ -22,7 +22,6 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 # micro benchmark: method call polymorphic inspired by richards
-import time
 
 iteration = 50000
 
@@ -85,20 +84,11 @@ def no_object_do_stuff():
 
 
 def measure(num):
-    print("Start timing...")
-    start = time.time()
-
     for i in range(num):  # 50000
         result = do_stuff()
 
     print(result)
-    duration = "%.3f\n" % (time.time() - start)
-    print("boolean-logic: " + duration)
-
 
-# warm up
-print('warming up ...')
-for i in range(1000):
-    do_stuff()
 
-measure(1000)
+def __benchmark__(num=1000):
+    measure(num)

graalpython/benchmarks/src/micro/builtin-len-tuple.py

@@ -22,8 +22,6 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 # builtin function len()
-import time
-
 
 def call_len(num, ll):
     length = 0
@@ -34,21 +32,11 @@ def call_len(num, ll):
 
 
 def measure():
-    print("Start timing...")
-    start = time.time()
-
     ll = tuple(range(1000))
     length = call_len(1000000000, ll)  # 1000000
 
     print("Final length ", length)
 
-    duration = "%.3f\n" % (time.time() - start)
-    print("builtin-len-tuple: " + duration)
-
-
-# warm up
-print('warming up ...')
-for run in range(10000):
-    call_len(50000, (1, 2, 3, 4, 5))
 
-measure()
+def __benchmark__(*args):
+    measure()

graalpython/benchmarks/src/micro/builtin-len.py

@@ -22,8 +22,6 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 # builtin function len()
-import time
-
 
 def call_len(num, ll):
     length = 0
@@ -35,21 +33,12 @@ def call_len(num, ll):
 
 
 def measure():
-    print("Start timing...")
-    start = time.time()
-
     ll = [x * 2 for x in range(1000)]
     length = call_len(500000000, ll)  # 1000000000
 
     print("Final length ", length)
 
-    duration = "%.3f\n" % (time.time() - start)
-    print("builtin-len: " + duration)
-
 
-# warm up
-print('warming up ...')
-for run in range(5000):
-    call_len(10000, [1, 2, 3, 4, 5])
 
-measure()
+def __benchmark__(*args):
+    measure()

graalpython/benchmarks/src/micro/call-method-polymorphic.py

@@ -22,7 +22,6 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 # micro benchmark: method call polymorphic inspired by richards
-import time
 
 iteration = 10000
 
@@ -84,20 +83,11 @@ def do_stuff():
 
 
 def measure(num):
-    print("Start timing...")
-    start = time.time()
-
     for i in range(num):  # 50000
         result = do_stuff()
 
     print(result)
-    duration = "%.3f\n" % (time.time() - start)
-    print("call-method-polymorphic: " + duration)
-
-
-# warm up
-print('warming up ...')
-for i in range(1000):
-    do_stuff()
+    
 
-measure(1000)
+def __benchmark__(num=1000):
+    measure(num)

graalpython/benchmarks/src/micro/for-range.py

@@ -22,7 +22,6 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 # micro benchmark: simple for range loop
-import time
 
 iteration = 50000  # 50000
 
@@ -40,20 +39,11 @@ def sumitup(iteration):
 
 
 def measure(num):
-    print("Start timing...")
-    start = time.time()
-
     for i in range(num):  # 50000
         sumitup(iteration)
 
     print(sumitup(iteration))
-    duration = "%.3f\n" % (time.time() - start)
-    print("for-range: " + duration)
-
-
-print('warming up ...')
-for i in range(10000):  # 5000
-    sumitup(6000)  # 1000
+    
 
-# add("a", "b")
-measure(50000)
+def __benchmark__(num=50000):
+    measure(num)