Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1673553 part 3 - Remove Warp browser pref. r=iain,preferences-reviewers

Browse Source 
Depends on D96988

Differential Revision: https://phabricator.services.mozilla.com/D96989
This commit is contained in:
Jan de Mooij 2020-11-16 14:00:04 +00:00
parent 7f3a15f80c
commit a7b38d6598
8 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/jit/JitOptions.cpp
View File

@ -345,13 +345,6 @@ void DefaultJitOptions::setFastWarmUp() {
smallFunctionMaxBytecodeLength = 2000;
}
void DefaultJitOptions::setWarpEnabled(bool enable) {
// WarpBuilder doesn't use optimization levels.
warpBuilder = enable;
disableOptimizationLevels = enable;
normalIonWarmUpThreshold = enable ? 1500 : 1000;
}
void DefaultJitOptions::setNormalIonWarmUpThreshold(uint32_t warmUpThreshold) {
normalIonWarmUpThreshold = warmUpThreshold;

1
js/src/jit/JitOptions.h
View File

@ -131,7 +131,6 @@ struct DefaultJitOptions {
void resetFullIonWarmUpThreshold();
void enableGvn(bool val);
void setFastWarmUp();
void setWarpEnabled(bool enable);
bool eagerIonCompilation() const { return normalIonWarmUpThreshold == 0; }
};

6
js/src/jsapi.cpp
View File

@ -5305,9 +5305,6 @@ JS_PUBLIC_API void JS_SetGlobalJitCompilerOption(JSContext* cx,
case JSJITCOMPILER_SPECTRE_JIT_TO_CXX_CALLS:
jit::JitOptions.spectreJitToCxxCalls = !!value;
break;
case JSJITCOMPILER_WARP_ENABLE:
jit::JitOptions.setWarpEnabled(!!value);
break;
case JSJITCOMPILER_WASM_FOLD_OFFSETS:
jit::JitOptions.wasmFoldOffsets = !!value;
break;
@ -5379,9 +5376,6 @@ JS_PUBLIC_API bool JS_GetGlobalJitCompilerOption(JSContext* cx,
case JSJITCOMPILER_OFFTHREAD_COMPILATION_ENABLE:
*valueOut = rt->canUseOffthreadIonCompilation();
break;
case JSJITCOMPILER_WARP_ENABLE:
*valueOut = jit::JitOptions.warpBuilder;
break;
case JSJITCOMPILER_WASM_FOLD_OFFSETS:
*valueOut = jit::JitOptions.wasmFoldOffsets ? 1 : 0;
break;

1
js/src/jsapi.h
View File

@ -2662,7 +2662,6 @@ extern JS_PUBLIC_API void JS_SetOffthreadIonCompilationEnabled(JSContext* cx,
Register(SPECTRE_STRING_MITIGATIONS, "spectre.string-mitigations") \
Register(SPECTRE_VALUE_MASKING, "spectre.value-masking") \
Register(SPECTRE_JIT_TO_CXX_CALLS, "spectre.jit-to-C++-calls") \
Register(WARP_ENABLE, "warp.enable") \
Register(WASM_FOLD_OFFSETS, "wasm.fold-offsets") \
Register(WASM_DELAY_TIER2, "wasm.delay-tier2") \
Register(WASM_JIT_BASELINE, "wasm.baseline") \

16
js/src/shell/js.cpp
View File

@ -4844,22 +4844,6 @@ static bool SetJitCompilerOption(JSContext* cx, unsigned argc, Value* vp) {
return false;
}
// Similarly, don't allow enabling or disabling Warp at runtime. Bytecode and
// VM data structures depend on whether TI is enabled/disabled.
if (opt == JSJITCOMPILER_WARP_ENABLE) {
uint32_t warpEnabled;
if (!JS_GetGlobalJitCompilerOption(cx, JSJITCOMPILER_WARP_ENABLE,
&warpEnabled)) {
return false;
}
if (bool(number) != warpEnabled) {
JS_ReportErrorASCII(
cx, "Enabling or disabling Warp at runtime is not supported.");
return false;
}
return true;
}
// Throw if disabling the JITs and there's JIT code on the stack, to avoid
// assertion failures.
if ((opt == JSJITCOMPILER_BASELINE_ENABLE ||

2
js/xpconnect/src/XPCJSContext.cpp
View File

@ -842,7 +842,6 @@ static void LoadStartupJSPrefs(XPCJSContext* xpccx) {
bool useBaselineInterp = Preferences::GetBool(JS_OPTIONS_DOT_STR "blinterp");
bool useBaselineJit = Preferences::GetBool(JS_OPTIONS_DOT_STR "baselinejit");
bool useIon = Preferences::GetBool(JS_OPTIONS_DOT_STR "ion");
bool useWarp = Preferences::GetBool(JS_OPTIONS_DOT_STR "warp");
bool useJitForTrustedPrincipals =
Preferences::GetBool(JS_OPTIONS_DOT_STR "jit_trustedprincipals");
bool useNativeRegExp =
@ -906,7 +905,6 @@ static void LoadStartupJSPrefs(XPCJSContext* xpccx) {
JS_SetGlobalJitCompilerOption(cx, JSJITCOMPILER_BASELINE_ENABLE,
useBaselineJit);
JS_SetGlobalJitCompilerOption(cx, JSJITCOMPILER_ION_ENABLE, useIon);
JS_SetGlobalJitCompilerOption(cx, JSJITCOMPILER_WARP_ENABLE, useWarp);
JS_SetGlobalJitCompilerOption(cx, JSJITCOMPILER_JIT_TRUSTEDPRINCIPALS_ENABLE,
useJitForTrustedPrincipals);
JS_SetGlobalJitCompilerOption(cx, JSJITCOMPILER_NATIVE_REGEXP_ENABLE,

1
modules/libpref/init/all.js
View File

@ -1096,7 +1096,6 @@ pref("javascript.options.baselinejit", true);
// Duplicated in JitOptions - ensure both match.
pref("javascript.options.baselinejit.threshold", 100);
pref("javascript.options.ion", true);
pref("javascript.options.warp", true);
// Duplicated in JitOptions - ensure both match.
pref("javascript.options.ion.threshold", 1500);
pref("javascript.options.ion.full.threshold", 100000);

9
toolkit/components/featuregates/Features.toml
View File

@ -177,15 +177,6 @@ type = "boolean"
bug-numbers = [1643027]
is-public = true
[js-warp]
title = "experimental-features-js-warp"
description = "experimental-features-js-warp-description"
restart-required = true
preference = "javascript.options.warp"
type = "boolean"
bug-numbers = [1613592]
is-public = true
[fission]
title = "experimental-features-fission"
description = "experimental-features-fission-description"