Revert "[gn build] (manually) port 1ee3205 (benchmark move)"

nico · nico · commit bbccf4992219 · 2021-11-16T20:07:17.000-05:00
1ee3205 was reverted in 67de95b. This reverts commit a8e8e2d and follow-up a0dc600
diff --git a/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/benchmarks/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/benchmarks/BUILD.gn
@@ -3,6 +3,6 @@ executable("ScudoBenchmarks") {
   sources = [ "malloc_benchmark.cpp" ]
   deps = [
     "//compiler-rt/lib/scudo/standalone:sources",
-    "//third-party/benchmark",
+    "//llvm/utils/benchmark",
   ]
 }
diff --git a/llvm/utils/gn/secondary/llvm/utils/benchmark/BUILD.gn b/llvm/utils/gn/secondary/llvm/utils/benchmark/BUILD.gn
@@ -1,9 +1,6 @@
 static_library("benchmark") {
   sources = [
     "src/benchmark.cc",
-    "src/benchmark_api_internal.cc",
-    "src/benchmark_name.cc",
-    "src/benchmark_runner.cc",
     "src/benchmark_register.cc",
     "src/colorprint.cc",
     "src/commandlineflags.cc",
@@ -12,7 +9,6 @@ static_library("benchmark") {
     "src/counter.cc",
     "src/csv_reporter.cc",
     "src/json_reporter.cc",
-    "src/perf_counters.cc",
     "src/reporter.cc",
     "src/sleep.cc",
     "src/statistics.cc",

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ executable("ScudoBenchmarks") {`
`3`	`3`	`sources = [ "malloc_benchmark.cpp" ]`
`4`	`4`	`deps = [`
`5`	`5`	`"//compiler-rt/lib/scudo/standalone:sources",`
`6`		`- "//third-party/benchmark",`
	`6`	`+ "//llvm/utils/benchmark",`
`7`	`7`	`]`
`8`	`8`	`}`