Add feature options to emscripten metadata (#1982)

Emscripten runs wasm-emscripten-finalize before running wasm-opt, so the target features section is stripped out before optimizations are run. One option would have been to add another wasm-opt invocation at the very end to strip the target features section, but dumping the features as metadata avoids the extra tool invocation. In the long run, it would be nice to have only as single binaryen invocation to do all the work that needs doing.

12 files changed, 108 insertions, 0 deletions

diff --git a/test/lld/duplicate_imports.wast.out b/test/lld/duplicate_imports.wast.out
index e7d36127f..9fdab56a9 100644
--- a/test/lld/duplicate_imports.wast.out
+++ b/test/lld/duplicate_imports.wast.out
@@ -137,6 +137,15 @@
   "invokeFuncs": [
     "invoke_ffd"
   ]
+  "features": [
+    "--mvp-features",
+    "--enable-threads",
+    "--enable-mutable-globals",
+    "--enable-nontrapping-float-to-int",
+    "--enable-simd",
+    "--enable-bulk-memory",
+    "--enable-sign-ext"
+  ]
 }
 -- END METADATA --
 ;)
diff --git a/test/lld/em_asm.wast.mem.out b/test/lld/em_asm.wast.mem.out
index 647342134..f10c49c89 100644
--- a/test/lld/em_asm.wast.mem.out
+++ b/test/lld/em_asm.wast.mem.out
@@ -261,6 +261,15 @@
   },
   "invokeFuncs": [
   ]
+  "features": [
+    "--mvp-features",
+    "--enable-threads",
+    "--enable-mutable-globals",
+    "--enable-nontrapping-float-to-int",
+    "--enable-simd",
+    "--enable-bulk-memory",
+    "--enable-sign-ext"
+  ]
 }
 -- END METADATA --
 ;)
diff --git a/test/lld/em_asm.wast.out b/test/lld/em_asm.wast.out
index 5e293f541..46b86987d 100644
--- a/test/lld/em_asm.wast.out
+++ b/test/lld/em_asm.wast.out
@@ -262,6 +262,15 @@
   },
   "invokeFuncs": [
   ]
+  "features": [
+    "--mvp-features",
+    "--enable-threads",
+    "--enable-mutable-globals",
+    "--enable-nontrapping-float-to-int",
+    "--enable-simd",
+    "--enable-bulk-memory",
+    "--enable-sign-ext"
+  ]
 }
 -- END METADATA --
 ;)
diff --git a/test/lld/em_asm_O0.wast.out b/test/lld/em_asm_O0.wast.out
index 099da3746..10ce9e0df 100644
--- a/test/lld/em_asm_O0.wast.out
+++ b/test/lld/em_asm_O0.wast.out
@@ -122,6 +122,15 @@
   },
   "invokeFuncs": [
   ]
+  "features": [
+    "--mvp-features",
+    "--enable-threads",
+    "--enable-mutable-globals",
+    "--enable-nontrapping-float-to-int",
+    "--enable-simd",
+    "--enable-bulk-memory",
+    "--enable-sign-ext"
+  ]
 }
 -- END METADATA --
 ;)
diff --git a/test/lld/em_asm_table.wast.out b/test/lld/em_asm_table.wast.out
index 06cfc9fc6..bc2fb60f9 100644
--- a/test/lld/em_asm_table.wast.out
+++ b/test/lld/em_asm_table.wast.out
@@ -92,6 +92,15 @@
   },
   "invokeFuncs": [
   ]
+  "features": [
+    "--mvp-features",
+    "--enable-threads",
+    "--enable-mutable-globals",
+    "--enable-nontrapping-float-to-int",
+    "--enable-simd",
+    "--enable-bulk-memory",
+    "--enable-sign-ext"
+  ]
 }
 -- END METADATA --
 ;)
diff --git a/test/lld/em_js_O0.wast.out b/test/lld/em_js_O0.wast.out
index 385daf8d5..85411c495 100644
--- a/test/lld/em_js_O0.wast.out
+++ b/test/lld/em_js_O0.wast.out
@@ -72,6 +72,15 @@
   },
   "invokeFuncs": [
   ]
+  "features": [
+    "--mvp-features",
+    "--enable-threads",
+    "--enable-mutable-globals",
+    "--enable-nontrapping-float-to-int",
+    "--enable-simd",
+    "--enable-bulk-memory",
+    "--enable-sign-ext"
+  ]
 }
 -- END METADATA --
 ;)
diff --git a/test/lld/hello_world.wast.mem.out b/test/lld/hello_world.wast.mem.out
index ce0c93510..c3826ecb9 100644
--- a/test/lld/hello_world.wast.mem.out
+++ b/test/lld/hello_world.wast.mem.out
@@ -97,6 +97,15 @@
   },
   "invokeFuncs": [
   ]
+  "features": [
+    "--mvp-features",
+    "--enable-threads",
+    "--enable-mutable-globals",
+    "--enable-nontrapping-float-to-int",
+    "--enable-simd",
+    "--enable-bulk-memory",
+    "--enable-sign-ext"
+  ]
 }
 -- END METADATA --
 ;)
diff --git a/test/lld/hello_world.wast.out b/test/lld/hello_world.wast.out
index 20539c0d5..18a21e2eb 100644
--- a/test/lld/hello_world.wast.out
+++ b/test/lld/hello_world.wast.out
@@ -98,6 +98,15 @@
   },
   "invokeFuncs": [
   ]
+  "features": [
+    "--mvp-features",
+    "--enable-threads",
+    "--enable-mutable-globals",
+    "--enable-nontrapping-float-to-int",
+    "--enable-simd",
+    "--enable-bulk-memory",
+    "--enable-sign-ext"
+  ]
 }
 -- END METADATA --
 ;)
diff --git a/test/lld/init.wast.out b/test/lld/init.wast.out
index e9ca29152..9244da718 100644
--- a/test/lld/init.wast.out
+++ b/test/lld/init.wast.out
@@ -109,6 +109,15 @@
   },
   "invokeFuncs": [
   ]
+  "features": [
+    "--mvp-features",
+    "--enable-threads",
+    "--enable-mutable-globals",
+    "--enable-nontrapping-float-to-int",
+    "--enable-simd",
+    "--enable-bulk-memory",
+    "--enable-sign-ext"
+  ]
 }
 -- END METADATA --
 ;)
diff --git a/test/lld/recursive.wast.out b/test/lld/recursive.wast.out
index be0a0f007..bce622b93 100644
--- a/test/lld/recursive.wast.out
+++ b/test/lld/recursive.wast.out
@@ -155,6 +155,15 @@
   },
   "invokeFuncs": [
   ]
+  "features": [
+    "--mvp-features",
+    "--enable-threads",
+    "--enable-mutable-globals",
+    "--enable-nontrapping-float-to-int",
+    "--enable-simd",
+    "--enable-bulk-memory",
+    "--enable-sign-ext"
+  ]
 }
 -- END METADATA --
 ;)
diff --git a/test/lld/reserved_func_ptr.wast.out b/test/lld/reserved_func_ptr.wast.out
index 86d61bc82..e777b2af5 100644
--- a/test/lld/reserved_func_ptr.wast.out
+++ b/test/lld/reserved_func_ptr.wast.out
@@ -192,6 +192,15 @@
   },
   "invokeFuncs": [
   ]
+  "features": [
+    "--mvp-features",
+    "--enable-threads",
+    "--enable-mutable-globals",
+    "--enable-nontrapping-float-to-int",
+    "--enable-simd",
+    "--enable-bulk-memory",
+    "--enable-sign-ext"
+  ]
 }
 -- END METADATA --
 ;)
diff --git a/test/lld/shared.wast.out b/test/lld/shared.wast.out
index 67f4739dd..2825913a3 100644
--- a/test/lld/shared.wast.out
+++ b/test/lld/shared.wast.out
@@ -72,6 +72,15 @@
   },
   "invokeFuncs": [
   ]
+  "features": [
+    "--mvp-features",
+    "--enable-threads",
+    "--enable-mutable-globals",
+    "--enable-nontrapping-float-to-int",
+    "--enable-simd",
+    "--enable-bulk-memory",
+    "--enable-sign-ext"
+  ]
 }
 -- END METADATA --
 ;)