prepare for landing before feature update

Author: dschuff

emcc.py

@@ -35,7 +35,7 @@
 from subprocess import PIPE
 
 
-from tools import shared, system_libs, utils, ports, feature_matrix
+from tools import shared, system_libs, utils, ports
 from tools import colored_logger, diagnostics, building
 from tools.shared import unsuffixed, unsuffixed_basename, get_file_suffix
 from tools.shared import run_process, exit_with_error, DEBUG
@@ -383,6 +383,12 @@ def get_clang_flags(user_args):
       flags.append('-matomics')
     if '-mbulk-memory' not in user_args:
       flags.append('-mbulk-memory')
+  elif '-mbulk-memory' not in user_args and '-mno-bulk-memory' not in user_args:
+    # Bulk memory may be enabled via threads or directly via -s.
+    if not settings.BULK_MEMORY:
+      flags.append('-mno-bulk-memory')
+  if '-mnontrapping-fptoint' not in user_args and '-mno-nontrapping-fptoint' not in user_args:
+      flags.append('-mno-nontrapping-fptoint')
 
   if settings.RELOCATABLE and '-fPIC' not in user_args:
     flags.append('-fPIC')
@@ -854,18 +860,6 @@ def phase_setup(options, state, newargs):
   if settings.SHARED_MEMORY:
     settings.BULK_MEMORY = 1
 
-  if '-mbulk-memory' not in newargs and '-mno-bulk-memory' not in newargs:
-    if feature_matrix.caniuse(feature_matrix.Feature.BULK_MEMORY):
-      newargs += ['-mbulk-memory']
-      settings.BULK_MEMORY = 1
-    else:
-      newargs += ['-mno-bulk-memory']
-  if '-mnontrapping-fptoint' not in newargs and '-mno-nontrapping-fptoint' not in newargs:
-    if feature_matrix.caniuse(feature_matrix.Feature.NON_TRAPPING_FPTOINT):
-      newargs += ['-mnontrapping-fptoint']
-    else:
-      newargs += ['-mno-nontrapping-fptoint']
-
   if 'DISABLE_EXCEPTION_CATCHING' in user_settings and 'EXCEPTION_CATCHING_ALLOWED' in user_settings:
     # If we get here then the user specified both DISABLE_EXCEPTION_CATCHING and EXCEPTION_CATCHING_ALLOWED
     # on the command line.  This is no longer valid so report either an error or a warning (for

test/test_core.py

@@ -4625,7 +4625,7 @@ def test_dylink_postsets_chunking(self):
 
   @with_dylink_reversed
   @parameterized({
-    'libcxx': ('libc,libc++,libmalloc,libc++abi,libbulkmemory',),
+    'libcxx': ('libc,libc++,libmalloc,libc++abi',),
     'all': ('1',),
     'missing': ('libc,libmalloc,libc++abi', False, False, False),
     'missing_assertions': ('libc,libmalloc,libc++abi', False, False, True),

test/test_other.py

@@ -8370,7 +8370,7 @@ def test_binaryen_warn_mem(self):
     self.run_process([EMCC, test_file('hello_world.c'), '-sINITIAL_MEMORY=' + str(16 * 1024 * 1024), '--pre-js', 'pre.js', '-sWASM_ASYNC_COMPILATION=0', '-sIMPORTED_MEMORY'])
     out = self.run_js('a.out.js', assert_returncode=NON_ZERO)
     self.assertContained('LinkError', out)
-    self.assertContained("memory import 1 has a larger maximum size 800 than the module's declared maximum", out)
+    self.assertContained("memory import 2 has a larger maximum size 800 than the module's declared maximum", out)
     self.assertNotContained('hello, world!', out)
     # and with memory growth, all should be good
     self.run_process([EMCC, test_file('hello_world.c'), '-sINITIAL_MEMORY=' + str(16 * 1024 * 1024), '--pre-js', 'pre.js', '-sALLOW_MEMORY_GROWTH', '-sWASM_ASYNC_COMPILATION=0', '-sIMPORTED_MEMORY'])
@@ -10270,37 +10270,45 @@ def test_wasm_features_section(self, args):
 
   def test_wasm_features(self):
     # Test that wasm features are explicitly enabled or disabled based on target engine version
-    def verify_features_sec(feature, expect_in):
-      with webassembly.Module('hello_world.o') as module:
+    def verify_features_sec(feature, expect_in, linked=False):
+      with webassembly.Module('a.out.wasm' if linked else 'hello_world.o') as module:
         features = module.get_target_features()
       if expect_in:
-        self.assertTrue(feature in features and features[feature] == webassembly.TargetFeaturePrefix.USED)
+        self.assertTrue(feature in features and
+                        features[feature] == webassembly.TargetFeaturePrefix.USED,
+                        f'{feature} missing from wasm file')
       else:
-        self.assertFalse(feature in features)
+        self.assertFalse(feature in features,
+                         f'{feature} unexpectedly found in wasm file')
+
+    def verify_features_sec_linked(feature, expect_in):
+      return verify_features_sec(feature, expect_in, linked=True)
 
     def compile(flags):
-      self.run_process([EMCC, test_file('hello_world.c'), '-c'] + flags)
+      self.run_process([EMCC, test_file('hello_world.c')] + flags)
 
-    compile([])
+    compile(['-c'])
     verify_features_sec('bulk-memory', False)
     verify_features_sec('nontrapping-fptoint', False)
     verify_features_sec('sign-ext', True)
     verify_features_sec('mutable-globals', True)
     verify_features_sec('multivalue', True)
     verify_features_sec('reference-types', True)
 
-    compile(['-mnontrapping-fptoint'])
+    compile(['-mnontrapping-fptoint', '-c'])
     verify_features_sec('nontrapping-fptoint', True)
 
-    compile(['-sMIN_SAFARI_VERSION=150000'])
-    verify_features_sec('sign-ext', True)
-    verify_features_sec('mutable-globals', True)
-    verify_features_sec('multivalue', True)
-    verify_features_sec('bulk-memory', True)
-    verify_features_sec('nontrapping-fptoint', True)
+    # BIGINT causes binaryen to not run, and keeps the target_features section
+    compile(['-sMIN_SAFARI_VERSION=150000', '-sWASM_BIGINT'])
+    verify_features_sec_linked('sign-ext', True)
+    verify_features_sec_linked('mutable-globals', True)
+    verify_features_sec_linked('multivalue', True)
+    verify_features_sec_linked('bulk-memory', True)
+    verify_features_sec_linked('nontrapping-fptoint', False)
 
-    compile(['-sMIN_SAFARI_VERSION=150000', '-mno-bulk-memory'])
-    verify_features_sec('bulk-memory', False)
+    compile(['-sMIN_SAFARI_VERSION=150000', '-mno-bulk-memory', '-sWASM_BIGINT'])
+    # FIXME? -mno-bulk-memory at link time does not override MIN_SAFARI_VERSION. it probably should?
+    verify_features_sec_linked('bulk-memory', True)
 
   def test_js_preprocess(self):
     # Use stderr rather than stdout here because stdout is redirected to the output JS file itself.
@@ -12850,7 +12858,7 @@ def test_split_module(self, customLoader, jspi):
     self.assertExists('profile.data')
 
     wasm_split = os.path.join(building.get_binaryen_bin(), 'wasm-split')
-    wasm_split_run = [wasm_split, '-g', '--enable-mutable-globals', '--enable-bulk-memory', '--export-prefix=%', 'test_split_module.wasm.orig', '-o1', 'primary.wasm', '-o2', 'secondary.wasm', '--profile=profile.data']
+    wasm_split_run = [wasm_split, '-g', '--enable-mutable-globals', '--export-prefix=%', 'test_split_module.wasm.orig', '-o1', 'primary.wasm', '-o2', 'secondary.wasm', '--profile=profile.data']
     if jspi:
       wasm_split_run += ['--jspi', '--enable-reference-types']
     self.run_process(wasm_split_run)

tools/feature_matrix.py

@@ -54,7 +54,7 @@ class Feature(IntEnum):
   Feature.BULK_MEMORY: {
     'chrome': 75,
     'firefox': 79,
-    'safari': 140000,
+    'safari': 150000,
   },
   Feature.MUTABLE_GLOBALS: {
     'chrome': 74,

tools/maybe_wasm2js.py

@@ -41,7 +41,7 @@
 
 # main
 
-cmd = [os.path.join(building.get_binaryen_bin(), 'wasm2js'), '--emscripten', '--enable-bulk-memory', wasm_file]
+cmd = [os.path.join(building.get_binaryen_bin(), 'wasm2js'), '--emscripten', wasm_file]
 cmd += opts
 js = shared.run_process(cmd, stdout=subprocess.PIPE).stdout
 # assign the instantiate function to where it will be used

tools/settings.py

@@ -96,10 +96,6 @@
     'WASM_OBJECT_FILES',
     'WASM_WORKERS',
     'BULK_MEMORY',
-    'MIN_SAFARI_VERSION',
-    'MIN_CHROME_VERSION',
-    'MIN_FIREFOX_VERSION',
-    'MIN_NODE_VERSION',
 
     # Internal settings used during compilation
     'EXCEPTION_CATCHING_ALLOWED',