[pypy-svn] r37514 - in pypy/dist/pypy/jit/codegen: demo i386/demo

[mwh at codespeak.net]

Author: mwh
Date: Mon Jan 29 11:58:15 2007
New Revision: 37514

Added:
   pypy/dist/pypy/jit/codegen/demo/
      - copied from r37512, pypy/dist/pypy/jit/codegen/i386/demo/
Removed:
   pypy/dist/pypy/jit/codegen/i386/demo/
Modified:
   pypy/dist/pypy/jit/codegen/demo/autorun.py
   pypy/dist/pypy/jit/codegen/demo/conftest.py
   pypy/dist/pypy/jit/codegen/demo/rerun_failures.py
   pypy/dist/pypy/jit/codegen/demo/support.py
   pypy/dist/pypy/jit/codegen/demo/test_factorial.py
   pypy/dist/pypy/jit/codegen/demo/test_random.py
Log:
move codegen/i386/demo to codegen/demo
still runs on the intel backend only.


Modified: pypy/dist/pypy/jit/codegen/demo/autorun.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/demo/autorun.py	(original)
+++ pypy/dist/pypy/jit/codegen/demo/autorun.py	Mon Jan 29 11:58:15 2007
@@ -1,6 +1,6 @@
 import random
-from pypy.jit.codegen.i386.demo import test_random
-from pypy.jit.codegen.i386.demo import conftest as demo_conftest
+from pypy.jit.codegen.demo import test_random
+from pypy.jit.codegen.demo import conftest as demo_conftest
 
 
 def test_forever():

Modified: pypy/dist/pypy/jit/codegen/demo/conftest.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/demo/conftest.py	(original)
+++ pypy/dist/pypy/jit/codegen/demo/conftest.py	Mon Jan 29 11:58:15 2007
@@ -7,4 +7,9 @@
                default=random.randrange(0, 10000),
                dest="randomseed",
                help="choose a fixed random seed"),
+        Option('--backend', action="store",
+               default='llgraph',
+               choices=['llgraph', 'dump', 'ppc', 'i386', 'llvm'],
+               dest="backend",
+               help="select the backend to run the functions with"),
         )

Modified: pypy/dist/pypy/jit/codegen/demo/rerun_failures.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/demo/rerun_failures.py	(original)
+++ pypy/dist/pypy/jit/codegen/demo/rerun_failures.py	Mon Jan 29 11:58:15 2007
@@ -1,5 +1,5 @@
-from pypy.jit.codegen.i386.demo import test_random
-from pypy.jit.codegen.i386.demo import conftest as demo_conftest
+from pypy.jit.codegen.demo import test_random
+from pypy.jit.codegen.demo import conftest as demo_conftest
 
 def rerun(seed, *args):
     prevseed = demo_conftest.option.randomseed
@@ -10,8 +10,8 @@
         demo_conftest.option.randomseed = prevseed
 
 # ____________________________________________________________
-# These are tests that failed at some point.  Run them all with
-# py.test rerun_failures.py.
+# These are tests that failed at some point on intel.  Run
+# them all with py.test rerun_failures.py.
 
 def test_4327406():    rerun(4327406)
 def test_9473():       rerun(9473)

Modified: pypy/dist/pypy/jit/codegen/demo/support.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/demo/support.py	(original)
+++ pypy/dist/pypy/jit/codegen/demo/support.py	Mon Jan 29 11:58:15 2007
@@ -9,7 +9,7 @@
 
 from pypy import conftest
 from pypy.jit import conftest as bench_conftest
-from pypy.jit.codegen.i386.demo import conftest as demo_conftest
+from pypy.jit.codegen.demo import conftest as demo_conftest
 
 
 def Random():

Modified: pypy/dist/pypy/jit/codegen/demo/test_factorial.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/demo/test_factorial.py	(original)
+++ pypy/dist/pypy/jit/codegen/demo/test_factorial.py	Mon Jan 29 11:58:15 2007
@@ -1,5 +1,5 @@
 import py
-from pypy.jit.codegen.i386.demo.support import rundemo
+from pypy.jit.codegen.demo.support import rundemo
 
 # try running this with the following py.test options:
 #

Modified: pypy/dist/pypy/jit/codegen/demo/test_random.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/demo/test_random.py	(original)
+++ pypy/dist/pypy/jit/codegen/demo/test_random.py	Mon Jan 29 11:58:15 2007
@@ -1,7 +1,7 @@
 import py
 from pypy.rlib.rarithmetic import intmask
-from pypy.jit.codegen.i386.demo.support import rundemo, Random, udir
-from pypy.jit.codegen.i386.demo import conftest as demo_conftest
+from pypy.jit.codegen.demo.support import rundemo, Random, udir
+from pypy.jit.codegen.demo import conftest as demo_conftest
 
 
 def test_random_function(nb_blocks=15, max_block_length=20):