Title: [195446] trunk/Source/_javascript_Core
- Revision
- 195446
- Author
- benja...@webkit.org
- Date
- 2016-01-21 23:24:36 -0800 (Thu, 21 Jan 2016)
Log Message
[JSC] The IRC allocator can mess up the degree of Tmps interfering with move-related Tmps
https://bugs.webkit.org/show_bug.cgi?id=153340
Reviewed by Filip Pizlo.
The _javascript_Core tests uncovered an interested bug in the iterated register
coalescing allocator. When coalescing a move under the right conditions, it is
possible to mess-up the graph for the Tmps interfering with the coalesced Tmps.
Some context first:
-When coalescing a move, we alias one Tmp to another. Let say that we had
Move X, Y
the coalescing may alias Y to X: Y->X.
-Since X and Y are equivalent after coalescing, any interference
edge with Y is "moved" to X.
The way this was done was to add an edge to X for every edge there was with Y.
Say we had an edge R--Y, we add an edge R--X.
Adding an edge increases the degree of R and Y. The degree of R was then
fixed by calling decrementDegree() on it.
-decrementDegree() is non trivial. It will move the Tmp to the right list
for further processing if the Tmp's degree becomes lower than the number
of available registers.
The bug appear in a particular case. Say we have 3 Tmp, A, B, and C.
-A and B are move related, they can be coalesced.
-A has an interference edge with C.
-B does not have and interfence edge with C.
-C's degree is exactly the number of avaialble registers/colors minus one (k - 1).
-> This implies C is already in its list.
We coalesce A and B into B (A->B).
-The first step, addEdgeDistinct() adds an edge between B and C. The degrees of
B and C are increased by one. The degree of C becomes k.
-Next, decrementDegree() is called on C. Its degree decreases to k-1.
Because of the change from k to k-1, decrementDegree() adds C to a list again.
We have two kinds of bugs depending on the test:
-A Tmp can be added to the simplifyWorklist several time.
-A Tmp can be in both simplifyWorklist and freezeWorklist (because its move-related
status changed since the last decrementDegree()).
In both cases, the Tmps interfering with the duplicated Tmp will end up with
a degree lower than their real value.
* b3/air/AirIteratedRegisterCoalescing.cpp:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (195445 => 195446)
--- trunk/Source/_javascript_Core/ChangeLog 2016-01-22 06:45:05 UTC (rev 195445)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-01-22 07:24:36 UTC (rev 195446)
@@ -1,3 +1,50 @@
+2016-01-21 Benjamin Poulain <benja...@webkit.org>
+
+ [JSC] The IRC allocator can mess up the degree of Tmps interfering with move-related Tmps
+ https://bugs.webkit.org/show_bug.cgi?id=153340
+
+ Reviewed by Filip Pizlo.
+
+ The _javascript_Core tests uncovered an interested bug in the iterated register
+ coalescing allocator. When coalescing a move under the right conditions, it is
+ possible to mess-up the graph for the Tmps interfering with the coalesced Tmps.
+
+ Some context first:
+ -When coalescing a move, we alias one Tmp to another. Let say that we had
+ Move X, Y
+ the coalescing may alias Y to X: Y->X.
+ -Since X and Y are equivalent after coalescing, any interference
+ edge with Y is "moved" to X.
+ The way this was done was to add an edge to X for every edge there was with Y.
+ Say we had an edge R--Y, we add an edge R--X.
+ Adding an edge increases the degree of R and Y. The degree of R was then
+ fixed by calling decrementDegree() on it.
+ -decrementDegree() is non trivial. It will move the Tmp to the right list
+ for further processing if the Tmp's degree becomes lower than the number
+ of available registers.
+
+ The bug appear in a particular case. Say we have 3 Tmp, A, B, and C.
+ -A and B are move related, they can be coalesced.
+ -A has an interference edge with C.
+ -B does not have and interfence edge with C.
+ -C's degree is exactly the number of avaialble registers/colors minus one (k - 1).
+ -> This implies C is already in its list.
+
+ We coalesce A and B into B (A->B).
+ -The first step, addEdgeDistinct() adds an edge between B and C. The degrees of
+ B and C are increased by one. The degree of C becomes k.
+ -Next, decrementDegree() is called on C. Its degree decreases to k-1.
+ Because of the change from k to k-1, decrementDegree() adds C to a list again.
+
+ We have two kinds of bugs depending on the test:
+ -A Tmp can be added to the simplifyWorklist several time.
+ -A Tmp can be in both simplifyWorklist and freezeWorklist (because its move-related
+ status changed since the last decrementDegree()).
+ In both cases, the Tmps interfering with the duplicated Tmp will end up with
+ a degree lower than their real value.
+
+ * b3/air/AirIteratedRegisterCoalescing.cpp:
+
2016-01-21 Andreas Kling <akl...@apple.com>
Add some missing WTF_MAKE_FAST_ALLOCATED in _javascript_Core.
Modified: trunk/Source/_javascript_Core/b3/air/AirIteratedRegisterCoalescing.cpp (195445 => 195446)
--- trunk/Source/_javascript_Core/b3/air/AirIteratedRegisterCoalescing.cpp 2016-01-22 06:45:05 UTC (rev 195445)
+++ trunk/Source/_javascript_Core/b3/air/AirIteratedRegisterCoalescing.cpp 2016-01-22 07:24:36 UTC (rev 195446)
@@ -291,6 +291,25 @@
}
}
+
+ bool addEdgeDistinctWithoutDegreeChange(IndexType a, IndexType b)
+ {
+ ASSERT(a != b);
+ if (m_interferenceEdges.add(InterferenceEdge(a, b)).isNewEntry) {
+ if (!isPrecolored(a)) {
+ ASSERT(!m_adjacencyList[a].contains(b));
+ m_adjacencyList[a].append(b);
+ }
+
+ if (!isPrecolored(b)) {
+ ASSERT(!m_adjacencyList[b].contains(a));
+ m_adjacencyList[b].append(a);
+ }
+ return true;
+ }
+ return false;
+ }
+
bool isMoveRelated(IndexType tmpIndex)
{
for (unsigned moveIndex : m_moveList[tmpIndex]) {
@@ -365,8 +384,19 @@
m_moveList[u].add(vMoves.begin(), vMoves.end());
forEachAdjacent(v, [this, u] (IndexType adjacentTmpIndex) {
- addEdgeDistinct(adjacentTmpIndex, u);
- decrementDegree(adjacentTmpIndex);
+ if (addEdgeDistinctWithoutDegreeChange(adjacentTmpIndex, u)) {
+ // If we added a new edge between the adjacentTmp and u, it replaces the edge
+ // that existed with v.
+ // The degree of adjacentTmp remains the same since the edge just changed from u to v.
+ // All we need to do is update the degree of u.
+ if (!isPrecolored(u))
+ m_degrees[u]++;
+ } else {
+ // If we already had an edge between the adjacentTmp and u, the degree of u
+ // is already correct. The degree of the adjacentTmp decreases since the edge
+ // with v is no longer relevant (we can think of it as merged with the edge with u).
+ decrementDegree(adjacentTmpIndex);
+ }
});
if (m_degrees[u] >= m_regsInPriorityOrder.size() && m_freezeWorklist.remove(u))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
