vm: keep locals local (5% speedup)

Author: ncw

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

vm/eval.go

@@ -1707,22 +1707,9 @@ func (vm *Vm) UnwindExceptHandler(frame *py.Frame, block *py.TryBlock){
 //
 // This is the equivalent of PyEval_EvalFrame
 funcRunFrame(frame*py.Frame) (res py.Object, errerror){
-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()
-// }
-// }()
+varvm=Vm{
+frame: frame,
+ }
 
 // FIXME
 // if (co->co_flags & CO_GENERATOR){
@@ -1742,12 +1729,11 @@ func RunFrame(frame *py.Frame) (res py.Object, err error){
 
 varopcodeOpCode
 varargint32
+opcodes:=frame.Code.Code
 forvm.why==whyNot{
-frame:=vm.frame
 ifdebugging{
 debugf("* %4d:", frame.Lasti)
  }
-opcodes:=frame.Code.Code
 opcode=OpCode(opcodes[frame.Lasti])
 frame.Lasti++
 ifopcode.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)
 iferr!=nil{
 // FIXME shouldn't be doing this - just use err?
 iferrExcInfo, ok:=err.(py.ExceptionInfo); ok{
@@ -1778,11 +1764,9 @@ func RunFrame(frame *py.Frame) (res py.Object, err error){
 vm.SetException(py.MakeException(err))
  }
  }
-ifvm.frame!=nil{
-ifdebugging{
-debugf("* Stack = %#v\n", vm.frame.Stack)
- }
-// if len(vm.frame.Stack) > 0{
+ifdebugging{
+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
-forvm.why!=whyNot&&vm.frame.Block!=nil{
+forvm.why!=whyNot&&frame.Block!=nil{
 // Peek at the current block.
-frame:=vm.frame
 b:=frame.Block
 ifdebugging{
 debugf("*** Unwinding %#v vm %#v\n", b, vm)

vm/vm.go

@@ -38,10 +38,3 @@ type Vm struct{
 // Previous exception type, value and traceback
 exc py.ExceptionInfo
 }
-
-// Make a new VM
-funcNewVm(frame*py.Frame) *Vm{
-return&Vm{
-frame: frame,
- }
-}