freedreno: Add missing dep on freedreno tracepoints.

We were only get guaranteed that libfreedreno (and thus the tracepoints
generation) was ready when we linked, not when we compiled the gmemtool.c
that also used it.

Fixes: a02dcb970f ("freedreno: Add GPU tracepoints")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9056>
(cherry picked from commit eabee821e9)
This commit is contained in:
Eric Anholt 2021-02-15 10:36:49 -08:00 committed by Dylan Baker
parent 25a9312d23
commit 9b7500dff0
2 changed files with 8 additions and 3 deletions

View file

@ -1903,7 +1903,7 @@
"description": "freedreno: Add missing dep on freedreno tracepoints.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "a02dcb970fff17e73648b58bf4a603bc4f9c0c36"
},

View file

@ -215,7 +215,7 @@ files_libfreedreno = files(
'ir3/ir3_gallium.h',
)
files_libfreedreno += custom_target(
freedreno_tracepoints = custom_target(
'freedreno_tracepoints.[ch]',
input: 'freedreno_tracepoints.py',
output: ['freedreno_tracepoints.c', 'freedreno_tracepoints.h'],
@ -228,6 +228,8 @@ files_libfreedreno += custom_target(
depend_files: u_trace_py,
)
files_libfreedreno += freedreno_tracepoints
freedreno_includes = [
inc_mesa, inc_mapi,
inc_src, inc_include, inc_gallium, inc_gallium_aux,
@ -296,7 +298,10 @@ ir3_compiler = executable(
gmemtool = executable(
'gmemtool',
'gmemtool.c',
[
'gmemtool.c',
freedreno_tracepoints[1]
],
include_directories : freedreno_includes,
dependencies : [
idep_nir,