diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2018-08-16 14:26:33 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-16 22:40:28 +0100 |
commit | 371283df2e315de452891c7ea5f7563ed19cdc88 (patch) | |
tree | cfb4c09a1a91c7c80ebef1a32e8e46337fbf331e /meta/recipes-devtools/python/python3_3.5.5.bb | |
parent | e00b4617797ce89865a6f8318b6abedcddae3046 (diff) | |
download | poky-371283df2e315de452891c7ea5f7563ed19cdc88.tar.gz |
python3: enable profile optimized builds
Enable profile guided optimization (pgo) for python3. Enabling pgo in
python is generally as simple as invoking the target profile-opt which:
- builds python binaries with profile instrumentation enabled,
- runs a specific profile task using that python to get the profile
data and,
- feeds the compiler with this profile data and rebuilds python.
This change invokes qemu-user for the second step of running a profile
task using target python. Depending on how long profile task takes to
run, this might add a significant time to compilation (which would be
true for native builds too). The default profile task can be changed by
the users depending on what makes sense for their use case (or can be
left empty). In case qemu-user isn't supported, profile task won't be run.
(From OE-Core rev: 05a2a53f9cc7e75b4a3838ab9368cadf0f15ba1b)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3_3.5.5.bb')
-rw-r--r-- | meta/recipes-devtools/python/python3_3.5.5.bb | 55 |
1 files changed, 34 insertions, 21 deletions
diff --git a/meta/recipes-devtools/python/python3_3.5.5.bb b/meta/recipes-devtools/python/python3_3.5.5.bb index 50f63e39c1..beaf3dc0ca 100644 --- a/meta/recipes-devtools/python/python3_3.5.5.bb +++ b/meta/recipes-devtools/python/python3_3.5.5.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require recipes-devtools/python/python.inc | 1 | require recipes-devtools/python/python.inc |
2 | 2 | ||
3 | DEPENDS = "python3-native libffi bzip2 gdbm openssl sqlite3 zlib virtual/libintl xz" | 3 | DEPENDS = "python3-native libffi bzip2 gdbm openssl sqlite3 zlib virtual/libintl xz qemu-native qemu-helper-native" |
4 | 4 | ||
5 | PR = "${INC_PR}.0" | 5 | PR = "${INC_PR}.0" |
6 | PYTHON_MAJMIN = "3.5" | 6 | PYTHON_MAJMIN = "3.5" |
@@ -37,6 +37,8 @@ SRC_URI += "\ | |||
37 | file://configure.ac-fix-LIBPL.patch \ | 37 | file://configure.ac-fix-LIBPL.patch \ |
38 | file://0001-Issue-21272-Use-_sysconfigdata.py-to-initialize-dist.patch \ | 38 | file://0001-Issue-21272-Use-_sysconfigdata.py-to-initialize-dist.patch \ |
39 | file://pass-missing-libraries-to-Extension-for-mul.patch \ | 39 | file://pass-missing-libraries-to-Extension-for-mul.patch \ |
40 | file://Use-correct-CFLAGS-for-extensions-when-cross-compili.patch \ | ||
41 | file://0002-Makefile-add-target-to-split-profile-generation.patch \ | ||
40 | " | 42 | " |
41 | SRC_URI[md5sum] = "f3763edf9824d5d3a15f5f646083b6e0" | 43 | SRC_URI[md5sum] = "f3763edf9824d5d3a15f5f646083b6e0" |
42 | SRC_URI[sha256sum] = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009" | 44 | SRC_URI[sha256sum] = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009" |
@@ -48,7 +50,7 @@ UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" | |||
48 | 50 | ||
49 | S = "${WORKDIR}/Python-${PV}" | 51 | S = "${WORKDIR}/Python-${PV}" |
50 | 52 | ||
51 | inherit autotools multilib_header python3native pkgconfig update-alternatives | 53 | inherit autotools multilib_header python3native pkgconfig update-alternatives qemu |
52 | 54 | ||
53 | MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}" | 55 | MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}" |
54 | 56 | ||
@@ -69,7 +71,8 @@ CACHED_CONFIGUREVARS = "ac_cv_have_chflags=no \ | |||
69 | TARGET_CC_ARCH += "-DNDEBUG -fno-inline" | 71 | TARGET_CC_ARCH += "-DNDEBUG -fno-inline" |
70 | SDK_CC_ARCH += "-DNDEBUG -fno-inline" | 72 | SDK_CC_ARCH += "-DNDEBUG -fno-inline" |
71 | EXTRA_OEMAKE += "CROSS_COMPILE=yes" | 73 | EXTRA_OEMAKE += "CROSS_COMPILE=yes" |
72 | EXTRA_OECONF += "CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ --without-ensurepip" | 74 | EXTRA_OECONF += "CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ --without-ensurepip --enable-optimizations" |
75 | PYTHON3_PROFILE_TASK ?= "${S}/Tools/pybench/pybench.py -n 10" | ||
73 | 76 | ||
74 | export CROSS_COMPILE = "${TARGET_PREFIX}" | 77 | export CROSS_COMPILE = "${TARGET_PREFIX}" |
75 | export _PYTHON_PROJECT_BASE = "${B}" | 78 | export _PYTHON_PROJECT_BASE = "${B}" |
@@ -102,7 +105,6 @@ do_compile() { | |||
102 | sed -e 's,${STAGING_DIR_HOST},,g' -i *.py | 105 | sed -e 's,${STAGING_DIR_HOST},,g' -i *.py |
103 | cd - | 106 | cd - |
104 | 107 | ||
105 | |||
106 | # remove any bogus LD_LIBRARY_PATH | 108 | # remove any bogus LD_LIBRARY_PATH |
107 | sed -i -e s,RUNSHARED=.*,RUNSHARED=, Makefile | 109 | sed -i -e s,RUNSHARED=.*,RUNSHARED=, Makefile |
108 | 110 | ||
@@ -121,23 +123,34 @@ do_compile() { | |||
121 | # then call do_install twice we get Makefile.orig == Makefile.sysroot | 123 | # then call do_install twice we get Makefile.orig == Makefile.sysroot |
122 | install -m 0644 Makefile Makefile.sysroot | 124 | install -m 0644 Makefile Makefile.sysroot |
123 | 125 | ||
124 | oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python3-native/pgen \ | 126 | oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python3-native/pgen \ |
125 | HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python3-native/python3 \ | 127 | HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python3-native/python3 \ |
126 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | 128 | STAGING_LIBDIR=${STAGING_LIBDIR} \ |
127 | STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ | 129 | STAGING_INCDIR=${STAGING_INCDIR} \ |
128 | STAGING_INCDIR=${STAGING_INCDIR} \ | 130 | STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ |
129 | LIB=${baselib} \ | 131 | LIB=${baselib} \ |
130 | ARCH=${TARGET_ARCH} \ | 132 | ARCH=${TARGET_ARCH} \ |
131 | OPT="${CFLAGS}" libpython3.so | 133 | OPT="${CFLAGS}" profile-opt |
134 | |||
135 | if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true', 'false', d)}; then | ||
136 | qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}', ['${B}', '${STAGING_DIR_TARGET}/${base_libdir}'])}" | ||
137 | cat > pgo-image-qemuwrapper << EOF | ||
138 | #!/bin/sh | ||
139 | set -x | ||
140 | $qemu_binary "\$@" | ||
141 | EOF | ||
142 | chmod +x pgo-image-qemuwrapper | ||
143 | ./pgo-image-qemuwrapper ${B}/python ${PYTHON3_PROFILE_TASK} || true | ||
144 | fi | ||
132 | 145 | ||
133 | oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python3-native/pgen \ | 146 | oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python3-native/pgen \ |
134 | HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python3-native/python3 \ | 147 | HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python3-native/python3 \ |
135 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | 148 | STAGING_LIBDIR=${STAGING_LIBDIR} \ |
136 | STAGING_INCDIR=${STAGING_INCDIR} \ | 149 | STAGING_INCDIR=${STAGING_INCDIR} \ |
137 | STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ | 150 | STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ |
138 | LIB=${baselib} \ | 151 | LIB=${baselib} \ |
139 | ARCH=${TARGET_ARCH} \ | 152 | ARCH=${TARGET_ARCH} \ |
140 | OPT="${CFLAGS}" | 153 | OPT="${CFLAGS}" clean_and_use_profile |
141 | } | 154 | } |
142 | 155 | ||
143 | do_install() { | 156 | do_install() { |
@@ -157,7 +170,7 @@ do_install() { | |||
157 | STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ | 170 | STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ |
158 | LIB=${baselib} \ | 171 | LIB=${baselib} \ |
159 | ARCH=${TARGET_ARCH} \ | 172 | ARCH=${TARGET_ARCH} \ |
160 | DESTDIR=${D} LIBDIR=${libdir} | 173 | DESTDIR=${D} LIBDIR=${libdir} build_all_use_profile |
161 | 174 | ||
162 | oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python3-native/pgen \ | 175 | oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python3-native/pgen \ |
163 | HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python3-native/python3 \ | 176 | HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python3-native/python3 \ |