commit 51ab19f3839774a9f5c2683c3bb8a7c564e94b7b
author Ian Zerny <zerny@google.com> Mon Oct 21 12:37:25 2019 +0200
committer Ian Zerny <zerny@google.com> Mon Oct 21 10:43:51 2019 +0000
tree 59f83269e968a2e417bfe19f182a733325506370
parent 25cccae06275b5621a75119c5d3726ce57b8ac68

Add no-tree-shaking variant to the bootstrap benchmarks.

Change-Id: Ic7cc4b4de94b0456db8da45661ad346da543ddab

tools/minify_tool.py

diff --git a/tools/minify_tool.py b/tools/minify_tool.py
index 8b086e5..cdbab78 100755
--- a/tools/minify_tool.py
+++ b/tools/minify_tool.py
@@ -87,7 +87,7 @@
 
 def minify_tool(mainclass=None, input_jar=utils.R8_JAR, output_jar=None,
                 lib=utils.RT_JAR, debug=True, build=True, benchmark_name=None,
-                track_memory_file=None):
+                track_memory_file=None, additional_args=[]):
   if output_jar is None:
     output_jar = generate_output_name(input_jar, mainclass)
   with utils.TempDir() as path:
@@ -100,12 +100,12 @@
     keep_path = os.path.join(path, 'keep.txt')
     with open(keep_path, 'w') as fp:
       fp.write(KEEP % mainclass)
-    args = ('--lib', lib,
+    args = ['--lib', lib,
             '--classfile',
             '--output', output_jar,
             '--pg-conf', keep_path,
             '--release',
-            tmp_input_path)
+            tmp_input_path] + additional_args
     start_time = time.time()
     return_code = toolhelper.run('r8', args, debug=debug, build=build,
                                  track_memory_file=track_memory_file)

tools/run_bootstrap_benchmark.py

diff --git a/tools/run_bootstrap_benchmark.py b/tools/run_bootstrap_benchmark.py
index 90834f8..e12051b 100755
--- a/tools/run_bootstrap_benchmark.py
+++ b/tools/run_bootstrap_benchmark.py
@@ -66,4 +66,15 @@
         utils.PINNED_PGR8_JAR)
     print "BootstrapR8PGDex(CodeSize):", utils.uncompressed_size(d8_pg_output)
 
+    r8_notreeshaking_output = os.path.join(temp, 'r8-notreeshaking.zip')
+    return_code = minify_tool.minify_tool(
+      input_jar=utils.PINNED_R8_JAR,
+      output_jar=r8_notreeshaking_output,
+      debug=False,
+      build=False,
+      benchmark_name="BootstrapR8NoTreeShaking",
+      additional_args=["--no-tree-shaking"])
+    if return_code != 0:
+      sys.exit(return_code)
+
   sys.exit(0)