change layout tests

test/layout_nhwc.cpp

@@ -76,7 +76,8 @@ TEST_CASE(conv_relu)
                               {{"padding", {1, 1}}, {"stride", {2, 2}}, {"dilation", {1, 1}}}),
             x,
             w);
-        m2.add_instruction(layout(), conv);
+        auto conv_layout = m2.add_instruction(layout(), conv);
+        m2.add_instruction(migraphx::make_op("relu"), conv_layout);
     }
     EXPECT(m1.sort() == m2.sort());
 }
@@ -115,7 +116,7 @@ TEST_CASE(conv_add)
             x,
             w);
         auto conv_layout = m2.add_instruction(layout(), conv);
-        auto b           = m2.add_instruction(
+        auto b = m2.add_instruction(
             migraphx::make_op("broadcast", {{"axis", 1}, {"out_lens", conv->get_shape().lens()}}),
             y);
         m2.add_instruction(migraphx::make_op("add"), conv_layout, b);