Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(723)

Unified Diff: test/unittests/compiler/node-test-utils.cc

Issue 1441643002: [Interpreter] Add support for global loads / stores / calls to BytecodeGraphBuilder. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@int_tf_call
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: test/unittests/compiler/node-test-utils.cc
diff --git a/test/unittests/compiler/node-test-utils.cc b/test/unittests/compiler/node-test-utils.cc
index d7ef3c5b36707c3a4224c09264495914e8d4680e..62f7c7912c0fb83d13179b14bf44fb7a536a8c31 100644
--- a/test/unittests/compiler/node-test-utils.cc
+++ b/test/unittests/compiler/node-test-utils.cc
@@ -1460,7 +1460,7 @@ class IsJSLoadNamedMatcher final : public NodeMatcher {
bool MatchAndExplain(Node* node, MatchResultListener* listener) const final {
return (NodeMatcher::MatchAndExplain(node, listener) &&
PrintMatchAndExplain(OpParameter<const NamedAccess>(node).name(),
- "descriptor", name_matcher_, listener) &&
+ "name", name_matcher_, listener) &&
PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0),
"object", object_value_matcher_, listener) &&
PrintMatchAndExplain(NodeProperties::GetValueInput(node, 1),
@@ -1481,6 +1481,107 @@ class IsJSLoadNamedMatcher final : public NodeMatcher {
};
+class IsJSLoadGlobalMatcher final : public NodeMatcher {
+ public:
+ IsJSLoadGlobalMatcher(const Matcher<Handle<Name>>& name_matcher,
+ const Matcher<Node*>& feedback_vector_matcher,
+ const Matcher<Node*>& effect_matcher,
+ const Matcher<Node*>& control_matcher)
+ : NodeMatcher(IrOpcode::kJSLoadGlobal),
+ name_matcher_(name_matcher),
+ feedback_vector_matcher_(feedback_vector_matcher),
+ effect_matcher_(effect_matcher),
+ control_matcher_(control_matcher) {}
+
+ void DescribeTo(std::ostream* os) const final {
+ NodeMatcher::DescribeTo(os);
+ *os << " whose name (";
+ name_matcher_.DescribeTo(os);
+ *os << "), feedback vector (";
+ feedback_vector_matcher_.DescribeTo(os);
+ *os << "), effect (";
+ effect_matcher_.DescribeTo(os);
+ *os << "), and control (";
+ control_matcher_.DescribeTo(os);
+ *os << ")";
+ }
+
+ bool MatchAndExplain(Node* node, MatchResultListener* listener) const final {
+ return (NodeMatcher::MatchAndExplain(node, listener) &&
+ PrintMatchAndExplain(
+ OpParameter<const LoadGlobalParameters>(node).name(), "name",
+ name_matcher_, listener) &&
+ PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0),
+ "feedback vector", feedback_vector_matcher_,
+ listener) &&
+ PrintMatchAndExplain(NodeProperties::GetEffectInput(node), "effect",
+ effect_matcher_, listener) &&
+ PrintMatchAndExplain(NodeProperties::GetControlInput(node),
+ "control", control_matcher_, listener));
+ }
+
+ private:
+ const Matcher<Handle<Name>> name_matcher_;
+ const Matcher<Node*> feedback_vector_matcher_;
+ const Matcher<Node*> effect_matcher_;
+ const Matcher<Node*> control_matcher_;
+};
+
+
+class IsJSStoreGlobalMatcher final : public NodeMatcher {
+ public:
+ IsJSStoreGlobalMatcher(const Matcher<Handle<Name>>& name_matcher,
+ const Matcher<Node*>& value_matcher,
+ const Matcher<Node*>& feedback_vector_matcher,
+ const Matcher<Node*>& effect_matcher,
+ const Matcher<Node*>& control_matcher)
+ : NodeMatcher(IrOpcode::kJSStoreGlobal),
+ name_matcher_(name_matcher),
+ value_matcher_(value_matcher),
+ feedback_vector_matcher_(feedback_vector_matcher),
+ effect_matcher_(effect_matcher),
+ control_matcher_(control_matcher) {}
+
+ void DescribeTo(std::ostream* os) const final {
+ NodeMatcher::DescribeTo(os);
+ *os << " whose name (";
+ name_matcher_.DescribeTo(os);
+ *os << "), value (";
+ value_matcher_.DescribeTo(os);
+ *os << "), feedback vector (";
+ feedback_vector_matcher_.DescribeTo(os);
+ *os << "), effect (";
+ effect_matcher_.DescribeTo(os);
+ *os << "), and control (";
+ control_matcher_.DescribeTo(os);
+ *os << ")";
+ }
+
+ bool MatchAndExplain(Node* node, MatchResultListener* listener) const final {
+ return (NodeMatcher::MatchAndExplain(node, listener) &&
+ PrintMatchAndExplain(
+ OpParameter<const StoreGlobalParameters>(node).name(), "name",
+ name_matcher_, listener) &&
+ PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0),
+ "value", value_matcher_, listener) &&
+ PrintMatchAndExplain(NodeProperties::GetValueInput(node, 1),
+ "feedback vector", feedback_vector_matcher_,
+ listener) &&
+ PrintMatchAndExplain(NodeProperties::GetEffectInput(node), "effect",
+ effect_matcher_, listener) &&
+ PrintMatchAndExplain(NodeProperties::GetControlInput(node),
+ "control", control_matcher_, listener));
+ }
+
+ private:
+ const Matcher<Handle<Name>> name_matcher_;
+ const Matcher<Node*> value_matcher_;
+ const Matcher<Node*> feedback_vector_matcher_;
+ const Matcher<Node*> effect_matcher_;
+ const Matcher<Node*> control_matcher_;
+};
+
+
class IsJSCallFunctionMatcher final : public NodeMatcher {
public:
IsJSCallFunctionMatcher(const std::vector<Matcher<Node*>>& value_matchers,
@@ -2117,6 +2218,26 @@ Matcher<Node*> IsJSLoadNamed(const Handle<Name> name,
}
+Matcher<Node*> IsJSLoadGlobal(const Handle<Name> name,
+ const Matcher<Node*>& feedback_vector_matcher,
+ const Matcher<Node*>& effect_matcher,
+ const Matcher<Node*>& control_matcher) {
+ return MakeMatcher(new IsJSLoadGlobalMatcher(
+ name, feedback_vector_matcher, effect_matcher, control_matcher));
+}
+
+
+Matcher<Node*> IsJSStoreGlobal(const Handle<Name> name,
+ const Matcher<Node*>& value_matcher,
+ const Matcher<Node*>& feedback_vector_matcher,
+ const Matcher<Node*>& effect_matcher,
+ const Matcher<Node*>& control_matcher) {
+ return MakeMatcher(
+ new IsJSStoreGlobalMatcher(name, value_matcher, feedback_vector_matcher,
+ effect_matcher, control_matcher));
+}
+
+
Matcher<Node*> IsJSCallFunction(std::vector<Matcher<Node*>> value_matchers,
const Matcher<Node*>& effect_matcher,
const Matcher<Node*>& control_matcher) {

Powered by Google App Engine
This is Rietveld 408576698