Restore and update metadce tests after LLVM and Binaryen rolls completed (#10283)

Author: kripken

tests/other/metadce/hello_libcxx_O2_fexceptions.imports

@@ -40,6 +40,7 @@ invoke_viii
 invoke_viiii
 invoke_viiiiiii
 invoke_viiiiiiiiii
+invoke_viiiiiiiiiiiiiii
 memory
 setTempRet0
 strftime_l

tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.imports

@@ -40,6 +40,7 @@ invoke_viii
 invoke_viiii
 invoke_viiiiiii
 invoke_viiiiiiiiii
+invoke_viiiiiiiiiiiiiii
 memory
 setTempRet0
 strftime_l

tests/other/metadce/hello_world_O2.funcs

@@ -6,7 +6,6 @@ $__growWasmMemory
 $__overflow
 $__stdio_write
 $__towrite
-$__wasi_syscall_ret
 $__wasm_call_ctors
 $dlfree
 $dlmalloc

tests/other/metadce/hello_world_Os.funcs

@@ -4,7 +4,6 @@ $__fwritex
 $__overflow
 $__stdio_write
 $__towrite
-$__wasi_syscall_ret
 $__wasm_call_ctors
 $fwrite
 $main

tests/other/metadce/hello_world_Oz.funcs

@@ -4,7 +4,6 @@ $__fwritex
 $__overflow
 $__stdio_write
 $__towrite
-$__wasi_syscall_ret
 $__wasm_call_ctors
 $fwrite
 $main

tests/test_other.py

@@ -8206,13 +8206,12 @@ def test_metadce_minimal_fastcomp(self, *args):
   @parameterized({
     'noexcept': (['-O2'],                    19, [], ['waka'], 218988, 17, 33, None), # noqa
     # exceptions increases code size significantly
-    'except':   (['-O2', '-fexceptions'],    52, [], ['waka'], 279827, 46, 46, None), # noqa
+    'except':   (['-O2', '-fexceptions'],    52, [], ['waka'], 279827, 47, 46, None), # noqa
     # exceptions does not pull in demangling by default, which increases code size
     'mangle':   (['-O2', '-fexceptions',
-                  '-s', 'DEMANGLE_SUPPORT'], 52, [], ['waka'], 408028, 46, 47, None), # noqa
+                  '-s', 'DEMANGLE_SUPPORT'], 52, [], ['waka'], 408028, 47, 47, None), # noqa
   })
   @no_fastcomp()
-  @unittest.skip("Allow LLVM roll to proceed")
   def test_metadce_cxx(self, *args):
     # test on libc++: see effects of emulated function pointers
     self.run_metadce_test('hello_libcxx.cpp', *args)
@@ -8231,10 +8230,10 @@ def test_metadce_cxx_fastcomp(self, *args):
   @parameterized({
     'O0': ([],      10, [], ['waka'], 22874,  9,  18, 58), # noqa
     'O1': (['-O1'],  7, [], ['waka'], 10415,  6,  14, 30), # noqa
-    'O2': (['-O2'],  7, [], ['waka'], 10256,  6,  14, 25), # noqa
+    'O2': (['-O2'],  7, [], ['waka'], 10256,  6,  14, 24), # noqa
     'O3': (['-O3'],  4, [], [],        1957,  4,   2, 12), # noqa; in -O3, -Os and -Oz we metadce
-    'Os': (['-Os'],  4, [], [],        1963,  4,   2, 13), # noqa
-    'Oz': (['-Oz'],  4, [], [],        2031,  4,   2, 13), # noqa
+    'Os': (['-Os'],  4, [], [],        1963,  4,   2, 12), # noqa
+    'Oz': (['-Oz'],  4, [], [],        2031,  4,   2, 12), # noqa
     # finally, check what happens when we export nothing. wasm should be almost empty
     'export_nothing':
           (['-Os', '-s', 'EXPORTED_FUNCTIONS=[]'],
@@ -8246,7 +8245,6 @@ def test_metadce_cxx_fastcomp(self, *args):
     'main_module_2': (['-O3', '-s', 'MAIN_MODULE=2'],   12, [], [],  10652,   12,   10, None), # noqa
   })
   @no_fastcomp()
-  @unittest.skip("Allow LLVM roll to proceed")
   def test_metadce_hello(self, *args):
     self.run_metadce_test('hello_world.cpp', *args)