From b8802035edb97548e054d559e6118dd12f9b1d4e Mon Sep 17 00:00:00 2001
From: Chandler Carruth <chandlerc@gmail.com>
Date: Thu, 5 Oct 2023 10:44:31 -0700
Subject: [PATCH] Switch benchmarks to match unit test namespacing. (#3268)

Specifically, rather than nesting them in `Carbon::Testing`, nest them
in `Carbon::Foo` for whatever component they're benchmarking. All our
current benchmarks are lexer benchmarks so its `Carbon::Lex`.

This makes even more sense for benchmarks than unittests I think.
---
 toolchain/lex/numeric_literal_benchmark.cpp  | 6 ++----
 toolchain/lex/string_literal_benchmark.cpp   | 6 ++----
 toolchain/lex/tokenized_buffer_benchmark.cpp | 7 ++-----
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/toolchain/lex/numeric_literal_benchmark.cpp b/toolchain/lex/numeric_literal_benchmark.cpp
index 6c4746099929..945b16036bd0 100644
--- a/toolchain/lex/numeric_literal_benchmark.cpp
+++ b/toolchain/lex/numeric_literal_benchmark.cpp
@@ -8,11 +8,9 @@
 #include "toolchain/diagnostics/null_diagnostics.h"
 #include "toolchain/lex/numeric_literal.h"
 
-namespace Carbon::Testing {
+namespace Carbon::Lex {
 namespace {
 
-using Lex::NumericLiteral;
-
 static void BM_Lex_Float(benchmark::State& state) {
   for (auto _ : state) {
     CARBON_CHECK(NumericLiteral::Lex("0.000001"));
@@ -49,4 +47,4 @@ BENCHMARK(BM_ComputeValue_Float);
 BENCHMARK(BM_ComputeValue_Integer);
 
 }  // namespace
-}  // namespace Carbon::Testing
+}  // namespace Carbon::Lex
diff --git a/toolchain/lex/string_literal_benchmark.cpp b/toolchain/lex/string_literal_benchmark.cpp
index 40bb254d918d..e0c895db6fd3 100644
--- a/toolchain/lex/string_literal_benchmark.cpp
+++ b/toolchain/lex/string_literal_benchmark.cpp
@@ -7,11 +7,9 @@
 #include "toolchain/diagnostics/null_diagnostics.h"
 #include "toolchain/lex/string_literal.h"
 
-namespace Carbon::Testing {
+namespace Carbon::Lex {
 namespace {
 
-using Lex::StringLiteral;
-
 static void BM_ValidString(benchmark::State& state, std::string_view introducer,
                            std::string_view terminator) {
   std::string x(introducer);
@@ -117,4 +115,4 @@ BENCHMARK(BM_SimpleStringValue_MultilineDoubleQuote);
 BENCHMARK(BM_SimpleStringValue_Raw);
 
 }  // namespace
-}  // namespace Carbon::Testing
+}  // namespace Carbon::Lex
diff --git a/toolchain/lex/tokenized_buffer_benchmark.cpp b/toolchain/lex/tokenized_buffer_benchmark.cpp
index 74033c0a42f3..935d6216c61a 100644
--- a/toolchain/lex/tokenized_buffer_benchmark.cpp
+++ b/toolchain/lex/tokenized_buffer_benchmark.cpp
@@ -15,12 +15,9 @@
 #include "toolchain/lex/token_kind.h"
 #include "toolchain/lex/tokenized_buffer.h"
 
-namespace Carbon::Testing {
+namespace Carbon::Lex {
 namespace {
 
-using Lex::TokenizedBuffer;
-using Lex::TokenKind;
-
 // A large value for measurement stability without making benchmarking too slow.
 // Needs to be a multiple of 100 so we can easily divide it up into percentages,
 // and 1% itself needs to not be too tiny. This makes 100,000 a great balance.
@@ -383,4 +380,4 @@ BENCHMARK(BM_ValidMix)
     ->Args({75, 10});
 
 }  // namespace
-}  // namespace Carbon::Testing
+}  // namespace Carbon::Lex