diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-03-10 20:52:14 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-12 15:35:08 +0000 |
commit | 6bb1621815f41fd09c971a0e26fb4bcd0963ab8a (patch) | |
tree | 1dfdf4e199902136d2821277340d23f4643aaa73 /meta/recipes-kernel/perf/perf.bb | |
parent | cca5433bafb2d7efc7d93a43bdf02e4f53534fd5 (diff) | |
download | poky-6bb1621815f41fd09c971a0e26fb4bcd0963ab8a.tar.gz |
perf: reproducibility fixes for pmu-events.c
perf generates pmu-events.c as part of the build process. The
code that generates the events is doing tree walks and potentially
other non-determinstic things.
We'd rather not mess with that implementation, so we add a script
that knows how to read the pmu-events.c, sort the entries and then
copy it over the generated one.
With this, we should always have events in the same order, improving
reproducibility.
(From OE-Core rev: 5281b2a6e16b6d24b66172b8269478356c0ce6c9)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/perf/perf.bb')
-rw-r--r-- | meta/recipes-kernel/perf/perf.bb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 2beb404c03..c7653e523c 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb | |||
@@ -250,6 +250,14 @@ do_configure_prepend () { | |||
250 | # all the calls have YFLAGS, which contains prefix mapping information. | 250 | # all the calls have YFLAGS, which contains prefix mapping information. |
251 | sed -i -e 's,$(YACC),$(YACC) $(YFLAGS),g' ${S}/scripts/Makefile.host | 251 | sed -i -e 's,$(YACC),$(YACC) $(YFLAGS),g' ${S}/scripts/Makefile.host |
252 | fi | 252 | fi |
253 | if [ -e "${S}/tools/perf/pmu-events/Build" ]; then | ||
254 | target='$(OUTPUT)pmu-events/pmu-events.c $(V)' | ||
255 | replacement1='$(OUTPUT)pmu-events/pmu-events.c $(V)\n' | ||
256 | replacement2='\t$(srctree)/sort-pmuevents.py $(OUTPUT)pmu-events/pmu-events.c $(OUTPUT)pmu-events/pmu-events.c.new\n' | ||
257 | replacement3='\tcp $(OUTPUT)pmu-events/pmu-events.c.new $(OUTPUT)pmu-events/pmu-events.c' | ||
258 | sed -i -e "s,$target,$replacement1$replacement2$replacement3,g" \ | ||
259 | "${S}/tools/perf/pmu-events/Build" | ||
260 | fi | ||
253 | # end reproducibility substitutions | 261 | # end reproducibility substitutions |
254 | 262 | ||
255 | # We need to ensure the --sysroot option in CC is preserved | 263 | # We need to ensure the --sysroot option in CC is preserved |
@@ -292,6 +300,14 @@ do_configure_prepend () { | |||
292 | # so we copy it from the sysroot unistd.h to the perf unistd.h | 300 | # so we copy it from the sysroot unistd.h to the perf unistd.h |
293 | install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h | 301 | install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h |
294 | install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/include/uapi/asm-generic/unistd.h | 302 | install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/include/uapi/asm-generic/unistd.h |
303 | |||
304 | # the fetcher is inhibited by the 'inherit kernelsrc', so we do a quick check and | ||
305 | # copy for a helper script we need | ||
306 | for p in $(echo ${FILESPATH} | tr ':' '\n'); do | ||
307 | if [ -e $p/sort-pmuevents.py ]; then | ||
308 | cp $p/sort-pmuevents.py ${S} | ||
309 | fi | ||
310 | done | ||
295 | } | 311 | } |
296 | 312 | ||
297 | python do_package_prepend() { | 313 | python do_package_prepend() { |