importInstructionNodeRenderer

Author: s-barannikov

llvm/utils/TableGen/GlobalISelEmitter.cpp

@@ -422,6 +422,10 @@ class GlobalISelEmitter final : public GlobalISelMatchTableExecutorEmitter {
   Error importXFormNodeRenderer(RuleMatcher &M, BuildMIAction &MIBuilder,
                                 const TreePatternNode &N) const;
 
+  Error importInstructionNodeRenderer(RuleMatcher &M, BuildMIAction &MIBuilder,
+                                      const TreePatternNode &N,
+                                      action_iterator &InsertPt) const;
+
   Expected<action_iterator>
   importExplicitUseRenderer(action_iterator InsertPt, RuleMatcher &Rule,
                             BuildMIAction &DstMIBuilder,
@@ -1339,6 +1343,27 @@ Error GlobalISelEmitter::importXFormNodeRenderer(
   return Error::success();
 }
 
+// Equivalent of MatcherGen::EmitResultInstructionAsOperand.
+Error GlobalISelEmitter::importInstructionNodeRenderer(
+    RuleMatcher &M, BuildMIAction &MIBuilder, const TreePatternNode &N,
+    action_iterator &InsertPt) const {
+  Expected<LLTCodeGen> OpTy = getInstResultType(N, Target);
+  if (!OpTy)
+    return OpTy.takeError();
+
+  unsigned TempRegID = M.allocateTempRegID();
+  InsertPt = M.insertAction<MakeTempRegisterAction>(InsertPt, *OpTy, TempRegID);
+  MIBuilder.addRenderer<TempRegRenderer>(TempRegID);
+
+  auto InsertPtOrError =
+      createAndImportSubInstructionRenderer(++InsertPt, M, N, TempRegID);
+  if (!InsertPtOrError)
+    return InsertPtOrError.takeError();
+
+  InsertPt = *InsertPtOrError;
+  return Error::success();
+}
+
 Expected<action_iterator> GlobalISelEmitter::importExplicitUseRenderer(
     action_iterator InsertPt, RuleMatcher &Rule, BuildMIAction &DstMIBuilder,
     const TreePatternNode &Dst) const {
@@ -1361,20 +1386,10 @@ Expected<action_iterator> GlobalISelEmitter::importExplicitUseRenderer(
   }
 
   if (Dst.getOperator()->isSubClassOf("Instruction")) {
-    auto OpTy = getInstResultType(Dst, Target);
-    if (!OpTy)
-      return OpTy.takeError();
-
-    unsigned TempRegID = Rule.allocateTempRegID();
-    InsertPt =
-        Rule.insertAction<MakeTempRegisterAction>(InsertPt, *OpTy, TempRegID);
-    DstMIBuilder.addRenderer<TempRegRenderer>(TempRegID);
-
-    auto InsertPtOrError =
-        createAndImportSubInstructionRenderer(++InsertPt, Rule, Dst, TempRegID);
-    if (auto Error = InsertPtOrError.takeError())
-      return std::move(Error);
-    return InsertPtOrError.get();
+    if (Error Err =
+            importInstructionNodeRenderer(Rule, DstMIBuilder, Dst, InsertPt))
+      return Err;
+    return InsertPt;
   }
 
   // Should not reach here.