Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (279047 => 279048)
--- trunk/Source/_javascript_Core/ChangeLog 2021-06-19 02:16:19 UTC (rev 279047)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-06-19 07:19:27 UTC (rev 279048)
@@ -1,3 +1,16 @@
+2021-06-19 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r278699.
+ https://bugs.webkit.org/show_bug.cgi?id=227174
+
+ Regressed JetStream2/WSL
+
+ Reverted changeset:
+
+ "[JSC] Remove useDataICInOptimizingJIT option"
+ https://bugs.webkit.org/show_bug.cgi?id=226862
+ https://trac.webkit.org/changeset/278699
+
2021-06-18 Yijia Huang <[email protected]>
Add a new pattern to B3ReduceStrength based on Bug 226984
Modified: trunk/Source/_javascript_Core/jit/JITCode.h (279047 => 279048)
--- trunk/Source/_javascript_Core/jit/JITCode.h 2021-06-19 02:16:19 UTC (rev 279047)
+++ trunk/Source/_javascript_Core/jit/JITCode.h 2021-06-19 07:19:27 UTC (rev 279048)
@@ -157,9 +157,13 @@
return jitType == JITType::InterpreterThunk || jitType == JITType::BaselineJIT;
}
- static bool useDataIC(JITType)
+ static bool useDataIC(JITType jitType)
{
- return Options::useDataIC();
+ if (!Options::useDataIC())
+ return false;
+ if (JITCode::isBaselineCode(jitType))
+ return true;
+ return Options::useDataICInOptimizingJIT();
}
virtual const DOMJIT::Signature* signature() const { return nullptr; }
Modified: trunk/Source/_javascript_Core/runtime/Options.cpp (279047 => 279048)
--- trunk/Source/_javascript_Core/runtime/Options.cpp 2021-06-19 02:16:19 UTC (rev 279047)
+++ trunk/Source/_javascript_Core/runtime/Options.cpp 2021-06-19 07:19:27 UTC (rev 279048)
@@ -435,6 +435,8 @@
if (!isARM64())
Options::useDataIC() = false;
+ if (!Options::useDataIC())
+ Options::useDataICInOptimizingJIT() = false;
// At initialization time, we may decide that useJIT should be false for any
// number of reasons (including failing to allocate JIT memory), and therefore,
Modified: trunk/Source/_javascript_Core/runtime/OptionsList.h (279047 => 279048)
--- trunk/Source/_javascript_Core/runtime/OptionsList.h 2021-06-19 02:16:19 UTC (rev 279047)
+++ trunk/Source/_javascript_Core/runtime/OptionsList.h 2021-06-19 07:19:27 UTC (rev 279048)
@@ -544,6 +544,7 @@
v(Bool, useTopLevelAwait, true, Normal, "allow the await keyword at the top level of a module.") \
v(Bool, verboseExecutablePoolAllocation, false, Normal, nullptr) \
v(Bool, useDataIC, isARM64(), Normal, nullptr) \
+ v(Bool, useDataICInOptimizingJIT, false, Normal, nullptr) \
enum OptionEquivalence {
Modified: trunk/Tools/ChangeLog (279047 => 279048)
--- trunk/Tools/ChangeLog 2021-06-19 02:16:19 UTC (rev 279047)
+++ trunk/Tools/ChangeLog 2021-06-19 07:19:27 UTC (rev 279048)
@@ -1,3 +1,16 @@
+2021-06-19 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r278699.
+ https://bugs.webkit.org/show_bug.cgi?id=227174
+
+ Regressed JetStream2/WSL
+
+ Reverted changeset:
+
+ "[JSC] Remove useDataICInOptimizingJIT option"
+ https://bugs.webkit.org/show_bug.cgi?id=226862
+ https://trac.webkit.org/changeset/278699
+
2021-06-18 Philippe Normand <[email protected]>
[MSE][GStreamer] Soundcloud serves MP4 audio with empty tfdt boxes
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (279047 => 279048)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2021-06-19 02:16:19 UTC (rev 279047)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2021-06-19 07:19:27 UTC (rev 279048)
@@ -552,7 +552,7 @@
EAGER_OPTIONS = ["--thresholdForJITAfterWarmUp=10", "--thresholdForJITSoon=10", "--thresholdForOptimizeAfterWarmUp=20", "--thresholdForOptimizeAfterLongWarmUp=20", "--thresholdForOptimizeSoon=20", "--thresholdForFTLOptimizeAfterWarmUp=20", "--thresholdForFTLOptimizeSoon=20", "--thresholdForOMGOptimizeAfterWarmUp=20", "--thresholdForOMGOptimizeSoon=20", "--maximumEvalCacheableSourceLength=150000", "--useEagerCodeBlockJettisonTiming=true", "--repatchBufferingCountdown=0"]
# NOTE: Tests rely on this using scribbleFreeCells.
NO_CJIT_OPTIONS = ["--useConcurrentJIT=false", "--thresholdForJITAfterWarmUp=100", "--scribbleFreeCells=true"]
-B3O1_OPTIONS = ["--defaultB3OptLevel=1"]
+B3O1_OPTIONS = ["--defaultB3OptLevel=1", "--useDataICInOptimizingJIT=1"]
B3O0_OPTIONS = ["--maxDFGNodesInBasicBlockForPreciseAnalysis=100", "--defaultB3OptLevel=0"]
FTL_OPTIONS = ["--useFTLJIT=true"]
FORCE_LLINT_EXIT_OPTIONS = ["--forceOSRExitToLLInt=true"]
