Snap for 13989311 from ee57f856c8 to 25Q4-release

Change-Id: Ifd907c3c04aa7e56a32cb701f75a4918cddd29b9

Android.bp

@@ -157,6 +157,8 @@ cc_defaults {
         "-DHAVE___BUILTIN_CLZ",
         "-DHAVE___BUILTIN_CLZLL",
         "-DHAVE___BUILTIN_UNREACHABLE",
+        "-DHAVE_PERFETTO",
+        "-DANDROID_LIBPERFETTO",
         "-DHAVE_PTHREAD=1",
         "-DHAVE_DLADDR",
         "-DHAVE_DL_ITERATE_PHDR",

meson.build

@@ -2144,14 +2144,22 @@ else
   pre_args += '-DCUSTOM_SHADER_REPLACEMENT'
 endif
 
+allow_fallback_for_perfetto = get_option('allow-fallback-for').contains('perfetto')
 with_perfetto = get_option('perfetto')
 with_datasources = get_option('datasources')
 with_any_datasource = with_datasources.length() != 0
 if with_perfetto
-  dep_perfetto = dependency('perfetto', fallback: ['perfetto', 'dep_perfetto'])
+  dep_perfetto = dependency(
+      'perfetto',
+      fallback: allow_fallback_for_perfetto ? ['perfetto', 'dep_perfetto'] : [],
+  )
   pre_args += '-DHAVE_PERFETTO'
 endif
 
+if get_option('android-libperfetto').enabled()
+  pre_args += '-DANDROID_LIBPERFETTO'
+endif
+
 with_teflon = get_option('teflon')
 if with_teflon and with_tests
   dep_xtensor = dependency('xtensor')

meson.options

@@ -51,6 +51,12 @@ option(
   description : 'Use Android\'s libbacktrace',
 )
 
+option(
+  'android-libperfetto',
+  type : 'feature',
+  description : 'Use Android\'s libperfetto',
+)
+
 option(
   'dri-drivers-path',
   type : 'string',
@@ -844,9 +850,9 @@ option(
 option(
   'allow-fallback-for',
   type : 'array',
-  value : [],
+  value : ['perfetto'],
   choices : [
-    'libdrm',
+    'libdrm', 'perfetto',
   ],
   description : 'Allows the fallback mechanism if the dependency is not available on the system, or too old.'
 )

src/gallium/targets/lavapipe/Android.bp

@@ -101,6 +101,7 @@ cc_library_shared {
         "mesa_wsw",
         "mesa_loader",
         "libLLVM16_swiftshader",
+        "libperfetto_client_experimental",
     ],
     shared_libs: [
         "libzstd",

src/gfxstream/guest/vulkan/Android.bp

@@ -53,6 +53,7 @@ cc_library_shared {
         "libringbuffer",
         "libqemupipe.ranchu",
         "libarect",
+        "libperfetto_client_experimental",
         "mesa_gfxstream_aemu",
         "mesa_gfxstream_guest_android",
         "mesa_gfxstream_connection_manager",

src/gfxstream/guest/vulkan_enc/Android.bp

@@ -48,6 +48,7 @@ cc_library_static {
     vendor: true,
     defaults: [
         "mesa_common_defaults",
+        "mesa_gfxstream_guest_cc_defaults",
     ],
     header_libs: [
         "mesa_common_headers",

src/tool/pps/pps.h

@@ -7,7 +7,16 @@
 
 #pragma once
 
+#ifndef ANDROID_LIBPERFETTO
 #include <perfetto.h>
+#else
+#include <perfetto/tracing.h>
+#include <perfetto/common/gpu_counter_descriptor.gen.h>
+#include <perfetto/common/gpu_counter_descriptor.pbzero.h>
+#include <perfetto/config/gpu/gpu_counter_config.pbzero.h>
+#include <perfetto/trace/clock_snapshot.pbzero.h>
+#include <perfetto/trace/gpu/gpu_counter_event.pbzero.h>
+#endif
 
 #define PPS_LOG PERFETTO_LOG
 #define PPS_LOG_IMPORTANT PERFETTO_ILOG

src/util/Android.bp

@@ -101,6 +101,7 @@ cc_library_static {
         "driconf_static_header",
     ],
     static_libs: [
+        "libperfetto_client_experimental",
         "mesa_util_c11",
     ],
     shared_libs: [
@@ -138,6 +139,7 @@ cc_library_static {
         "os_socket.c",
         "pb_slab.c",
         "perf/u_trace.c",
+        "perf/u_perfetto.cc",
         "u_process.c",
         "u_qsort.cpp",
         "rwlock.c",

src/util/perf/u_perfetto.cc

@@ -23,7 +23,11 @@
 
 #include "u_perfetto.h"
 
+#ifndef ANDROID_LIBPERFETTO
 #include <perfetto.h>
+#else
+#include <perfetto/tracing.h>
+#endif
 
 #include "c11/threads.h"
 #include "util/macros.h"

src/util/perf/u_perfetto_renderpass.h

@@ -23,7 +23,11 @@
 
 #include "vulkan/runtime/vk_object.h"
 
-#include "perfetto.h"
+#ifndef ANDROID_LIBPERFETTO
+#include <perfetto.h>
+#else
+#include <perfetto/tracing.h>
+#endif
 
 #include "util/hash_table.h"
 #include "util/perf/u_trace.h"

src/util/perf/u_trace.py

@@ -673,7 +673,14 @@ perfetto_utils_hdr_template = """\
 #ifndef ${guard_name}
 #define ${guard_name}
 
+#ifndef ANDROID_LIBPERFETTO
 #include <perfetto.h>
+#else
+#include <perfetto/tracing.h>
+#include <perfetto/trace/clock_snapshot.pbzero.h>
+#include <perfetto/trace/gpu/gpu_render_stage_event.pbzero.h>
+#include <perfetto/trace/gpu/vulkan_api_event.pbzero.h>
+#endif
 
 % for header in HEADERS:
 #include "${header.hdr}"

src/vulkan/wsi/Android.bp

@@ -55,7 +55,6 @@ cc_library_static {
     static_libs: [
         "mesa_vulkan_util",
         "mesa_vulkan_runtime",
-        "mesa_gfxstream_vulkan_entrypoints",
         "mesa_util",
         "libdrm",
     ],