Merge pull request #260 from goccy/feature/improve-interface-perf

Improve encoding performance for empty interface type

internal/cmd/generator/vm.go.tmpl

@@ -177,11 +177,13 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				code = code.Next
 				break
 			}
+			if recursiveLevel > encoder.StartDetectingCyclesAfter {
 				for _, seen := range ctx.SeenPtr {
 					if p == seen {
 						return nil, errUnsupportedValue(code, p)
 					}
 				}
+			}
 			ctx.SeenPtr = append(ctx.SeenPtr, p)
 			iface := (*emptyInterface)(ptrToUnsafePtr(p))
 			if iface.ptr == nil {
@@ -226,9 +228,12 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			store(ctxptr, end.ElemIdx, uintptr(unsafe.Pointer(code.Next)))
 			storeIndent(ctxptr, end, uintptr(oldBaseIndent))
 			code = c
+			recursiveLevel++
 		case encoder.OpInterfaceEnd:
-			offset := load(ctxptr, code.Idx)
+			recursiveLevel--
+
 			// restore ctxptr
+			offset := load(ctxptr, code.Idx)
 			restoreIndent(ctx, code, ctxptr)
 			ctx.SeenPtr = ctx.SeenPtr[:len(ctx.SeenPtr)-1]
 

internal/encoder/vm/vm.go

@@ -177,11 +177,13 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				code = code.Next
 				break
 			}
+			if recursiveLevel > encoder.StartDetectingCyclesAfter {
 				for _, seen := range ctx.SeenPtr {
 					if p == seen {
 						return nil, errUnsupportedValue(code, p)
 					}
 				}
+			}
 			ctx.SeenPtr = append(ctx.SeenPtr, p)
 			iface := (*emptyInterface)(ptrToUnsafePtr(p))
 			if iface.ptr == nil {
@@ -226,9 +228,12 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			store(ctxptr, end.ElemIdx, uintptr(unsafe.Pointer(code.Next)))
 			storeIndent(ctxptr, end, uintptr(oldBaseIndent))
 			code = c
+			recursiveLevel++
 		case encoder.OpInterfaceEnd:
-			offset := load(ctxptr, code.Idx)
+			recursiveLevel--
+
 			// restore ctxptr
+			offset := load(ctxptr, code.Idx)
 			restoreIndent(ctx, code, ctxptr)
 			ctx.SeenPtr = ctx.SeenPtr[:len(ctx.SeenPtr)-1]
 

internal/encoder/vm_color/vm.go

@@ -177,11 +177,13 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				code = code.Next
 				break
 			}
+			if recursiveLevel > encoder.StartDetectingCyclesAfter {
 				for _, seen := range ctx.SeenPtr {
 					if p == seen {
 						return nil, errUnsupportedValue(code, p)
 					}
 				}
+			}
 			ctx.SeenPtr = append(ctx.SeenPtr, p)
 			iface := (*emptyInterface)(ptrToUnsafePtr(p))
 			if iface.ptr == nil {
@@ -226,9 +228,12 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			store(ctxptr, end.ElemIdx, uintptr(unsafe.Pointer(code.Next)))
 			storeIndent(ctxptr, end, uintptr(oldBaseIndent))
 			code = c
+			recursiveLevel++
 		case encoder.OpInterfaceEnd:
-			offset := load(ctxptr, code.Idx)
+			recursiveLevel--
+
 			// restore ctxptr
+			offset := load(ctxptr, code.Idx)
 			restoreIndent(ctx, code, ctxptr)
 			ctx.SeenPtr = ctx.SeenPtr[:len(ctx.SeenPtr)-1]
 

internal/encoder/vm_color_indent/vm.go

@@ -177,11 +177,13 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				code = code.Next
 				break
 			}
+			if recursiveLevel > encoder.StartDetectingCyclesAfter {
 				for _, seen := range ctx.SeenPtr {
 					if p == seen {
 						return nil, errUnsupportedValue(code, p)
 					}
 				}
+			}
 			ctx.SeenPtr = append(ctx.SeenPtr, p)
 			iface := (*emptyInterface)(ptrToUnsafePtr(p))
 			if iface.ptr == nil {
@@ -226,9 +228,12 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			store(ctxptr, end.ElemIdx, uintptr(unsafe.Pointer(code.Next)))
 			storeIndent(ctxptr, end, uintptr(oldBaseIndent))
 			code = c
+			recursiveLevel++
 		case encoder.OpInterfaceEnd:
-			offset := load(ctxptr, code.Idx)
+			recursiveLevel--
+
 			// restore ctxptr
+			offset := load(ctxptr, code.Idx)
 			restoreIndent(ctx, code, ctxptr)
 			ctx.SeenPtr = ctx.SeenPtr[:len(ctx.SeenPtr)-1]
 

internal/encoder/vm_indent/vm.go

@@ -177,11 +177,13 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				code = code.Next
 				break
 			}
+			if recursiveLevel > encoder.StartDetectingCyclesAfter {
 				for _, seen := range ctx.SeenPtr {
 					if p == seen {
 						return nil, errUnsupportedValue(code, p)
 					}
 				}
+			}
 			ctx.SeenPtr = append(ctx.SeenPtr, p)
 			iface := (*emptyInterface)(ptrToUnsafePtr(p))
 			if iface.ptr == nil {
@@ -226,9 +228,12 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 			store(ctxptr, end.ElemIdx, uintptr(unsafe.Pointer(code.Next)))
 			storeIndent(ctxptr, end, uintptr(oldBaseIndent))
 			code = c
+			recursiveLevel++
 		case encoder.OpInterfaceEnd:
-			offset := load(ctxptr, code.Idx)
+			recursiveLevel--
+
 			// restore ctxptr
+			offset := load(ctxptr, code.Idx)
 			restoreIndent(ctx, code, ctxptr)
 			ctx.SeenPtr = ctx.SeenPtr[:len(ctx.SeenPtr)-1]