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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: test/unittests/compiler/node-matchers-unittest.cc

Issue 774193003: [turbofan] Use "leal" in even more situations (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@765983002
Patch Set: Fix Windows Created 6 years 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 | « src/compiler/x64/instruction-selector-x64.cc ('k') | test/unittests/compiler/x64/instruction-selector-x64-unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/unittests/compiler/node-matchers-unittest.cc
diff --git a/test/unittests/compiler/node-matchers-unittest.cc b/test/unittests/compiler/node-matchers-unittest.cc
index 937c0869074ec99c4a31a3b51ca02ad2398e0789..5969cb424ad2ceca710c2a8e973d2b573ac15afa 100644
--- a/test/unittests/compiler/node-matchers-unittest.cc
+++ b/test/unittests/compiler/node-matchers-unittest.cc
@@ -30,14 +30,13 @@ class NodeMatcherTest : public GraphTest {
namespace {
template <class Matcher>
-void CheckScaledWithOffsetMatch(Matcher* matcher, Node* scaled,
- int scale_exponent, Node* offset,
- Node* constant) {
+void CheckBaseWithIndexAndDisplacement(Matcher* matcher, Node* index, int scale,
+ Node* base, Node* displacement) {
EXPECT_TRUE(matcher->matches());
- EXPECT_EQ(scaled, matcher->scaled());
- EXPECT_EQ(scale_exponent, matcher->scale_exponent());
- EXPECT_EQ(offset, matcher->offset());
- EXPECT_EQ(constant, matcher->constant());
+ EXPECT_EQ(index, matcher->index());
+ EXPECT_EQ(scale, matcher->scale());
+ EXPECT_EQ(base, matcher->base());
+ EXPECT_EQ(displacement, matcher->displacement());
}
};
@@ -45,34 +44,43 @@ void CheckScaledWithOffsetMatch(Matcher* matcher, Node* scaled,
TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
graph()->SetStart(graph()->NewNode(common()->Start(0)));
- const Operator* c0_op = common()->Int32Constant(0);
- Node* c0 = graph()->NewNode(c0_op);
- USE(c0);
- const Operator* c1_op = common()->Int32Constant(1);
- Node* c1 = graph()->NewNode(c1_op);
- USE(c1);
- const Operator* c2_op = common()->Int32Constant(2);
- Node* c2 = graph()->NewNode(c2_op);
- USE(c2);
- const Operator* c3_op = common()->Int32Constant(3);
- Node* c3 = graph()->NewNode(c3_op);
- USE(c3);
- const Operator* c4_op = common()->Int32Constant(4);
- Node* c4 = graph()->NewNode(c4_op);
- USE(c4);
- const Operator* c8_op = common()->Int32Constant(8);
- Node* c8 = graph()->NewNode(c8_op);
- USE(c8);
- const Operator* c15_op = common()->Int32Constant(15);
- Node* c15 = graph()->NewNode(c15_op);
- USE(c15);
-
- const Operator* o0_op = common()->Parameter(0);
- Node* o0 = graph()->NewNode(o0_op, graph()->start());
- USE(o0);
- const Operator* o1_op = common()->Parameter(1);
- Node* o1 = graph()->NewNode(o1_op, graph()->start());
- USE(o0);
+ const Operator* d0_op = common()->Int32Constant(0);
+ Node* d0 = graph()->NewNode(d0_op);
+ USE(d0);
+ const Operator* d1_op = common()->Int32Constant(1);
+ Node* d1 = graph()->NewNode(d1_op);
+ USE(d1);
+ const Operator* d2_op = common()->Int32Constant(2);
+ Node* d2 = graph()->NewNode(d2_op);
+ USE(d2);
+ const Operator* d3_op = common()->Int32Constant(3);
+ Node* d3 = graph()->NewNode(d3_op);
+ USE(d3);
+ const Operator* d4_op = common()->Int32Constant(4);
+ Node* d4 = graph()->NewNode(d4_op);
+ USE(d4);
+ const Operator* d5_op = common()->Int32Constant(5);
+ Node* d5 = graph()->NewNode(d5_op);
+ USE(d5);
+ const Operator* d7_op = common()->Int32Constant(7);
+ Node* d7 = graph()->NewNode(d7_op);
+ USE(d4);
+ const Operator* d8_op = common()->Int32Constant(8);
+ Node* d8 = graph()->NewNode(d8_op);
+ USE(d8);
+ const Operator* d9_op = common()->Int32Constant(9);
+ Node* d9 = graph()->NewNode(d9_op);
+ USE(d9);
+ const Operator* d15_op = common()->Int32Constant(15);
+ Node* d15 = graph()->NewNode(d15_op);
+ USE(d15);
+
+ const Operator* b0_op = common()->Parameter(0);
+ Node* b0 = graph()->NewNode(b0_op, graph()->start());
+ USE(b0);
+ const Operator* b1_op = common()->Parameter(1);
+ Node* b1 = graph()->NewNode(b1_op, graph()->start());
+ USE(b0);
const Operator* p1_op = common()->Parameter(3);
Node* p1 = graph()->NewNode(p1_op, graph()->start());
@@ -82,23 +90,29 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
USE(a_op);
const Operator* m_op = machine()->Int32Mul();
- Node* m1 = graph()->NewNode(m_op, p1, c1);
- Node* m2 = graph()->NewNode(m_op, p1, c2);
- Node* m4 = graph()->NewNode(m_op, p1, c4);
- Node* m8 = graph()->NewNode(m_op, p1, c8);
- Node* m3 = graph()->NewNode(m_op, p1, c3);
+ Node* m1 = graph()->NewNode(m_op, p1, d1);
+ Node* m2 = graph()->NewNode(m_op, p1, d2);
+ Node* m3 = graph()->NewNode(m_op, p1, d3);
+ Node* m4 = graph()->NewNode(m_op, p1, d4);
+ Node* m5 = graph()->NewNode(m_op, p1, d5);
+ Node* m7 = graph()->NewNode(m_op, p1, d7);
+ Node* m8 = graph()->NewNode(m_op, p1, d8);
+ Node* m9 = graph()->NewNode(m_op, p1, d9);
USE(m1);
USE(m2);
+ USE(m3);
USE(m4);
+ USE(m5);
+ USE(m7);
USE(m8);
- USE(m3);
+ USE(m9);
const Operator* s_op = machine()->Word32Shl();
- Node* s0 = graph()->NewNode(s_op, p1, c0);
- Node* s1 = graph()->NewNode(s_op, p1, c1);
- Node* s2 = graph()->NewNode(s_op, p1, c2);
- Node* s3 = graph()->NewNode(s_op, p1, c3);
- Node* s4 = graph()->NewNode(s_op, p1, c4);
+ Node* s0 = graph()->NewNode(s_op, p1, d0);
+ Node* s1 = graph()->NewNode(s_op, p1, d1);
+ Node* s2 = graph()->NewNode(s_op, p1, d2);
+ Node* s3 = graph()->NewNode(s_op, p1, d3);
+ Node* s4 = graph()->NewNode(s_op, p1, d4);
USE(s0);
USE(s1);
USE(s2);
@@ -107,257 +121,282 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
// 1 INPUT
- // Only relevant test cases is checking for non-match.
- ScaledWithOffset32Matcher match0(c15);
+ // Only relevant test dases is Checking for non-match.
+ BaseWithIndexAndDisplacement32Matcher match0(d15);
EXPECT_FALSE(match0.matches());
// 2 INPUT
- // (O0 + O1) -> [O0, 0, O1, NULL]
- ScaledWithOffset32Matcher match1(graph()->NewNode(a_op, o0, o1));
- CheckScaledWithOffsetMatch(&match1, o1, 0, o0, NULL);
-
- // (O0 + C15) -> [NULL, 0, O0, C15]
- ScaledWithOffset32Matcher match2(graph()->NewNode(a_op, o0, c15));
- CheckScaledWithOffsetMatch(&match2, NULL, 0, o0, c15);
-
- // (C15 + O0) -> [NULL, 0, O0, C15]
- ScaledWithOffset32Matcher match3(graph()->NewNode(a_op, c15, o0));
- CheckScaledWithOffsetMatch(&match3, NULL, 0, o0, c15);
-
- // (O0 + M1) -> [p1, 0, O0, NULL]
- ScaledWithOffset32Matcher match4(graph()->NewNode(a_op, o0, m1));
- CheckScaledWithOffsetMatch(&match4, p1, 0, o0, NULL);
-
- // (M1 + O0) -> [p1, 0, O0, NULL]
- m1 = graph()->NewNode(m_op, p1, c1);
- ScaledWithOffset32Matcher match5(graph()->NewNode(a_op, m1, o0));
- CheckScaledWithOffsetMatch(&match5, p1, 0, o0, NULL);
-
- // (C15 + M1) -> [P1, 0, NULL, C15]
- m1 = graph()->NewNode(m_op, p1, c1);
- ScaledWithOffset32Matcher match6(graph()->NewNode(a_op, c15, m1));
- CheckScaledWithOffsetMatch(&match6, p1, 0, NULL, c15);
-
- // (M1 + C15) -> [P1, 0, NULL, C15]
- m1 = graph()->NewNode(m_op, p1, c1);
- ScaledWithOffset32Matcher match7(graph()->NewNode(a_op, m1, c15));
- CheckScaledWithOffsetMatch(&match7, p1, 0, NULL, c15);
-
- // (O0 + S0) -> [p1, 0, O0, NULL]
- ScaledWithOffset32Matcher match8(graph()->NewNode(a_op, o0, s0));
- CheckScaledWithOffsetMatch(&match8, p1, 0, o0, NULL);
-
- // (S0 + O0) -> [p1, 0, O0, NULL]
- s0 = graph()->NewNode(s_op, p1, c0);
- ScaledWithOffset32Matcher match9(graph()->NewNode(a_op, s0, o0));
- CheckScaledWithOffsetMatch(&match9, p1, 0, o0, NULL);
-
- // (C15 + S0) -> [P1, 0, NULL, C15]
- s0 = graph()->NewNode(s_op, p1, c0);
- ScaledWithOffset32Matcher match10(graph()->NewNode(a_op, c15, s0));
- CheckScaledWithOffsetMatch(&match10, p1, 0, NULL, c15);
-
- // (S0 + C15) -> [P1, 0, NULL, C15]
- s0 = graph()->NewNode(s_op, p1, c0);
- ScaledWithOffset32Matcher match11(graph()->NewNode(a_op, s0, c15));
- CheckScaledWithOffsetMatch(&match11, p1, 0, NULL, c15);
-
- // (O0 + M2) -> [p1, 1, O0, NULL]
- ScaledWithOffset32Matcher match12(graph()->NewNode(a_op, o0, m2));
- CheckScaledWithOffsetMatch(&match12, p1, 1, o0, NULL);
-
- // (M2 + O0) -> [p1, 1, O0, NULL]
- m2 = graph()->NewNode(m_op, p1, c2);
- ScaledWithOffset32Matcher match13(graph()->NewNode(a_op, m2, o0));
- CheckScaledWithOffsetMatch(&match13, p1, 1, o0, NULL);
-
- // (C15 + M2) -> [P1, 1, NULL, C15]
- m2 = graph()->NewNode(m_op, p1, c2);
- ScaledWithOffset32Matcher match14(graph()->NewNode(a_op, c15, m2));
- CheckScaledWithOffsetMatch(&match14, p1, 1, NULL, c15);
-
- // (M2 + C15) -> [P1, 1, NULL, C15]
- m2 = graph()->NewNode(m_op, p1, c2);
- ScaledWithOffset32Matcher match15(graph()->NewNode(a_op, m2, c15));
- CheckScaledWithOffsetMatch(&match15, p1, 1, NULL, c15);
-
- // (O0 + S1) -> [p1, 1, O0, NULL]
- ScaledWithOffset32Matcher match16(graph()->NewNode(a_op, o0, s1));
- CheckScaledWithOffsetMatch(&match16, p1, 1, o0, NULL);
-
- // (S1 + O0) -> [p1, 1, O0, NULL]
- s1 = graph()->NewNode(s_op, p1, c1);
- ScaledWithOffset32Matcher match17(graph()->NewNode(a_op, s1, o0));
- CheckScaledWithOffsetMatch(&match17, p1, 1, o0, NULL);
-
- // (C15 + S1) -> [P1, 1, NULL, C15]
- s1 = graph()->NewNode(s_op, p1, c1);
- ScaledWithOffset32Matcher match18(graph()->NewNode(a_op, c15, s1));
- CheckScaledWithOffsetMatch(&match18, p1, 1, NULL, c15);
-
- // (S1 + C15) -> [P1, 1, NULL, C15]
- s1 = graph()->NewNode(s_op, p1, c1);
- ScaledWithOffset32Matcher match19(graph()->NewNode(a_op, s1, c15));
- CheckScaledWithOffsetMatch(&match19, p1, 1, NULL, c15);
-
- // (O0 + M4) -> [p1, 2, O0, NULL]
- ScaledWithOffset32Matcher match20(graph()->NewNode(a_op, o0, m4));
- CheckScaledWithOffsetMatch(&match20, p1, 2, o0, NULL);
-
- // (M4 + O0) -> [p1, 2, O0, NULL]
- m4 = graph()->NewNode(m_op, p1, c4);
- ScaledWithOffset32Matcher match21(graph()->NewNode(a_op, m4, o0));
- CheckScaledWithOffsetMatch(&match21, p1, 2, o0, NULL);
-
- // (C15 + M4) -> [p1, 2, NULL, C15]
- m4 = graph()->NewNode(m_op, p1, c4);
- ScaledWithOffset32Matcher match22(graph()->NewNode(a_op, c15, m4));
- CheckScaledWithOffsetMatch(&match22, p1, 2, NULL, c15);
-
- // (M4 + C15) -> [p1, 2, NULL, C15]
- m4 = graph()->NewNode(m_op, p1, c4);
- ScaledWithOffset32Matcher match23(graph()->NewNode(a_op, m4, c15));
- CheckScaledWithOffsetMatch(&match23, p1, 2, NULL, c15);
-
- // (O0 + S2) -> [p1, 2, O0, NULL]
- ScaledWithOffset32Matcher match24(graph()->NewNode(a_op, o0, s2));
- CheckScaledWithOffsetMatch(&match24, p1, 2, o0, NULL);
-
- // (S2 + O0) -> [p1, 2, O0, NULL]
- s2 = graph()->NewNode(s_op, p1, c2);
- ScaledWithOffset32Matcher match25(graph()->NewNode(a_op, s2, o0));
- CheckScaledWithOffsetMatch(&match25, p1, 2, o0, NULL);
-
- // (C15 + S2) -> [p1, 2, NULL, C15]
- s2 = graph()->NewNode(s_op, p1, c2);
- ScaledWithOffset32Matcher match26(graph()->NewNode(a_op, c15, s2));
- CheckScaledWithOffsetMatch(&match26, p1, 2, NULL, c15);
-
- // (S2 + C15) -> [p1, 2, NULL, C15]
- s2 = graph()->NewNode(s_op, p1, c2);
- ScaledWithOffset32Matcher match27(graph()->NewNode(a_op, s2, c15));
- CheckScaledWithOffsetMatch(&match27, p1, 2, NULL, c15);
-
- // (O0 + M8) -> [p1, 2, O0, NULL]
- ScaledWithOffset32Matcher match28(graph()->NewNode(a_op, o0, m8));
- CheckScaledWithOffsetMatch(&match28, p1, 3, o0, NULL);
-
- // (M8 + O0) -> [p1, 2, O0, NULL]
- m8 = graph()->NewNode(m_op, p1, c8);
- ScaledWithOffset32Matcher match29(graph()->NewNode(a_op, m8, o0));
- CheckScaledWithOffsetMatch(&match29, p1, 3, o0, NULL);
-
- // (C15 + M8) -> [p1, 2, NULL, C15]
- m8 = graph()->NewNode(m_op, p1, c8);
- ScaledWithOffset32Matcher match30(graph()->NewNode(a_op, c15, m8));
- CheckScaledWithOffsetMatch(&match30, p1, 3, NULL, c15);
-
- // (M8 + C15) -> [p1, 2, NULL, C15]
- m8 = graph()->NewNode(m_op, p1, c8);
- ScaledWithOffset32Matcher match31(graph()->NewNode(a_op, m8, c15));
- CheckScaledWithOffsetMatch(&match31, p1, 3, NULL, c15);
-
- // (O0 + S3) -> [p1, 2, O0, NULL]
- ScaledWithOffset32Matcher match32(graph()->NewNode(a_op, o0, s3));
- CheckScaledWithOffsetMatch(&match32, p1, 3, o0, NULL);
-
- // (S3 + O0) -> [p1, 2, O0, NULL]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset32Matcher match33(graph()->NewNode(a_op, s3, o0));
- CheckScaledWithOffsetMatch(&match33, p1, 3, o0, NULL);
-
- // (C15 + S3) -> [p1, 2, NULL, C15]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset32Matcher match34(graph()->NewNode(a_op, c15, s3));
- CheckScaledWithOffsetMatch(&match34, p1, 3, NULL, c15);
-
- // (S3 + C15) -> [p1, 2, NULL, C15]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset32Matcher match35(graph()->NewNode(a_op, s3, c15));
- CheckScaledWithOffsetMatch(&match35, p1, 3, NULL, c15);
+ // (B0 + B1) -> [B0, 0, B1, NULL]
+ BaseWithIndexAndDisplacement32Matcher match1(graph()->NewNode(a_op, b0, b1));
+ CheckBaseWithIndexAndDisplacement(&match1, b1, 0, b0, NULL);
+
+ // (B0 + D15) -> [NULL, 0, B0, D15]
+ BaseWithIndexAndDisplacement32Matcher match2(graph()->NewNode(a_op, b0, d15));
+ CheckBaseWithIndexAndDisplacement(&match2, NULL, 0, b0, d15);
+
+ // (D15 + B0) -> [NULL, 0, B0, D15]
+ BaseWithIndexAndDisplacement32Matcher match3(graph()->NewNode(a_op, d15, b0));
+ CheckBaseWithIndexAndDisplacement(&match3, NULL, 0, b0, d15);
+
+ // (B0 + M1) -> [p1, 0, B0, NULL]
+ BaseWithIndexAndDisplacement32Matcher match4(graph()->NewNode(a_op, b0, m1));
+ CheckBaseWithIndexAndDisplacement(&match4, p1, 0, b0, NULL);
+
+ // (M1 + B0) -> [p1, 0, B0, NULL]
+ m1 = graph()->NewNode(m_op, p1, d1);
+ BaseWithIndexAndDisplacement32Matcher match5(graph()->NewNode(a_op, m1, b0));
+ CheckBaseWithIndexAndDisplacement(&match5, p1, 0, b0, NULL);
+
+ // (D15 + M1) -> [P1, 0, NULL, D15]
+ m1 = graph()->NewNode(m_op, p1, d1);
+ BaseWithIndexAndDisplacement32Matcher match6(graph()->NewNode(a_op, d15, m1));
+ CheckBaseWithIndexAndDisplacement(&match6, p1, 0, NULL, d15);
+
+ // (M1 + D15) -> [P1, 0, NULL, D15]
+ m1 = graph()->NewNode(m_op, p1, d1);
+ BaseWithIndexAndDisplacement32Matcher match7(graph()->NewNode(a_op, m1, d15));
+ CheckBaseWithIndexAndDisplacement(&match7, p1, 0, NULL, d15);
+
+ // (B0 + S0) -> [p1, 0, B0, NULL]
+ BaseWithIndexAndDisplacement32Matcher match8(graph()->NewNode(a_op, b0, s0));
+ CheckBaseWithIndexAndDisplacement(&match8, p1, 0, b0, NULL);
+
+ // (S0 + B0) -> [p1, 0, B0, NULL]
+ s0 = graph()->NewNode(s_op, p1, d0);
+ BaseWithIndexAndDisplacement32Matcher match9(graph()->NewNode(a_op, s0, b0));
+ CheckBaseWithIndexAndDisplacement(&match9, p1, 0, b0, NULL);
+
+ // (D15 + S0) -> [P1, 0, NULL, D15]
+ s0 = graph()->NewNode(s_op, p1, d0);
+ BaseWithIndexAndDisplacement32Matcher match10(
+ graph()->NewNode(a_op, d15, s0));
+ CheckBaseWithIndexAndDisplacement(&match10, p1, 0, NULL, d15);
+
+ // (S0 + D15) -> [P1, 0, NULL, D15]
+ s0 = graph()->NewNode(s_op, p1, d0);
+ BaseWithIndexAndDisplacement32Matcher match11(
+ graph()->NewNode(a_op, s0, d15));
+ CheckBaseWithIndexAndDisplacement(&match11, p1, 0, NULL, d15);
+
+ // (B0 + M2) -> [p1, 1, B0, NULL]
+ BaseWithIndexAndDisplacement32Matcher match12(graph()->NewNode(a_op, b0, m2));
+ CheckBaseWithIndexAndDisplacement(&match12, p1, 1, b0, NULL);
+
+ // (M2 + B0) -> [p1, 1, B0, NULL]
+ m2 = graph()->NewNode(m_op, p1, d2);
+ BaseWithIndexAndDisplacement32Matcher match13(graph()->NewNode(a_op, m2, b0));
+ CheckBaseWithIndexAndDisplacement(&match13, p1, 1, b0, NULL);
+
+ // (D15 + M2) -> [P1, 1, NULL, D15]
+ m2 = graph()->NewNode(m_op, p1, d2);
+ BaseWithIndexAndDisplacement32Matcher match14(
+ graph()->NewNode(a_op, d15, m2));
+ CheckBaseWithIndexAndDisplacement(&match14, p1, 1, NULL, d15);
+
+ // (M2 + D15) -> [P1, 1, NULL, D15]
+ m2 = graph()->NewNode(m_op, p1, d2);
+ BaseWithIndexAndDisplacement32Matcher match15(
+ graph()->NewNode(a_op, m2, d15));
+ CheckBaseWithIndexAndDisplacement(&match15, p1, 1, NULL, d15);
+
+ // (B0 + S1) -> [p1, 1, B0, NULL]
+ BaseWithIndexAndDisplacement32Matcher match16(graph()->NewNode(a_op, b0, s1));
+ CheckBaseWithIndexAndDisplacement(&match16, p1, 1, b0, NULL);
+
+ // (S1 + B0) -> [p1, 1, B0, NULL]
+ s1 = graph()->NewNode(s_op, p1, d1);
+ BaseWithIndexAndDisplacement32Matcher match17(graph()->NewNode(a_op, s1, b0));
+ CheckBaseWithIndexAndDisplacement(&match17, p1, 1, b0, NULL);
+
+ // (D15 + S1) -> [P1, 1, NULL, D15]
+ s1 = graph()->NewNode(s_op, p1, d1);
+ BaseWithIndexAndDisplacement32Matcher match18(
+ graph()->NewNode(a_op, d15, s1));
+ CheckBaseWithIndexAndDisplacement(&match18, p1, 1, NULL, d15);
+
+ // (S1 + D15) -> [P1, 1, NULL, D15]
+ s1 = graph()->NewNode(s_op, p1, d1);
+ BaseWithIndexAndDisplacement32Matcher match19(
+ graph()->NewNode(a_op, s1, d15));
+ CheckBaseWithIndexAndDisplacement(&match19, p1, 1, NULL, d15);
+
+ // (B0 + M4) -> [p1, 2, B0, NULL]
+ BaseWithIndexAndDisplacement32Matcher match20(graph()->NewNode(a_op, b0, m4));
+ CheckBaseWithIndexAndDisplacement(&match20, p1, 2, b0, NULL);
+
+ // (M4 + B0) -> [p1, 2, B0, NULL]
+ m4 = graph()->NewNode(m_op, p1, d4);
+ BaseWithIndexAndDisplacement32Matcher match21(graph()->NewNode(a_op, m4, b0));
+ CheckBaseWithIndexAndDisplacement(&match21, p1, 2, b0, NULL);
+
+ // (D15 + M4) -> [p1, 2, NULL, D15]
+ m4 = graph()->NewNode(m_op, p1, d4);
+ BaseWithIndexAndDisplacement32Matcher match22(
+ graph()->NewNode(a_op, d15, m4));
+ CheckBaseWithIndexAndDisplacement(&match22, p1, 2, NULL, d15);
+
+ // (M4 + D15) -> [p1, 2, NULL, D15]
+ m4 = graph()->NewNode(m_op, p1, d4);
+ BaseWithIndexAndDisplacement32Matcher match23(
+ graph()->NewNode(a_op, m4, d15));
+ CheckBaseWithIndexAndDisplacement(&match23, p1, 2, NULL, d15);
+
+ // (B0 + S2) -> [p1, 2, B0, NULL]
+ BaseWithIndexAndDisplacement32Matcher match24(graph()->NewNode(a_op, b0, s2));
+ CheckBaseWithIndexAndDisplacement(&match24, p1, 2, b0, NULL);
+
+ // (S2 + B0) -> [p1, 2, B0, NULL]
+ s2 = graph()->NewNode(s_op, p1, d2);
+ BaseWithIndexAndDisplacement32Matcher match25(graph()->NewNode(a_op, s2, b0));
+ CheckBaseWithIndexAndDisplacement(&match25, p1, 2, b0, NULL);
+
+ // (D15 + S2) -> [p1, 2, NULL, D15]
+ s2 = graph()->NewNode(s_op, p1, d2);
+ BaseWithIndexAndDisplacement32Matcher match26(
+ graph()->NewNode(a_op, d15, s2));
+ CheckBaseWithIndexAndDisplacement(&match26, p1, 2, NULL, d15);
+
+ // (S2 + D15) -> [p1, 2, NULL, D15]
+ s2 = graph()->NewNode(s_op, p1, d2);
+ BaseWithIndexAndDisplacement32Matcher match27(
+ graph()->NewNode(a_op, s2, d15));
+ CheckBaseWithIndexAndDisplacement(&match27, p1, 2, NULL, d15);
+
+ // (B0 + M8) -> [p1, 2, B0, NULL]
+ BaseWithIndexAndDisplacement32Matcher match28(graph()->NewNode(a_op, b0, m8));
+ CheckBaseWithIndexAndDisplacement(&match28, p1, 3, b0, NULL);
+
+ // (M8 + B0) -> [p1, 2, B0, NULL]
+ m8 = graph()->NewNode(m_op, p1, d8);
+ BaseWithIndexAndDisplacement32Matcher match29(graph()->NewNode(a_op, m8, b0));
+ CheckBaseWithIndexAndDisplacement(&match29, p1, 3, b0, NULL);
+
+ // (D15 + M8) -> [p1, 2, NULL, D15]
+ m8 = graph()->NewNode(m_op, p1, d8);
+ BaseWithIndexAndDisplacement32Matcher match30(
+ graph()->NewNode(a_op, d15, m8));
+ CheckBaseWithIndexAndDisplacement(&match30, p1, 3, NULL, d15);
+
+ // (M8 + D15) -> [p1, 2, NULL, D15]
+ m8 = graph()->NewNode(m_op, p1, d8);
+ BaseWithIndexAndDisplacement32Matcher match31(
+ graph()->NewNode(a_op, m8, d15));
+ CheckBaseWithIndexAndDisplacement(&match31, p1, 3, NULL, d15);
+
+ // (B0 + S3) -> [p1, 2, B0, NULL]
+ BaseWithIndexAndDisplacement32Matcher match32(graph()->NewNode(a_op, b0, s3));
+ CheckBaseWithIndexAndDisplacement(&match32, p1, 3, b0, NULL);
+
+ // (S3 + B0) -> [p1, 2, B0, NULL]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement32Matcher match33(graph()->NewNode(a_op, s3, b0));
+ CheckBaseWithIndexAndDisplacement(&match33, p1, 3, b0, NULL);
+
+ // (D15 + S3) -> [p1, 2, NULL, D15]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement32Matcher match34(
+ graph()->NewNode(a_op, d15, s3));
+ CheckBaseWithIndexAndDisplacement(&match34, p1, 3, NULL, d15);
+
+ // (S3 + D15) -> [p1, 2, NULL, D15]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement32Matcher match35(
+ graph()->NewNode(a_op, s3, d15));
+ CheckBaseWithIndexAndDisplacement(&match35, p1, 3, NULL, d15);
// 2 INPUT - NEGATIVE CASES
- // (M3 + O1) -> [O0, 0, M3, NULL]
- ScaledWithOffset32Matcher match36(graph()->NewNode(a_op, o1, m3));
- CheckScaledWithOffsetMatch(&match36, m3, 0, o1, NULL);
+ // (M3 + B1) -> [B0, 0, M3, NULL]
+ BaseWithIndexAndDisplacement32Matcher match36(graph()->NewNode(a_op, b1, m3));
+ CheckBaseWithIndexAndDisplacement(&match36, m3, 0, b1, NULL);
- // (S4 + O1) -> [O0, 0, S4, NULL]
- ScaledWithOffset32Matcher match37(graph()->NewNode(a_op, o1, s4));
- CheckScaledWithOffsetMatch(&match37, s4, 0, o1, NULL);
+ // (S4 + B1) -> [B0, 0, S4, NULL]
+ BaseWithIndexAndDisplacement32Matcher match37(graph()->NewNode(a_op, b1, s4));
+ CheckBaseWithIndexAndDisplacement(&match37, s4, 0, b1, NULL);
// 3 INPUT
- // (C15 + S3) + O0 -> [p1, 2, o0, c15]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset32Matcher match38(
- graph()->NewNode(a_op, graph()->NewNode(a_op, c15, s3), o0));
- CheckScaledWithOffsetMatch(&match38, p1, 3, o0, c15);
-
- // (O0 + C15) + S3 -> [p1, 2, o0, c15]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset32Matcher match39(
- graph()->NewNode(a_op, graph()->NewNode(a_op, o0, c15), s3));
- CheckScaledWithOffsetMatch(&match39, p1, 3, o0, c15);
-
- // (S3 + O0) + C15 -> [p1, 2, o0, c15]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset32Matcher match40(
- graph()->NewNode(a_op, graph()->NewNode(a_op, s3, o0), c15));
- CheckScaledWithOffsetMatch(&match40, p1, 3, o0, c15);
-
- // C15 + (S3 + O0) -> [p1, 2, o0, c15]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset32Matcher match41(
- graph()->NewNode(a_op, c15, graph()->NewNode(a_op, s3, o0)));
- CheckScaledWithOffsetMatch(&match41, p1, 3, o0, c15);
-
- // O0 + (C15 + S3) -> [p1, 2, o0, c15]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset32Matcher match42(
- graph()->NewNode(a_op, o0, graph()->NewNode(a_op, c15, s3)));
- CheckScaledWithOffsetMatch(&match42, p1, 3, o0, c15);
-
- // S3 + (O0 + C15) -> [p1, 2, o0, c15]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset32Matcher match43(
- graph()->NewNode(a_op, s3, graph()->NewNode(a_op, o0, c15)));
- CheckScaledWithOffsetMatch(&match43, p1, 3, o0, c15);
+ // (D15 + S3) + B0 -> [p1, 2, b0, d15]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement32Matcher match38(
+ graph()->NewNode(a_op, graph()->NewNode(a_op, d15, s3), b0));
+ CheckBaseWithIndexAndDisplacement(&match38, p1, 3, b0, d15);
+
+ // (B0 + D15) + S3 -> [p1, 2, b0, d15]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement32Matcher match39(
+ graph()->NewNode(a_op, graph()->NewNode(a_op, b0, d15), s3));
+ CheckBaseWithIndexAndDisplacement(&match39, p1, 3, b0, d15);
+
+ // (S3 + B0) + D15 -> [p1, 2, b0, d15]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement32Matcher match40(
+ graph()->NewNode(a_op, graph()->NewNode(a_op, s3, b0), d15));
+ CheckBaseWithIndexAndDisplacement(&match40, p1, 3, b0, d15);
+
+ // D15 + (S3 + B0) -> [p1, 2, b0, d15]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement32Matcher match41(
+ graph()->NewNode(a_op, d15, graph()->NewNode(a_op, s3, b0)));
+ CheckBaseWithIndexAndDisplacement(&match41, p1, 3, b0, d15);
+
+ // B0 + (D15 + S3) -> [p1, 2, b0, d15]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement32Matcher match42(
+ graph()->NewNode(a_op, b0, graph()->NewNode(a_op, d15, s3)));
+ CheckBaseWithIndexAndDisplacement(&match42, p1, 3, b0, d15);
+
+ // S3 + (B0 + D15) -> [p1, 2, b0, d15]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement32Matcher match43(
+ graph()->NewNode(a_op, s3, graph()->NewNode(a_op, b0, d15)));
+ CheckBaseWithIndexAndDisplacement(&match43, p1, 3, b0, d15);
+
+ // Check that scales that require using the base address work dorrectly.
}
TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
graph()->SetStart(graph()->NewNode(common()->Start(0)));
- const Operator* c0_op = common()->Int64Constant(0);
- Node* c0 = graph()->NewNode(c0_op);
- USE(c0);
- const Operator* c1_op = common()->Int64Constant(1);
- Node* c1 = graph()->NewNode(c1_op);
- USE(c1);
- const Operator* c2_op = common()->Int64Constant(2);
- Node* c2 = graph()->NewNode(c2_op);
- USE(c2);
- const Operator* c3_op = common()->Int64Constant(3);
- Node* c3 = graph()->NewNode(c3_op);
- USE(c3);
- const Operator* c4_op = common()->Int64Constant(4);
- Node* c4 = graph()->NewNode(c4_op);
- USE(c4);
- const Operator* c8_op = common()->Int64Constant(8);
- Node* c8 = graph()->NewNode(c8_op);
- USE(c8);
- const Operator* c15_op = common()->Int64Constant(15);
- Node* c15 = graph()->NewNode(c15_op);
- USE(c15);
-
- const Operator* o0_op = common()->Parameter(0);
- Node* o0 = graph()->NewNode(o0_op, graph()->start());
- USE(o0);
- const Operator* o1_op = common()->Parameter(1);
- Node* o1 = graph()->NewNode(o1_op, graph()->start());
- USE(o0);
+ const Operator* d0_op = common()->Int64Constant(0);
+ Node* d0 = graph()->NewNode(d0_op);
+ USE(d0);
+ const Operator* d1_op = common()->Int64Constant(1);
+ Node* d1 = graph()->NewNode(d1_op);
+ USE(d1);
+ const Operator* d2_op = common()->Int64Constant(2);
+ Node* d2 = graph()->NewNode(d2_op);
+ USE(d2);
+ const Operator* d3_op = common()->Int64Constant(3);
+ Node* d3 = graph()->NewNode(d3_op);
+ USE(d3);
+ const Operator* d4_op = common()->Int64Constant(4);
+ Node* d4 = graph()->NewNode(d4_op);
+ USE(d4);
+ const Operator* d5_op = common()->Int64Constant(5);
+ Node* d5 = graph()->NewNode(d5_op);
+ USE(d5);
+ const Operator* d7_op = common()->Int64Constant(7);
+ Node* d7 = graph()->NewNode(d7_op);
+ USE(d7);
+ const Operator* d8_op = common()->Int64Constant(8);
+ Node* d8 = graph()->NewNode(d8_op);
+ USE(d8);
+ const Operator* d9_op = common()->Int64Constant(9);
+ Node* d9 = graph()->NewNode(d9_op);
+ USE(d8);
+ const Operator* d15_op = common()->Int64Constant(15);
+ Node* d15 = graph()->NewNode(d15_op);
+ USE(d15);
+
+ const Operator* b0_op = common()->Parameter(0);
+ Node* b0 = graph()->NewNode(b0_op, graph()->start());
+ USE(b0);
+ const Operator* b1_op = common()->Parameter(1);
+ Node* b1 = graph()->NewNode(b1_op, graph()->start());
+ USE(b0);
const Operator* p1_op = common()->Parameter(3);
Node* p1 = graph()->NewNode(p1_op, graph()->start());
@@ -367,23 +406,29 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
USE(a_op);
const Operator* m_op = machine()->Int64Mul();
- Node* m1 = graph()->NewNode(m_op, p1, c1);
- Node* m2 = graph()->NewNode(m_op, p1, c2);
- Node* m4 = graph()->NewNode(m_op, p1, c4);
- Node* m8 = graph()->NewNode(m_op, p1, c8);
- Node* m3 = graph()->NewNode(m_op, p1, c3);
+ Node* m1 = graph()->NewNode(m_op, p1, d1);
+ Node* m2 = graph()->NewNode(m_op, p1, d2);
+ Node* m3 = graph()->NewNode(m_op, p1, d3);
+ Node* m4 = graph()->NewNode(m_op, p1, d4);
+ Node* m5 = graph()->NewNode(m_op, p1, d5);
+ Node* m7 = graph()->NewNode(m_op, p1, d7);
+ Node* m8 = graph()->NewNode(m_op, p1, d8);
+ Node* m9 = graph()->NewNode(m_op, p1, d9);
USE(m1);
USE(m2);
+ USE(m3);
USE(m4);
+ USE(m5);
+ USE(m7);
USE(m8);
- USE(m3);
+ USE(m9);
const Operator* s_op = machine()->Word64Shl();
- Node* s0 = graph()->NewNode(s_op, p1, c0);
- Node* s1 = graph()->NewNode(s_op, p1, c1);
- Node* s2 = graph()->NewNode(s_op, p1, c2);
- Node* s3 = graph()->NewNode(s_op, p1, c3);
- Node* s4 = graph()->NewNode(s_op, p1, c4);
+ Node* s0 = graph()->NewNode(s_op, p1, d0);
+ Node* s1 = graph()->NewNode(s_op, p1, d1);
+ Node* s2 = graph()->NewNode(s_op, p1, d2);
+ Node* s3 = graph()->NewNode(s_op, p1, d3);
+ Node* s4 = graph()->NewNode(s_op, p1, d4);
USE(s0);
USE(s1);
USE(s2);
@@ -392,223 +437,287 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
// 1 INPUT
- // Only relevant test cases is checking for non-match.
- ScaledWithOffset64Matcher match0(c15);
+ // Only relevant test dases is Checking for non-match.
+ BaseWithIndexAndDisplacement64Matcher match0(d15);
EXPECT_FALSE(match0.matches());
// 2 INPUT
- // (O0 + O1) -> [O0, 0, O1, NULL]
- ScaledWithOffset64Matcher match1(graph()->NewNode(a_op, o0, o1));
- CheckScaledWithOffsetMatch(&match1, o1, 0, o0, NULL);
-
- // (O0 + C15) -> [NULL, 0, O0, C15]
- ScaledWithOffset64Matcher match2(graph()->NewNode(a_op, o0, c15));
- CheckScaledWithOffsetMatch(&match2, NULL, 0, o0, c15);
-
- // (C15 + O0) -> [NULL, 0, O0, C15]
- ScaledWithOffset64Matcher match3(graph()->NewNode(a_op, c15, o0));
- CheckScaledWithOffsetMatch(&match3, NULL, 0, o0, c15);
-
- // (O0 + M1) -> [p1, 0, O0, NULL]
- ScaledWithOffset64Matcher match4(graph()->NewNode(a_op, o0, m1));
- CheckScaledWithOffsetMatch(&match4, p1, 0, o0, NULL);
-
- // (M1 + O0) -> [p1, 0, O0, NULL]
- m1 = graph()->NewNode(m_op, p1, c1);
- ScaledWithOffset64Matcher match5(graph()->NewNode(a_op, m1, o0));
- CheckScaledWithOffsetMatch(&match5, p1, 0, o0, NULL);
-
- // (C15 + M1) -> [P1, 0, NULL, C15]
- m1 = graph()->NewNode(m_op, p1, c1);
- ScaledWithOffset64Matcher match6(graph()->NewNode(a_op, c15, m1));
- CheckScaledWithOffsetMatch(&match6, p1, 0, NULL, c15);
-
- // (M1 + C15) -> [P1, 0, NULL, C15]
- m1 = graph()->NewNode(m_op, p1, c1);
- ScaledWithOffset64Matcher match7(graph()->NewNode(a_op, m1, c15));
- CheckScaledWithOffsetMatch(&match7, p1, 0, NULL, c15);
-
- // (O0 + S0) -> [p1, 0, O0, NULL]
- ScaledWithOffset64Matcher match8(graph()->NewNode(a_op, o0, s0));
- CheckScaledWithOffsetMatch(&match8, p1, 0, o0, NULL);
-
- // (S0 + O0) -> [p1, 0, O0, NULL]
- s0 = graph()->NewNode(s_op, p1, c0);
- ScaledWithOffset64Matcher match9(graph()->NewNode(a_op, s0, o0));
- CheckScaledWithOffsetMatch(&match9, p1, 0, o0, NULL);
-
- // (C15 + S0) -> [P1, 0, NULL, C15]
- s0 = graph()->NewNode(s_op, p1, c0);
- ScaledWithOffset64Matcher match10(graph()->NewNode(a_op, c15, s0));
- CheckScaledWithOffsetMatch(&match10, p1, 0, NULL, c15);
-
- // (S0 + C15) -> [P1, 0, NULL, C15]
- s0 = graph()->NewNode(s_op, p1, c0);
- ScaledWithOffset64Matcher match11(graph()->NewNode(a_op, s0, c15));
- CheckScaledWithOffsetMatch(&match11, p1, 0, NULL, c15);
-
- // (O0 + M2) -> [p1, 1, O0, NULL]
- ScaledWithOffset64Matcher match12(graph()->NewNode(a_op, o0, m2));
- CheckScaledWithOffsetMatch(&match12, p1, 1, o0, NULL);
-
- // (M2 + O0) -> [p1, 1, O0, NULL]
- m2 = graph()->NewNode(m_op, p1, c2);
- ScaledWithOffset64Matcher match13(graph()->NewNode(a_op, m2, o0));
- CheckScaledWithOffsetMatch(&match13, p1, 1, o0, NULL);
-
- // (C15 + M2) -> [P1, 1, NULL, C15]
- m2 = graph()->NewNode(m_op, p1, c2);
- ScaledWithOffset64Matcher match14(graph()->NewNode(a_op, c15, m2));
- CheckScaledWithOffsetMatch(&match14, p1, 1, NULL, c15);
-
- // (M2 + C15) -> [P1, 1, NULL, C15]
- m2 = graph()->NewNode(m_op, p1, c2);
- ScaledWithOffset64Matcher match15(graph()->NewNode(a_op, m2, c15));
- CheckScaledWithOffsetMatch(&match15, p1, 1, NULL, c15);
-
- // (O0 + S1) -> [p1, 1, O0, NULL]
- ScaledWithOffset64Matcher match16(graph()->NewNode(a_op, o0, s1));
- CheckScaledWithOffsetMatch(&match16, p1, 1, o0, NULL);
-
- // (S1 + O0) -> [p1, 1, O0, NULL]
- s1 = graph()->NewNode(s_op, p1, c1);
- ScaledWithOffset64Matcher match17(graph()->NewNode(a_op, s1, o0));
- CheckScaledWithOffsetMatch(&match17, p1, 1, o0, NULL);
-
- // (C15 + S1) -> [P1, 1, NULL, C15]
- s1 = graph()->NewNode(s_op, p1, c1);
- ScaledWithOffset64Matcher match18(graph()->NewNode(a_op, c15, s1));
- CheckScaledWithOffsetMatch(&match18, p1, 1, NULL, c15);
-
- // (S1 + C15) -> [P1, 1, NULL, C15]
- s1 = graph()->NewNode(s_op, p1, c1);
- ScaledWithOffset64Matcher match19(graph()->NewNode(a_op, s1, c15));
- CheckScaledWithOffsetMatch(&match19, p1, 1, NULL, c15);
-
- // (O0 + M4) -> [p1, 2, O0, NULL]
- ScaledWithOffset64Matcher match20(graph()->NewNode(a_op, o0, m4));
- CheckScaledWithOffsetMatch(&match20, p1, 2, o0, NULL);
-
- // (M4 + O0) -> [p1, 2, O0, NULL]
- m4 = graph()->NewNode(m_op, p1, c4);
- ScaledWithOffset64Matcher match21(graph()->NewNode(a_op, m4, o0));
- CheckScaledWithOffsetMatch(&match21, p1, 2, o0, NULL);
-
- // (C15 + M4) -> [p1, 2, NULL, C15]
- m4 = graph()->NewNode(m_op, p1, c4);
- ScaledWithOffset64Matcher match22(graph()->NewNode(a_op, c15, m4));
- CheckScaledWithOffsetMatch(&match22, p1, 2, NULL, c15);
-
- // (M4 + C15) -> [p1, 2, NULL, C15]
- m4 = graph()->NewNode(m_op, p1, c4);
- ScaledWithOffset64Matcher match23(graph()->NewNode(a_op, m4, c15));
- CheckScaledWithOffsetMatch(&match23, p1, 2, NULL, c15);
-
- // (O0 + S2) -> [p1, 2, O0, NULL]
- ScaledWithOffset64Matcher match24(graph()->NewNode(a_op, o0, s2));
- CheckScaledWithOffsetMatch(&match24, p1, 2, o0, NULL);
-
- // (S2 + O0) -> [p1, 2, O0, NULL]
- s2 = graph()->NewNode(s_op, p1, c2);
- ScaledWithOffset64Matcher match25(graph()->NewNode(a_op, s2, o0));
- CheckScaledWithOffsetMatch(&match25, p1, 2, o0, NULL);
-
- // (C15 + S2) -> [p1, 2, NULL, C15]
- s2 = graph()->NewNode(s_op, p1, c2);
- ScaledWithOffset64Matcher match26(graph()->NewNode(a_op, c15, s2));
- CheckScaledWithOffsetMatch(&match26, p1, 2, NULL, c15);
-
- // (S2 + C15) -> [p1, 2, NULL, C15]
- s2 = graph()->NewNode(s_op, p1, c2);
- ScaledWithOffset64Matcher match27(graph()->NewNode(a_op, s2, c15));
- CheckScaledWithOffsetMatch(&match27, p1, 2, NULL, c15);
-
- // (O0 + M8) -> [p1, 2, O0, NULL]
- ScaledWithOffset64Matcher match28(graph()->NewNode(a_op, o0, m8));
- CheckScaledWithOffsetMatch(&match28, p1, 3, o0, NULL);
-
- // (M8 + O0) -> [p1, 2, O0, NULL]
- m8 = graph()->NewNode(m_op, p1, c8);
- ScaledWithOffset64Matcher match29(graph()->NewNode(a_op, m8, o0));
- CheckScaledWithOffsetMatch(&match29, p1, 3, o0, NULL);
-
- // (C15 + M8) -> [p1, 2, NULL, C15]
- m8 = graph()->NewNode(m_op, p1, c8);
- ScaledWithOffset64Matcher match30(graph()->NewNode(a_op, c15, m8));
- CheckScaledWithOffsetMatch(&match30, p1, 3, NULL, c15);
-
- // (M8 + C15) -> [p1, 2, NULL, C15]
- m8 = graph()->NewNode(m_op, p1, c8);
- ScaledWithOffset64Matcher match31(graph()->NewNode(a_op, m8, c15));
- CheckScaledWithOffsetMatch(&match31, p1, 3, NULL, c15);
-
- // (O0 + S3) -> [p1, 2, O0, NULL]
- ScaledWithOffset64Matcher match64(graph()->NewNode(a_op, o0, s3));
- CheckScaledWithOffsetMatch(&match64, p1, 3, o0, NULL);
-
- // (S3 + O0) -> [p1, 2, O0, NULL]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset64Matcher match33(graph()->NewNode(a_op, s3, o0));
- CheckScaledWithOffsetMatch(&match33, p1, 3, o0, NULL);
-
- // (C15 + S3) -> [p1, 2, NULL, C15]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset64Matcher match34(graph()->NewNode(a_op, c15, s3));
- CheckScaledWithOffsetMatch(&match34, p1, 3, NULL, c15);
-
- // (S3 + C15) -> [p1, 2, NULL, C15]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset64Matcher match35(graph()->NewNode(a_op, s3, c15));
- CheckScaledWithOffsetMatch(&match35, p1, 3, NULL, c15);
+ // (B0 + B1) -> [B0, 0, B1, NULL]
+ BaseWithIndexAndDisplacement64Matcher match1(graph()->NewNode(a_op, b0, b1));
+ CheckBaseWithIndexAndDisplacement(&match1, b1, 0, b0, NULL);
+
+ // (B0 + D15) -> [NULL, 0, B0, D15]
+ BaseWithIndexAndDisplacement64Matcher match2(graph()->NewNode(a_op, b0, d15));
+ CheckBaseWithIndexAndDisplacement(&match2, NULL, 0, b0, d15);
+
+ // (D15 + B0) -> [NULL, 0, B0, D15]
+ BaseWithIndexAndDisplacement64Matcher match3(graph()->NewNode(a_op, d15, b0));
+ CheckBaseWithIndexAndDisplacement(&match3, NULL, 0, b0, d15);
+
+ // (B0 + M1) -> [p1, 0, B0, NULL]
+ BaseWithIndexAndDisplacement64Matcher match4(graph()->NewNode(a_op, b0, m1));
+ CheckBaseWithIndexAndDisplacement(&match4, p1, 0, b0, NULL);
+
+ // (M1 + B0) -> [p1, 0, B0, NULL]
+ m1 = graph()->NewNode(m_op, p1, d1);
+ BaseWithIndexAndDisplacement64Matcher match5(graph()->NewNode(a_op, m1, b0));
+ CheckBaseWithIndexAndDisplacement(&match5, p1, 0, b0, NULL);
+
+ // (D15 + M1) -> [P1, 0, NULL, D15]
+ m1 = graph()->NewNode(m_op, p1, d1);
+ BaseWithIndexAndDisplacement64Matcher match6(graph()->NewNode(a_op, d15, m1));
+ CheckBaseWithIndexAndDisplacement(&match6, p1, 0, NULL, d15);
+
+ // (M1 + D15) -> [P1, 0, NULL, D15]
+ m1 = graph()->NewNode(m_op, p1, d1);
+ BaseWithIndexAndDisplacement64Matcher match7(graph()->NewNode(a_op, m1, d15));
+ CheckBaseWithIndexAndDisplacement(&match7, p1, 0, NULL, d15);
+
+ // (B0 + S0) -> [p1, 0, B0, NULL]
+ BaseWithIndexAndDisplacement64Matcher match8(graph()->NewNode(a_op, b0, s0));
+ CheckBaseWithIndexAndDisplacement(&match8, p1, 0, b0, NULL);
+
+ // (S0 + B0) -> [p1, 0, B0, NULL]
+ s0 = graph()->NewNode(s_op, p1, d0);
+ BaseWithIndexAndDisplacement64Matcher match9(graph()->NewNode(a_op, s0, b0));
+ CheckBaseWithIndexAndDisplacement(&match9, p1, 0, b0, NULL);
+
+ // (D15 + S0) -> [P1, 0, NULL, D15]
+ s0 = graph()->NewNode(s_op, p1, d0);
+ BaseWithIndexAndDisplacement64Matcher match10(
+ graph()->NewNode(a_op, d15, s0));
+ CheckBaseWithIndexAndDisplacement(&match10, p1, 0, NULL, d15);
+
+ // (S0 + D15) -> [P1, 0, NULL, D15]
+ s0 = graph()->NewNode(s_op, p1, d0);
+ BaseWithIndexAndDisplacement64Matcher match11(
+ graph()->NewNode(a_op, s0, d15));
+ CheckBaseWithIndexAndDisplacement(&match11, p1, 0, NULL, d15);
+
+ // (B0 + M2) -> [p1, 1, B0, NULL]
+ BaseWithIndexAndDisplacement64Matcher match12(graph()->NewNode(a_op, b0, m2));
+ CheckBaseWithIndexAndDisplacement(&match12, p1, 1, b0, NULL);
+
+ // (M2 + B0) -> [p1, 1, B0, NULL]
+ m2 = graph()->NewNode(m_op, p1, d2);
+ BaseWithIndexAndDisplacement64Matcher match13(graph()->NewNode(a_op, m2, b0));
+ CheckBaseWithIndexAndDisplacement(&match13, p1, 1, b0, NULL);
+
+ // (D15 + M2) -> [P1, 1, NULL, D15]
+ m2 = graph()->NewNode(m_op, p1, d2);
+ BaseWithIndexAndDisplacement64Matcher match14(
+ graph()->NewNode(a_op, d15, m2));
+ CheckBaseWithIndexAndDisplacement(&match14, p1, 1, NULL, d15);
+
+ // (M2 + D15) -> [P1, 1, NULL, D15]
+ m2 = graph()->NewNode(m_op, p1, d2);
+ BaseWithIndexAndDisplacement64Matcher match15(
+ graph()->NewNode(a_op, m2, d15));
+ CheckBaseWithIndexAndDisplacement(&match15, p1, 1, NULL, d15);
+
+ // (B0 + S1) -> [p1, 1, B0, NULL]
+ BaseWithIndexAndDisplacement64Matcher match16(graph()->NewNode(a_op, b0, s1));
+ CheckBaseWithIndexAndDisplacement(&match16, p1, 1, b0, NULL);
+
+ // (S1 + B0) -> [p1, 1, B0, NULL]
+ s1 = graph()->NewNode(s_op, p1, d1);
+ BaseWithIndexAndDisplacement64Matcher match17(graph()->NewNode(a_op, s1, b0));
+ CheckBaseWithIndexAndDisplacement(&match17, p1, 1, b0, NULL);
+
+ // (D15 + S1) -> [P1, 1, NULL, D15]
+ s1 = graph()->NewNode(s_op, p1, d1);
+ BaseWithIndexAndDisplacement64Matcher match18(
+ graph()->NewNode(a_op, d15, s1));
+ CheckBaseWithIndexAndDisplacement(&match18, p1, 1, NULL, d15);
+
+ // (S1 + D15) -> [P1, 1, NULL, D15]
+ s1 = graph()->NewNode(s_op, p1, d1);
+ BaseWithIndexAndDisplacement64Matcher match19(
+ graph()->NewNode(a_op, s1, d15));
+ CheckBaseWithIndexAndDisplacement(&match19, p1, 1, NULL, d15);
+
+ // (B0 + M4) -> [p1, 2, B0, NULL]
+ BaseWithIndexAndDisplacement64Matcher match20(graph()->NewNode(a_op, b0, m4));
+ CheckBaseWithIndexAndDisplacement(&match20, p1, 2, b0, NULL);
+
+ // (M4 + B0) -> [p1, 2, B0, NULL]
+ m4 = graph()->NewNode(m_op, p1, d4);
+ BaseWithIndexAndDisplacement64Matcher match21(graph()->NewNode(a_op, m4, b0));
+ CheckBaseWithIndexAndDisplacement(&match21, p1, 2, b0, NULL);
+
+ // (D15 + M4) -> [p1, 2, NULL, D15]
+ m4 = graph()->NewNode(m_op, p1, d4);
+ BaseWithIndexAndDisplacement64Matcher match22(
+ graph()->NewNode(a_op, d15, m4));
+ CheckBaseWithIndexAndDisplacement(&match22, p1, 2, NULL, d15);
+
+ // (M4 + D15) -> [p1, 2, NULL, D15]
+ m4 = graph()->NewNode(m_op, p1, d4);
+ BaseWithIndexAndDisplacement64Matcher match23(
+ graph()->NewNode(a_op, m4, d15));
+ CheckBaseWithIndexAndDisplacement(&match23, p1, 2, NULL, d15);
+
+ // (B0 + S2) -> [p1, 2, B0, NULL]
+ BaseWithIndexAndDisplacement64Matcher match24(graph()->NewNode(a_op, b0, s2));
+ CheckBaseWithIndexAndDisplacement(&match24, p1, 2, b0, NULL);
+
+ // (S2 + B0) -> [p1, 2, B0, NULL]
+ s2 = graph()->NewNode(s_op, p1, d2);
+ BaseWithIndexAndDisplacement64Matcher match25(graph()->NewNode(a_op, s2, b0));
+ CheckBaseWithIndexAndDisplacement(&match25, p1, 2, b0, NULL);
+
+ // (D15 + S2) -> [p1, 2, NULL, D15]
+ s2 = graph()->NewNode(s_op, p1, d2);
+ BaseWithIndexAndDisplacement64Matcher match26(
+ graph()->NewNode(a_op, d15, s2));
+ CheckBaseWithIndexAndDisplacement(&match26, p1, 2, NULL, d15);
+
+ // (S2 + D15) -> [p1, 2, NULL, D15]
+ s2 = graph()->NewNode(s_op, p1, d2);
+ BaseWithIndexAndDisplacement64Matcher match27(
+ graph()->NewNode(a_op, s2, d15));
+ CheckBaseWithIndexAndDisplacement(&match27, p1, 2, NULL, d15);
+
+ // (B0 + M8) -> [p1, 2, B0, NULL]
+ BaseWithIndexAndDisplacement64Matcher match28(graph()->NewNode(a_op, b0, m8));
+ CheckBaseWithIndexAndDisplacement(&match28, p1, 3, b0, NULL);
+
+ // (M8 + B0) -> [p1, 2, B0, NULL]
+ m8 = graph()->NewNode(m_op, p1, d8);
+ BaseWithIndexAndDisplacement64Matcher match29(graph()->NewNode(a_op, m8, b0));
+ CheckBaseWithIndexAndDisplacement(&match29, p1, 3, b0, NULL);
+
+ // (D15 + M8) -> [p1, 2, NULL, D15]
+ m8 = graph()->NewNode(m_op, p1, d8);
+ BaseWithIndexAndDisplacement64Matcher match30(
+ graph()->NewNode(a_op, d15, m8));
+ CheckBaseWithIndexAndDisplacement(&match30, p1, 3, NULL, d15);
+
+ // (M8 + D15) -> [p1, 2, NULL, D15]
+ m8 = graph()->NewNode(m_op, p1, d8);
+ BaseWithIndexAndDisplacement64Matcher match31(
+ graph()->NewNode(a_op, m8, d15));
+ CheckBaseWithIndexAndDisplacement(&match31, p1, 3, NULL, d15);
+
+ // (B0 + S3) -> [p1, 2, B0, NULL]
+ BaseWithIndexAndDisplacement64Matcher match64(graph()->NewNode(a_op, b0, s3));
+ CheckBaseWithIndexAndDisplacement(&match64, p1, 3, b0, NULL);
+
+ // (S3 + B0) -> [p1, 2, B0, NULL]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement64Matcher match33(graph()->NewNode(a_op, s3, b0));
+ CheckBaseWithIndexAndDisplacement(&match33, p1, 3, b0, NULL);
+
+ // (D15 + S3) -> [p1, 2, NULL, D15]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement64Matcher match34(
+ graph()->NewNode(a_op, d15, s3));
+ CheckBaseWithIndexAndDisplacement(&match34, p1, 3, NULL, d15);
+
+ // (S3 + D15) -> [p1, 2, NULL, D15]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement64Matcher match35(
+ graph()->NewNode(a_op, s3, d15));
+ CheckBaseWithIndexAndDisplacement(&match35, p1, 3, NULL, d15);
// 2 INPUT - NEGATIVE CASES
- // (M3 + O1) -> [O0, 0, M3, NULL]
- ScaledWithOffset64Matcher match36(graph()->NewNode(a_op, o1, m3));
- CheckScaledWithOffsetMatch(&match36, m3, 0, o1, NULL);
+ // (M3 + B1) -> [B0, 0, M3, NULL]
+ BaseWithIndexAndDisplacement64Matcher match36(graph()->NewNode(a_op, b1, m3));
+ CheckBaseWithIndexAndDisplacement(&match36, m3, 0, b1, NULL);
- // (S4 + O1) -> [O0, 0, S4, NULL]
- ScaledWithOffset64Matcher match37(graph()->NewNode(a_op, o1, s4));
- CheckScaledWithOffsetMatch(&match37, s4, 0, o1, NULL);
+ // (S4 + B1) -> [B0, 0, S4, NULL]
+ BaseWithIndexAndDisplacement64Matcher match37(graph()->NewNode(a_op, b1, s4));
+ CheckBaseWithIndexAndDisplacement(&match37, s4, 0, b1, NULL);
// 3 INPUT
- // (C15 + S3) + O0 -> [p1, 2, o0, c15]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset64Matcher match38(
- graph()->NewNode(a_op, graph()->NewNode(a_op, c15, s3), o0));
- CheckScaledWithOffsetMatch(&match38, p1, 3, o0, c15);
-
- // (O0 + C15) + S3 -> [p1, 2, o0, c15]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset64Matcher match39(
- graph()->NewNode(a_op, graph()->NewNode(a_op, o0, c15), s3));
- CheckScaledWithOffsetMatch(&match39, p1, 3, o0, c15);
-
- // (S3 + O0) + C15 -> [p1, 2, o0, c15]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset64Matcher match40(
- graph()->NewNode(a_op, graph()->NewNode(a_op, s3, o0), c15));
- CheckScaledWithOffsetMatch(&match40, p1, 3, o0, c15);
-
- // C15 + (S3 + O0) -> [p1, 2, o0, c15]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset64Matcher match41(
- graph()->NewNode(a_op, c15, graph()->NewNode(a_op, s3, o0)));
- CheckScaledWithOffsetMatch(&match41, p1, 3, o0, c15);
-
- // O0 + (C15 + S3) -> [p1, 2, o0, c15]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset64Matcher match42(
- graph()->NewNode(a_op, o0, graph()->NewNode(a_op, c15, s3)));
- CheckScaledWithOffsetMatch(&match42, p1, 3, o0, c15);
-
- // S3 + (O0 + C15) -> [p1, 2, o0, c15]
- s3 = graph()->NewNode(s_op, p1, c3);
- ScaledWithOffset64Matcher match43(
- graph()->NewNode(a_op, s3, graph()->NewNode(a_op, o0, c15)));
- CheckScaledWithOffsetMatch(&match43, p1, 3, o0, c15);
+ // (D15 + S3) + B0 -> [p1, 2, b0, d15]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement64Matcher match38(
+ graph()->NewNode(a_op, graph()->NewNode(a_op, d15, s3), b0));
+ CheckBaseWithIndexAndDisplacement(&match38, p1, 3, b0, d15);
+
+ // (B0 + D15) + S3 -> [p1, 2, b0, d15]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement64Matcher match39(
+ graph()->NewNode(a_op, graph()->NewNode(a_op, b0, d15), s3));
+ CheckBaseWithIndexAndDisplacement(&match39, p1, 3, b0, d15);
+
+ // (S3 + B0) + D15 -> [p1, 2, b0, d15]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement64Matcher match40(
+ graph()->NewNode(a_op, graph()->NewNode(a_op, s3, b0), d15));
+ CheckBaseWithIndexAndDisplacement(&match40, p1, 3, b0, d15);
+
+ // D15 + (S3 + B0) -> [p1, 2, b0, d15]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement64Matcher match41(
+ graph()->NewNode(a_op, d15, graph()->NewNode(a_op, s3, b0)));
+ CheckBaseWithIndexAndDisplacement(&match41, p1, 3, b0, d15);
+
+ // B0 + (D15 + S3) -> [p1, 2, b0, d15]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement64Matcher match42(
+ graph()->NewNode(a_op, b0, graph()->NewNode(a_op, d15, s3)));
+ CheckBaseWithIndexAndDisplacement(&match42, p1, 3, b0, d15);
+
+ // S3 + (B0 + D15) -> [p1, 2, b0, d15]
+ s3 = graph()->NewNode(s_op, p1, d3);
+ BaseWithIndexAndDisplacement64Matcher match43(
+ graph()->NewNode(a_op, s3, graph()->NewNode(a_op, b0, d15)));
+ CheckBaseWithIndexAndDisplacement(&match43, p1, 3, b0, d15);
+
+ // 2 INPUT with non-power of 2 scale
+
+ // (M3 + D15) -> [p1, 1, p1, D15]
+ m3 = graph()->NewNode(m_op, p1, d3);
+ BaseWithIndexAndDisplacement64Matcher match44(
+ graph()->NewNode(a_op, m3, d15));
+ CheckBaseWithIndexAndDisplacement(&match44, p1, 1, p1, d15);
+
+ // (M5 + D15) -> [p1, 2, p1, D15]
+ m5 = graph()->NewNode(m_op, p1, d5);
+ BaseWithIndexAndDisplacement64Matcher match45(
+ graph()->NewNode(a_op, m5, d15));
+ CheckBaseWithIndexAndDisplacement(&match45, p1, 2, p1, d15);
+
+ // (M9 + D15) -> [p1, 3, p1, D15]
+ m9 = graph()->NewNode(m_op, p1, d9);
+ BaseWithIndexAndDisplacement64Matcher match46(
+ graph()->NewNode(a_op, m9, d15));
+ CheckBaseWithIndexAndDisplacement(&match46, p1, 3, p1, d15);
+
+ // 3 INPUT negative cases: non-power of 2 scale but with a base
+
+ // ((M3 + B0) + D15) -> [m3, 0, b0, D15]
+ m3 = graph()->NewNode(m_op, p1, d3);
+ Node* temp = graph()->NewNode(a_op, m3, b0);
+ BaseWithIndexAndDisplacement64Matcher match47(
+ graph()->NewNode(a_op, temp, d15));
+ CheckBaseWithIndexAndDisplacement(&match47, m3, 0, b0, d15);
+
+ // (M3 + (B0 + D15)) -> [m3, 0, b0, D15]
+ m3 = graph()->NewNode(m_op, p1, d3);
+ temp = graph()->NewNode(a_op, d15, b0);
+ BaseWithIndexAndDisplacement64Matcher match48(
+ graph()->NewNode(a_op, m3, temp));
+ CheckBaseWithIndexAndDisplacement(&match48, m3, 0, b0, d15);
+
+ // ((B0 + M3) + D15) -> [m3, 0, b0, D15]
+ m3 = graph()->NewNode(m_op, p1, d3);
+ temp = graph()->NewNode(a_op, b0, m3);
+ BaseWithIndexAndDisplacement64Matcher match49(
+ graph()->NewNode(a_op, temp, d15));
+ CheckBaseWithIndexAndDisplacement(&match49, m3, 0, b0, d15);
+
+ // (M3 + (D15 + B0)) -> [m3, 0, b0, D15]
+ m3 = graph()->NewNode(m_op, p1, d3);
+ temp = graph()->NewNode(a_op, b0, d15);
+ BaseWithIndexAndDisplacement64Matcher match50(
+ graph()->NewNode(a_op, m3, temp));
+ CheckBaseWithIndexAndDisplacement(&match50, m3, 0, b0, d15);
}
« no previous file with comments | « src/compiler/x64/instruction-selector-x64.cc ('k') | test/unittests/compiler/x64/instruction-selector-x64-unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698