From 67370f72d22b00b2cdd13396294d5fdd2e34a360 Mon Sep 17 00:00:00 2001 From: Vaibhav Gogte Date: Wed, 8 Jan 2025 09:56:49 -0800 Subject: [PATCH] Roll back reuse size class experiment. PiperOrigin-RevId: 713325896 Change-Id: I759d5bff104c0cf6f8c15ca029243c9030013b85 --- tcmalloc/experiment.cc | 3 +-- tcmalloc/experiment_config.h | 2 -- tcmalloc/static_vars.cc | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tcmalloc/experiment.cc b/tcmalloc/experiment.cc index ab47b6da4..8c9e21cf5 100644 --- a/tcmalloc/experiment.cc +++ b/tcmalloc/experiment.cc @@ -61,8 +61,7 @@ bool HasBrittleTestFailures(Experiment exp) { return true; } - if (exp == Experiment::TEST_ONLY_TCMALLOC_REUSE_SIZE_CLASSES || - exp == Experiment::TCMALLOC_REUSE_SIZE_CLASSES) { + if (exp == Experiment::TEST_ONLY_TCMALLOC_REUSE_SIZE_CLASSES) { return true; } diff --git a/tcmalloc/experiment_config.h b/tcmalloc/experiment_config.h index 8a82b79a3..d5b78cc77 100644 --- a/tcmalloc/experiment_config.h +++ b/tcmalloc/experiment_config.h @@ -24,7 +24,6 @@ enum class Experiment : int { // clang-format off // go/keep-sorted start TCMALLOC_DENSE_TRACKERS_SORTED_ON_SPANS, // TODO(b/348043731): Complete experiment. - TCMALLOC_REUSE_SIZE_CLASSES, // TODO(b/358126781): Complete experiment. TEST_ONLY_L3_AWARE, // TODO(b/239977380): Complete experiment. TEST_ONLY_TCMALLOC_DENSE_TRACKERS_SORTED_ON_SPANS_ALLOCATED, // TODO(b/348043731): Complete experiment. TEST_ONLY_TCMALLOC_HUGE_CACHE_RELEASE_30S, // TODO(b/319872040): Complete experiment. @@ -45,7 +44,6 @@ struct ExperimentConfig { inline constexpr ExperimentConfig experiments[] = { // go/keep-sorted start {Experiment::TCMALLOC_DENSE_TRACKERS_SORTED_ON_SPANS, "TCMALLOC_DENSE_TRACKERS_SORTED_ON_SPANS"}, - {Experiment::TCMALLOC_REUSE_SIZE_CLASSES, "TCMALLOC_REUSE_SIZE_CLASSES"}, {Experiment::TEST_ONLY_L3_AWARE, "TEST_ONLY_L3_AWARE"}, {Experiment::TEST_ONLY_TCMALLOC_DENSE_TRACKERS_SORTED_ON_SPANS_ALLOCATED, "TEST_ONLY_TCMALLOC_DENSE_TRACKERS_SORTED_ON_SPANS_ALLOCATED"}, {Experiment::TEST_ONLY_TCMALLOC_HUGE_CACHE_RELEASE_30S, "TEST_ONLY_TCMALLOC_HUGE_CACHE_RELEASE_30S"}, diff --git a/tcmalloc/static_vars.cc b/tcmalloc/static_vars.cc index 906137abe..38fe08595 100644 --- a/tcmalloc/static_vars.cc +++ b/tcmalloc/static_vars.cc @@ -177,8 +177,7 @@ SizeClassConfiguration Static::size_class_configuration() { // TODO(b/242710633): remove this opt out. return SizeClassConfiguration::kLegacy; } else if (IsExperimentActive( - Experiment::TEST_ONLY_TCMALLOC_REUSE_SIZE_CLASSES) || - IsExperimentActive(Experiment::TCMALLOC_REUSE_SIZE_CLASSES)) { + Experiment::TEST_ONLY_TCMALLOC_REUSE_SIZE_CLASSES)) { return SizeClassConfiguration::kReuse; } else { return SizeClassConfiguration::kPow2Below64;