Changeset 140504 in webkit for trunk/Source/JavaScriptCore/dfg/DFGNodeFlags.h

Timestamp:

Jan 22, 2013, 9:35:23 PM (13 years ago)

Author:

[email protected]

Message:

Convert CSE phase to not rely too much on NodeIndex
​https://bugs.webkit.org/show_bug.cgi?id=107616

Reviewed by Geoffrey Garen.

• Instead of looping over the graph (which assumes that you can simply loop over all nodes without considering blocks first) to reset node.replacement, do that in the loop that sets up relevantToOSR, just before running CSE on the block.

• Instead of having a relevantToOSR bitvector indexed by NodeIndex, made NodeRelevantToOSR be a NodeFlag. We had exactly one bit left in NodeFlags, so I did some reshuffling to fit it in.

• dfg/DFGCSEPhase.cpp:

(JSC::DFG::CSEPhase::CSEPhase):
(JSC::DFG::CSEPhase::eliminateIrrelevantPhantomChildren):
(JSC::DFG::CSEPhase::performNodeCSE):
(JSC::DFG::CSEPhase::performBlockCSE):
(CSEPhase):

• dfg/DFGNodeFlags.h:

(DFG):

• dfg/DFGNodeType.h:

(DFG):

File:

• trunk/Source/JavaScriptCore/dfg/DFGNodeFlags.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/dfg/DFGNodeFlags.h

@@ -37 +37 @@
 // Entries in the NodeType enum (below) are composed of an id, a result type (possibly none)
 // and some additional informative flags (must generate, is constant, etc).
-#define NodeResultMask              0xF
+#define NodeResultMask              0x7
 #define NodeResultJS                0x1
 #define NodeResultNumber            0x2
@@ -44 +44 @@
 #define NodeResultStorage           0x5
                                 
-#define NodeMustGenerate           0x10 // set on nodes that have side effects, and may not trivially be removed by DCE.
-#define NodeHasVarArgs             0x20
-#define NodeClobbersWorld          0x40
-#define NodeMightClobber           0x80
+#define NodeMustGenerate           0x08 // set on nodes that have side effects, and may not trivially be removed by DCE.
+#define NodeHasVarArgs             0x10
+#define NodeClobbersWorld          0x20
+#define NodeMightClobber           0x40
                                 
-#define NodeBehaviorMask          0x300
-#define NodeMayOverflow           0x100
-#define NodeMayNegZero            0x200
+#define NodeBehaviorMask          0x180
+#define NodeMayOverflow           0x080
+#define NodeMayNegZero            0x100
                                 
-#define NodeBackPropMask         0x7C00
+#define NodeBackPropMask         0x3E00
 #define NodeUseBottom            0x0000
-#define NodeUsedAsNumber          0x400 // The result of this computation may be used in a context that observes fractional, or bigger-than-int32, results.
-#define NodeNeedsNegZero          0x800 // The result of this computation may be used in a context that observes -0.
-#define NodeUsedAsOther          0x1000 // The result of this computation may be used in a context that distinguishes between NaN and other things (like undefined).
+#define NodeUsedAsNumber         0x0200 // The result of this computation may be used in a context that observes fractional, or bigger-than-int32, results.
+#define NodeNeedsNegZero         0x0400 // The result of this computation may be used in a context that observes -0.
+#define NodeUsedAsOther          0x0800 // The result of this computation may be used in a context that distinguishes between NaN and other things (like undefined).
 #define NodeUsedAsValue          (NodeUsedAsNumber | NodeNeedsNegZero | NodeUsedAsOther)
-#define NodeUsedAsInt            0x2000 // The result of this computation is known to be used in a context that prefers, but does not require, integer values.
-#define NodeUsedAsIntLocally     0x4000 // Same as NodeUsedAsInt, but within the same basic block.
+#define NodeUsedAsInt            0x1000 // The result of this computation is known to be used in a context that prefers, but does not require, integer values.
+#define NodeUsedAsIntLocally     0x2000 // Same as NodeUsedAsInt, but within the same basic block.
 
-#define NodeDoesNotExit          0x8000 // This flag is negated to make it natural for the default to be that a node does exit.
+#define NodeDoesNotExit          0x4000 // This flag is negated to make it natural for the default to be that a node does exit.
+
+#define NodeRelevantToOSR        0x8000
 
 typedef uint16_t NodeFlags;