From 187c1dc0819107b5417a11738528e31e0e99e00a Mon Sep 17 00:00:00 2001
From: Megvii Engine Team <megengine@megvii.com>
Date: Wed, 5 Jan 2022 14:31:31 +0800
Subject: [PATCH] fix(jit): copy aux var when shallow copying JITExecutor

GitOrigin-RevId: 3b331e1c17717c88b3149275ba4d860cb975213d
---
 src/jit/impl/jit.sereg.h | 46 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/jit/impl/jit.sereg.h b/src/jit/impl/jit.sereg.h
index 49cc2ce5..1575da42 100644
--- a/src/jit/impl/jit.sereg.h
+++ b/src/jit/impl/jit.sereg.h
@@ -9,7 +9,9 @@
  * "AS IS" BASIS, WITHOUT ARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  */
 
+#include "megbrain/graph/helper.h"
 #include "megbrain/jit/executor_opr.h"
+#include "megbrain/serialization/opr_shallow_copy.h"
 #include "megbrain/serialization/sereg.h"
 
 namespace mgb {
@@ -19,9 +21,47 @@ cg::OperatorNodeBase* opr_shallow_copy_jit_executor_opr(
         const cg::OperatorNodeBase& opr_, const VarNodeArray& inputs,
         const OperatorNodeConfig& config) {
     auto&& opr = opr_.cast_final_safe<JITExecutor>();
-    return JITExecutor::make(opr.internal_graph_ptr(), inputs, config)
-            .node()
-            ->owner_opr();
+    auto* shape_infer = opr.internal_graph().shape_infer();
+    auto* value_infer = opr.internal_graph().value_infer();
+    ThinHashMap<cg::VarNode*, cg::VarNode*> var_replace_map;
+    mgb_assert(inputs.size() == opr.input().size());
+    auto on_opr = [&](cg::OperatorNodeBase* opr) {
+        auto&& inputs = opr->input();
+        cg::VarNodeArray new_inputs;
+        for (auto&& input : inputs) {
+            new_inputs.push_back(var_replace_map.at(input));
+        }
+        auto* new_opr = opr;
+        if (new_inputs != inputs) {
+            auto&& config = opr->config();
+            new_opr =
+                    mgb::serialization::copy_opr_shallow(*opr, new_inputs, config, ctx);
+        }
+        auto&& outputs = opr->output();
+        auto&& new_outputs = new_opr->output();
+        mgb_assert(outputs.size() == new_outputs.size());
+        for (size_t i = 0; i < outputs.size(); ++i) {
+            var_replace_map[outputs.at(i)] = new_outputs.at(i);
+        }
+    };
+    cg::DepOprIter iter{on_opr};
+    for (size_t i = 0; i < inputs.size(); ++i) {
+        var_replace_map[opr.input(i)] = inputs[i];
+        iter.set_visited(opr.input(i)->owner_opr());
+    }
+    if (shape_infer) {
+        iter.add(shape_infer);
+        shape_infer = var_replace_map.at(shape_infer);
+    }
+    if (value_infer) {
+        iter.add(value_infer);
+        value_infer = var_replace_map.at(value_infer);
+    }
+    auto internal_graph = opr.internal_graph_ptr();
+    internal_graph = std::make_shared<InternalGraph>(
+            internal_graph->output(), shape_infer, value_infer,
+            internal_graph->placeholders());
+    return JITExecutor::make(internal_graph, inputs, config).node()->owner_opr();
 }
 
 MGB_REG_OPR_SHALLOW_COPY(JITExecutor, opr_shallow_copy_jit_executor_opr);
-- 
GitLab