Add changes

src/auto_contiguous.cpp

@@ -25,6 +25,7 @@
 #include <migraphx/program.hpp>
 #include <migraphx/instruction.hpp>
 #include <migraphx/make_op.hpp>
+#include <migraphx/ranges.hpp>
 #include <migraphx/iterator_for.hpp>
 
 namespace migraphx {
@@ -58,17 +59,30 @@ void auto_contiguous::apply(module& m) const
     auto last = std::prev(m.end());
     for(auto ins : iterator_for(m))
     {
-        if(ins->name() == "layout")
+        if(contains({"layout", "contiguous", "@return", "@param", "@outline"}, ins->name()))
             continue;
+        auto outputs = ins->outputs();
         // for last instruction that is NOT a return
-        if(ins->outputs().empty() and ins != last)
+        if(outputs.empty() and ins != last)
             continue;
+        if(not outputs.empty())
+            // if contiguous was already inserted, skip
+            if(std::all_of(outputs.begin(), outputs.end(), [](auto output) {
+                   return output->name() == "contiguous";
+               }))
+                continue;
         shape s = ins->get_shape();
-        if(not s.dynamic() and not s.standard() and s.elements() != 0)
-        {
-            auto c = m.insert_instruction(std::next(ins), make_op("contiguous"), ins);
-            m.replace_instruction(ins, c);
-        }
+        if(s.dynamic())
+            continue;
+        if(s.type() == shape::tuple_type)
+            continue;
+        if(s.standard() and ins->name() == "@literal")
+            continue;
+        if(s.scalar() and not contains(ins->name(), "broadcast"))
+            continue;
+
+        auto c = m.insert_instruction(std::next(ins), make_op("contiguous"), ins);
+        m.replace_instruction(ins, c);
     }
 }
 

src/eliminate_contiguous.cpp

@@ -30,6 +30,7 @@
 #include <migraphx/op/contiguous.hpp>
 #include <migraphx/op/identity.hpp>
 #include <migraphx/par_for.hpp>
+#include <type_traits>
 #include <utility>
 
 namespace migraphx {
@@ -180,6 +181,18 @@ static void remove_contiguous(const std::string& op_name, module& m, F f)
     }
 }
 
+static void remove_contiguous_nops(const std::string& op_name, module& m)
+{
+    for(auto ins : iterator_for(m))
+    {
+        if(ins->name() != op_name)
+            continue;
+        if(ins->inputs().front()->get_shape() != ins->get_shape())
+            continue;
+        m.replace_instruction(ins, ins->inputs().front());
+    }
+}
+
 void eliminate_contiguous::apply(module& m) const
 {
     // Skip contiguous from splits first
@@ -189,6 +202,7 @@ void eliminate_contiguous::apply(module& m) const
         return (ins->inputs().front()->outputs().size() == 1);
     });
     remove_contiguous(op_name, m, [](auto) { return true; });
+    remove_contiguous_nops(op_name, m);
 }
 
 } // namespace MIGRAPHX_INLINE_NS

src/targets/gpu/target.cpp

@@ -134,7 +134,6 @@ std::vector<pass> target::get_passes(migraphx::context& gctx, const compile_opti
         dead_code_elimination{},
         prefuse_ops{},
         dead_code_elimination{},
-        auto_contiguous{},
         optimize_module{},
         fuse_pointwise{},
         dead_code_elimination{},
@@ -146,6 +145,7 @@ std::vector<pass> target::get_passes(migraphx::context& gctx, const compile_opti
         dead_code_elimination{},
         enable_pass(mlir_enabled(), fuse_mlir{&ctx}),
         dead_code_elimination{},
+        auto_contiguous{},
         lowering{&ctx, options.offload_copy},
         eliminate_contiguous{"gpu::contiguous"},
         dead_code_elimination{},

test/auto_contiguous_test.cpp

@@ -148,11 +148,13 @@ TEST_CASE(two_transpose_gather)
             migraphx::make_op("transpose", {{"permutation", {0, 2, 3, 1}}}), data);
         auto ctd = m2.add_instruction(migraphx::make_op("contiguous"), td);
         auto sd  = m2.add_instruction(migraphx::make_op("softmax", {{"axis", 2}}), ctd);
-        auto bd =
-            m2.add_instruction(migraphx::make_op("transpose", {{"permutation", {0, 3, 1, 2}}}), sd);
+        auto csd = m2.add_instruction(migraphx::make_op("contiguous"), sd);
+        auto bd  = m2.add_instruction(
+            migraphx::make_op("transpose", {{"permutation", {0, 3, 1, 2}}}), csd);
         auto cbd = m2.add_instruction(migraphx::make_op("contiguous"), bd);
         auto r   = m2.add_instruction(migraphx::make_op("gather", {{"axis", 2}}), cbd, ind);
-        m2.add_return({r});
+        auto cr  = m2.add_instruction(migraphx::make_op("contiguous"), r);
+        m2.add_return({cr});
     }
 
     EXPECT(m1 == m2);
@@ -177,7 +179,8 @@ TEST_CASE(standard_reshape_lazy)
         auto ca   = m2.add_instruction(migraphx::make_op("contiguous"), add);
         auto r =
             m2.add_instruction(migraphx::make_op("reshape_lazy", {{"dims", {2, 1, 12, 5}}}), ca);
-        m2.add_return({r});
+        auto cr = m2.add_instruction(migraphx::make_op("contiguous"), r);
+        m2.add_return({cr});
     }
 
     EXPECT(m1 == m2);
@@ -198,8 +201,10 @@ TEST_CASE(standard_reshape)
     {
         auto data = m2.add_parameter("2x2", {migraphx::shape::float_type, {2, 3, 4, 5}});
         auto add  = m2.add_instruction(migraphx::make_op("add"), data, data);
-        auto r = m2.add_instruction(migraphx::make_op("reshape", {{"dims", {2, 1, 12, 5}}}), add);
-        m2.add_return({r});
+        auto ca   = m2.add_instruction(migraphx::make_op("contiguous"), add);
+        auto r    = m2.add_instruction(migraphx::make_op("reshape", {{"dims", {2, 1, 12, 5}}}), ca);
+        auto cr = m2.add_instruction(migraphx::make_op("contiguous"), r);
+        m2.add_return({cr});
     }
 
     EXPECT(m1 == m2);