vm: keep locals local (5% speedup)

ncw · ncw · commit 00ffff004131 · 2015-05-30T11:32:38.000+01:00
diff --git a/notes.txt b/notes.txt
@@ -13,6 +13,10 @@ Speed 35% improvement
 Before 2430 pystone/s
 After 3278 pystone/s
 
+After compile debug out with a constant 9293 pystones/s + 180%
+Keep locals 9789 local 5% improvement
+
+
 Still to do
   * think about exception handling - do nested tracebacks work?
     * write a test for it!
@@ -24,7 +28,7 @@ CAN now inline the do_XXX functions into the EvalFrame which will probably speed
   * also make vm.STACK into frame.STACK and keep a pointer to frame
   * probably makes vm struct redundant? move its contents as locals.
   * move frame into vm module? Then can't use *Frame in
-
+  * tried this - was 20% slower
 
   * Write go module
     * "go" command which is go(fn, args, kwargs) - implement with a builtin special in the interpreter probably
diff --git a/vm/eval.go b/vm/eval.go
@@ -1707,22 +1707,9 @@ func (vm *Vm) UnwindExceptHandler(frame *py.Frame, block *py.TryBlock) {
 //
 // This is the equivalent of PyEval_EvalFrame
 func RunFrame(frame *py.Frame) (res py.Object, err error) {
-	vm := NewVm(frame)
-	// defer func() {
-	// 	if r := recover(); r != nil {
-	// 		switch x := r.(type) {
-	// 		case error:
-	// 			err = x
-	// 		case string:
-	// 			err = errors.New(x)
-	// 		default:
-	// 			err = errors.New(fmt.Sprintf("Unknown error '%s'", x))
-	// 		}
-	// 		if debugging { debugf("*** Exception raised %v\n", r) }
-	// 		// Dump the goroutine stack
-	// 		debug.PrintStack()
-	// 	}
-	// }()
+	var vm = Vm{
+		frame: frame,
+	}
 
 	// FIXME
 	// if (co->co_flags & CO_GENERATOR) {
@@ -1742,12 +1729,11 @@ func RunFrame(frame *py.Frame) (res py.Object, err error) {
 
 	var opcode OpCode
 	var arg int32
+	opcodes := frame.Code.Code
 	for vm.why == whyNot {
-		frame := vm.frame
 		if debugging {
 			debugf("* %4d:", frame.Lasti)
 		}
-		opcodes := frame.Code.Code
 		opcode = OpCode(opcodes[frame.Lasti])
 		frame.Lasti++
 		if opcode.HAS_ARG() {
@@ -1767,7 +1753,7 @@ func RunFrame(frame *py.Frame) (res py.Object, err error) {
 			}
 		}
 		vm.extended = false
-		err = jumpTable[opcode](vm, arg)
+		err = jumpTable[opcode](&vm, arg)
 		if err != nil {
 			// FIXME shouldn't be doing this - just use err?
 			if errExcInfo, ok := err.(py.ExceptionInfo); ok {
@@ -1778,11 +1764,9 @@ func RunFrame(frame *py.Frame) (res py.Object, err error) {
 				vm.SetException(py.MakeException(err))
 			}
 		}
-		if vm.frame != nil {
-			if debugging {
-				debugf("* Stack = %#v\n", vm.frame.Stack)
-			}
-			// if len(vm.frame.Stack) > 0 {
+		if debugging {
+			debugf("* Stack = %#v\n", frame.Stack)
+			// if len(frame.Stack) > 0 {
 			// 	if t, ok := vm.TOP().(*py.Type); ok {
 			// 		if debugging { debugf(" * TOP = %#v\n", t) }
 			// 	}
@@ -1794,9 +1778,8 @@ func RunFrame(frame *py.Frame) (res py.Object, err error) {
 
 		// Something exceptional has happened - unwind the block stack
 		// and find out what
-		for vm.why != whyNot && vm.frame.Block != nil {
+		for vm.why != whyNot && frame.Block != nil {
 			// Peek at the current block.
-			frame := vm.frame
 			b := frame.Block
 			if debugging {
 				debugf("*** Unwinding %#v vm %#v\n", b, vm)
diff --git a/vm/vm.go b/vm/vm.go
@@ -38,10 +38,3 @@ type Vm struct {
 	// Previous exception type, value and traceback
 	exc py.ExceptionInfo
 }
-
-// Make a new VM
-func NewVm(frame *py.Frame) *Vm {
-	return &Vm{
-		frame: frame,
-	}
-}
