Revision: 23953
Author: [email protected]
Date: Mon Sep 15 15:06:05 2014 UTC
Log: Exact black-list of AST nodes for TurboFan.
[email protected]
Review URL: https://codereview.chromium.org/564203003
https://code.google.com/p/v8/source/detail?r=23953
Modified:
/branches/bleeding_edge/src/ast.cc
/branches/bleeding_edge/src/ast.h
/branches/bleeding_edge/test/cctest/cctest.status
/branches/bleeding_edge/test/mjsunit/mjsunit.status
/branches/bleeding_edge/test/mozilla/mozilla.status
/branches/bleeding_edge/test/webkit/webkit.status
=======================================
--- /branches/bleeding_edge/src/ast.cc Mon Sep 8 09:39:39 2014 UTC
+++ /branches/bleeding_edge/src/ast.cc Mon Sep 15 15:06:05 2014 UTC
@@ -997,45 +997,52 @@
entry_id_(id_gen->GetNextId()) {}
-#define REGULAR_NODE(NodeType) \
+#define REGULAR_NODE(NodeType) \
void AstConstructionVisitor::Visit##NodeType(NodeType* node) { \
- increase_node_count(); \
+ increase_node_count(); \
}
-#define REGULAR_NODE_WITH_FEEDBACK_SLOTS(NodeType) \
+#define REGULAR_NODE_WITH_FEEDBACK_SLOTS(NodeType) \
void AstConstructionVisitor::Visit##NodeType(NodeType* node) { \
- increase_node_count(); \
- add_slot_node(node); \
+ increase_node_count(); \
+ add_slot_node(node); \
}
-#define DONT_OPTIMIZE_NODE(NodeType) \
+#define DONT_OPTIMIZE_NODE(NodeType) \
void AstConstructionVisitor::Visit##NodeType(NodeType* node) { \
- increase_node_count(); \
- set_dont_optimize_reason(k##NodeType); \
- add_flag(kDontSelfOptimize); \
+ increase_node_count(); \
+ set_dont_crankshaft_reason(k##NodeType); \
+ add_flag(kDontSelfOptimize); \
}
-#define DONT_OPTIMIZE_NODE_WITH_FEEDBACK_SLOTS(NodeType) \
+#define DONT_OPTIMIZE_NODE_WITH_FEEDBACK_SLOTS(NodeType) \
void AstConstructionVisitor::Visit##NodeType(NodeType* node) { \
- increase_node_count(); \
- add_slot_node(node); \
- set_dont_optimize_reason(k##NodeType); \
- add_flag(kDontSelfOptimize); \
+ increase_node_count(); \
+ add_slot_node(node); \
+ set_dont_crankshaft_reason(k##NodeType); \
+ add_flag(kDontSelfOptimize); \
+ }
+#define DONT_TURBOFAN_NODE(NodeType) \
+ void AstConstructionVisitor::Visit##NodeType(NodeType* node) { \
+ increase_node_count(); \
+ set_dont_crankshaft_reason(k##NodeType); \
+ set_dont_turbofan_reason(k##NodeType); \
+ add_flag(kDontSelfOptimize); \
}
#define DONT_SELFOPTIMIZE_NODE(NodeType) \
void AstConstructionVisitor::Visit##NodeType(NodeType* node) { \
- increase_node_count(); \
- add_flag(kDontSelfOptimize); \
+ increase_node_count(); \
+ add_flag(kDontSelfOptimize); \
}
-#define DONT_SELFOPTIMIZE_NODE_WITH_FEEDBACK_SLOTS(NodeType) \
+#define DONT_SELFOPTIMIZE_NODE_WITH_FEEDBACK_SLOTS(NodeType) \
void AstConstructionVisitor::Visit##NodeType(NodeType* node) { \
- increase_node_count(); \
- add_slot_node(node); \
- add_flag(kDontSelfOptimize); \
+ increase_node_count(); \
+ add_slot_node(node); \
+ add_flag(kDontSelfOptimize); \
}
-#define DONT_CACHE_NODE(NodeType) \
+#define DONT_CACHE_NODE(NodeType) \
void AstConstructionVisitor::Visit##NodeType(NodeType* node) { \
- increase_node_count(); \
- set_dont_optimize_reason(k##NodeType); \
- add_flag(kDontSelfOptimize); \
- add_flag(kDontCache); \
+ increase_node_count(); \
+ set_dont_crankshaft_reason(k##NodeType); \
+ add_flag(kDontSelfOptimize); \
+ add_flag(kDontCache); \
}
REGULAR_NODE(VariableDeclaration)
@@ -1082,15 +1089,17 @@
DONT_OPTIMIZE_NODE(ModuleUrl)
DONT_OPTIMIZE_NODE(ModuleStatement)
DONT_OPTIMIZE_NODE(WithStatement)
-DONT_OPTIMIZE_NODE(ForOfStatement)
-DONT_OPTIMIZE_NODE(TryCatchStatement)
-DONT_OPTIMIZE_NODE(TryFinallyStatement)
DONT_OPTIMIZE_NODE(DebuggerStatement)
DONT_OPTIMIZE_NODE(NativeFunctionLiteral)
DONT_OPTIMIZE_NODE(SuperReference)
DONT_OPTIMIZE_NODE_WITH_FEEDBACK_SLOTS(Yield)
+// TODO(turbofan): Remove the dont_turbofan_reason once this list is empty.
+DONT_TURBOFAN_NODE(ForOfStatement)
+DONT_TURBOFAN_NODE(TryCatchStatement)
+DONT_TURBOFAN_NODE(TryFinallyStatement)
+
DONT_SELFOPTIMIZE_NODE(DoWhileStatement)
DONT_SELFOPTIMIZE_NODE(WhileStatement)
DONT_SELFOPTIMIZE_NODE(ForStatement)
@@ -1105,7 +1114,7 @@
add_slot_node(node);
if (node->is_jsruntime()) {
// Don't try to optimize JS runtime calls because we bailout on them.
- set_dont_optimize_reason(kCallToAJavaScriptRuntimeFunction);
+ set_dont_crankshaft_reason(kCallToAJavaScriptRuntimeFunction);
}
}
=======================================
--- /branches/bleeding_edge/src/ast.h Wed Sep 10 16:39:42 2014 UTC
+++ /branches/bleeding_edge/src/ast.h Mon Sep 15 15:06:05 2014 UTC
@@ -2973,10 +2973,17 @@
class AstConstructionVisitor BASE_EMBEDDED {
public:
- AstConstructionVisitor() : dont_optimize_reason_(kNoReason) { }
+ AstConstructionVisitor()
+ : dont_crankshaft_reason_(kNoReason),
dont_turbofan_reason_(kNoReason) {}
AstProperties* ast_properties() { return &properties_; }
- BailoutReason dont_optimize_reason() { return dont_optimize_reason_; }
+ BailoutReason dont_optimize_reason() {
+ if (dont_turbofan_reason_ != kNoReason) {
+ return dont_turbofan_reason_;
+ } else {
+ return dont_crankshaft_reason_;
+ }
+ }
private:
template<class> friend class AstNodeFactory;
@@ -2989,8 +2996,11 @@
void increase_node_count() { properties_.add_node_count(1); }
void add_flag(AstPropertiesFlag flag) { properties_.flags()->Add(flag); }
- void set_dont_optimize_reason(BailoutReason reason) {
- dont_optimize_reason_ = reason;
+ void set_dont_crankshaft_reason(BailoutReason reason) {
+ dont_crankshaft_reason_ = reason;
+ }
+ void set_dont_turbofan_reason(BailoutReason reason) {
+ dont_turbofan_reason_ = reason;
}
void add_slot_node(FeedbackSlotInterface* slot_node) {
@@ -3002,7 +3012,8 @@
}
AstProperties properties_;
- BailoutReason dont_optimize_reason_;
+ BailoutReason dont_crankshaft_reason_;
+ BailoutReason dont_turbofan_reason_;
};
=======================================
--- /branches/bleeding_edge/test/cctest/cctest.status Mon Sep 15 09:03:59
2014 UTC
+++ /branches/bleeding_edge/test/cctest/cctest.status Mon Sep 15 15:06:05
2014 UTC
@@ -83,12 +83,6 @@
# Scheduler cannot handle free-floating loops yet
'test-run-inlining/InlineLoop': [SKIP],
- # TODO(mstarzinger): Sometimes the try-catch blacklist fails.
- 'test-debug/DebugEvaluateWithoutStack': [PASS, NO_VARIANTS],
- 'test-debug/MessageQueues': [PASS, NO_VARIANTS],
- 'test-debug/NestedBreakEventContextData': [PASS, NO_VARIANTS],
- 'test-debug/SendClientDataToHandler': [PASS, NO_VARIANTS],
-
# TODO(dcarney): C calls are broken all over the place.
'test-run-machops/RunCall*': [SKIP],
'test-run-machops/RunLoadImmIndex': [SKIP],
=======================================
--- /branches/bleeding_edge/test/mjsunit/mjsunit.status Mon Sep 15 12:48:55
2014 UTC
+++ /branches/bleeding_edge/test/mjsunit/mjsunit.status Mon Sep 15 15:06:05
2014 UTC
@@ -63,10 +63,6 @@
# from the deoptimizer to do that.
'arguments-indirect': [PASS, NO_VARIANTS],
- # TODO(mstarzinger): Sometimes the try-catch blacklist fails.
- 'debug-references': [PASS, NO_VARIANTS],
- 'regress/regress-263': [PASS, NO_VARIANTS],
-
# TODO(rossberg): Typer doesn't like contexts very much.
'harmony/block-conflicts': [PASS, NO_VARIANTS],
'harmony/block-for': [PASS, NO_VARIANTS],
=======================================
--- /branches/bleeding_edge/test/mozilla/mozilla.status Thu Sep 11 12:38:16
2014 UTC
+++ /branches/bleeding_edge/test/mozilla/mozilla.status Mon Sep 15 15:06:05
2014 UTC
@@ -56,7 +56,6 @@
# TODO(turbofan): These are all covered by mjsunit as well. Enable them
once
# we pass 'mjsunit' and 'webkit' with TurboFan.
'js1_4/Functions/function-001': [PASS, NO_VARIANTS],
- 'js1_5/Regress/regress-104077': [PASS, NO_VARIANTS],
'js1_5/Regress/regress-396684': [PASS, NO_VARIANTS],
'js1_5/Regress/regress-80981': [PASS, NO_VARIANTS],
=======================================
--- /branches/bleeding_edge/test/webkit/webkit.status Mon Sep 15 09:03:59
2014 UTC
+++ /branches/bleeding_edge/test/webkit/webkit.status Mon Sep 15 15:06:05
2014 UTC
@@ -33,8 +33,6 @@
'dfg-inline-arguments-become-int32': [PASS, FAIL],
'dfg-inline-arguments-reset': [PASS, FAIL],
'dfg-inline-arguments-reset-changetype': [PASS, FAIL],
- # TODO(turbofan): Sometimes the try-catch blacklist fails.
- 'exception-with-handler-inside-eval-with-dynamic-scope': [PASS,
NO_VARIANTS],
# TODO(turbofan): We run out of stack earlier on 64-bit for now.
'fast/js/deep-recursion-test': [PASS, NO_VARIANTS],
# TODO(bmeurer,svenpanne): Investigate test failure.
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
