WasmFS: Force-include FS only when FORCE_FILESYSTEM (#19511)

kripken · web-flow · commit c5e53c4e5e62 · 2023-06-06T12:36:05.000-07:00
This just applies the principle consistently. The only issues in the test suite
were 3 tests that did manual FS.* operations without setting
FORCE_FILESYSTEM, so add that to them.

As the test updates show this helps with code size (removing unused JS
helps by itself, and also helps metadce remove wasm things that the JS
was pointing to).
diff --git a/src/library_fs.js b/src/library_fs.js
@@ -1870,7 +1870,3 @@ FS.staticInit();` +
 #endif
   },
 });
-
-if (FORCE_FILESYSTEM) {
-  DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.push('$FS');
-}
diff --git a/src/library_fs_shared.js b/src/library_fs_shared.js
@@ -105,5 +105,11 @@ mergeInto(LibraryManager.library, {
     if (canWrite) mode |= {{{ cDefs.S_IWUGO }}};
     return mode;
   },
-
 });
+
+// Normally only the FS things that the compiler sees are needed are included.
+// FORCE_FILESYSTEM makes us always include the FS object, which lets the user
+// call APIs on it from JS freely.
+if (FORCE_FILESYSTEM) {
+  DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.push('$FS');
+}
diff --git a/src/library_wasmfs.js b/src/library_wasmfs.js
@@ -331,7 +331,5 @@ FS.createPreloadedFile = FS_createPreloadedFile;
   },
   _wasmfs_copy_preloaded_file_data: function(index, buffer) {
     HEAPU8.set(wasmFSPreloadedFiles[index].fileData, buffer);
-  }
+  },
 });
-
-DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.push('$FS');
diff --git a/test/other/metadce/test_metadce_cxx_wasmfs.jssize b/test/other/metadce/test_metadce_cxx_wasmfs.jssize
@@ -1 +1 @@
-13082
+12960
diff --git a/test/other/metadce/test_metadce_files_wasmfs.exports b/test/other/metadce/test_metadce_files_wasmfs.exports
@@ -2,8 +2,3 @@ q
 r
 s
 t
-u
-v
-w
-x
-y
diff --git a/test/other/metadce/test_metadce_files_wasmfs.funcs b/test/other/metadce/test_metadce_files_wasmfs.funcs
@@ -29,13 +29,11 @@ $__pthread_mutex_lock
 $__stdio_close
 $__stdio_seek
 $__stdio_write
-$__syscall_newfstatat
 $__time
 $__unlockfile
 $__wasi_fd_close
 $__wasi_fd_write
 $__wasm_call_ctors
-$_wasmfs_read_file
 $close
 $decltype\28auto\29\20std::__2::__variant_detail::__visitation::__base::__dispatcher<1ul>::__dispatch\5babi:v160004\5d<std::__2::__variant_detail::__dtor<std::__2::__variant_detail::__traits<long\2c\20std::__2::shared_ptr<wasmfs::File>>\2c\20\28std::__2::__variant_detail::_Trait\291>::__destroy\5babi:v160004\5d\28\29::'lambda'\28auto&\29&&\2c\20std::__2::__variant_detail::__base<\28std::__2::__variant_detail::_Trait\291\2c\20long\2c\20std::__2::shared_ptr<wasmfs::File>>&>\28auto\2c\20std::__2::__variant_detail::__base<\28std::__2::__variant_detail::_Trait\291\2c\20long\2c\20std::__2::shared_ptr<wasmfs::File>>&\29
 $dlfree
@@ -51,9 +49,6 @@ $operator\20new\28unsigned\20long\29
 $pthread_mutex_init
 $readAtOffset\28OffsetHandling\2c\20unsigned\20int\2c\20__wasi_iovec_t\20const*\2c\20unsigned\20long\2c\20unsigned\20long*\2c\20unsigned\20long\20long\29
 $sbrk
-$stackAlloc
-$stackRestore
-$stackSave
 $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::MemoryDirectory\2c\20std::__2::allocator<wasmfs::MemoryDirectory>>::__on_zero_shared\28\29
diff --git a/test/other/metadce/test_metadce_files_wasmfs.jssize b/test/other/metadce/test_metadce_files_wasmfs.jssize
@@ -1 +1 @@
-7061
+6940
diff --git a/test/other/metadce/test_metadce_files_wasmfs.size b/test/other/metadce/test_metadce_files_wasmfs.size
@@ -1 +1 @@
-50559
+49396
diff --git a/test/other/metadce/test_metadce_hello_wasmfs.exports b/test/other/metadce/test_metadce_hello_wasmfs.exports
@@ -2,8 +2,3 @@ q
 r
 s
 t
-u
-v
-w
-x
-y
diff --git a/test/other/metadce/test_metadce_hello_wasmfs.funcs b/test/other/metadce/test_metadce_hello_wasmfs.funcs
@@ -31,14 +31,12 @@ $__pthread_mutex_lock
 $__stdio_close
 $__stdio_seek
 $__stdio_write
-$__syscall_newfstatat
 $__time
 $__towrite
 $__unlockfile
 $__wasi_fd_close
 $__wasi_fd_write
 $__wasm_call_ctors
-$_wasmfs_read_file
 $decltype\28auto\29\20std::__2::__variant_detail::__visitation::__base::__dispatcher<1ul>::__dispatch\5babi:v160004\5d<std::__2::__variant_detail::__dtor<std::__2::__variant_detail::__traits<long\2c\20std::__2::shared_ptr<wasmfs::File>>\2c\20\28std::__2::__variant_detail::_Trait\291>::__destroy\5babi:v160004\5d\28\29::'lambda'\28auto&\29&&\2c\20std::__2::__variant_detail::__base<\28std::__2::__variant_detail::_Trait\291\2c\20long\2c\20std::__2::shared_ptr<wasmfs::File>>&>\28auto\2c\20std::__2::__variant_detail::__base<\28std::__2::__variant_detail::_Trait\291\2c\20long\2c\20std::__2::shared_ptr<wasmfs::File>>&\29
 $dlfree
 $dlmalloc
@@ -51,9 +49,6 @@ $memmove
 $operator\20new\28unsigned\20long\29
 $pthread_mutex_init
 $sbrk
-$stackAlloc
-$stackRestore
-$stackSave
 $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::MemoryDirectory\2c\20std::__2::allocator<wasmfs::MemoryDirectory>>::__on_zero_shared\28\29
diff --git a/test/other/metadce/test_metadce_hello_wasmfs.jssize b/test/other/metadce/test_metadce_hello_wasmfs.jssize
@@ -1 +1 @@
-7061
+6940
diff --git a/test/other/metadce/test_metadce_hello_wasmfs.size b/test/other/metadce/test_metadce_hello_wasmfs.size
@@ -1 +1 @@
-49610
+45278
diff --git a/test/other/metadce/test_metadce_minimal_wasmfs.exports b/test/other/metadce/test_metadce_minimal_wasmfs.exports
@@ -2,8 +2,3 @@ p
 q
 r
 s
-t
-u
-v
-w
-x
diff --git a/test/other/metadce/test_metadce_minimal_wasmfs.funcs b/test/other/metadce/test_metadce_minimal_wasmfs.funcs
@@ -30,15 +30,12 @@ $__pthread_mutex_lock
 $__stdio_close
 $__stdio_seek
 $__stdio_write
-$__syscall_newfstatat
-$__syscall_ret
 $__time
 $__unlockfile
 $__wasi_fd_close
 $__wasi_fd_write
 $__wasi_syscall_ret
 $__wasm_call_ctors
-$_wasmfs_read_file
 $add
 $byn$mgfn-shared$__cxx_global_array_dtor
 $byn$mgfn-shared$wasmfs::SpecialFiles::\28anonymous\20namespace\29::StdoutFile::~StdoutFile\28\29
@@ -56,9 +53,6 @@ $memmove
 $operator\20new\28unsigned\20long\29
 $pthread_mutex_init
 $sbrk
-$stackAlloc
-$stackRestore
-$stackSave
 $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::MemoryDirectory\2c\20std::__2::allocator<wasmfs::MemoryDirectory>>::__on_zero_shared\28\29
diff --git a/test/other/metadce/test_metadce_minimal_wasmfs.jssize b/test/other/metadce/test_metadce_minimal_wasmfs.jssize
@@ -1 +1 @@
-5562
+5442
diff --git a/test/other/metadce/test_metadce_minimal_wasmfs.size b/test/other/metadce/test_metadce_minimal_wasmfs.size
@@ -1 +1 @@
-47015
+42722
diff --git a/test/test_core.py b/test/test_core.py
@@ -5831,6 +5831,8 @@ def test_stat_mknod(self):
 
   @also_with_wasmfs
   def test_fcntl(self):
+    if self.get_setting('WASMFS'):
+      self.emcc_args += ['-sFORCE_FILESYSTEM']
     self.add_pre_run("FS.createDataFile('/', 'test', 'abcdef', true, true, false);")
     self.do_run_in_out_file_test('fcntl/test_fcntl.c')
 
@@ -5839,6 +5841,8 @@ def test_fcntl_open(self):
 
   @also_with_wasm_bigint
   def test_fcntl_misc(self):
+    if self.get_setting('WASMFS'):
+      self.emcc_args += ['-sFORCE_FILESYSTEM']
     self.add_pre_run("FS.createDataFile('/', 'test', 'abcdef', true, true, false);")
     self.do_run_in_out_file_test('fcntl/test_fcntl_misc.c')
 
@@ -6863,6 +6867,9 @@ def test_lua(self):
   @no_wasm64('MEMORY64 does not yet support SJLJ')
   @is_slow_test
   def test_freetype(self):
+    if self.get_setting('WASMFS'):
+      self.emcc_args += ['-sFORCE_FILESYSTEM']
+
     self.add_pre_run("FS.createDataFile('/', 'font.ttf', %s, true, false, false);" % str(
       list(bytearray(read_binary(test_file('freetype/LiberationSansBold.ttf'))))
     ))

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,3 @@ q`
`2`	`2`	`r`
`3`	`3`	`s`
`4`	`4`	`t`
`5`		`-u`
`6`		`-v`
`7`		`-w`
`8`		`-x`
`9`		`-y`