From c38a6523ab4df2b57337be0b2446bd9d30be94b4 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Wed, 13 Feb 2019 11:32:23 +0000 Subject: scons: Marshal Python sources using the same Python as gem5 We currently use the Python version used by scons to marshal Python code. This doesn't work when building gem5 with Python 3 support since scons typically runs in Python 2.7. Add a custom marshal helper that links with the same library as gem5 to generate byte code that is guaranteed to work in gem5's Python interpreter. Change-Id: I665b0f2078726d4c055d74a3e668a580fc613b59 Signed-off-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/c/16422 Reviewed-by: Gabe Black --- src/SConscript | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'src/SConscript') diff --git a/src/SConscript b/src/SConscript index ab0e1fcde..1d65649f8 100644 --- a/src/SConscript +++ b/src/SConscript @@ -45,10 +45,8 @@ import array import bisect import functools import imp -import marshal import os import re -import subprocess import sys import zlib @@ -1130,6 +1128,11 @@ env.Command('sim/tags.cc', None, Transform("VER TAGS"))) env.AlwaysBuild(tags) +# Build a small helper that marshals the Python code using the same +# version of Python as gem5. This is in an unorthodox location to +# avoid building it for every variant. +py_marshal = env.Program('python/marshal.cc')[0] + # Embed python files. All .py files that have been indicated by a # PySource() call in a SConscript need to be embedded into the M5 # library. To do that, we compile the file to byte code, marshal the @@ -1141,17 +1144,22 @@ def embedPyFile(target, source, env): return "0" return '"%s"' % string - '''Action function to compile a .py into a code object, marshal - it, compress it, and stick it into an asm file so the code appears - as just bytes with a label in the data section''' + '''Action function to compile a .py into a code object, marshal it, + compress it, and stick it into an asm file so the code appears as + just bytes with a label in the data section. The action takes two + sources: + + source[0]: Binary used to marshal Python sources + source[1]: Python script to marshal + ''' + + import subprocess - src = file(str(source[0]), 'r').read() + marshalled = subprocess.check_output([source[0].abspath, str(source[1])]) - pysource = PySource.tnodes[source[0]] - compiled = compile(src, pysource.abspath, 'exec') - marshalled = marshal.dumps(compiled) compressed = zlib.compress(marshalled) data = compressed + pysource = PySource.tnodes[source[1]] sym = pysource.symname code = code_formatter() @@ -1178,7 +1186,7 @@ EmbeddedPython embedded_${sym}( code.write(str(target[0])) for source in PySource.all: - env.Command(source.cpp, source.tnode, + env.Command(source.cpp, [ py_marshal, source.tnode ], MakeAction(embedPyFile, Transform("EMBED PY"))) Source(source.cpp, tags=source.tags, add_tags='python') -- cgit v1.2.3