change layout tests

test/layout_nhwc.cpp

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