Commit d2198a2a authored by Paul's avatar Paul
Browse files

Formatting

parent 81fb85e7
...@@ -121,7 +121,8 @@ bool check_conflicts(migraphx::program& p, migraphx::instruction_ref x, migraphx ...@@ -121,7 +121,8 @@ bool check_conflicts(migraphx::program& p, migraphx::instruction_ref x, migraphx
} }
void check_conflicts(migraphx::program& p, void check_conflicts(migraphx::program& p,
std::vector<std::vector<migraphx::instruction_ref>> conflicts, bool result = true) std::vector<std::vector<migraphx::instruction_ref>> conflicts,
bool result = true)
{ {
migraphx::dfor(conflicts.size(), conflicts.size())([&](auto i, auto j) { migraphx::dfor(conflicts.size(), conflicts.size())([&](auto i, auto j) {
if(i == j) if(i == j)
...@@ -274,13 +275,13 @@ TEST_CASE(seq_merge) ...@@ -274,13 +275,13 @@ TEST_CASE(seq_merge)
{ {
instruction_map stream; instruction_map stream;
migraphx::program p; migraphx::program p;
auto one = p.add_literal(1); auto one = p.add_literal(1);
auto c1 = chain(p, 2, unary_op{}, one); auto c1 = chain(p, 2, unary_op{}, one);
auto i1 = p.add_instruction(unary_op{}, one); auto i1 = p.add_instruction(unary_op{}, one);
auto binary1 = p.add_instruction(nary_op{}, i1, c1.back()); auto binary1 = p.add_instruction(nary_op{}, i1, c1.back());
auto c2 = chain(p, 2, unary_op{}, binary1); auto c2 = chain(p, 2, unary_op{}, binary1);
auto i2 = p.add_instruction(unary_op{}, binary1); auto i2 = p.add_instruction(unary_op{}, binary1);
auto binary2 = p.add_instruction(nary_op{}, i2, c2.back()); auto binary2 = p.add_instruction(nary_op{}, i2, c2.back());
p.compile(schedule_target{&stream}); p.compile(schedule_target{&stream});
...@@ -305,15 +306,15 @@ TEST_CASE(par_merge) ...@@ -305,15 +306,15 @@ TEST_CASE(par_merge)
{ {
instruction_map stream; instruction_map stream;
migraphx::program p; migraphx::program p;
auto one = p.add_literal(1); auto one = p.add_literal(1);
auto start1 = p.add_instruction(unary_op{}, one); auto start1 = p.add_instruction(unary_op{}, one);
auto c1 = chain(p, 3, unary_op{}, start1); auto c1 = chain(p, 3, unary_op{}, start1);
auto i1 = p.add_instruction(unary_op{}, start1); auto i1 = p.add_instruction(unary_op{}, start1);
auto binary1 = p.add_instruction(nary_op{}, i1, c1.back()); auto binary1 = p.add_instruction(nary_op{}, i1, c1.back());
auto start2 = p.add_instruction(unary_op{}, one); auto start2 = p.add_instruction(unary_op{}, one);
auto c2 = chain(p, 2, unary_op{}, start2); auto c2 = chain(p, 2, unary_op{}, start2);
auto i2 = p.add_instruction(unary_op{}, start2); auto i2 = p.add_instruction(unary_op{}, start2);
auto binary2 = p.add_instruction(nary_op{}, i2, c2.back()); auto binary2 = p.add_instruction(nary_op{}, i2, c2.back());
auto binary3 = p.add_instruction(nary_op{}, binary1, binary2); auto binary3 = p.add_instruction(nary_op{}, binary1, binary2);
......
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