Bug 1762409 - Remove wormhole instructions. r=rhunt

Differential Revision: https://phabricator.services.mozilla.com/D152118
This commit is contained in:
Yury Delendik
2022-07-26 22:39:37 +00:00
parent f6e3700998
commit 225a541507
34 changed files with 48 additions and 493 deletions

View File

@@ -616,9 +616,6 @@ JS_FOR_WASM_FEATURES(WASM_DEFAULT_FEATURE, WASM_DEFAULT_FEATURE,
#undef WASM_DEFAULT_FEATURE
#undef WASM_EXPERIMENTAL_FEATURE
#ifdef ENABLE_WASM_SIMD_WORMHOLE
bool shell::enableWasmSimdWormhole = false;
#endif
bool shell::enableWasmVerbose = false;
bool shell::enableTestWasmAwaitTier2 = false;
bool shell::enableSourcePragmas = true;
@@ -8797,9 +8794,7 @@ static bool WasmLoop(JSContext* cx, unsigned argc, Value* vp) {
Rooted<TypedArrayObject*> typedArray(cx, &ret->as<TypedArrayObject>());
Rooted<WasmInstanceObject*> instanceObj(cx);
// No additional compile options here, we don't need them for this use case.
RootedValue maybeOptions(cx);
if (!wasm::Eval(cx, typedArray, importObj, maybeOptions, &instanceObj)) {
if (!wasm::Eval(cx, typedArray, importObj, &instanceObj)) {
// Clear any pending exceptions, we don't care about them
cx->clearPendingException();
}
@@ -11092,9 +11087,6 @@ static bool SetContextOptions(JSContext* cx, const OptionParser& op) {
#undef WASM_DEFAULT_FEATURE
#undef WASM_EXPERIMENTAL_FEATURE
#ifdef ENABLE_WASM_SIMD_WORMHOLE
enableWasmSimdWormhole = op.getBoolOption("wasm-simd-wormhole");
#endif
enableWasmVerbose = op.getBoolOption("wasm-verbose");
enableTestWasmAwaitTier2 = op.getBoolOption("test-wasm-await-tier2");
enableSourcePragmas = !op.getBoolOption("no-source-pragmas");
@@ -11137,9 +11129,6 @@ static bool SetContextOptions(JSContext* cx, const OptionParser& op) {
JS_FOR_WASM_FEATURES(WASM_FEATURE, WASM_FEATURE, WASM_FEATURE)
#undef WASM_FEATURE
#ifdef ENABLE_WASM_SIMD_WORMHOLE
.setWasmSimdWormhole(enableWasmSimdWormhole)
#endif
.setWasmVerbose(enableWasmVerbose)
.setTestWasmAwaitTier2(enableTestWasmAwaitTier2)
.setSourcePragmas(enableSourcePragmas)
@@ -11546,9 +11535,6 @@ static void SetWorkerContextOptions(JSContext* cx) {
JS_FOR_WASM_FEATURES(WASM_FEATURE, WASM_FEATURE, WASM_FEATURE)
#undef WASM_FEATURE
#ifdef ENABLE_WASM_SIMD_WORMHOLE
.setWasmSimdWormhole(enableWasmSimdWormhole)
#endif
.setWasmVerbose(enableWasmVerbose)
.setTestWasmAwaitTier2(enableTestWasmAwaitTier2)
.setSourcePragmas(enableSourcePragmas);
@@ -12102,14 +12088,8 @@ int main(int argc, char** argv) {
#undef WASM_DEFAULT_FEATURE
#undef WASM_TENTATIVE_FEATURE
#undef WASM_EXPERIMENTAL_FEATURE
#ifdef ENABLE_WASM_SIMD_WORMHOLE
!op.addBoolOption('\0', "wasm-simd-wormhole",
"Enable wasm SIMD wormhole (UTSL)") ||
#else
!op.addBoolOption('\0', "wasm-simd-wormhole", "No-op") ||
#endif
!op.addBoolOption('\0', "no-native-regexp",
"Disable native regexp compilation") ||
!op.addBoolOption('\0', "no-native-regexp",
"Disable native regexp compilation") ||
!op.addIntOption(
'\0', "regexp-warmup-threshold", "COUNT",
"Wait for COUNT invocations before compiling regexps to native code "
@@ -12839,10 +12819,9 @@ int main(int argc, char** argv) {
WASM_EXPERIMENTAL_FEATURE)
# undef WASM_DEFAULT_FEATURE
# undef WASM_EXPERIMENTAL_FEATURE
// Feature selection options
"--wasm-simd-wormhole",
// Compiler selection options
"--test-wasm-await-tier2", NULL};
"--test-wasm-await-tier2",
NULL};
for (const char** p = &to_propagate[0]; *p; p++) {
if (op.getBoolOption(&(*p)[2] /* 2 => skip the leading '--' */)) {
if (!sCompilerProcessFlags.append(*p)) {