Changeset 36976 in webkit for trunk/JavaScriptCore/kjs/nodes.h

Timestamp:

Sep 26, 2008, 6:44:15 PM (17 years ago)

Author:

[email protected]

Message:

2008-09-26 Gavin Barraclough <​[email protected]>

Reviewed by Maciej Stachowiak & Oliver Hunt.

Add support for reusing temporary JSNumberCells. This change is based on the observation
that if the result of certain operations is a JSNumberCell and is consumed by a subsequent
operation that would produce a JSNumberCell, we can reuse the object rather than allocating
a fresh one. E.g. given the expression ((a * b) * c), we can statically determine that
(a * b) will have a numeric result (or else it will have thrown an exception), so the result
will either be a JSNumberCell or a JSImmediate.

This patch changes three areas of JSC:

• The AST now tracks type information about the result of each node.
• This information is consumed in bytecode compilation, and certain bytecode operations now carry the statically determined type information about their operands.
• CTI uses the information in a number of fashions:
  • Where an operand to certain arithmetic operations is reusable, it will plant code to try to perform the operation in JIT code & reuse the cell, where appropriate.
  • Where it can be statically determined that an operand can only be numeric (typically the result of another arithmetic operation) the code will not redundantly check that the JSCell is a JSNumberCell.
  • Where either of the operands to an add are non-numeric do not plant an optimized arithmetic code path, just call straight out to the C function.

+6% Sunspider (10% progression on 3D, 16% progression on math, 60% progression on access-nbody),
+1% v8-tests (improvements in raytrace & crypto)

• VM/CTI.cpp: Add optimized code generation with reuse of temporary JSNumberCells.
• VM/CTI.h:
• kjs/JSNumberCell.h:
• masm/X86Assembler.h:

• VM/CodeBlock.cpp: Add type information to specific bytecodes.
• VM/CodeGenerator.cpp:
• VM/CodeGenerator.h:
• VM/Machine.cpp:

• kjs/nodes.cpp: Track static type information for nodes.
• kjs/nodes.h:
• kjs/ResultDescriptor.h: (Added)
• JavaScriptCore.xcodeproj/project.pbxproj:

File:

• trunk/JavaScriptCore/kjs/nodes.h (modified) (39 diffs)

trunk/JavaScriptCore/kjs/nodes.h

@@ -33 +33 @@
 #include "Opcode.h"
 #include "RegisterID.h"
+#include "ResultType.h"
 #include "SourceRange.h"
 #include "SymbolTable.h"
@@ -194 +195 @@
         
     protected:
-        Node(JSGlobalData*, JSType) JSC_FAST_CALL; // used by ExpressionNode
-
-        int m_line : 28;
-        unsigned m_expectedReturnType : 3; // JSType
+        int m_line;
     };
 
     class ExpressionNode : public Node {
     public:
-        ExpressionNode(JSGlobalData* globalData) JSC_FAST_CALL : Node(globalData) {}
-        ExpressionNode(JSGlobalData* globalData, JSType expectedReturn) JSC_FAST_CALL
-            : Node(globalData, expectedReturn)
+        ExpressionNode(JSGlobalData* globalData, ResultType resultDesc = ResultType::unknown()) JSC_FAST_CALL
+            : Node(globalData)
+            , m_resultDesc(resultDesc)
         {
         }
@@ -217 +215 @@
         virtual bool isDotAccessorNode() const JSC_FAST_CALL { return false; }
 
-        JSType expectedReturnType() const JSC_FAST_CALL { return static_cast<JSType>(m_expectedReturnType); }
+        ResultType resultDescriptor() const JSC_FAST_CALL { return m_resultDesc; }
 
         // This needs to be in public in order to compile using GCC 3.x 
         typedef enum { EvalOperator, FunctionCall } CallerType;
+
+    private:
+        ResultType m_resultDesc;
     };
 
@@ -246 +247 @@
     public:
         NullNode(JSGlobalData* globalData) JSC_FAST_CALL
-            : ExpressionNode(globalData, NullType)
+            : ExpressionNode(globalData, ResultType::nullType())
         {
         }
@@ -261 +262 @@
     public:
         BooleanNode(JSGlobalData* globalData, bool value) JSC_FAST_CALL
-            : ExpressionNode(globalData, BooleanType)
+            : ExpressionNode(globalData, ResultType::boolean())
             , m_value(value)
         {
@@ -279 +280 @@
     public:
         NumberNode(JSGlobalData* globalData, double v) JSC_FAST_CALL
-            : ExpressionNode(globalData, NumberType)
+            : ExpressionNode(globalData, ResultType::constNumber())
             , m_double(v)
         {
@@ -316 +317 @@
     public:
         StringNode(JSGlobalData* globalData, const Identifier& v) JSC_FAST_CALL
-            : ExpressionNode(globalData, StringType)
+            : ExpressionNode(globalData, ResultType::string())
             , m_value(v)
         {
@@ -845 +846 @@
     public:
         PrePostResolveNode(JSGlobalData* globalData, const Identifier& ident, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
-            : ExpressionNode(globalData, NumberType)
+            : ExpressionNode(globalData, ResultType::constNumber()) // could be reusable for pre?
             , ThrowableExpressionData(divot, startOffset, endOffset)
             , m_ident(ident)
@@ -1027 +1028 @@
     public:
         TypeOfResolveNode(JSGlobalData* globalData, const Identifier& ident) JSC_FAST_CALL
-            : ExpressionNode(globalData, StringType)
+            : ExpressionNode(globalData, ResultType::string())
             , m_ident(ident)
         {
@@ -1047 +1048 @@
     public:
         TypeOfValueNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
-            : ExpressionNode(globalData, StringType)
+            : ExpressionNode(globalData, ResultType::string())
             , m_expr(expr)
         {
@@ -1147 +1148 @@
         }
 
-        UnaryOpNode(JSGlobalData* globalData, JSType type, ExpressionNode* expr)
+        UnaryOpNode(JSGlobalData* globalData, ResultType type, ExpressionNode* expr)
             : ExpressionNode(globalData, type)
             , m_expr(expr)
@@ -1163 +1164 @@
     public:
         UnaryPlusNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
-            : UnaryOpNode(globalData, NumberType, expr)
+            : UnaryOpNode(globalData, ResultType::constNumber(), expr)
         {
         }
@@ -1175 +1176 @@
     public:
         NegateNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
-            : UnaryOpNode(globalData, NumberType, expr)
+            : UnaryOpNode(globalData, ResultType::reusableNumber(), expr)
         {
         }
@@ -1187 +1188 @@
     public:
         BitwiseNotNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
-            : UnaryOpNode(globalData, NumberType, expr)
+            : UnaryOpNode(globalData, ResultType::reusableNumber(), expr)
         {
         }
@@ -1199 +1200 @@
     public:
         LogicalNotNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
-            : UnaryOpNode(globalData, BooleanType, expr)
+            : UnaryOpNode(globalData, ResultType::boolean(), expr)
         {
         }
@@ -1218 +1219 @@
         }
 
-        BinaryOpNode(JSGlobalData* globalData, JSType type, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments)
+        BinaryOpNode(JSGlobalData* globalData, ResultType type, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments)
             : ExpressionNode(globalData, type)
             , m_expr1(expr1)
@@ -1245 +1246 @@
         }
 
-        ReverseBinaryOpNode(JSGlobalData* globalData, JSType type, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments)
+        ReverseBinaryOpNode(JSGlobalData* globalData, ResultType type, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments)
             : ExpressionNode(globalData, type)
             , m_expr1(expr1)
@@ -1265 +1266 @@
     public:
         MultNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1277 +1278 @@
     public:
         DivNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1289 +1290 @@
     public:
         ModNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1301 +1302 @@
     public:
         AddNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::forAdd(expr1->resultDescriptor(), expr2->resultDescriptor()), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1313 +1314 @@
     public:
         SubNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1325 +1326 @@
     public:
         LeftShiftNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1337 +1338 @@
     public:
         RightShiftNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1349 +1350 @@
     public:
         UnsignedRightShiftNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1361 +1362 @@
     public:
         LessNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1373 +1374 @@
     public:
         GreaterNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : ReverseBinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
+            : ReverseBinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1385 +1386 @@
     public:
         LessEqNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1397 +1398 @@
     public:
         GreaterEqNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : ReverseBinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
+            : ReverseBinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1408 +1409 @@
     class ThrowableBinaryOpNode : public BinaryOpNode, public ThrowableExpressionData {
     public:
-        ThrowableBinaryOpNode(JSGlobalData* globalData, JSType type, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
+        ThrowableBinaryOpNode(JSGlobalData* globalData, ResultType type, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
             : BinaryOpNode(globalData, type, expr1, expr2, rightHasAssignments)
         {
@@ -1422 +1423 @@
     public:
         InstanceOfNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : ThrowableBinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
+            : ThrowableBinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1448 +1449 @@
     public:
         EqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1461 +1462 @@
     public:
         NotEqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1473 +1474 @@
     public:
         StrictEqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1486 +1487 @@
     public:
         NotStrictEqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1498 +1499 @@
     public:
         BitAndNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1510 +1511 @@
     public:
         BitOrNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1522 +1523 @@
     public:
         BitXOrNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1537 +1538 @@
     public:
         LogicalOpNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, LogicalOperator oper) JSC_FAST_CALL
-            : ExpressionNode(globalData, BooleanType)
+            : ExpressionNode(globalData, ResultType::boolean())
             , m_expr1(expr1)
             , m_expr2(expr2)