Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[upstream_utils] Upgrade to Google Benchmark 1.9.5 (#8760)

Browse Source
This commit is contained in:
Tyler Veness
2026-04-11 16:52:24 -07:00
committed by GitHub
parent 042567d0ba
commit 7e9138f8c1
24 changed files with 215 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
upstream_utils/benchmark.py
View File

@@ -35,7 +35,7 @@ def copy_upstream_src(wpilib_root: Path):
def main():
name = "benchmark"
url = "https://github.com/google/benchmark.git"
tag = "v1.9.4"
tag = "v1.9.5"
benchmark = Lib(name, url, tag, copy_upstream_src)
benchmark.main()

2
upstream_utils/benchmark_patches/0001-Add-roboRIO-benchmark-support.patch
View File

@@ -8,7 +8,7 @@ Subject: [PATCH 1/2] Add roboRIO benchmark support
1 file changed, 2 insertions(+)
diff --git a/src/sysinfo.cc b/src/sysinfo.cc
index 60e9e5c219a470944609f36773b4d8effa019059..86922c0da6303e1c35b4f7cb92a751fb84ba6f95 100644
index 3977772bfede4971379b157b5478abe7bdad21f7..ec52119ad73aca9c4667855e2f2fdbf4d22ced77 100644
--- a/src/sysinfo.cc
+++ b/src/sysinfo.cc
@@ -441,6 +441,8 @@ std::vector<CPUInfo::CacheInfo> GetCacheSizes() {

6
upstream_utils/benchmark_patches/0002-Suppress-Wformat-nonliteral.patch
View File

@@ -43,10 +43,10 @@ index c90232f20ff7b6dfdc09ee2df02a6d735b1d99ea..c4c48d15a049f39c77aeee47ae46741e
return buff.get();
}
diff --git a/src/string_util.cc b/src/string_util.cc
index 420de4cf259ce0bf3087b004b1f0d0b1c78028a7..698129453cd6ea1baf5f12ae58db467008b6ce8c 100644
index 9c5df3ba25c92012bbae5063522a17bb47777151..9c483b335136a5b0e62c5f364a5eb1dfef5a414d 100644
--- a/src/string_util.cc
+++ b/src/string_util.cc
@@ -123,7 +123,14 @@ std::string StrFormatImp(const char* msg, va_list args) {
@@ -124,7 +124,14 @@ std::string StrFormatImp(const char* msg, va_list args) {
// 2015-10-08: vsnprintf is used instead of snd::vsnprintf due to a limitation
// in the android-ndk
@@ -61,7 +61,7 @@ index 420de4cf259ce0bf3087b004b1f0d0b1c78028a7..698129453cd6ea1baf5f12ae58db4670
va_end(args_cp);
@@ -141,7 +148,14 @@ std::string StrFormatImp(const char* msg, va_list args) {
@@ -142,7 +149,14 @@ std::string StrFormatImp(const char* msg, va_list args) {
auto buff_ptr = std::unique_ptr<char[]>(new char[size]);
// 2015-10-08: vsnprintf is used instead of snd::vsnprintf due to a limitation
// in the android-ndk