Use closure compiler for metadce tests (#16622)

sbc100 · web-flow · commit 8dc2f005ccae · 2022-03-29T10:52:12.000-07:00
Its seems like we should be measuring sizes with closure
compiler enabled.
diff --git a/tests/other/metadce/hello_libcxx_O2.jssize b/tests/other/metadce/hello_libcxx_O2.jssize
@@ -1 +1 @@
-94516
+26239
diff --git a/tests/other/metadce/hello_libcxx_O2_EVAL_CTORS.jssize b/tests/other/metadce/hello_libcxx_O2_EVAL_CTORS.jssize
@@ -1 +1 @@
-94516
+26239
diff --git a/tests/other/metadce/hello_libcxx_O2_EVAL_CTORS_2.jssize b/tests/other/metadce/hello_libcxx_O2_EVAL_CTORS_2.jssize
@@ -1 +1 @@
-94414
+26202
diff --git a/tests/other/metadce/hello_libcxx_O2_fexceptions.jssize b/tests/other/metadce/hello_libcxx_O2_fexceptions.jssize
@@ -1 +1 @@
-106574
+31507
diff --git a/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.jssize b/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.jssize
@@ -1 +1 @@
-107561
+31607
diff --git a/tests/other/metadce/hello_world.jssize b/tests/other/metadce/hello_world.jssize
@@ -1 +1 @@
-89374
+26932
diff --git a/tests/other/metadce/hello_world_O1.jssize b/tests/other/metadce/hello_world_O1.jssize
@@ -1 +1 @@
-59012
+9610
diff --git a/tests/other/metadce/hello_world_O2.jssize b/tests/other/metadce/hello_world_O2.jssize
@@ -1 +1 @@
-21775
+6905
diff --git a/tests/other/metadce/hello_world_O3.jssize b/tests/other/metadce/hello_world_O3.jssize
@@ -1 +1 @@
-15108
+6240
diff --git a/tests/other/metadce/hello_world_O3_MAIN_MODULE_2.jssize b/tests/other/metadce/hello_world_O3_MAIN_MODULE_2.jssize
@@ -1 +1 @@
-96164
+27149
diff --git a/tests/other/metadce/hello_world_Os.jssize b/tests/other/metadce/hello_world_Os.jssize
@@ -1 +1 @@
-14905
+6150
diff --git a/tests/other/metadce/hello_world_Os_EXPORTED_FUNCTIONS_NONE.jssize b/tests/other/metadce/hello_world_Os_EXPORTED_FUNCTIONS_NONE.jssize
@@ -1 +1 @@
-11775
+4819
diff --git a/tests/other/metadce/hello_world_Oz.jssize b/tests/other/metadce/hello_world_Oz.jssize
@@ -1 +1 @@
-14780
+6109
diff --git a/tests/other/metadce/libcxxabi_message_O3.jssize b/tests/other/metadce/libcxxabi_message_O3.jssize
@@ -1 +1 @@
-12971
+5443
diff --git a/tests/other/metadce/libcxxabi_message_O3_STANDALONE_WASM.jssize b/tests/other/metadce/libcxxabi_message_O3_STANDALONE_WASM.jssize
@@ -1 +1 @@
-14840
+5543
diff --git a/tests/other/metadce/mem_O3.jssize b/tests/other/metadce/mem_O3.jssize
@@ -1 +1 @@
-15096
+6374
diff --git a/tests/other/metadce/mem_O3_ALLOW_MEMORY_GROWTH.jssize b/tests/other/metadce/mem_O3_ALLOW_MEMORY_GROWTH.jssize
@@ -1 +1 @@
-15815
+6704
diff --git a/tests/other/metadce/mem_O3_ALLOW_MEMORY_GROWTH_STANDALONE_WASM.jssize b/tests/other/metadce/mem_O3_ALLOW_MEMORY_GROWTH_STANDALONE_WASM.jssize
@@ -1 +1 @@
-15735
+6045
diff --git a/tests/other/metadce/mem_O3_STANDALONE_WASM.jssize b/tests/other/metadce/mem_O3_STANDALONE_WASM.jssize
@@ -1 +1 @@
-15557
+5969
diff --git a/tests/other/metadce/mem_no_argv_O3_STANDALONE_WASM.jssize b/tests/other/metadce/mem_no_argv_O3_STANDALONE_WASM.jssize
@@ -1 +1 @@
-14840
+5543
diff --git a/tests/other/metadce/mem_no_argv_O3_STANDALONE_WASM_flto.jssize b/tests/other/metadce/mem_no_argv_O3_STANDALONE_WASM_flto.jssize
@@ -1 +1 @@
-14840
+5543
diff --git a/tests/other/metadce/mem_no_main_O3_STANDALONE_WASM_noentry.jssize b/tests/other/metadce/mem_no_main_O3_STANDALONE_WASM_noentry.jssize
@@ -1 +1 @@
-12984
+5468
diff --git a/tests/other/metadce/minimal.jssize b/tests/other/metadce/minimal.jssize
@@ -1 +1 @@
-86764
+21524
diff --git a/tests/other/metadce/minimal_O1.jssize b/tests/other/metadce/minimal_O1.jssize
@@ -1 +1 @@
-54787
+6069
diff --git a/tests/other/metadce/minimal_O2.jssize b/tests/other/metadce/minimal_O2.jssize
@@ -1 +1 @@
-18154
+4695
diff --git a/tests/other/metadce/minimal_O3.jssize b/tests/other/metadce/minimal_O3.jssize
@@ -1 +1 @@
-10484
+4119
diff --git a/tests/other/metadce/minimal_Os.jssize b/tests/other/metadce/minimal_Os.jssize
@@ -1 +1 @@
-10281
+4035
diff --git a/tests/other/metadce/minimal_Os_MINIMAL_RUNTIME.jssize b/tests/other/metadce/minimal_Os_MINIMAL_RUNTIME.jssize
@@ -1 +1 @@
-1038
+428
diff --git a/tests/other/metadce/minimal_Oz.jssize b/tests/other/metadce/minimal_Oz.jssize
@@ -1 +1 @@
-10281
+4035
diff --git a/tests/other/metadce/minimal_Oz_EVAL_CTORS.jssize b/tests/other/metadce/minimal_Oz_EVAL_CTORS.jssize
@@ -1 +1 @@
-10017
+3924
diff --git a/tests/other/metadce/minimal_main_Oz_USE_PTHREADS_PROXY_TO_PTHREAD.jssize b/tests/other/metadce/minimal_main_Oz_USE_PTHREADS_PROXY_TO_PTHREAD.jssize
@@ -1 +1 @@
-31524
+13190
diff --git a/tests/test_other.py b/tests/test_other.py
@@ -7235,18 +7235,25 @@ def args_to_filename(args):
     expected_basename = os.path.splitext(filename)[0]
     expected_basename += args_to_filename(args)
 
-    self.run_process([compiler_for(filename), filename, '-g2'] + args + self.get_emcc_args())
+    # Run once without closure and parse output to find asmLibraryArg
+    build_cmd = [compiler_for(filename), filename] + args + self.get_emcc_args()
+    self.run_process(build_cmd + ['-g2'])
     # find the imports we send from JS
     js = read_file('a.out.js')
     start = js.find('asmLibraryArg = ')
-    end = js.find('}', start) + 1
+    assert(start != -1)
+    end = js.find('}', start)
+    assert(end != -1)
     start = js.find('{', start)
-    relevant = js[start + 2:end - 2]
+    assert(start != -1)
+    relevant = js[start + 2:end - 1]
     relevant = relevant.replace(' ', '').replace('"', '').replace("'", '').split(',')
     sent = [x.split(':')[0].strip() for x in relevant]
     sent = [x for x in sent if x]
     sent.sort()
 
+    self.run_process(build_cmd + ['--profiling-funcs', '--closure=1'])
+
     for exists in expected_exists:
       self.assertIn(exists, sent)
     for not_exists in expected_not_exists:
