Cleanup run_codesize_test. NFC (#24387)

This change removes the `expected_exists`, `expected_not_exists`
arguments which are no longer used. These lists are now redundant since
we check instead with golden files.

We had a few places where `waka` was being passed to
`expected_not_exists` but there are no code size tests that use a
symbols called `waka`. Perhaps there once was and this was just
cargo-culted?

Also, remove the now-unnecessary use of `*args` which was making it hard
to understand exactly which arguments the tests were using.

Author: sbc100

test/other/codesize/hello_libcxx.cpp

@@ -5,8 +5,7 @@
 
 #include <iostream>
 
-int main()
-{
+int main() {
   std::cout << "hello, world!" << std::endl;
   return 0;
 }

test/test_other.py

@@ -9178,16 +9178,15 @@ def test_unoptimized_code_size(self):
                                      test_file('other/test_unoptimized_code_size_strict.js.size'),
                                      os.path.getsize('strict.js'))
 
-  def run_codesize_test(self, filename, args=[], expected_exists=[], expected_not_exists=[],  # noqa
-                        check_funcs=True):
+  def run_codesize_test(self, filename, emcc_args, check_funcs=True):
 
     # in -Os, -Oz, we remove imports wasm doesn't need
-    print('Running metadce test: %s:' % filename, args, expected_exists, expected_not_exists, check_funcs)
+    print('Running codesize test: %s:' % filename, emcc_args, check_funcs)
     filename = test_file('other/codesize', filename)
     expected_basename = test_file('other/codesize', self.id().split('.')[-1])
 
     # Run once without closure and parse output to find wasmImports
-    build_cmd = [compiler_for(filename), filename, '--output-eol=linux', '--emit-minification-map=minify.map'] + args + self.get_emcc_args()
+    build_cmd = [compiler_for(filename), filename, '--output-eol=linux', '--emit-minification-map=minify.map'] + emcc_args + self.get_emcc_args()
     self.run_process(build_cmd + ['-g2'])
     # find the imports we send from JS
     # TODO(sbc): Find a way to do that that doesn't depend on internal details of
@@ -9213,19 +9212,14 @@ def run_codesize_test(self, filename, args=[], expected_exists=[], expected_not_
 
     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:
-      self.assertNotIn(not_exists, sent)
-
     js_size = os.path.getsize('a.out.js')
     gz_size = get_file_gzipped_size('a.out.js')
     js_size_file = expected_basename + '.jssize'
     gz_size_file = expected_basename + '.gzsize'
     self.check_expected_size_in_file('js', js_size_file, js_size)
     self.check_expected_size_in_file('gz', gz_size_file, gz_size)
 
-    if '-sSINGLE_FILE' in args:
+    if '-sSINGLE_FILE' in emcc_args:
       # No wasm file in the final output so we skip the rest of the
       # testing
       return
@@ -9277,25 +9271,25 @@ def strip_numeric_suffixes(funcname):
       self.assertFileContents(filename, data)
 
   @parameterized({
-    'O0': ([],      [], ['waka']), # noqa
-    'O1': (['-O1'], [], ['waka']), # noqa
-    'O2': (['-O2'], [], ['waka']), # noqa
+    'O0': ([],),
+    'O1': (['-O1'],),
+    'O2': (['-O2'],),
     # in -O3, -Os and -Oz we metadce, and they shrink it down to the minimal output we want
-    'O3': (['-O3'], [], []), # noqa
-    'Os': (['-Os'], [], []), # noqa
-    'Oz': (['-Oz'], [], []), # noqa
-    'Os_mr': (['-Os', '-sMINIMAL_RUNTIME'], [], [], 74), # noqa
+    'O3': (['-O3'],), # noqa
+    'Os': (['-Os'],), # noqa
+    'Oz': (['-Oz'],), # noqa
+    'Os_mr': (['-Os', '-sMINIMAL_RUNTIME'],),
     # EVAL_CTORS also removes the __wasm_call_ctors function
-    'Oz-ctors': (['-Oz', '-sEVAL_CTORS'], [], []), # noqa
-    '64': (['-Oz', '-sMEMORY64'], [], []), # noqa
+    'Oz-ctors': (['-Oz', '-sEVAL_CTORS'],),
+    '64': (['-Oz', '-sMEMORY64'],),
     # WasmFS should not be fully linked into a minimal program.
-    'wasmfs': (['-Oz', '-sWASMFS'], [], []), # noqa
-    'esm': (['-Oz', '-sEXPORT_ES6'], [], []), # noqa
+    'wasmfs': (['-Oz', '-sWASMFS'],),
+    'esm': (['-Oz', '-sEXPORT_ES6'],),
   })
-  def test_codesize_minimal(self, *args):
+  def test_codesize_minimal(self, args):
     self.set_setting('STRICT')
     self.emcc_args.append('--no-entry')
-    self.run_codesize_test('minimal.c', *args)
+    self.run_codesize_test('minimal.c', args)
 
   @node_pthreads
   @parameterized({
@@ -9306,88 +9300,80 @@ def test_codesize_minimal_pthreads(self, args):
     self.run_codesize_test('minimal_main.c', ['-Oz', '-pthread', '-sPROXY_TO_PTHREAD', '-sSTRICT'] + args)
 
   @parameterized({
-    'noexcept': (['-O2'],                    [], ['waka']), # noqa
+    'noexcept': (['-O2'],), # noqa
     # exceptions increases code size significantly
-    'except':   (['-O2', '-fexceptions'],    [], ['waka']), # noqa
+    'except':   (['-O2', '-fexceptions'],), # noqa
     # exceptions does not pull in demangling by default, which increases code size
-    'mangle':   (['-O2', '-fexceptions',
-                  '-sEXPORTED_FUNCTIONS=_main,_free,___cxa_demangle', '-Wno-deprecated'], [], ['waka']), # noqa
+    'mangle':   (['-O2', '-fexceptions', '-sEXPORTED_FUNCTIONS=_main,_free,___cxa_demangle', '-Wno-deprecated'],), # noqa
     # Wasm EH's code size increase is smaller than that of Emscripten EH
-    'except_wasm':   (['-O2', '-fwasm-exceptions', '-sWASM_LEGACY_EXCEPTIONS=0'], [], ['waka']),
-    'except_wasm_legacy':   (['-O2', '-fwasm-exceptions', '-sWASM_LEGACY_EXCEPTIONS'], [], ['waka']),
+    'except_wasm': (['-O2', '-fwasm-exceptions', '-sWASM_LEGACY_EXCEPTIONS=0'],),
+    'except_wasm_legacy': (['-O2', '-fwasm-exceptions', '-sWASM_LEGACY_EXCEPTIONS'],),
     # eval_ctors 1 can partially optimize, but runs into getenv() for locale
     # code. mode 2 ignores those and fully optimizes out the ctors
-    'ctors1':    (['-O2', '-sEVAL_CTORS'],   [], ['waka']),
-    'ctors2':    (['-O2', '-sEVAL_CTORS=2'], [], ['waka']),
-    'wasmfs':    (['-O2', '-sWASMFS'],       [], ['waka']),
-    'lto':       (['-Oz', '-flto'],          [], ['waka']),
+    'ctors1':    (['-O2', '-sEVAL_CTORS'],),
+    'ctors2':    (['-O2', '-sEVAL_CTORS=2'],),
+    'wasmfs':    (['-O2', '-sWASMFS'],),
+    'lto':       (['-Oz', '-flto'],),
   })
-  def test_codesize_cxx(self, *args):
+  def test_codesize_cxx(self, args):
     # do not check functions in this test as there are a lot of libc++ functions
     # pulled in here, and small LLVM backend changes can affect their size and
     # lead to different inlining decisions which add or remove a function
-    self.run_codesize_test('hello_libcxx.cpp', *args, check_funcs=False)
+    self.run_codesize_test('hello_libcxx.cpp', args, check_funcs=False)
 
   @parameterized({
-    'O0': ([],      [], ['waka']),
-    'O1': (['-O1'], [], ['waka']),
-    'O2': (['-O2'], [], ['waka']),
-    'O3': (['-O3'], [], []), # in -O3, -Os and -Oz we metadce
-    'Os': (['-Os'], [], []),
-    'Oz': (['-Oz'], [], []),
+    'O0': ([],),
+    'O1': (['-O1'],),
+    'O2': (['-O2'],),
+    'O3': (['-O3'],), # in -O3, -Os and -Oz we metadce
+    'Os': (['-Os'],),
+    'Oz': (['-Oz'],),
     # finally, check what happens when we export nothing. wasm should be almost empty
-    'export_nothing': (['-Os', '-sEXPORTED_FUNCTIONS=[]'], [], []),
+    'export_nothing': (['-Os', '-sEXPORTED_FUNCTIONS=[]'],),
     # we don't metadce with linkable code! other modules may want stuff
     # TODO(sbc): Investivate why the number of exports is order of magnitude
     # larger for wasm backend.
-    'dylink': (['-O3', '-sMAIN_MODULE=2'], [], []),
+    'dylink': (['-O3', '-sMAIN_MODULE=2'],),
     # WasmFS should not be fully linked into a hello world program.
-    'wasmfs': (['-O3', '-sWASMFS'], [], []),
-    'single_file': (['-O3', '-sSINGLE_FILE'], [], []), # noqa
+    'wasmfs': (['-O3', '-sWASMFS'],),
+    'single_file': (['-O3', '-sSINGLE_FILE'],), # noqa
   })
-  def test_codesize_hello(self, *args):
-    self.run_codesize_test('hello_world.c', *args)
+  def test_codesize_hello(self, args):
+    self.run_codesize_test('hello_world.c', args)
 
   @parameterized({
-    'O3':                 ('mem.c', ['-O3'],
-                           [], []),         # noqa
+    'O3':                 ('mem.c', ['-O3']),
     # argc/argv support code etc. is in the wasm
-    'O3_standalone':      ('mem.c', ['-O3', '-sSTANDALONE_WASM'],
-                           [], []),         # noqa
+    'O3_standalone':      ('mem.c', ['-O3', '-sSTANDALONE_WASM']),
     # without argc/argv, no support code for them is emitted
-    'O3_standalone_narg': ('mem_no_argv.c', ['-O3', '-sSTANDALONE_WASM'],
-                           [], []),         # noqa
+    'O3_standalone_narg': ('mem_no_argv.c', ['-O3', '-sSTANDALONE_WASM']),
     # without main, no support code for argc/argv is emitted either
-    'O3_standalone_lib':  ('mem_no_main.c', ['-O3', '-sSTANDALONE_WASM', '--no-entry'],
-                           [], []),         # noqa
+    'O3_standalone_lib':  ('mem_no_main.c', ['-O3', '-sSTANDALONE_WASM', '--no-entry']),
     # Growth support code is in JS, no significant change in the wasm
-    'O3_grow':            ('mem.c', ['-O3', '-sALLOW_MEMORY_GROWTH'],
-                           [], []),         # noqa
+    'O3_grow':            ('mem.c', ['-O3', '-sALLOW_MEMORY_GROWTH']),
     # Growth support code is in the wasm
-    'O3_grow_standalone': ('mem.c', ['-O3', '-sALLOW_MEMORY_GROWTH', '-sSTANDALONE_WASM'],
-                           [], []),         # noqa
+    'O3_grow_standalone': ('mem.c', ['-O3', '-sALLOW_MEMORY_GROWTH', '-sSTANDALONE_WASM']),
     # without argc/argv, no support code for them is emitted, even with lto
     'O3_standalone_narg_flto':
-                          ('mem_no_argv.c', ['-O3', '-sSTANDALONE_WASM', '-flto'],
-                           [], []),         # noqa
+                          ('mem_no_argv.c', ['-O3', '-sSTANDALONE_WASM', '-flto']),         # noqa
   })
-  def test_codesize_mem(self, filename, *args):
-    self.run_codesize_test(filename, *args)
+  def test_codesize_mem(self, filename, args):
+    self.run_codesize_test(filename, args)
 
   @parameterized({
-    'O3':            (['-O3'],                      [], []), # noqa
+    'O3':            (['-O3'],),
     # argc/argv support code etc. is in the wasm
-    'O3_standalone': (['-O3', '-sSTANDALONE_WASM'], [], []), # noqa
+    'O3_standalone': (['-O3', '-sSTANDALONE_WASM'],),
   })
-  def test_codesize_libcxxabi_message(self, *args):
-    self.run_codesize_test('libcxxabi_message.cpp', *args)
+  def test_codesize_libcxxabi_message(self, args):
+    self.run_codesize_test('libcxxabi_message.cpp', args)
 
   @parameterized({
-    'js_fs':  (['-O3', '-sNO_WASMFS'], [], []), # noqa
-    'wasmfs': (['-O3', '-sWASMFS'],    [], []), # noqa
+    'js_fs':  (['-O3', '-sNO_WASMFS'],), # noqa
+    'wasmfs': (['-O3', '-sWASMFS'],), # noqa
   })
-  def test_codesize_files(self, *args):
-    self.run_codesize_test('files.cpp', *args)
+  def test_codesize_files(self, args):
+    self.run_codesize_test('files.cpp', args)
 
   def test_exported_runtime_methods_metadce(self):
     exports = ['stackSave', 'stackRestore', 'stackAlloc', 'FS']