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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2122853002: Implement UnaligedLoad and UnaligedStore turbofan operators. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Nits. Fixes some errors Created 4 years, 5 months 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
« no previous file with comments | « test/unittests/compiler/node-test-utils.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 89c0d4f9665668bcb3cd7bfda2041e10ebb7296e..cf2be44505f75d3c3adba11a036e1a67aabdfbf9 100644
--- a/test/unittests/compiler/node-test-utils.cc
+++ b/test/unittests/compiler/node-test-utils.cc
@@ -1194,132 +1194,140 @@ class IsStoreElementMatcher final : public NodeMatcher {
const Matcher<Node*> control_matcher_;
};
-
-class IsLoadMatcher final : public NodeMatcher {
- public:
- IsLoadMatcher(const Matcher<LoadRepresentation>& rep_matcher,
- const Matcher<Node*>& base_matcher,
- const Matcher<Node*>& index_matcher,
- const Matcher<Node*>& effect_matcher,
- const Matcher<Node*>& control_matcher)
- : NodeMatcher(IrOpcode::kLoad),
- rep_matcher_(rep_matcher),
- base_matcher_(base_matcher),
- index_matcher_(index_matcher),
- effect_matcher_(effect_matcher),
- control_matcher_(control_matcher) {}
-
- void DescribeTo(std::ostream* os) const final {
- NodeMatcher::DescribeTo(os);
- *os << " whose rep (";
- rep_matcher_.DescribeTo(os);
- *os << "), base (";
- base_matcher_.DescribeTo(os);
- *os << "), index (";
- index_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 {
- Node* effect_node = nullptr;
- Node* control_node = nullptr;
- if (NodeProperties::FirstEffectIndex(node) < node->InputCount()) {
- effect_node = NodeProperties::GetEffectInput(node);
- }
- if (NodeProperties::FirstControlIndex(node) < node->InputCount()) {
- control_node = NodeProperties::GetControlInput(node);
- }
- return (NodeMatcher::MatchAndExplain(node, listener) &&
- PrintMatchAndExplain(OpParameter<LoadRepresentation>(node), "rep",
- rep_matcher_, listener) &&
- PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0), "base",
- base_matcher_, listener) &&
- PrintMatchAndExplain(NodeProperties::GetValueInput(node, 1),
- "index", index_matcher_, listener) &&
- PrintMatchAndExplain(effect_node, "effect", effect_matcher_,
- listener) &&
- PrintMatchAndExplain(control_node, "control", control_matcher_,
- listener));
- }
-
- private:
- const Matcher<LoadRepresentation> rep_matcher_;
- const Matcher<Node*> base_matcher_;
- const Matcher<Node*> index_matcher_;
- const Matcher<Node*> effect_matcher_;
- const Matcher<Node*> control_matcher_;
-};
-
-
-class IsStoreMatcher final : public NodeMatcher {
- public:
- IsStoreMatcher(const Matcher<StoreRepresentation>& rep_matcher,
- const Matcher<Node*>& base_matcher,
- const Matcher<Node*>& index_matcher,
- const Matcher<Node*>& value_matcher,
- const Matcher<Node*>& effect_matcher,
- const Matcher<Node*>& control_matcher)
- : NodeMatcher(IrOpcode::kStore),
- rep_matcher_(rep_matcher),
- base_matcher_(base_matcher),
- index_matcher_(index_matcher),
- value_matcher_(value_matcher),
- effect_matcher_(effect_matcher),
- control_matcher_(control_matcher) {}
-
- void DescribeTo(std::ostream* os) const final {
- NodeMatcher::DescribeTo(os);
- *os << " whose rep (";
- rep_matcher_.DescribeTo(os);
- *os << "), base (";
- base_matcher_.DescribeTo(os);
- *os << "), index (";
- index_matcher_.DescribeTo(os);
- *os << "), value (";
- value_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 {
- Node* effect_node = nullptr;
- Node* control_node = nullptr;
- if (NodeProperties::FirstEffectIndex(node) < node->InputCount()) {
- effect_node = NodeProperties::GetEffectInput(node);
- }
- if (NodeProperties::FirstControlIndex(node) < node->InputCount()) {
- control_node = NodeProperties::GetControlInput(node);
- }
- return (NodeMatcher::MatchAndExplain(node, listener) &&
- PrintMatchAndExplain(OpParameter<StoreRepresentation>(node), "rep",
- rep_matcher_, listener) &&
- PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0), "base",
- base_matcher_, listener) &&
- PrintMatchAndExplain(NodeProperties::GetValueInput(node, 1),
- "index", index_matcher_, listener) &&
- PrintMatchAndExplain(NodeProperties::GetValueInput(node, 2),
- "value", value_matcher_, listener) &&
- PrintMatchAndExplain(effect_node, "effect", effect_matcher_,
- listener) &&
- PrintMatchAndExplain(control_node, "control", control_matcher_,
- listener));
- }
-
- private:
- const Matcher<StoreRepresentation> rep_matcher_;
- const Matcher<Node*> base_matcher_;
- const Matcher<Node*> index_matcher_;
- const Matcher<Node*> value_matcher_;
- const Matcher<Node*> effect_matcher_;
- const Matcher<Node*> control_matcher_;
-};
+#define LOAD_MATCHER(kLoad) \
+ class Is##kLoad##Matcher final : public NodeMatcher { \
+ public: \
+ Is##kLoad##Matcher(const Matcher<kLoad##Representation>& rep_matcher, \
+ const Matcher<Node*>& base_matcher, \
+ const Matcher<Node*>& index_matcher, \
+ const Matcher<Node*>& effect_matcher, \
+ const Matcher<Node*>& control_matcher) \
+ : NodeMatcher(IrOpcode::k##kLoad), \
+ rep_matcher_(rep_matcher), \
+ base_matcher_(base_matcher), \
+ index_matcher_(index_matcher), \
+ effect_matcher_(effect_matcher), \
+ control_matcher_(control_matcher) {} \
+ \
+ void DescribeTo(std::ostream* os) const final { \
+ NodeMatcher::DescribeTo(os); \
+ *os << " whose rep ("; \
+ rep_matcher_.DescribeTo(os); \
+ *os << "), base ("; \
+ base_matcher_.DescribeTo(os); \
+ *os << "), index ("; \
+ index_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 { \
+ Node* effect_node = nullptr; \
+ Node* control_node = nullptr; \
+ if (NodeProperties::FirstEffectIndex(node) < node->InputCount()) { \
+ effect_node = NodeProperties::GetEffectInput(node); \
+ } \
+ if (NodeProperties::FirstControlIndex(node) < node->InputCount()) { \
+ control_node = NodeProperties::GetControlInput(node); \
+ } \
+ return (NodeMatcher::MatchAndExplain(node, listener) && \
+ PrintMatchAndExplain(OpParameter<kLoad##Representation>(node), \
+ "rep", rep_matcher_, listener) && \
+ PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0), \
+ "base", base_matcher_, listener) && \
+ PrintMatchAndExplain(NodeProperties::GetValueInput(node, 1), \
+ "index", index_matcher_, listener) && \
+ PrintMatchAndExplain(effect_node, "effect", effect_matcher_, \
+ listener) && \
+ PrintMatchAndExplain(control_node, "control", control_matcher_, \
+ listener)); \
+ } \
+ \
+ private: \
+ const Matcher<kLoad##Representation> rep_matcher_; \
+ const Matcher<Node*> base_matcher_; \
+ const Matcher<Node*> index_matcher_; \
+ const Matcher<Node*> effect_matcher_; \
+ const Matcher<Node*> control_matcher_; \
+ };
+
+LOAD_MATCHER(Load)
+LOAD_MATCHER(UnalignedLoad)
+
+#define STORE_MATCHER(kStore) \
+ class Is##kStore##Matcher final : public NodeMatcher { \
+ public: \
+ Is##kStore##Matcher(const Matcher<kStore##Representation>& rep_matcher, \
+ const Matcher<Node*>& base_matcher, \
+ const Matcher<Node*>& index_matcher, \
+ const Matcher<Node*>& value_matcher, \
+ const Matcher<Node*>& effect_matcher, \
+ const Matcher<Node*>& control_matcher) \
+ : NodeMatcher(IrOpcode::k##kStore), \
+ rep_matcher_(rep_matcher), \
+ base_matcher_(base_matcher), \
+ index_matcher_(index_matcher), \
+ value_matcher_(value_matcher), \
+ effect_matcher_(effect_matcher), \
+ control_matcher_(control_matcher) {} \
+ \
+ void DescribeTo(std::ostream* os) const final { \
+ NodeMatcher::DescribeTo(os); \
+ *os << " whose rep ("; \
+ rep_matcher_.DescribeTo(os); \
+ *os << "), base ("; \
+ base_matcher_.DescribeTo(os); \
+ *os << "), index ("; \
+ index_matcher_.DescribeTo(os); \
+ *os << "), value ("; \
+ value_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 { \
+ Node* effect_node = nullptr; \
+ Node* control_node = nullptr; \
+ if (NodeProperties::FirstEffectIndex(node) < node->InputCount()) { \
+ effect_node = NodeProperties::GetEffectInput(node); \
+ } \
+ if (NodeProperties::FirstControlIndex(node) < node->InputCount()) { \
+ control_node = NodeProperties::GetControlInput(node); \
+ } \
+ return (NodeMatcher::MatchAndExplain(node, listener) && \
+ PrintMatchAndExplain(OpParameter<kStore##Representation>(node), \
+ "rep", rep_matcher_, listener) && \
+ PrintMatchAndExplain(NodeProperties::GetValueInput(node, 0), \
+ "base", base_matcher_, listener) && \
+ PrintMatchAndExplain(NodeProperties::GetValueInput(node, 1), \
+ "index", index_matcher_, listener) && \
+ PrintMatchAndExplain(NodeProperties::GetValueInput(node, 2), \
+ "value", value_matcher_, listener) && \
+ PrintMatchAndExplain(effect_node, "effect", effect_matcher_, \
+ listener) && \
+ PrintMatchAndExplain(control_node, "control", control_matcher_, \
+ listener)); \
+ } \
+ \
+ private: \
+ const Matcher<kStore##Representation> rep_matcher_; \
+ const Matcher<Node*> base_matcher_; \
+ const Matcher<Node*> index_matcher_; \
+ const Matcher<Node*> value_matcher_; \
+ const Matcher<Node*> effect_matcher_; \
+ const Matcher<Node*> control_matcher_; \
+ };
+
+STORE_MATCHER(Store)
+STORE_MATCHER(UnalignedStore)
class IsStackSlotMatcher final : public NodeMatcher {
public:
@@ -2135,7 +2143,6 @@ Matcher<Node*> IsStoreElement(const Matcher<ElementAccess>& access_matcher,
effect_matcher, control_matcher));
}
-
Matcher<Node*> IsLoad(const Matcher<LoadRepresentation>& rep_matcher,
const Matcher<Node*>& base_matcher,
const Matcher<Node*>& index_matcher,
@@ -2145,6 +2152,15 @@ Matcher<Node*> IsLoad(const Matcher<LoadRepresentation>& rep_matcher,
effect_matcher, control_matcher));
}
+Matcher<Node*> IsUnalignedLoad(
+ const Matcher<UnalignedLoadRepresentation>& rep_matcher,
+ const Matcher<Node*>& base_matcher, const Matcher<Node*>& index_matcher,
+ const Matcher<Node*>& effect_matcher,
+ const Matcher<Node*>& control_matcher) {
+ return MakeMatcher(new IsUnalignedLoadMatcher(rep_matcher, base_matcher,
+ index_matcher, effect_matcher,
+ control_matcher));
+}
Matcher<Node*> IsStore(const Matcher<StoreRepresentation>& rep_matcher,
const Matcher<Node*>& base_matcher,
@@ -2157,6 +2173,16 @@ Matcher<Node*> IsStore(const Matcher<StoreRepresentation>& rep_matcher,
effect_matcher, control_matcher));
}
+Matcher<Node*> IsUnalignedStore(
+ const Matcher<UnalignedStoreRepresentation>& rep_matcher,
+ const Matcher<Node*>& base_matcher, const Matcher<Node*>& index_matcher,
+ const Matcher<Node*>& value_matcher, const Matcher<Node*>& effect_matcher,
+ const Matcher<Node*>& control_matcher) {
+ return MakeMatcher(new IsUnalignedStoreMatcher(
+ rep_matcher, base_matcher, index_matcher, value_matcher, effect_matcher,
+ control_matcher));
+}
+
Matcher<Node*> IsStackSlot(const Matcher<MachineRepresentation>& rep_matcher) {
return MakeMatcher(new IsStackSlotMatcher(rep_matcher));
}
« no previous file with comments | « test/unittests/compiler/node-test-utils.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698