Author: Alexander Hesse <[email protected]>
Branch: split-rpython
Changeset: r59863:a0b190c85333
Date: 2013-01-07 16:21 +0100
http://bitbucket.org/pypy/pypy/changeset/a0b190c85333/
Log: Moved spli to toplevel
diff --git a/rpython/translator/tool/benchmark.py
b/rpython/translator/tool/benchmark.py
deleted file mode 100644
--- a/rpython/translator/tool/benchmark.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from pypy.tool import testit
-from rpython.tool.udir import udir
-from rpython.translator.tool.cbuild import build_cfunc
-from rpython.translator.test.test_cltrans import global_cl, make_cl_func
-
-def benchmark(func):
- try:
- func = func.im_func
- except AttributeError:
- pass
- c_func = build_cfunc(func, dot=False)
- if global_cl:
- cl_func = make_cl_func(func)
- print "generated c-func for", func.func_name
- t1 = timeit(100, func)
- t2 = timeit(100, c_func)
- if global_cl:
- t3 = timeit(100, cl_func)
- print "cpython func ", t1, "seconds"
- print "pypy/pyrex/cmodule ", t2, "seconds"
- if global_cl:
- print "cl (experimental) ", t3, "seconds", global_cl
-
-def timeit(num, func, *args):
- from time import time as now
- start = now()
- for i in xrange(num):
- func(*args)
- return now()-start
-
-if __name__ == '__main__':
- from rpython.translator.test.snippet import sieve_of_eratosthenes
- benchmark(sieve_of_eratosthenes)
diff --git a/rpython/jit/tl/spli/__init__.py b/spli/__init__.py
rename from rpython/jit/tl/spli/__init__.py
rename to spli/__init__.py
diff --git a/rpython/jit/tl/spli/examples.py b/spli/examples.py
rename from rpython/jit/tl/spli/examples.py
rename to spli/examples.py
diff --git a/rpython/jit/tl/spli/execution.py b/spli/execution.py
rename from rpython/jit/tl/spli/execution.py
rename to spli/execution.py
--- a/rpython/jit/tl/spli/execution.py
+++ b/spli/execution.py
@@ -1,4 +1,4 @@
-from rpython.jit.tl.spli import interpreter, objects, pycode
+from spli import interpreter, objects, pycode
def run_from_cpython_code(co, args=[], locs=None, globs=None):
diff --git a/rpython/jit/tl/spli/interpreter.py b/spli/interpreter.py
rename from rpython/jit/tl/spli/interpreter.py
rename to spli/interpreter.py
--- a/rpython/jit/tl/spli/interpreter.py
+++ b/spli/interpreter.py
@@ -1,6 +1,6 @@
import os
from rpython.tool import stdlib_opcode
-from rpython.jit.tl.spli import objects, pycode
+from spli import objects, pycode
from rpython.rlib.unroll import unrolling_iterable
from rpython.rlib.jit import JitDriver, promote, dont_look_inside
from rpython.rlib.objectmodel import we_are_translated
diff --git a/rpython/jit/tl/spli/objects.py b/spli/objects.py
rename from rpython/jit/tl/spli/objects.py
rename to spli/objects.py
--- a/rpython/jit/tl/spli/objects.py
+++ b/spli/objects.py
@@ -154,5 +154,5 @@
self.globs = globs
def call(self, args):
- from rpython.jit.tl.spli import execution
+ from spli import execution
return execution.run(self.code, args, None, self.globs)
diff --git a/rpython/jit/tl/spli/pycode.py b/spli/pycode.py
rename from rpython/jit/tl/spli/pycode.py
rename to spli/pycode.py
--- a/rpython/jit/tl/spli/pycode.py
+++ b/spli/pycode.py
@@ -1,5 +1,5 @@
from pypy.interpreter import pycode
-from rpython.jit.tl.spli import objects
+from spli import objects
class Code(objects.SPLIObject):
diff --git a/rpython/jit/tl/spli/serializer.py b/spli/serializer.py
rename from rpython/jit/tl/spli/serializer.py
rename to spli/serializer.py
--- a/rpython/jit/tl/spli/serializer.py
+++ b/spli/serializer.py
@@ -6,8 +6,8 @@
import py
import sys
import types
-from rpython.jit.tl.spli.objects import Int, Str, spli_None
-from rpython.jit.tl.spli.pycode import Code
+from spli.objects import Int, Str, spli_None
+from spli.pycode import Code
from rpython.rlib.rstruct.runpack import runpack
import struct
diff --git a/rpython/jit/tl/spli/targetspli.py b/spli/targetspli.py
rename from rpython/jit/tl/spli/targetspli.py
rename to spli/targetspli.py
--- a/rpython/jit/tl/spli/targetspli.py
+++ b/spli/targetspli.py
@@ -3,7 +3,7 @@
"""
import sys, os
-from rpython.jit.tl.spli import execution, serializer, objects
+from spli import execution, serializer, objects
from rpython.rlib.streamio import open_file_as_stream
diff --git a/rpython/jit/tl/spli/test/__init__.py b/spli/test/__init__.py
rename from rpython/jit/tl/spli/test/__init__.py
rename to spli/test/__init__.py
diff --git a/rpython/jit/tl/spli/test/test_interpreter.py
b/spli/test/test_interpreter.py
rename from rpython/jit/tl/spli/test/test_interpreter.py
rename to spli/test/test_interpreter.py
--- a/rpython/jit/tl/spli/test/test_interpreter.py
+++ b/spli/test/test_interpreter.py
@@ -1,6 +1,6 @@
import py
import os
-from rpython.jit.tl.spli import execution, objects
+from spli import execution, objects
class TestSPLIInterpreter:
diff --git a/rpython/jit/tl/spli/test/test_jit.py b/spli/test/test_jit.py
rename from rpython/jit/tl/spli/test/test_jit.py
rename to spli/test/test_jit.py
--- a/rpython/jit/tl/spli/test/test_jit.py
+++ b/spli/test/test_jit.py
@@ -1,7 +1,7 @@
import py
from rpython.jit.metainterp.test.support import JitMixin
-from rpython.jit.tl.spli import interpreter, objects, serializer
+from spli import interpreter, objects, serializer
from rpython.jit.metainterp.typesystem import LLTypeHelper, OOTypeHelper
from rpython.jit.backend.llgraph import runner
from rpython.rtyper.annlowlevel import llstr, hlstr
diff --git a/rpython/jit/tl/spli/test/test_serializer.py
b/spli/test/test_serializer.py
rename from rpython/jit/tl/spli/test/test_serializer.py
rename to spli/test/test_serializer.py
--- a/rpython/jit/tl/spli/test/test_serializer.py
+++ b/spli/test/test_serializer.py
@@ -1,5 +1,5 @@
-from rpython.jit.tl.spli.serializer import serialize, deserialize
-from rpython.jit.tl.spli import execution, pycode, objects
+from spli.serializer import serialize, deserialize
+from spli import execution, pycode, objects
class TestSerializer(object):
diff --git a/rpython/jit/tl/spli/test/test_translated.py
b/spli/test/test_translated.py
rename from rpython/jit/tl/spli/test/test_translated.py
rename to spli/test/test_translated.py
--- a/rpython/jit/tl/spli/test/test_translated.py
+++ b/spli/test/test_translated.py
@@ -1,7 +1,7 @@
from rpython.rtyper.test.test_llinterp import interpret
-from rpython.jit.tl.spli import execution, objects
-from rpython.jit.tl.spli.serializer import serialize, deserialize
+from spli import execution, objects
+from spli.serializer import serialize, deserialize
class TestSPLITranslated(object):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
