Finish roll after #22308 (#22309)

This re-enables the tests and updates the outputs. The suffixes vanish here as WebAssembly/binaryen#6793 replaces .1 with _1, and we have code in this test to ignore such suffixes (as LLVM adds them, and we strip hem to make the output less likely to change frequently).
emscripten-core · Aug 2, 2024 · cf0ec7a · cf0ec7a
1 parent ea35c8c
commit cf0ec7a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 24 deletions.
diff --git a/test/other/metadce/test_metadce_files_wasmfs.funcs b/test/other/metadce/test_metadce_files_wasmfs.funcs
@@ -4,7 +4,7 @@ $__cxx_global_array_dtor.2
 $__cxx_global_array_dtor.3
 $__cxx_global_array_dtor.4
 $__cxx_global_array_dtor.5
-$__cxx_global_array_dtor.6
+$__cxx_global_array_dtor
 $__cxxabiv1::__base_class_type_info::has_unambiguous_public_base\28__cxxabiv1::__dynamic_cast_info*\2c\20void*\2c\20int\29\20const
 $__cxxabiv1::__base_class_type_info::search_above_dst\28__cxxabiv1::__dynamic_cast_info*\2c\20void\20const*\2c\20void\20const*\2c\20int\2c\20bool\29\20const
 $__cxxabiv1::__base_class_type_info::search_below_dst\28__cxxabiv1::__dynamic_cast_info*\2c\20void\20const*\2c\20int\2c\20bool\29\20const
@@ -46,27 +46,27 @@ $pthread_mutex_init
 $sbrk
 $std::__2::__allocation_result<std::__2::allocator_traits<std::__2::allocator<char>>::pointer>\20std::__2::__allocate_at_least\5babi:nn180100\5d<std::__2::allocator<char>>\28std::__2::allocator<char>&\2c\20unsigned\20long\29
 $std::__2::__shared_ptr_emplace<wasmfs::MemoryDataFile\2c\20std::__2::allocator<wasmfs::MemoryDataFile>>::~__shared_ptr_emplace\28\29
-$std::__2::__shared_ptr_emplace<wasmfs::MemoryDataFile\2c\20std::__2::allocator<wasmfs::MemoryDataFile>>::~__shared_ptr_emplace\28\29.1
+$std::__2::__shared_ptr_emplace<wasmfs::MemoryDataFile\2c\20std::__2::allocator<wasmfs::MemoryDataFile>>::~__shared_ptr_emplace\28\29
 $std::__2::__shared_ptr_emplace<wasmfs::MemoryDirectory\2c\20std::__2::allocator<wasmfs::MemoryDirectory>>::__on_zero_shared\28\29
 $std::__2::__shared_ptr_emplace<wasmfs::MemoryDirectory\2c\20std::__2::allocator<wasmfs::MemoryDirectory>>::~__shared_ptr_emplace\28\29
-$std::__2::__shared_ptr_emplace<wasmfs::MemoryDirectory\2c\20std::__2::allocator<wasmfs::MemoryDirectory>>::~__shared_ptr_emplace\28\29.1
+$std::__2::__shared_ptr_emplace<wasmfs::MemoryDirectory\2c\20std::__2::allocator<wasmfs::MemoryDirectory>>::~__shared_ptr_emplace\28\29
 $std::__2::__shared_ptr_emplace<wasmfs::MemorySymlink\2c\20std::__2::allocator<wasmfs::MemorySymlink>>::__on_zero_shared\28\29
 $std::__2::__shared_ptr_emplace<wasmfs::MemorySymlink\2c\20std::__2::allocator<wasmfs::MemorySymlink>>::~__shared_ptr_emplace\28\29
-$std::__2::__shared_ptr_emplace<wasmfs::MemorySymlink\2c\20std::__2::allocator<wasmfs::MemorySymlink>>::~__shared_ptr_emplace\28\29.1
+$std::__2::__shared_ptr_emplace<wasmfs::MemorySymlink\2c\20std::__2::allocator<wasmfs::MemorySymlink>>::~__shared_ptr_emplace\28\29
 $std::__2::__shared_ptr_emplace<wasmfs::OpenFileState\2c\20std::__2::allocator<wasmfs::OpenFileState>>::__on_zero_shared\28\29
 $std::__2::__shared_ptr_emplace<wasmfs::OpenFileState\2c\20std::__2::allocator<wasmfs::OpenFileState>>::~__shared_ptr_emplace\28\29
-$std::__2::__shared_ptr_emplace<wasmfs::OpenFileState\2c\20std::__2::allocator<wasmfs::OpenFileState>>::~__shared_ptr_emplace\28\29.1
+$std::__2::__shared_ptr_emplace<wasmfs::OpenFileState\2c\20std::__2::allocator<wasmfs::OpenFileState>>::~__shared_ptr_emplace\28\29
 $std::__2::__shared_ptr_emplace<wasmfs::SpecialFiles::\28anonymous\20namespace\29::NullFile\2c\20std::__2::allocator<wasmfs::SpecialFiles::\28anonymous\20namespace\29::NullFile>>::__on_zero_shared\28\29
 $std::__2::__shared_ptr_emplace<wasmfs::SpecialFiles::\28anonymous\20namespace\29::NullFile\2c\20std::__2::allocator<wasmfs::SpecialFiles::\28anonymous\20namespace\29::NullFile>>::~__shared_ptr_emplace\28\29
-$std::__2::__shared_ptr_emplace<wasmfs::SpecialFiles::\28anonymous\20namespace\29::NullFile\2c\20std::__2::allocator<wasmfs::SpecialFiles::\28anonymous\20namespace\29::NullFile>>::~__shared_ptr_emplace\28\29.1
+$std::__2::__shared_ptr_emplace<wasmfs::SpecialFiles::\28anonymous\20namespace\29::NullFile\2c\20std::__2::allocator<wasmfs::SpecialFiles::\28anonymous\20namespace\29::NullFile>>::~__shared_ptr_emplace\28\29
+$std::__2::__shared_ptr_emplace<wasmfs::SpecialFiles::\28anonymous\20namespace\29::RandomFile\2c\20std::__2::allocator<wasmfs::SpecialFiles::\28anonymous\20namespace\29::RandomFile>>::~__shared_ptr_emplace\28\29
 $std::__2::__shared_ptr_emplace<wasmfs::SpecialFiles::\28anonymous\20namespace\29::RandomFile\2c\20std::__2::allocator<wasmfs::SpecialFiles::\28anonymous\20namespace\29::RandomFile>>::~__shared_ptr_emplace\28\29
-$std::__2::__shared_ptr_emplace<wasmfs::SpecialFiles::\28anonymous\20namespace\29::RandomFile\2c\20std::__2::allocator<wasmfs::SpecialFiles::\28anonymous\20namespace\29::RandomFile>>::~__shared_ptr_emplace\28\29.1
 $std::__2::__shared_ptr_emplace<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StderrFile\2c\20std::__2::allocator<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StderrFile>>::~__shared_ptr_emplace\28\29
-$std::__2::__shared_ptr_emplace<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StderrFile\2c\20std::__2::allocator<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StderrFile>>::~__shared_ptr_emplace\28\29.1
+$std::__2::__shared_ptr_emplace<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StderrFile\2c\20std::__2::allocator<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StderrFile>>::~__shared_ptr_emplace\28\29
+$std::__2::__shared_ptr_emplace<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StdinFile\2c\20std::__2::allocator<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StdinFile>>::~__shared_ptr_emplace\28\29
 $std::__2::__shared_ptr_emplace<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StdinFile\2c\20std::__2::allocator<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StdinFile>>::~__shared_ptr_emplace\28\29
-$std::__2::__shared_ptr_emplace<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StdinFile\2c\20std::__2::allocator<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StdinFile>>::~__shared_ptr_emplace\28\29.1
 $std::__2::__shared_ptr_emplace<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StdoutFile\2c\20std::__2::allocator<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StdoutFile>>::~__shared_ptr_emplace\28\29
-$std::__2::__shared_ptr_emplace<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StdoutFile\2c\20std::__2::allocator<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StdoutFile>>::~__shared_ptr_emplace\28\29.1
+$std::__2::__shared_ptr_emplace<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StdoutFile\2c\20std::__2::allocator<wasmfs::SpecialFiles::\28anonymous\20namespace\29::StdoutFile>>::~__shared_ptr_emplace\28\29
 $std::__2::__shared_weak_count::__release_weak\28\29
 $std::__2::__shared_weak_count::lock\28\29
 $std::__2::__tree<std::__2::__value_type<std::__2::basic_string<char\2c\20std::__2::char_traits<char>\2c\20std::__2::allocator<char>>\2c\20wasmfs::Directory::DCacheEntry>\2c\20std::__2::__map_value_compare<std::__2::basic_string<char\2c\20std::__2::char_traits<char>\2c\20std::__2::allocator<char>>\2c\20std::__2::__value_type<std::__2::basic_string<char\2c\20std::__2::char_traits<char>\2c\20std::__2::allocator<char>>\2c\20wasmfs::Directory::DCacheEntry>\2c\20std::__2::less<std::__2::basic_string<char\2c\20std::__2::char_traits<char>\2c\20std::__2::allocator<char>>>\2c\20true>\2c\20std::__2::allocator<std::__2::__value_type<std::__2::basic_string<char\2c\20std::__2::char_traits<char>\2c\20std::__2::allocator<char>>\2c\20wasmfs::Directory::DCacheEntry>>>::destroy\28std::__2::__tree_node<std::__2::__value_type<std::__2::basic_string<char\2c\20std::__2::char_traits<char>\2c\20std::__2::allocator<char>>\2c\20wasmfs::Directory::DCacheEntry>\2c\20void*>*\29
@@ -102,7 +102,7 @@ $wasmfs::MemoryDataFile::read\28unsigned\20char*\2c\20unsigned\20long\2c\20long\
 $wasmfs::MemoryDataFile::setSize\28long\20long\29
 $wasmfs::MemoryDataFile::write\28unsigned\20char\20const*\2c\20unsigned\20long\2c\20long\20long\29
 $wasmfs::MemoryDataFile::~MemoryDataFile\28\29
-$wasmfs::MemoryDataFile::~MemoryDataFile\28\29.1
+$wasmfs::MemoryDataFile::~MemoryDataFile\28\29
 $wasmfs::MemoryDirectory::getChild\28std::__2::basic_string<char\2c\20std::__2::char_traits<char>\2c\20std::__2::allocator<char>>\20const&\29
 $wasmfs::MemoryDirectory::getEntries\28\29
 $wasmfs::MemoryDirectory::getName\28std::__2::shared_ptr<wasmfs::File>\29
@@ -114,10 +114,10 @@ $wasmfs::MemoryDirectory::insertMove\28std::__2::basic_string<char\2c\20std::__2
 $wasmfs::MemoryDirectory::insertSymlink\28std::__2::basic_string<char\2c\20std::__2::char_traits<char>\2c\20std::__2::allocator<char>>\20const&\2c\20std::__2::basic_string<char\2c\20std::__2::char_traits<char>\2c\20std::__2::allocator<char>>\20const&\29
 $wasmfs::MemoryDirectory::removeChild\28std::__2::basic_string<char\2c\20std::__2::char_traits<char>\2c\20std::__2::allocator<char>>\20const&\29
 $wasmfs::MemoryDirectory::~MemoryDirectory\28\29
-$wasmfs::MemoryDirectory::~MemoryDirectory\28\29.1
+$wasmfs::MemoryDirectory::~MemoryDirectory\28\29
 $wasmfs::MemorySymlink::getTarget\28\29\20const
 $wasmfs::MemorySymlink::~MemorySymlink\28\29
-$wasmfs::MemorySymlink::~MemorySymlink\28\29.1
+$wasmfs::MemorySymlink::~MemorySymlink\28\29
 $wasmfs::OpenFileState::create\28std::__2::shared_ptr<wasmfs::File>\2c\20unsigned\20int\2c\20std::__2::shared_ptr<wasmfs::OpenFileState>&\29
 $wasmfs::SpecialFiles::\28anonymous\20namespace\29::NullFile::getSize\28\29
 $wasmfs::SpecialFiles::\28anonymous\20namespace\29::NullFile::read\28unsigned\20char*\2c\20unsigned\20long\2c\20long\20long\29
@@ -133,7 +133,7 @@ $wasmfs::SpecialFiles::\28anonymous\20namespace\29::StdoutFile::~StdoutFile\28\2
 $wasmfs::SpecialFiles::\28anonymous\20namespace\29::WritingStdFile::flush\28\29
 $wasmfs::SpecialFiles::\28anonymous\20namespace\29::WritingStdFile::writeToJS\28unsigned\20char\20const*\2c\20unsigned\20long\2c\20void\20\28*\29\28char\20const*\29\2c\20std::__2::vector<char\2c\20std::__2::allocator<char>>&\29
 $wasmfs::SpecialFiles::\28anonymous\20namespace\29::WritingStdFile::~WritingStdFile\28\29
-$wasmfs::SpecialFiles::\28anonymous\20namespace\29::WritingStdFile::~WritingStdFile\28\29.1
+$wasmfs::SpecialFiles::\28anonymous\20namespace\29::WritingStdFile::~WritingStdFile\28\29
 $wasmfs::SpecialFiles::getStderr\28\29
 $wasmfs::SpecialFiles::getStdin\28\29
 $wasmfs::SpecialFiles::getStdout\28\29

diff --git a/test/other/metadce/test_metadce_minimal_pthreads.funcs b/test/other/metadce/test_metadce_minimal_pthreads.funcs
@@ -21,7 +21,7 @@ $__tl_lock
 $__tl_unlock
 $__wait
 $__wake
-$__wake.1
+$__wake
 $__wasi_syscall_ret
 $__wasm_call_ctors
 $__wasm_init_memory
@@ -40,14 +40,14 @@ $_emscripten_tls_init
 $_emscripten_yield
 $_main_thread
 $a_cas
-$a_cas.7
-$a_cas_p.1
+$a_cas
+$a_cas_p
 $a_dec
 $a_fetch_add
-$a_fetch_add.1
+$a_fetch_add
 $a_inc
 $a_store
-$a_swap.1
+$a_swap
 $add
 $call_callback_then_free_ctx
 $call_cancel_then_free_ctx

diff --git a/test/test_other.py b/test/test_other.py
@@ -8667,8 +8667,6 @@ def test_metadce_minimal(self, *args):
 
   @node_pthreads
   def test_metadce_minimal_pthreads(self):
-    self.skipTest('let https://github.com/WebAssembly/binaryen/pull/6793 roll')
-
     self.run_metadce_test('minimal_main.c', ['-Oz', '-pthread', '-sPROXY_TO_PTHREAD'])
 
   @parameterized({
@@ -8749,9 +8747,7 @@ def test_metadce_libcxxabi_message(self, *args):
 
   @parameterized({
     'js_fs':  (['-O3', '-sNO_WASMFS'], [], []), # noqa
-    # TODO: Re-enable after https://github.com/WebAssembly/binaryen/pull/6793
-    #       rolls in.
-    # 'wasmfs': (['-O3', '-sWASMFS'],    [], []), # noqa
+    'wasmfs': (['-O3', '-sWASMFS'],    [], []), # noqa
   })
   def test_metadce_files(self, *args):
     self.run_metadce_test('files.cpp', *args)