Update googletest and googlebench deps

GregoryComer · GregoryComer · commit 4cedbc5b8ace · 2025-11-05T17:07:44.000-08:00
diff --git a/bench/get-current.cc b/bench/get-current.cc
@@ -2,40 +2,40 @@
 
 #include <cpuinfo.h>
 
-static void cpuinfo_get_current_processor(benchmark::State& state) {
+static void cpuinfo_get_current_processor_bench(benchmark::State& state) {
 	cpuinfo_initialize();
 	while (state.KeepRunning()) {
 		const cpuinfo_processor* current_processor = cpuinfo_get_current_processor();
 		benchmark::DoNotOptimize(current_processor);
 	}
 }
-BENCHMARK(cpuinfo_get_current_processor)->Unit(benchmark::kNanosecond);
+BENCHMARK(cpuinfo_get_current_processor_bench)->Unit(benchmark::kNanosecond);
 
-static void cpuinfo_get_current_core(benchmark::State& state) {
+static void cpuinfo_get_current_core_bench(benchmark::State& state) {
 	cpuinfo_initialize();
 	while (state.KeepRunning()) {
 		const cpuinfo_core* current_core = cpuinfo_get_current_core();
 		benchmark::DoNotOptimize(current_core);
 	}
 }
-BENCHMARK(cpuinfo_get_current_core)->Unit(benchmark::kNanosecond);
+BENCHMARK(cpuinfo_get_current_core_bench)->Unit(benchmark::kNanosecond);
 
-static void cpuinfo_get_current_uarch_index(benchmark::State& state) {
+static void cpuinfo_get_current_uarch_index_bench(benchmark::State& state) {
 	cpuinfo_initialize();
 	while (state.KeepRunning()) {
 		const uint32_t uarch_index = cpuinfo_get_current_uarch_index();
 		benchmark::DoNotOptimize(uarch_index);
 	}
 }
-BENCHMARK(cpuinfo_get_current_uarch_index)->Unit(benchmark::kNanosecond);
+BENCHMARK(cpuinfo_get_current_uarch_index_bench)->Unit(benchmark::kNanosecond);
 
-static void cpuinfo_get_current_uarch_index_with_default(benchmark::State& state) {
+static void cpuinfo_get_current_uarch_index_with_default_bench(benchmark::State& state) {
 	cpuinfo_initialize();
 	while (state.KeepRunning()) {
 		const uint32_t uarch_index = cpuinfo_get_current_uarch_index_with_default(0);
 		benchmark::DoNotOptimize(uarch_index);
 	}
 }
-BENCHMARK(cpuinfo_get_current_uarch_index_with_default)->Unit(benchmark::kNanosecond);
+BENCHMARK(cpuinfo_get_current_uarch_index_with_default_bench)->Unit(benchmark::kNanosecond);
 
 BENCHMARK_MAIN();
diff --git a/bench/init.cc b/bench/init.cc
@@ -2,11 +2,11 @@
 
 #include <cpuinfo.h>
 
-static void cpuinfo_initialize(benchmark::State& state) {
+static void cpuinfo_initialize_bench(benchmark::State& state) {
 	while (state.KeepRunning()) {
 		cpuinfo_initialize();
 	}
 }
-BENCHMARK(cpuinfo_initialize)->Iterations(1)->Unit(benchmark::kMillisecond);
+BENCHMARK(cpuinfo_initialize_bench)->Iterations(1)->Unit(benchmark::kMillisecond);
 
 BENCHMARK_MAIN();
diff --git a/cmake/DownloadGoogleBenchmark.cmake b/cmake/DownloadGoogleBenchmark.cmake
@@ -4,8 +4,8 @@ PROJECT(googlebenchmark-download NONE)
 
 INCLUDE(ExternalProject)
 ExternalProject_Add(googlebenchmark
-	URL https://github.com/google/benchmark/archive/v1.6.1.zip
-	URL_HASH SHA256=367e963b8620080aff8c831e24751852cffd1f74ea40f25d9cc1b667a9dd5e45
+	URL https://github.com/google/benchmark/archive/refs/tags/v1.9.4.tar.gz
+	URL_HASH SHA256=b334658edd35efcf06a99d9be21e4e93e092bd5f95074c1673d5c8705d95c104
 	SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/googlebenchmark"
 	BINARY_DIR "${CONFU_DEPENDENCIES_BINARY_DIR}/googlebenchmark"
 	CONFIGURE_COMMAND ""
diff --git a/cmake/DownloadGoogleTest.cmake b/cmake/DownloadGoogleTest.cmake
@@ -4,8 +4,8 @@ PROJECT(googletest-download NONE)
 
 INCLUDE(ExternalProject)
 ExternalProject_Add(googletest
-	URL https://github.com/google/googletest/archive/release-1.11.0.zip
-	URL_HASH SHA256=353571c2440176ded91c2de6d6cd88ddd41401d14692ec1f99e35d013feda55a
+	URL https://github.com/google/googletest/archive/refs/tags/v1.17.0.zip
+	URL_HASH SHA256=40d4ec942217dcc84a9ebe2a68584ada7d4a33a8ee958755763278ea1c5e18ff
 	SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest"
 	BINARY_DIR "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest"
 	CONFIGURE_COMMAND ""
diff --git a/scripts/local-build.sh b/scripts/local-build.sh
@@ -8,6 +8,16 @@
 
 set -e
 
+if [ -d deps/googletest ]; then
+  rm -rf deps/googletest
+fi
+if [ -d deps/googlebenchmark-download ]; then
+  rm -rf deps/googlebenchmark-download
+fi
+if [ -d deps/googlebenchmark-download ]; then
+  rm -rf deps/googlebenchmark-download
+fi
+
 mkdir -p build/local
 
 CMAKE_ARGS=()

Original file line number	Diff line number	Diff line change
`@@ -2,40 +2,40 @@`
`2`	`2`
`3`	`3`	`#include <cpuinfo.h>`
`4`	`4`
`5`		`-static void cpuinfo_get_current_processor(benchmark::State& state) {`
	`5`	`+static void cpuinfo_get_current_processor_bench(benchmark::State& state) {`
`6`	`6`	`cpuinfo_initialize();`
`7`	`7`	`while (state.KeepRunning()) {`
`8`	`8`	`const cpuinfo_processor* current_processor = cpuinfo_get_current_processor();`
`9`	`9`	`benchmark::DoNotOptimize(current_processor);`
`10`	`10`	`}`
`11`	`11`	`}`
`12`		`-BENCHMARK(cpuinfo_get_current_processor)->Unit(benchmark::kNanosecond);`
	`12`	`+BENCHMARK(cpuinfo_get_current_processor_bench)->Unit(benchmark::kNanosecond);`
`13`	`13`
`14`		`-static void cpuinfo_get_current_core(benchmark::State& state) {`
	`14`	`+static void cpuinfo_get_current_core_bench(benchmark::State& state) {`
`15`	`15`	`cpuinfo_initialize();`
`16`	`16`	`while (state.KeepRunning()) {`
`17`	`17`	`const cpuinfo_core* current_core = cpuinfo_get_current_core();`
`18`	`18`	`benchmark::DoNotOptimize(current_core);`
`19`	`19`	`}`
`20`	`20`	`}`
`21`		`-BENCHMARK(cpuinfo_get_current_core)->Unit(benchmark::kNanosecond);`
	`21`	`+BENCHMARK(cpuinfo_get_current_core_bench)->Unit(benchmark::kNanosecond);`
`22`	`22`
`23`		`-static void cpuinfo_get_current_uarch_index(benchmark::State& state) {`
	`23`	`+static void cpuinfo_get_current_uarch_index_bench(benchmark::State& state) {`
`24`	`24`	`cpuinfo_initialize();`
`25`	`25`	`while (state.KeepRunning()) {`
`26`	`26`	`const uint32_t uarch_index = cpuinfo_get_current_uarch_index();`
`27`	`27`	`benchmark::DoNotOptimize(uarch_index);`
`28`	`28`	`}`
`29`	`29`	`}`
`30`		`-BENCHMARK(cpuinfo_get_current_uarch_index)->Unit(benchmark::kNanosecond);`
	`30`	`+BENCHMARK(cpuinfo_get_current_uarch_index_bench)->Unit(benchmark::kNanosecond);`
`31`	`31`
`32`		`-static void cpuinfo_get_current_uarch_index_with_default(benchmark::State& state) {`
	`32`	`+static void cpuinfo_get_current_uarch_index_with_default_bench(benchmark::State& state) {`
`33`	`33`	`cpuinfo_initialize();`
`34`	`34`	`while (state.KeepRunning()) {`
`35`	`35`	`const uint32_t uarch_index = cpuinfo_get_current_uarch_index_with_default(0);`
`36`	`36`	`benchmark::DoNotOptimize(uarch_index);`
`37`	`37`	`}`
`38`	`38`	`}`
`39`		`-BENCHMARK(cpuinfo_get_current_uarch_index_with_default)->Unit(benchmark::kNanosecond);`
	`39`	`+BENCHMARK(cpuinfo_get_current_uarch_index_with_default_bench)->Unit(benchmark::kNanosecond);`
`40`	`40`
`41`	`41`	`BENCHMARK_MAIN();`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@`
`2`	`2`
`3`	`3`	`#include <cpuinfo.h>`
`4`	`4`
`5`		`-static void cpuinfo_initialize(benchmark::State& state) {`
	`5`	`+static void cpuinfo_initialize_bench(benchmark::State& state) {`
`6`	`6`	`while (state.KeepRunning()) {`
`7`	`7`	`cpuinfo_initialize();`
`8`	`8`	`}`
`9`	`9`	`}`
`10`		`-BENCHMARK(cpuinfo_initialize)->Iterations(1)->Unit(benchmark::kMillisecond);`
	`10`	`+BENCHMARK(cpuinfo_initialize_bench)->Iterations(1)->Unit(benchmark::kMillisecond);`
`11`	`11`
`12`	`12`	`BENCHMARK_MAIN();`