Commit 2880cc9e authored by Mike Wittman's avatar Mike Wittman Committed by Commit Bot

Reland "[Sampling profiler] Move ENABLE_ARM_CFI_TABLE to profiler header"

This reverts commit 45e2dc4e.

Reason for revert: not the cause of the perf regression

Original change's description:
> Revert "[Sampling profiler] Move ENABLE_ARM_CFI_TABLE to profiler header"
>
> This reverts commit 74826cab.
>
> Reason for revert: testing whether this is responsible for rendering.mobile perf regression
>
> Original change's description:
> > [Sampling profiler] Move ENABLE_ARM_CFI_TABLE to profiler header
> >
> > ENABLE_ARM_CFI_TABLE is in service of the sampling profiler on Android,
> > and is unrelated to any debugging functionality, so move it to a
> > buildflag header under base/profiler.
> >
> > Also add the required includes to the files that use it.
> >
> > Bug: 1129939
> > Change-Id: I884b2128fc2ab2f6f1bec2343c59134448328529
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2421443
> > Commit-Queue: Mike Wittman <wittman@chromium.org>
> > Commit-Queue: Lei Zhang <thestig@chromium.org>
> > Auto-Submit: Mike Wittman <wittman@chromium.org>
> > Reviewed-by: Lei Zhang <thestig@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#809167}
>
> TBR=thestig@chromium.org,wittman@chromium.org
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: 1130974, 1129939
> Change-Id: I00050d0bf8cd7988d0ad8969f0b8a29e8accf669
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2432308
> Reviewed-by: Mike Wittman <wittman@chromium.org>
> Commit-Queue: Mike Wittman <wittman@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#810801}

TBR=thestig@chromium.org,wittman@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1130974
Bug: 1129939
Change-Id: I3180fd8161b3df701d467d1a028d0e504938dfe1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2435778Reviewed-by: default avatarMike Wittman <wittman@chromium.org>
Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Commit-Queue: Mike Wittman <wittman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811309}
parent 8bb17025
...@@ -1279,6 +1279,7 @@ component("base") { ...@@ -1279,6 +1279,7 @@ component("base") {
":logging_buildflags", ":logging_buildflags",
":orderfile_buildflags", ":orderfile_buildflags",
":partition_alloc_buildflags", ":partition_alloc_buildflags",
":profiler_buildflags",
":sanitizer_buildflags", ":sanitizer_buildflags",
":synchronization_buildflags", ":synchronization_buildflags",
":tracing_buildflags", ":tracing_buildflags",
...@@ -2248,7 +2249,6 @@ buildflag_header("debugging_buildflags") { ...@@ -2248,7 +2249,6 @@ buildflag_header("debugging_buildflags") {
"CAN_UNWIND_WITH_FRAME_POINTERS=$can_unwind_with_frame_pointers", "CAN_UNWIND_WITH_FRAME_POINTERS=$can_unwind_with_frame_pointers",
"UNSAFE_DEVELOPER_BUILD=$is_unsafe_developer_build", "UNSAFE_DEVELOPER_BUILD=$is_unsafe_developer_build",
"CAN_UNWIND_WITH_CFI_TABLE=$can_unwind_with_cfi_table", "CAN_UNWIND_WITH_CFI_TABLE=$can_unwind_with_cfi_table",
"ENABLE_ARM_CFI_TABLE=$enable_arm_cfi_table",
"EXCLUDE_UNWIND_TABLES=$exclude_unwind_tables", "EXCLUDE_UNWIND_TABLES=$exclude_unwind_tables",
"ENABLE_GDBINIT_WARNING=$enable_gdbinit_warning", "ENABLE_GDBINIT_WARNING=$enable_gdbinit_warning",
"ENABLE_LLDBINIT_WARNING=$enable_lldbinit_warning", "ENABLE_LLDBINIT_WARNING=$enable_lldbinit_warning",
...@@ -2330,6 +2330,13 @@ buildflag_header("tracing_buildflags") { ...@@ -2330,6 +2330,13 @@ buildflag_header("tracing_buildflags") {
] ]
} }
buildflag_header("profiler_buildflags") {
header = "profiler_buildflags.h"
header_dir = "base/profiler"
flags = [ "ENABLE_ARM_CFI_TABLE=$enable_arm_cfi_table" ]
}
# This is the subset of files from base that should not be used with a dynamic # This is the subset of files from base that should not be used with a dynamic
# library. Note that this library cannot depend on base because base depends on # library. Note that this library cannot depend on base because base depends on
# base_static. # base_static.
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "base/memory/singleton.h" #include "base/memory/singleton.h"
#include "base/profiler/profiler_buildflags.h"
#include "base/profiler/stack_buffer.h" #include "base/profiler/stack_buffer.h"
#include "base/profiler/stack_sampler.h" #include "base/profiler/stack_sampler.h"
#include "base/profiler/unwinder.h" #include "base/profiler/unwinder.h"
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "base/location.h" #include "base/location.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/profiler/profiler_buildflags.h"
#include "base/profiler/stack_buffer.h" #include "base/profiler/stack_buffer.h"
#include "base/profiler/stack_sampling_profiler.h" #include "base/profiler/stack_sampling_profiler.h"
#include "base/profiler/unwinder.h" #include "base/profiler/unwinder.h"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "base/metrics/metrics_hashes.h" #include "base/metrics/metrics_hashes.h"
#include "base/profiler/profiler_buildflags.h"
#include "base/profiler/sample_metadata.h" #include "base/profiler/sample_metadata.h"
#include "base/profiler/stack_sampler.h" #include "base/profiler/stack_sampler.h"
#include "base/profiler/stack_sampling_profiler.h" #include "base/profiler/stack_sampling_profiler.h"
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "base/message_loop/work_id_provider.h" #include "base/message_loop/work_id_provider.h"
#include "base/no_destructor.h" #include "base/no_destructor.h"
#include "base/process/process.h" #include "base/process/process.h"
#include "base/profiler/profiler_buildflags.h"
#include "base/profiler/sample_metadata.h" #include "base/profiler/sample_metadata.h"
#include "base/profiler/sampling_profiler_thread_token.h" #include "base/profiler/sampling_profiler_thread_token.h"
#include "base/rand_util.h" #include "base/rand_util.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment