From a0738525ed8ab6de1eabc210290c6c2a5921863c Mon Sep 17 00:00:00 2001 From: Antonio Caggiano Date: Mon, 15 Mar 2021 16:07:39 +0100 Subject: [PATCH] util: Perfetto SDK v15.0 Add Perfetto SDK v15.0 as a dependency using a meson wrap. Signed-off-by: Antonio Caggiano Acked-by: Alyssa Rosenzweig Acked-by: Emma Anholt Reviewed-by: Rob Clark Reviewed-by: John Bates Part-of: --- meson.build | 6 ++++++ meson_options.txt | 6 ++++++ subprojects/perfetto.wrap | 5 +++++ 3 files changed, 17 insertions(+) create mode 100644 subprojects/perfetto.wrap diff --git a/meson.build b/meson.build index 0c3d0c762b809..08c1b84d25d60 100644 --- a/meson.build +++ b/meson.build @@ -2046,6 +2046,11 @@ endif # as GCC LTO drops them. See: https://bugs.freedesktop.org/show_bug.cgi?id=109391 gcc_lto_quirk = (cc.get_id() == 'gcc') ? ['-fno-lto'] : [] +with_perfetto = get_option('perfetto') +if with_perfetto + dep_perfetto = dependency('perfetto', fallback: ['perfetto', 'dep_perfetto']) +endif + subdir('include') subdir('bin') subdir('src') @@ -2171,6 +2176,7 @@ lines += 'HUD lmsensors: ' + (dep_lmsensors.found() ? 'yes' : 'no') lines += '' lines += 'Shared-glapi: ' + (with_shared_glapi ? 'yes' : 'no') +lines += 'Perfetto: ' + (with_perfetto ? 'yes' : 'no') indent = ' ' diff --git a/meson_options.txt b/meson_options.txt index 496091852c5d4..772ea057903c2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -465,3 +465,9 @@ option( value : true, description : 'use msse2 flag for mingw x86. Default: true', ) +option( + 'perfetto', + type : 'boolean', + value : false, + description : 'Enable performance analysis with Perfetto. Default: false' +) \ No newline at end of file diff --git a/subprojects/perfetto.wrap b/subprojects/perfetto.wrap new file mode 100644 index 0000000000000..d233e0a24f363 --- /dev/null +++ b/subprojects/perfetto.wrap @@ -0,0 +1,5 @@ +[wrap-git] +directory = perfetto + +url = https://android.googlesource.com/platform/external/perfetto +revision = v15.0