[pypy-svn] r64174 - in pypy/trunk/pypy: config rpython/lltypesystem/test translator/js translator/llvm translator/test

[arigo at codespeak.net]

Author: arigo
Date: Thu Apr 16 17:13:12 2009
New Revision: 64174

Removed:
   pypy/trunk/pypy/translator/js/
   pypy/trunk/pypy/translator/llvm/
Modified:
   pypy/trunk/pypy/config/translationoption.py
   pypy/trunk/pypy/rpython/lltypesystem/test/test_rffi.py
   pypy/trunk/pypy/translator/test/test_interactive.py
Log:
Kill the "llvm" and "js" directories completely.  You can still find
them at the previous subversion revision.  For now they are unmaintained.


Modified: pypy/trunk/pypy/config/translationoption.py
==============================================================================
--- pypy/trunk/pypy/config/translationoption.py	(original)
+++ pypy/trunk/pypy/config/translationoption.py	Thu Apr 16 17:13:12 2009
@@ -33,20 +33,20 @@
                                 ]
                      }),
     ChoiceOption("backend", "Backend to use for code generation",
-                 ["c", "llvm", "cli", "jvm", "js"], default="c",
+                 ["c", "cli", "jvm"], default="c",
                  requires={
                      "c":      [("translation.type_system", "lltype")],
-                     "llvm":   [("translation.type_system", "lltype"),
-                                ("translation.backendopt.raisingop2direct_call", True),
-                                ],
+                     #"llvm":   [("translation.type_system", "lltype"),
+                     #           ("translation.backendopt.raisingop2direct_call", True),
+                     #           ],
                      "cli":    [("translation.type_system", "ootype")],
                      "jvm":    [("translation.type_system", "ootype")],
-                     "js":     [("translation.type_system", "ootype")],
+                     #"js":     [("translation.type_system", "ootype")],
                      },
                  cmdline="-b --backend"),
-    BoolOption("llvm_via_c", "compile llvm via C",
-               default=False, cmdline="--llvm-via-c",
-               requires=[("translation.backend", "llvm")]),
+    #BoolOption("llvm_via_c", "compile llvm via C",
+    #           default=False, cmdline="--llvm-via-c",
+    #           requires=[("translation.backend", "llvm")]),
 
     # gc
     ChoiceOption("gc", "Garbage Collection Strategy",
@@ -80,21 +80,21 @@
         ]),
     ChoiceOption("gcrootfinder",
                  "Strategy for finding GC Roots (framework GCs only)",
-                 ["n/a", "shadowstack", "llvmgc", "asmgcc"],
+                 ["n/a", "shadowstack", "asmgcc"],
                  "shadowstack",
                  cmdline="--gcrootfinder",
                  requires={
                      "shadowstack": [("translation.gctransformer", "framework")],
-                     "llvmgc": [("translation.gctransformer", "framework"),
-                                ("translation.backend", "llvm"),
-                                ("translation.thread", False)],
+                     #"llvmgc": [("translation.gctransformer", "framework"),
+                     #           ("translation.backend", "llvm"),
+                     #           ("translation.thread", False)],
                      "asmgcc": [("translation.gctransformer", "framework"),
                                 ("translation.backend", "c"),
                                 ("translation.thread", False)],
                     },
                  suggests={
                      "shadowstack": [("translation.gc", "generation")],
-                     "llvmgc": [("translation.gc", "generation")],
+                     #"llvmgc": [("translation.gc", "generation")],
                      "asmgcc": [("translation.gc", "generation")],
                  }),
 
@@ -255,13 +255,13 @@
                              ('translation.backendopt.constfold', False)])
     ]),
 
-    OptionDescription("llvm", "GenLLVM options", [
-        BoolOption("debug", "Include the llops in the source as comments", default=False),
-        BoolOption("logging", "Log how long the various parts of llvm generation take", default=False),
-        BoolOption("isolate", "Perform an isolated import", default=True),
-        StrOption("opt_options", "Options passed to opt (influences level of optimization in LLVM)",
-                     default="-std-compile-opts"),
-    ]),
+    #OptionDescription("llvm", "GenLLVM options", [
+    #    BoolOption("debug", "Include the llops in the source as comments", default=False),
+    #    BoolOption("logging", "Log how long the various parts of llvm generation take", default=False),
+    #    BoolOption("isolate", "Perform an isolated import", default=True),
+    #    StrOption("opt_options", "Options passed to opt (influences level of optimization in LLVM)",
+    #                 default="-std-compile-opts"),
+    #]),
 
     OptionDescription("cli", "GenCLI options", [
         BoolOption("trace_calls", "Trace function calls", default=False,

Modified: pypy/trunk/pypy/rpython/lltypesystem/test/test_rffi.py
==============================================================================
--- pypy/trunk/pypy/rpython/lltypesystem/test/test_rffi.py	(original)
+++ pypy/trunk/pypy/rpython/lltypesystem/test/test_rffi.py	Thu Apr 16 17:13:12 2009
@@ -5,7 +5,6 @@
 from pypy.rpython.lltypesystem.rffi import _keeper_for_type # crap
 from pypy.rlib.rposix import get_errno, set_errno
 from pypy.translator.c.test.test_genc import compile as compile_c
-from pypy.translator.llvm.test.runtest import compile_function as compile_llvm
 from pypy.rpython.lltypesystem.lltype import Signed, Ptr, Char, malloc
 from pypy.rpython.lltypesystem.rstr import STR
 from pypy.rpython.lltypesystem import lltype
@@ -744,11 +743,15 @@
         py.test.skip("GenC does not handle char return values correctly")
 
 class TestLLVMRffi(BaseTestRffi):
+    def setup_class(cls):
+        py.test.skip("llvm backend removed for now")
+
     def compile(self, func, args, **kwds):
         # pfff....
         if 'backendopt' in kwds:
             kwds['optimize'] = kwds['backendopt']
             del kwds['backendopt']
+        from pypy.translator.llvm.test.runtest import compile_function as compile_llvm
         return compile_llvm(func, args, **kwds)
 
     def test_nonmovingbuffer(self):

Modified: pypy/trunk/pypy/translator/test/test_interactive.py
==============================================================================
--- pypy/trunk/pypy/translator/test/test_interactive.py	(original)
+++ pypy/trunk/pypy/translator/test/test_interactive.py	Thu Apr 16 17:13:12 2009
@@ -73,6 +73,7 @@
     py.test.raises(Exception, "t.source()")
 
 def test_simple_source_llvm():
+    py.test.skip("we have no more llvm backend for now")
     from pypy.translator.llvm.test.runtest import llvm_test
     llvm_test()