[pypy-svn] r37521 - pypy/dist/pypy/jit/codegen/demo

[arigo at codespeak.net]

Author: arigo
Date: Mon Jan 29 12:37:43 2007
New Revision: 37521

Modified:
   pypy/dist/pypy/jit/codegen/demo/support.py
   pypy/dist/pypy/jit/codegen/demo/test_random.py
Log:
Use get_python_callable in demo/support; test_random now passes on the
llgraph backend too.



Modified: pypy/dist/pypy/jit/codegen/demo/support.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/demo/support.py	(original)
+++ pypy/dist/pypy/jit/codegen/demo/support.py	Mon Jan 29 12:37:43 2007
@@ -3,7 +3,7 @@
 from pypy.tool.udir import udir
 from pypy.rlib.ros import putenv
 from pypy.jit.codegen.graph2rgenop import rcompile
-from ctypes import cast, c_void_p, CFUNCTYPE, c_int
+from pypy.rpython.lltypesystem import lltype
 
 from pypy import conftest
 from pypy.jit import conftest as bench_conftest
@@ -80,8 +80,8 @@
                                  ', '.join(map(repr, args)))
     expected = entrypoint(*args)
     print 'Python ===>', expected
-    fp = cast(c_void_p(gv_entrypoint.value),
-              CFUNCTYPE(c_int, *[c_int] * nb_args))
+    F1 = lltype.FuncType([lltype.Signed] * nb_args, lltype.Signed)
+    fp = RGenOp.get_python_callable(lltype.Ptr(F1), gv_entrypoint)
     res = fp(*args)
     print 'i386   ===>', res
     print

Modified: pypy/dist/pypy/jit/codegen/demo/test_random.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/demo/test_random.py	(original)
+++ pypy/dist/pypy/jit/codegen/demo/test_random.py	Mon Jan 29 12:37:43 2007
@@ -89,4 +89,8 @@
         'print dummyfn(10000, *args)\n' % (src, args))
     exec src.compile()
 
-    rundemo(dummyfn, 10000, *args)
+    if demo_conftest.option.backend == 'llgraph':
+        iterations = 50
+    else:
+        iterations = 10000
+    rundemo(dummyfn, iterations, *args)