[pypy-svn] r22199 - pypy/dist/pypy/jit/test

[arigo at codespeak.net]

Author: arigo
Date: Sun Jan 15 17:19:38 2006
New Revision: 22199

Added:
   pypy/dist/pypy/jit/test/test_jit_tlr.py   (contents, props changed)
Modified:
   pypy/dist/pypy/jit/test/test_jit_tl.py
Log:
Checking in another example toy language test that I wrote some time ago for
demonstration purposes.


Modified: pypy/dist/pypy/jit/test/test_jit_tl.py
==============================================================================
--- pypy/dist/pypy/jit/test/test_jit_tl.py	(original)
+++ pypy/dist/pypy/jit/test/test_jit_tl.py	Sun Jan 15 17:19:38 2006
@@ -6,6 +6,7 @@
 from pypy.jit.llabstractinterp import LLAbstractInterp
 from pypy.rpython.rstr import string_repr
 from pypy.rpython.llinterp import LLInterpreter
+from pypy.jit.test.test_llabstractinterp import summary
 #from pypy.translator.backendopt import inline
 
 #py.test.skip("in-progress")
@@ -35,12 +36,7 @@
     #interp.graphs[0].show()
 
     # return a summary of the instructions left in graph2
-    insns = {}
-    for copygraph in interp.itercopygraphs():
-        for block in copygraph.iterblocks():
-            for op in block.operations:
-                insns[op.opname] = insns.get(op.opname, 0) + 1
-    return insns
+    return summary(interp)
 
 
 def run_jit(code):

Added: pypy/dist/pypy/jit/test/test_jit_tlr.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/jit/test/test_jit_tlr.py	Sun Jan 15 17:19:38 2006
@@ -0,0 +1,102 @@
+from pypy.annotation import model as annmodel
+from pypy.annotation.listdef import ListDef
+from pypy.translator.translator import TranslationContext
+from pypy.jit.llabstractinterp import LLAbstractInterp
+from pypy.jit.test.test_llabstractinterp import summary
+from pypy.rpython.llinterp import LLInterpreter
+from pypy.rpython.objectmodel import hint
+from pypy.rpython.rstr import string_repr
+
+MOV_A_R    = 1
+MOV_R_A    = 2
+JUMP_IF_A  = 3
+SET_A      = 4
+ADD_R_TO_A = 5
+RETURN_A   = 6
+ALLOCATE   = 7
+NEG_A      = 8
+
+
+def interpret(bytecode, a):
+    """Another Toy Language interpreter, this one register-based."""
+    regs = []
+    pc = 0
+    while True:
+        opcode = hint(ord(bytecode[pc]), concrete=True)
+        pc += 1
+        if opcode == MOV_A_R:
+            n = ord(bytecode[pc])
+            pc += 1
+            regs[n] = a
+        elif opcode == MOV_R_A:
+            n = ord(bytecode[pc])
+            pc += 1
+            a = regs[n]
+        elif opcode == JUMP_IF_A:
+            target = ord(bytecode[pc])
+            pc += 1
+            if a:
+                pc = target
+        elif opcode == SET_A:
+            a = ord(bytecode[pc])
+            pc += 1
+        elif opcode == ADD_R_TO_A:
+            n = ord(bytecode[pc])
+            pc += 1
+            a += regs[n]
+        elif opcode == RETURN_A:
+            return a
+        elif opcode == ALLOCATE:
+            n = ord(bytecode[pc])
+            pc += 1
+            regs = [0] * n
+        elif opcode == NEG_A:
+            a = -a
+
+SQUARE_LIST = [
+    # compute the square of 'a' >= 1
+    ALLOCATE,    3,
+    MOV_A_R,     0,   # counter
+    MOV_A_R,     1,   # copy of 'a'
+    SET_A,       0,
+    MOV_A_R,     2,   # accumulator for the result
+    # 10:
+    SET_A,       1,
+    NEG_A,
+    ADD_R_TO_A,  0,
+    MOV_A_R,     0,
+    MOV_R_A,     2,
+    ADD_R_TO_A,  1,
+    MOV_A_R,     2,
+    MOV_R_A,     0,
+    JUMP_IF_A,  10,
+
+    MOV_R_A,     2,
+    RETURN_A ]
+
+SQUARE = ''.join([chr(n) for n in SQUARE_LIST])
+
+
+def test_multiply():
+    assert interpret(SQUARE, 1) == 1
+    assert interpret(SQUARE, 7) == 49
+    assert interpret(SQUARE, 9) == 81
+
+def test_compile():
+    t = TranslationContext()
+    t.buildannotator().build_types(interpret, [str, int])
+    rtyper = t.buildrtyper()
+    rtyper.specialize()
+
+    interp = LLAbstractInterp()
+    hints = {0: string_repr.convert_const(SQUARE)}
+    graph2 = interp.eval(t.graphs[0], hints)
+    #graph2.show()
+
+    llinterp = LLInterpreter(rtyper)
+    res = llinterp.eval_graph(graph2, [17])
+    assert res == 289
+
+    insns = summary(interp)
+    assert insns == {'int_add': 2,
+                     'int_is_true': 1}