Skip to content

GitLab

Commit 75ff4513 authored by Paul's avatar Paul
Browse files

Formatting

parent adf9a5ce
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 34 deletions
src/include/migraph/matcher.hpp
View file @ 75ff4513
...@@ -179,7 +179,7 @@ matcher_result match_instruction(program& p, instruction_ref ins, M&& m) ...@@ -179,7 +179,7 @@ matcher_result match_instruction(program& p, instruction_ref ins, M&& m)
assert(ins != p.end()); assert(ins != p.end());
matcher_result result; matcher_result result;
matcher_context ctx{p.end()}; matcher_context ctx{p.end()};
result.result = m.match(ctx, ins); result.result = m.match(ctx, ins);
result.instructions = ctx.instructions; result.instructions = ctx.instructions;
return result; return result;
} }
......
test/matcher.cpp
View file @ 75ff4513
...@@ -174,9 +174,9 @@ void match_args2() ...@@ -174,9 +174,9 @@ void match_args2()
auto two = p.add_literal(2); auto two = p.add_literal(2);
auto sum = p.add_instruction(sum_op{}, one, two); auto sum = p.add_instruction(sum_op{}, one, two);
p.add_instruction(pass_op{}, sum); p.add_instruction(pass_op{}, sum);
auto m = matchers::name("sum")( auto m =
matchers::args(matchers::name("@literal"), matchers::name("sum")), matchers::name("sum")(matchers::args(matchers::name("@literal"), matchers::name("sum")),
matchers::standard_shape()); matchers::standard_shape());
auto r = find_match(p, m); auto r = find_match(p, m);
EXPECT(bool{r.result == p.end()}); EXPECT(bool{r.result == p.end()});
} }
...@@ -188,9 +188,8 @@ void match_args3() ...@@ -188,9 +188,8 @@ void match_args3()
auto two = p.add_literal(2); auto two = p.add_literal(2);
auto sum = p.add_instruction(sum_op{}, one, two); auto sum = p.add_instruction(sum_op{}, one, two);
p.add_instruction(pass_op{}, sum); p.add_instruction(pass_op{}, sum);
auto m = matchers::name("sum")( auto m = matchers::name("sum")(matchers::args(matchers::name("@literal")),
matchers::args(matchers::name("@literal")), matchers::standard_shape());
matchers::standard_shape());
auto r = find_match(p, m); auto r = find_match(p, m);
EXPECT(bool{r.result == sum}); EXPECT(bool{r.result == sum});
} }
...@@ -198,14 +197,14 @@ void match_args3() ...@@ -198,14 +197,14 @@ void match_args3()
void match_args4() void match_args4()
{ {
migraph::program p; migraph::program p;
auto one = p.add_literal(1); auto one = p.add_literal(1);
auto two = p.add_literal(2); auto two = p.add_literal(2);
auto sum1 = p.add_instruction(sum_op{}, one, two); auto sum1 = p.add_instruction(sum_op{}, one, two);
auto sum2 = p.add_instruction(sum_op{}, sum1, two); auto sum2 = p.add_instruction(sum_op{}, sum1, two);
p.add_instruction(pass_op{}, sum2); p.add_instruction(pass_op{}, sum2);
auto m = matchers::name("sum")( auto m =
matchers::args(matchers::name("sum"), matchers::name("@literal")), matchers::name("sum")(matchers::args(matchers::name("sum"), matchers::name("@literal")),
matchers::standard_shape()); matchers::standard_shape());
auto r = find_match(p, m); auto r = find_match(p, m);
EXPECT(bool{r.result == sum2}); EXPECT(bool{r.result == sum2});
} }
...@@ -217,9 +216,9 @@ void match_args5() ...@@ -217,9 +216,9 @@ void match_args5()
auto two = p.add_literal(2); auto two = p.add_literal(2);
auto sum = p.add_instruction(sum_op{}, one, two); auto sum = p.add_instruction(sum_op{}, one, two);
p.add_instruction(pass_op{}, sum); p.add_instruction(pass_op{}, sum);
auto m = matchers::name("sum")( auto m =
matchers::args(matchers::name("sum"), matchers::name("@literal")), matchers::name("sum")(matchers::args(matchers::name("sum"), matchers::name("@literal")),
matchers::standard_shape()); matchers::standard_shape());
auto r = find_match(p, m); auto r = find_match(p, m);
EXPECT(bool{r.result == p.end()}); EXPECT(bool{r.result == p.end()});
} }
...@@ -227,13 +226,12 @@ void match_args5() ...@@ -227,13 +226,12 @@ void match_args5()
void match_args6() void match_args6()
{ {
migraph::program p; migraph::program p;
auto one = p.add_literal(1); auto one = p.add_literal(1);
auto two = p.add_literal(2); auto two = p.add_literal(2);
auto sum = p.add_instruction(sum_op{}, one, two); auto sum = p.add_instruction(sum_op{}, one, two);
auto pass = p.add_instruction(pass_op{}, sum); auto pass = p.add_instruction(pass_op{}, sum);
auto m = matchers::name("pass")( auto m =
matchers::args(matchers::name("sum")), matchers::name("pass")(matchers::args(matchers::name("sum")), matchers::standard_shape());
matchers::standard_shape());
auto r = find_match(p, m); auto r = find_match(p, m);
EXPECT(bool{r.result == pass}); EXPECT(bool{r.result == pass});
} }
...@@ -241,27 +239,31 @@ void match_args6() ...@@ -241,27 +239,31 @@ void match_args6()
void match_args7() void match_args7()
{ {
migraph::program p; migraph::program p;
auto one = p.add_literal(1); auto one = p.add_literal(1);
auto two = p.add_literal(2); auto two = p.add_literal(2);
auto sum = p.add_instruction(sum_op{}, one, two); auto sum = p.add_instruction(sum_op{}, one, two);
auto pass = p.add_instruction(pass_op{}, sum); auto pass = p.add_instruction(pass_op{}, sum);
auto m = matchers::name("pass")( auto m = matchers::name("pass")(matchers::args(matchers::name("sum")(matchers::args(
matchers::args(matchers::name("sum")(matchers::args(matchers::name("@literal"), matchers::name("@literal")))), matchers::name("@literal"), matchers::name("@literal")))),
matchers::standard_shape()); matchers::standard_shape());
auto r = find_match(p, m); auto r = find_match(p, m);
EXPECT(bool{r.result == pass}); EXPECT(bool{r.result == pass});
} }
void match_bind1() void match_bind1()
{ {
migraph::program p; migraph::program p;
auto one = p.add_literal(1); auto one = p.add_literal(1);
auto two = p.add_literal(2); auto two = p.add_literal(2);
auto sum = p.add_instruction(sum_op{}, one, two); auto sum = p.add_instruction(sum_op{}, one, two);
auto pass = p.add_instruction(pass_op{}, sum); auto pass = p.add_instruction(pass_op{}, sum);
auto m = matchers::name("pass")( auto m = matchers::name("pass")(
matchers::args(matchers::name("sum")(matchers::args(matchers::name("@literal").bind("one"), matchers::name("@literal").bind("two"))).bind("sum")), matchers::args(
matchers::standard_shape()).bind("pass"); matchers::name("sum")(matchers::args(matchers::name("@literal").bind("one"),
matchers::name("@literal").bind("two")))
.bind("sum")),
matchers::standard_shape())
.bind("pass");
auto r = find_match(p, m); auto r = find_match(p, m);
EXPECT(bool{r.instructions.at("one") == one}); EXPECT(bool{r.instructions.at("one") == one});
EXPECT(bool{r.instructions.at("two") == two}); EXPECT(bool{r.instructions.at("two") == two});
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment