From ea2035e8986e5c7aa9a518f3b0a40ec9e147b016 Mon Sep 17 00:00:00 2001 From: Jason Macnak Date: Wed, 28 Aug 2024 19:20:05 +0000 Subject: [PATCH] Add perfetto tracing to host renderer ... to aid debugging. Reviewed-by: Aaron Ruby Acked-by: Yonggang Luo Acked-by: Adam Jackson Part-of: --- src/gfxstream/codegen/scripts/cereal/decoder.py | 3 +-- src/gfxstream/codegen/scripts/cereal/subdecode.py | 3 +-- src/gfxstream/codegen/scripts/cerealgenerator.py | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/gfxstream/codegen/scripts/cereal/decoder.py b/src/gfxstream/codegen/scripts/cereal/decoder.py index 640ac78f850..dc2dab751c6 100644 --- a/src/gfxstream/codegen/scripts/cereal/decoder.py +++ b/src/gfxstream/codegen/scripts/cereal/decoder.py @@ -932,14 +932,13 @@ size_t VkDecoder::Impl::decode(void* buf, size_t len, IOStream* ioStream, cgen.line("case OP_%s:" % name) cgen.beginBlock() - cgen.stmt("android::base::beginTrace(\"%s decode\")" % name) + cgen.stmt("GFXSTREAM_TRACE_EVENT(GFXSTREAM_TRACE_DECODER_CATEGORY, \"VkDecoder %s\")" % name) if api.name in custom_decodes.keys(): custom_decodes[api.name](typeInfo, api, cgen) else: emit_default_decoding(typeInfo, api, cgen) - cgen.stmt("android::base::endTrace()") cgen.stmt("break") cgen.endBlock() self.module.appendImpl(self.cgen.swapCode()) diff --git a/src/gfxstream/codegen/scripts/cereal/subdecode.py b/src/gfxstream/codegen/scripts/cereal/subdecode.py index c5b44a9da90..feecc33c24c 100644 --- a/src/gfxstream/codegen/scripts/cereal/subdecode.py +++ b/src/gfxstream/codegen/scripts/cereal/subdecode.py @@ -378,14 +378,13 @@ class VulkanSubDecoder(VulkanWrapperGenerator): cgen.line("case OP_%s:" % name) cgen.beginBlock() - cgen.stmt("android::base::beginTrace(\"%s subdecode\")" % name) + cgen.stmt("GFXSTREAM_TRACE_EVENT(GFXSTREAM_TRACE_DECODER_CATEGORY, \"VkSubDecoder %s\")" % name) if api.name in custom_decodes.keys(): custom_decodes[api.name](typeInfo, api, cgen) else: emit_default_decoding(typeInfo, api, cgen) - cgen.stmt("android::base::endTrace()") cgen.stmt("break") cgen.endBlock() self.module.appendImpl(self.cgen.swapCode()) diff --git a/src/gfxstream/codegen/scripts/cerealgenerator.py b/src/gfxstream/codegen/scripts/cerealgenerator.py index 8807c3f29c9..dd8a0ef8bec 100644 --- a/src/gfxstream/codegen/scripts/cerealgenerator.py +++ b/src/gfxstream/codegen/scripts/cerealgenerator.py @@ -530,10 +530,10 @@ class BumpPool; #include "{self.baseLibDirPrefix}/BumpPool.h" #include "{self.baseLibDirPrefix}/system/System.h" -#include "{self.baseLibDirPrefix}/Tracing.h" #include "{self.baseLibDirPrefix}/Metrics.h" #include "render-utils/IOStream.h" #include "FrameBuffer.h" +#include "gfxstream/host/Tracing.h" #include "host-common/feature_control.h" #include "host-common/GfxstreamFatalError.h" #include "host-common/logging.h"