speed up dump ir

kendryte · Jan 2, 2025 · c97a89e · c97a89e
1 parent 7213bc9
commit c97a89e
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 27 deletions.
diff --git a/src/Nncase.Core/CompilerServices.cs b/src/Nncase.Core/CompilerServices.cs
@@ -91,8 +91,9 @@ public interface ICompilerServicesProvider
     /// </summary>
     /// <param name="expr"> the expression. </param>
     /// <param name="useScript">Print script format.</param>
+    /// <param name="display_callable">display callable.</param>
     /// <returns>the string.</returns>
-    string Print(Expr expr, bool useScript);
+    string Print(Expr expr, bool useScript, bool display_callable);
 
     /// <summary>
     /// Evaluate the expression tree.
@@ -475,7 +476,7 @@ public static bool TryEMatchRoot(Expr expr, IPattern pattern, [MaybeNullWhen(fal
     /// <returns>Result.</returns>
     public static string PrintOp(Op op, IIRPrinterContext context, bool iLmode) => Provider.PrintOp(op, context, iLmode);
 
-    public static void DumpIR(Expr expr, string prefix, string dumpPath, bool display_callable = true) =>
+    public static void DumpIR(Expr expr, string prefix, string dumpPath, bool display_callable = false) =>
       Provider.DumpIR(expr, prefix, dumpPath, display_callable);
 
     /// <summary>
@@ -484,7 +485,7 @@ public static void DumpIR(Expr expr, string prefix, string dumpPath, bool displa
     /// not support prim func/prim func wrapper.
     /// </remarks>
     /// </summary>
-    public static void DumpDotIR(Expr expr, string prefix, string dumpPath, bool display_callable = true) =>
+    public static void DumpDotIR(Expr expr, string prefix, string dumpPath, bool display_callable = false) =>
       Provider.DumpDotIR(expr, prefix, dumpPath, display_callable);
 
     /// <summary>
@@ -508,7 +509,7 @@ public static void DumpPatternIR(Expr expr, string prefix, string dumpDir) =>
 
     public static string Print(IRType type) => Provider.Print(type);
 
-    public static string Print(Expr expr, bool useScript = false) => Provider.Print(expr, useScript);
+    public static string Print(Expr expr, bool useScript = false, bool display_callable = false) => Provider.Print(expr, useScript, display_callable);
 
     /// <summary>
     /// Get target.
@@ -629,7 +630,7 @@ public void DumpPatternIR(Expr expr, string prefix, string dumpDir) =>
     public string Print(IRType type) => _irprinterProvider.Print(type);
 
     /// <inheritdoc/>
-    public string Print(Expr expr, bool useScript) => _irprinterProvider.Print(expr, useScript);
+    public string Print(Expr expr, bool useScript, bool display_callable) => _irprinterProvider.Print(expr, useScript, display_callable);
 
     /// <inheritdoc/>
     public bool TryMatch(Expr expr, IPattern pattern, MatchOptions options, [MaybeNullWhen(false)] out IMatchResult result)

diff --git a/src/Nncase.Core/Diagnostics/IDumpper.cs b/src/Nncase.Core/Diagnostics/IDumpper.cs
@@ -36,7 +36,7 @@ public interface IDumpper
     /// <returns>Sub dummper.</returns>
     IDumpper CreateSubDummper(string subDirectory, DumpFlags? dumpFlags = null);
 
-    void DumpIR(Expr expr, string prefix, string? reletivePath = null, bool displayCallable = true);
+    void DumpIR(Expr expr, string prefix, string? reletivePath = null, bool displayCallable = false);
 
     void DumpDotIR(Expr expr, string prefix, string? reletivePath = null);
 

diff --git a/src/Nncase.Core/Diagnostics/NullDumpper.cs b/src/Nncase.Core/Diagnostics/NullDumpper.cs
@@ -27,7 +27,7 @@ public sealed class NullDumpper : IDumpper
     public IDumpper CreateSubDummper(string subDirectory, DumpFlags? dumpFlags) => this;
 
     /// <inheritdoc/>
-    public void DumpIR(Expr expr, string prefix, string? reletivePath = null, bool displayCallable = true)
+    public void DumpIR(Expr expr, string prefix, string? reletivePath = null, bool displayCallable = false)
     {
     }
 

diff --git a/src/Nncase.Core/IR/IIRPrinterProvider.cs b/src/Nncase.Core/IR/IIRPrinterProvider.cs
@@ -91,6 +91,7 @@ public interface IIRPrinterProvider
     /// </summary>
     /// <param name="expr"> the expression.</param>
     /// <param name="useScript"> tir mode.</param>
+    /// <param name="display_callable"> display callable.</param>
     /// <returns>the string.</returns>
-    string Print(Expr expr, bool useScript);
+    string Print(Expr expr, bool useScript, bool display_callable);
 }
diff --git a/src/Nncase.Diagnostics/Diagnostics/Dumpper.cs b/src/Nncase.Diagnostics/Diagnostics/Dumpper.cs
@@ -34,7 +34,7 @@ public IDumpper CreateSubDummper(string subDirectory, DumpFlags? dumpFlags)
         return new Dumpper(subDumpFlags, Path.Join(_dumpDirectory, subDirectory));
     }
 
-    public void DumpIR(Expr expr, string prefix, string? reletivePath = null, bool displayCallable = true)
+    public void DumpIR(Expr expr, string prefix, string? reletivePath = null, bool displayCallable = false)
     {
         var path = Path.Join(_dumpDirectory, reletivePath);
         CompilerServices.DumpIR(expr, prefix, EnsureWritable(path), displayCallable);

diff --git a/src/Nncase.Diagnostics/Diagnostics/ILPrintVisitor.cs b/src/Nncase.Diagnostics/Diagnostics/ILPrintVisitor.cs
@@ -390,9 +390,16 @@ protected override string VisitFunction(Function expr)
         _scope.IndWriteLine("{");
 
         // 2. Function body
-        using (_scope.IndentUp())
+        if (_scope.IndentLevel == 0 || _displayCallable)
         {
-            var body = Visit(expr.Body);
+            using (_scope.IndentUp())
+            {
+                var body = Visit(expr.Body);
+            }
+        }
+        else
+        {
+            _scope.IndWriteLine("...");
         }
 
         // 3. Function closing
@@ -418,22 +425,15 @@ protected override string VisitFusion(Fusion expr)
         _scope.IndWriteLine("{");
 
         // 2. Function body
-        if (_displayCallable)
+        using (_scope.IndentUp())
         {
-            using (_scope.IndentUp())
+            var body_builder = new StringBuilder();
+            using (var body_writer = new StringWriter(body_builder))
             {
-                var body_builder = new StringBuilder();
-                using (var body_writer = new StringWriter(body_builder))
-                {
-                    var visitor = new ILPrintVisitor(body_writer, true, _scope.IndentLevel).Visit(expr.Body);
-                    _scope.Append(body_writer.ToString());
-                }
+                var visitor = new ILPrintVisitor(body_writer, _displayCallable, _scope.IndentLevel).Visit(expr.Body);
+                _scope.Append(body_writer.ToString());
             }
         }
-        else
-        {
-            _scope.IndWriteLine("...");
-        }
 
         // 3. Function closing
         _scope.IndWriteLine("}");
@@ -462,7 +462,7 @@ protected override string VisitPrimFunctionWrapper(PrimFunctionWrapper expr)
         {
             using (_scope.IndentUp())
             {
-                using (var bodys = new StringReader(CompilerServices.Print(expr.Target)))
+                using (var bodys = new StringReader(CompilerServices.Print(expr.Target, false, false)))
                 {
                     while (bodys.ReadLine() is string line)
                     {

diff --git a/src/Nncase.Diagnostics/Diagnostics/IRPrinterProvider.cs b/src/Nncase.Diagnostics/Diagnostics/IRPrinterProvider.cs
@@ -130,13 +130,13 @@ public string Print(IRType type)
     }
 
     /// <inheritdoc/>
-    public string Print(Expr expr, bool useScript)
+    public string Print(Expr expr, bool useScript, bool dispalycallable)
     {
         var sb = new StringBuilder();
         using var dumpWriter = new StringWriter(sb);
         var text = expr is PrimFunction || useScript
-            ? new ScriptPrintVisitor(dumpWriter, true).Visit(expr).Serialize()
-            : new ILPrintVisitor(dumpWriter, true, 0).Visit(expr);
+            ? new ScriptPrintVisitor(dumpWriter, dispalycallable).Visit(expr).Serialize()
+            : new ILPrintVisitor(dumpWriter, dispalycallable, 0).Visit(expr);
 
         return useScript ? text : expr switch
         {