[GR-28780] Save tagged graphs of benchmarks

qunaibit · qunaibit · commit 6d280f5f57a0 · 2021-02-11T03:02:38.000Z
PullRequest: graalpython/1530
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/arith-binop.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/arith-binop.py
@@ -23,7 +23,7 @@
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 # arithmetic ops (partially extracted from spectralnorm)
 
-
+# igv: function_root_docompute_at
 def docompute(num):
     for i in range(num):
         sum_ = 0.0
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/arith-modulo-sized.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/arith-modulo-sized.py
@@ -24,6 +24,7 @@
 # modulo ops
 
 
+# igv: function_root_docompute_at
 def docompute(num):
     for i in range(num):
         sum = 0
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/attribute-access-polymorphic.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/attribute-access-polymorphic.py
@@ -61,6 +61,7 @@ def __init__(self, foo):
              WorkTask(12), WorkTask(13), WorkTask(14), WorkTask(15)]
 
 
+# igv: function_root_do_stuff_at
 def do_stuff():
     task_list = TASK_LIST
     total = 0
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/attribute-access-super.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/attribute-access-super.py
@@ -63,6 +63,7 @@ def get_super(self):
         return super()
 
 
+# ~igv~: function_root_do_stuff_at
 def do_stuff(bar):
     foobar = bar.get_super()
     for i in range(50000):
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/attribute-access.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/attribute-access.py
@@ -31,6 +31,7 @@ def __init__(self, a):
         self.a = a
 
 
+# igv: function_root_do_stuff_at
 def do_stuff(foo):
     for i in range(iteration):
         local_a = foo.a + 1
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/attribute-bool.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/attribute-bool.py
@@ -51,6 +51,7 @@ def running(self):
         return self
 
 
+# igv: function_root_do_stuff_at
 def do_stuff():
     task = TaskState()
 
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/boolean-logic-sized.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/boolean-logic-sized.py
@@ -58,6 +58,7 @@ def setup_task_queue():
 TASK_QUEUE = setup_task_queue()
 
 
+# igv: function_root_do_stuff_at
 def do_stuff():
     total = 0
     for i in range(iteration):
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/builtin-len-tuple-sized.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/builtin-len-tuple-sized.py
@@ -23,6 +23,7 @@
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 # builtin function len()
 
+# igv: function_root_call_len_at
 def call_len(num, ll):
     length = 0
     for i in range(num):
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/builtin-len.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/builtin-len.py
@@ -23,6 +23,7 @@
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 # builtin function len()
 
+# igv: function_root_call_len_at
 def call_len(num, ll):
     length = 0
     for i in range(num):
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-call-classmethod.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-call-classmethod.py
@@ -128,6 +128,7 @@
 ccompile("c_classmethod", code)
 from c_classmethod import NativeCustomType
 
+# ~igv~: function_root_count_at
 def count(num):
     total = 0
     for i in range(num):
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-call-method.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-call-method.py
@@ -144,6 +144,7 @@
 ccompile("c_method_module", code)
 from c_method_module import NativeCustomType
 
+# ~igv~: function_root_count_at
 def count(num):
     print("###### NUM: " + str(num))
     obj = NativeCustomType()
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-instantiate-large.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-instantiate-large.py
@@ -122,6 +122,7 @@
 ccompile("c_instantiation", code)
 import c_instantiation
 
+# ~igv~: function_root_iterate_list_at
 def iterate_list(num):
     types = []
     for t in range(num):
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-issubtype-monorphic.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-issubtype-monorphic.py
@@ -127,6 +127,7 @@
 ccompile("c_classmethod", code)
 from c_classmethod import NativeCustomType
 
+# igv: function_root_count_at
 def count(num):
     total = 0
     for i in range(num):
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-issubtype-polymorphic-forced-to-native.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-issubtype-polymorphic-forced-to-native.py
@@ -131,6 +131,7 @@
 ccompile("c_classmethod", code)
 from c_classmethod import NativeCustomType
 
+# ~igv~: function_root_count_at
 def count(num):
     total = 0
     classes = [str, object, type]
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-issubtype-polymorphic.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-issubtype-polymorphic.py
@@ -131,6 +131,7 @@
 class X():
     pass
 
+# ~igv~: function_root_count_at
 def count(num):
     total = 0
     classes = [str, object, type, dict, list, X]
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-magic-bool.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-magic-bool.py
@@ -183,6 +183,7 @@
 ccompile("c_magic_bool_module", code)
 import c_magic_bool_module
 
+# ~igv~: function_root_count_at
 def count(num):
     idxObj = c_magic_bool_module.NativeMagicMethods()
     cnt_true = 0
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-magic-iter.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-magic-iter.py
@@ -240,6 +240,7 @@
 ccompile("c_custom_iterable_module", code)
 import c_custom_iterable_module
 
+# ~igv~: function_root_count_at
 def count(num):
     idxObj = c_custom_iterable_module.NativeCustomIterable(num % 11)
     for t in range(num):
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/c_arith-binop.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/c_arith-binop.py
@@ -106,6 +106,7 @@
 from c_arith_binop_module import FloatSubclass
 
 
+# ~igv~: function_root_docompute_at
 def docompute(num):
     for i in range(num):
         sum_ = FloatSubclass(0.0)
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/c_arith_binop_2.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/c_arith_binop_2.py
@@ -195,6 +195,7 @@
 from c_arith_binop_module import FloatSubclass
 
 
+# ~igv~: function_root_docompute_at
 def docompute(num):
     for i in range(num):
         sum_ = FloatSubclass(0.0)
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/c_member_access.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/c_member_access.py
@@ -138,6 +138,7 @@
 import c_member_access_module
 
 
+# ~igv~: function_root_do_stuff_at
 def do_stuff(foo):
     for i in range(50000):
         local_a = foo.number + 1
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/call-classmethod-sized.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/call-classmethod-sized.py
@@ -42,6 +42,7 @@ class CustomType:
     def customClassMethod(clazz, *args):
         return args[0]
 
+# igv: function_root_count_at
 def count(num):
     total = 0
     for i in range(num):
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/generate-functions-sized.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/generate-functions-sized.py
@@ -37,6 +37,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+# igv: function_root_count_at
 def count(num):
     def foo(n): 
         def bar(): 
diff --git a/mx.graalpython/mx_graalpython_benchmark.py b/mx.graalpython/mx_graalpython_benchmark.py
@@ -68,6 +68,7 @@
 
 DEFAULT_ITERATIONS = 10
 
+BENCH_BGV = 'benchmarks-bgv'
 
 # ----------------------------------------------------------------------------------------------------------------------
 #
@@ -398,8 +399,89 @@ def __init__(self, name, benchmarks):
         super(PythonBaseBenchmarkSuite, self).__init__()
         self._name = name
         self._benchmarks = benchmarks
-
-    def benchmarkList(self, bm_suite_args):
+        self._graph_dump_time = None
+        self._benchmarks_graphs = {}
+
+    def has_graph_tags(self, benchmark):
+        has_tag = False
+        self._benchmarks_graphs[benchmark] = set()
+        benchmark_path = join(self._bench_path, "{}.py".format(benchmark))
+        with open(benchmark_path, 'r') as fp:
+            text = fp.read()
+
+        for l in text.split('\n'):
+            if '# igv:' in l:
+                s = l.replace('# igv:', '').strip()
+                if s:
+                    self._benchmarks_graphs[benchmark].add(s)
+                    has_tag = True
+
+        return benchmark if has_tag else None
+
+    def has_graph_option(self, bmSuiteArgs):
+        if "--graph" in bmSuiteArgs:
+            import time
+            self._graph_dump_time = time.time()
+            os.mkdir(join(BENCH_BGV, '%d' % self._graph_dump_time))
+            bmSuiteArgs.remove('--graph')
+            return True
+        return False
+
+    def add_graph_dump_option(self, bmSuiteArgs, benchmark):
+        if self._graph_dump_time and self._benchmarks_graphs.get(benchmark):
+            dump_opt = '-Dgraal.Dump='
+            dump_path = join(BENCH_BGV, '%d' % self._graph_dump_time, 'run')
+            dump_path_opt = '-Dgraal.DumpPath=' + dump_path
+            if dump_opt not in bmSuiteArgs:
+                return [dump_opt, dump_path_opt]
+            return [dump_path_opt]
+
+        return []
+
+    def post_run_graph(self, benchmark, host_vm_config, guest_vm_config):
+        graph_tags = self._benchmarks_graphs.get(benchmark)
+        if self._graph_dump_time and graph_tags:
+            repo_hash = SUITE.vc.tip(SUITE.dir, 'master').strip()[:7]
+            name_format = '{h}.{g_vm}.{h_vm}.{s}.{b}.{t}.bgv'
+            dump_path = join(BENCH_BGV, '%d' % self._graph_dump_time, 'run')
+            selected_bgv = {}
+            num_tags = len(graph_tags)
+            for f in sorted(os.listdir(dump_path), reverse=True):
+                selected = False
+                if num_tags == 0 or not f.endswith('.bgv'):
+                    os.remove(join(dump_path, f))
+                    continue
+                for t in graph_tags:
+                    if t in selected_bgv:
+                        continue
+                    if t in f:
+                        graph_tags.remove(t)
+                        selected = True
+                        num_tags -= 1
+                        selected_bgv[t] = f
+                        break
+                if not selected:
+                    os.remove(join(dump_path, f))
+            bench_bgv_dir = join(BENCH_BGV, '%d' % self._graph_dump_time)
+            for t in selected_bgv:
+                old_name = selected_bgv[t]
+                new_name = name_format.format(
+                    h=repo_hash,
+                    g_vm=guest_vm_config,
+                    h_vm=host_vm_config,
+                    s=self._name,
+                    b=benchmark,
+                    t=t)
+                print('rename: %s to %s' % (old_name, new_name))
+                os.rename(join(dump_path, old_name), join(bench_bgv_dir, new_name))
+            if graph_tags:
+                print('The following tags did not correspond to any bgv file:')
+                print('\n'.join(graph_tags))
+                raise FileNotFoundError
+
+    def benchmarkList(self, bmSuiteArgs):
+        if self.has_graph_option(bmSuiteArgs):
+            return [b for b in self._benchmarks.keys() if self.has_graph_tags(b)]
         return list(self._benchmarks.keys())
 
     def benchmarks(self):
@@ -495,6 +577,7 @@ def _replace_host_vm(key):
 
         _replace_host_vm('graalvm-ce')
         _replace_host_vm('graalvm-ee')
+        self.post_run_graph(benchmarks[0], dims['host-vm-config'], dims['guest-vm-config'])
 
         return ret_code, out, dims
 
@@ -559,13 +642,14 @@ def get_arg(self, bench_name):
         return " ".join(self._benchmarks[bench_name])
 
     def createVmCommandLineArgs(self, benchmarks, bmSuiteArgs):
-        vm_args = self.vmArgs(bmSuiteArgs)
-        run_args = self.runArgs(bmSuiteArgs)
         if not benchmarks or len(benchmarks) != 1:
             mx.abort("Please run a specific benchmark (mx benchmark {}:<benchmark-name>) or all the benchmarks "
                      "(mx benchmark {}:*)".format(self.name(), self.name()))
 
         benchmark = benchmarks[0]
+        vm_args = self.add_graph_dump_option(bmSuiteArgs, benchmark)
+        vm_args += self.vmArgs(bmSuiteArgs)
+        run_args = self.runArgs(bmSuiteArgs)
 
         cmd_args = [self._harness_path]
 
