[pypy-svn] r70021 - in pypy/branch/sepcomp/pypy/translator: . c
xoraxax at codespeak.net
xoraxax at codespeak.net
Wed Dec 9 13:13:27 CET 2009
Author: xoraxax
Date: Wed Dec 9 13:13:26 2009
New Revision: 70021
Modified:
pypy/branch/sepcomp/pypy/translator/c/genc.py
pypy/branch/sepcomp/pypy/translator/driver.py
Log:
Add support for secondary entrypoints and separate compilation.
Write one file instead of multiple to ease linking (should be optimized).
Modified: pypy/branch/sepcomp/pypy/translator/c/genc.py
==============================================================================
--- pypy/branch/sepcomp/pypy/translator/c/genc.py (original)
+++ pypy/branch/sepcomp/pypy/translator/c/genc.py Wed Dec 9 13:13:26 2009
@@ -23,7 +23,7 @@
_compiled = False
modulename = None
- def __init__(self, translator, entrypoint, config, gcpolicy=None):
+ def __init__(self, translator, entrypoint, config, gcpolicy=None, secondary_entrypoints=()):
self.translator = translator
self.entrypoint = entrypoint
self.entrypoint_name = self.entrypoint.func_name
@@ -33,6 +33,7 @@
if gcpolicy is not None and gcpolicy.requires_stackless:
config.translation.stackless = True
self.eci = ExternalCompilationInfo()
+ self.secondary_entrypoints = secondary_entrypoints
def build_database(self):
translator = self.translator
@@ -69,6 +70,11 @@
# build entrypoint and eventually other things to expose
pf = self.getentrypointptr()
pfname = db.get(pf)
+
+ for func, _ in self.secondary_entrypoints:
+ bk = translator.annotator.bookkeeper
+ db.get(getfunctionptr(bk.getdesc(func).getuniquegraph()))
+
self.c_entrypoint_name = pfname
db.complete()
@@ -83,10 +89,14 @@
libraries=db.gcpolicy.gc_libraries()))
all = []
+ exported_names = []
for node in self.db.globalcontainers():
eci = getattr(node, 'compilation_info', None)
if eci:
all.append(eci)
+ if getattr(getattr(node, "obj", None), "export", None): # XXX this should be handled in the db
+ exported_names.append(node.name)
+ all.append(ExternalCompilationInfo(export_symbols=tuple(exported_names)))
self.eci = self.eci.merge(*all)
def get_gcpolicyclass(self):
@@ -225,6 +235,7 @@
entrypoint_ptr = self.getentrypointptr()
wrapped_entrypoint_c_name = self.db.get(entrypoint_ptr)
+ self.so_name = self.c_source_filename.new(ext=so_ext)
CODE = """
import ctypes
@@ -251,7 +262,7 @@
_rpython_startup = _lib.RPython_StartupCode
_rpython_startup()
-""" % {'so_name': self.c_source_filename.new(ext=so_ext),
+""" % {'so_name': self.so_name,
'c_entrypoint_name': wrapped_entrypoint_c_name,
'nargs': len(lltype.typeOf(entrypoint_ptr).TO.ARGS)}
modfile.write(CODE)
@@ -492,7 +503,7 @@
othernodes.append(node)
# for now, only split for stand-alone programs.
if self.database.standalone:
- self.one_source_file = False
+ self.one_source_file = True # XXX False
self.funcnodes = funcnodes
self.othernodes = othernodes
self.path = path
@@ -797,6 +808,8 @@
incfilename = targetdir.join('common_header.h')
fi = incfilename.open('w')
+ if database.translator.config.translation.generatemodule: # XXX refactor the 2 src gen funcs
+ defines["PYPY_EXTMODULE"] = "1"
#
# Header
#
Modified: pypy/branch/sepcomp/pypy/translator/driver.py
==============================================================================
--- pypy/branch/sepcomp/pypy/translator/driver.py (original)
+++ pypy/branch/sepcomp/pypy/translator/driver.py Wed Dec 9 13:13:26 2009
@@ -4,12 +4,15 @@
from pypy.translator.tool.taskengine import SimpleTaskEngine
from pypy.translator.goal import query
from pypy.translator.goal.timing import Timer
+from pypy.translator.sepcomp import ImportExportComponent, get_function_name
from pypy.annotation import model as annmodel
from pypy.annotation.listdef import s_list_of_strings
+from pypy.annotation.signature import annotationoftype
from pypy.annotation import policy as annpolicy
from py.compat import optparse
from pypy.tool.udir import udir
+
import py
from pypy.tool.ansi_print import ansi_log
log = py.log.Producer("translation")
@@ -215,12 +218,14 @@
self.entry_point = entry_point
self.translator = translator
self.libdef = None
-
+ self.secondary_entrypoints = ()
self.translator.driver_instrument_result = self.instrument_result
def setup_library(self, libdef, policy=None, extra={}, empty_translator=None):
+ """ Used by carbonpython only. """
self.setup(None, None, policy, extra, empty_translator)
self.libdef = libdef
+ self.secondary_entrypoints = libdef.functions
def instrument_result(self, args):
backend, ts = self.get_backend_and_type_system()
@@ -302,22 +307,35 @@
annmodel.DEBUG = self.config.translation.debug
annotator = translator.buildannotator(policy=policy)
+ if self.config.translation.exportpackage:
+ iep = ImportExportComponent.packages[self.config.translation.exportpackage]
+ self.secondary_entrypoints = iep.entry_points
+
if self.entry_point:
s = annotator.build_types(self.entry_point, self.inputtypes)
-
- self.sanity_check_annotation()
- if self.standalone and s.knowntype != int:
- raise Exception("stand-alone program entry point must return an "
- "int (and not, e.g., None or always raise an "
- "exception).")
- annotator.simplify()
- return s
else:
- assert self.libdef is not None
- for func, inputtypes in self.libdef.functions:
- annotator.build_types(func, inputtypes)
- self.sanity_check_annotation()
- annotator.simplify()
+ s = None
+
+ if self.secondary_entrypoints is not None:
+ for func, inputtypes in self.secondary_entrypoints:
+ if inputtypes == Ellipsis:
+ continue
+ rettype = annotator.build_types(func, inputtypes)
+
+ self.sanity_check_annotation()
+ if self.entry_point and self.standalone and s.knowntype != int:
+ raise Exception("stand-alone program entry point must return an "
+ "int (and not, e.g., None or always raise an "
+ "exception).")
+ annotator.simplify()
+
+ # XXX only supports a single set of exports per compilation run
+ generating_package = self.config.translation.exportpackage
+ if generating_package:
+ export_table = ImportExportComponent.packages[generating_package].new_table()
+ export_table.load_entrypoint_annotations(self.translator, self.secondary_entrypoints)
+
+ return s
#
task_annotate = taskdef(task_annotate, [], "Annotating&simplifying")
@@ -484,11 +502,24 @@
else:
from pypy.translator.c.genc import CExtModuleBuilder as CBuilder
cbuilder = CBuilder(self.translator, self.entry_point,
- config=self.config)
+ config=self.config, secondary_entrypoints=self.secondary_entrypoints)
+
+ # XXX make more general (for all backends)
+ # XXX only supports a single set of exports per compilation run
+ generating_package = self.config.translation.exportpackage
+ if generating_package:
+ export_table = ImportExportComponent.packages[generating_package].table
+ export_table.load_entrypoints(self.translator, self.secondary_entrypoints)
+
+ # XXX messy
cbuilder.stackless = self.config.translation.stackless
- if not standalone: # xxx more messy
+ if not standalone:
cbuilder.modulename = self.extmod_name
+
database = cbuilder.build_database()
+ if generating_package:
+ export_table.convert_llvalues(database)
+ ImportExportComponent.save_all()
self.log.info("database for generating C source was created")
self.cbuilder = cbuilder
self.database = database
@@ -507,15 +538,20 @@
#
task_source_c = taskdef(task_source_c, ['database_c'], "Generating c source")
- def create_exe(self):
+ def create_exe(self, is_so=False):
if self.exe_name is not None:
import shutil
- exename = mkexename(self.c_entryp)
- info = {'backend': self.config.translation.backend}
+ if is_so:
+ exename = self.c_entryp
+ else:
+ exename = mkexename(self.c_entryp)
newexename = self.exe_name % self.get_info()
+ if is_so:
+ newexename += ".so"
if '/' not in newexename and '\\' not in newexename:
newexename = './' + newexename
- newexename = mkexename(newexename)
+ if not is_so:
+ newexename = mkexename(newexename)
shutil.copy(exename, newexename)
self.c_entryp = newexename
self.log.info("created: %s" % (self.c_entryp,))
@@ -528,7 +564,12 @@
self.c_entryp = cbuilder.executable_name
self.create_exe()
else:
- self.c_entryp = cbuilder.get_entry_point()
+ if self.config.translation.generatemodule:
+ cbuilder._make_wrapper_module()
+ self.c_entryp = str(cbuilder.so_name)
+ self.create_exe(True)
+ else:
+ self.c_entryp = cbuilder.get_entry_point()
#
task_compile_c = taskdef(task_compile_c, ['source_c'], "Compiling c source")
More information about the Pypy-commit
mailing list