[GR-12531] fix micros

PullRequest: graalpython/276

Author: cosminbasca

ci.jsonnet

@@ -1,5 +1,5 @@
 {
-  overlay: "2b63e24614bc48b008ea15460ab22129f4a2c442",
+  overlay: "7d52b9cf9133fbfadcff23cd368aacc7a6a362d5",
 
   // ======================================================================================================
   // 

mx.graalpython/mx_graalpython_bench_param.py

@@ -92,17 +92,21 @@
     'special-add': ITER_15 + ['5'],
     'special-len': ITER_10 + ['5'],
     'member_access': ITER_10 + ['5'],
+    'magic-bool': ITER_10 + ['100000000'],
+    'magic-iter': ITER_10 + ['50000000'],
+    'instantiation': ITER_10 + ['50000000'],
+    'call-classmethod': ITER_15 + ['50000000'],
+}
+
+
+MICRO_NATIVE_BENCHMARKS = {
     'c_member_access': ITER_25 + ['5'],
     'c-list-iterating-obj': ITER_15 + ['50000000'],
-    'magic-bool': ITER_10 + ['100000000'],
     'c-magic-bool': ITER_10 + ['100000000'],
-    'magic-iter': ITER_10 + ['50000000'],
     'c-magic-iter': ITER_10 + ['50000000'],
-    'instantiation': ITER_10 + ['50000000'],
     'c-instantiation': ITER_10 + ['50000000'],
     'c_arith-binop': ITER_25 + ['5'],
     'c_arith_binop_2': ITER_25 + ['50'],
-    'call-classmethod': ITER_15 + ['50000000'],
     'c-call-classmethod': ITER_15 + ['50000000']
 }
 
@@ -159,6 +163,7 @@
 # ----------------------------------------------------------------------------------------------------------------------
 BENCHMARKS = {
     "micro": [PATH_MICRO, MICRO_BENCHMARKS],
+    "micro-native": [PATH_MICRO, MICRO_NATIVE_BENCHMARKS],
     "meso": [PATH_MESO, MESO_BENCHMARKS],
     "macro": [PATH_MACRO, MACRO_BENCHMARKS],
     # "interop": [PATH_INTEROP, INTEROP_BENCHMARKS],

mx.graalpython/mx_graalpython_benchmark.py

@@ -125,9 +125,10 @@ def run(self, cwd, args):
 class CPythonVm(AbstractPythonVm):
     PYTHON_INTERPRETER = "python3"
 
-    def __init__(self, config_name, options=None, virtualenv=None):
+    def __init__(self, config_name, options=None, virtualenv=None, no_warmup=False):
         super(CPythonVm, self).__init__(config_name, options)
         self._virtualenv = virtualenv
+        self._no_warmup = no_warmup
 
     @property
     def interpreter(self):
@@ -138,6 +139,24 @@ def interpreter(self):
     def name(self):
         return VM_NAME_CPYTHON
 
+    @staticmethod
+    def remove_warmup_runs(args):
+        _args = []
+        i = 0
+        while i < len(args):
+            arg = args[i]
+            _args.append(arg)
+            if arg == '-i':
+                _args.append('0')
+                i += 1
+            i += 1
+        return _args
+
+    def run(self, cwd, args):
+        if self._no_warmup:
+            args = CPythonVm.remove_warmup_runs(args)
+        return super(CPythonVm, self).run(cwd, args)
+
 
 class PyPyVm(AbstractPythonVm):
     def __init__(self, config_name, options=None):
@@ -321,7 +340,8 @@ def successPatterns(self):
 
     def failurePatterns(self):
         return [
-            re.compile(r"Exception")
+            # lookahead pattern for when truffle compilation details are enabled in the log
+            re.compile(r"^(?!(\[truffle\])).*Exception")
         ]
 
     def group(self):