[benchmark] Update to 1.8.4 (#38916)

Co-authored-by: Monica <v-liumonica@microsoft.com>
This commit is contained in:
MonicaLiu 2024-07-26 00:11:21 -07:00 committed by GitHub
parent fd5a494702
commit be087b6804
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 11 additions and 23 deletions

View File

@ -1,15 +0,0 @@
diff --git a/src/sysinfo.cc b/src/sysinfo.cc
index 922e83a..ec9fd35 100644
--- a/src/sysinfo.cc
+++ b/src/sysinfo.cc
@@ -771,8 +771,8 @@ double GetCPUCyclesPerSecond(CPUInfo::Scaling scaling) {
kstat_close(kc);
return clock_hz;
#elif defined(BENCHMARK_OS_QNX)
- return static_cast<double>((int64_t)(SYSPAGE_ENTRY(cpuinfo)->speed) *
- (int64_t)(1000 * 1000));
+ return static_cast<double>(static_cast<int64_t>(SYSPAGE_ENTRY(cpuinfo)->speed) *
+ static_cast<int64_t>(1000 * 1000));
#elif defined(BENCHMARK_OS_QURT)
// QuRT doesn't provide any API to query Hexagon frequency.
return 1000000000;

View File

@ -2,10 +2,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO google/benchmark REPO google/benchmark
REF "v${VERSION}" REF "v${VERSION}"
SHA512 4e12114251c79a426873cfba6e27270b69fc980cef9a68e9cb3170f8e2e203f77dee19ab1e65cad51cd67e60991d3bbfdd52553f22522ce5e6c611b5aa07602c SHA512 835d12b88fe52309ce6b2ffbc8b3c178ac594be7d249b5daca0373d1d03ec83ea3c7b94224f67f22d21919376985867eeff0d1c0721501cfd8a9e9b8a9c48882
HEAD_REF main HEAD_REF main
PATCHES
fix_qnx.patch
) )
vcpkg_cmake_configure( vcpkg_cmake_configure(
@ -27,4 +25,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright # Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

View File

@ -1,8 +1,7 @@
{ {
"$comment": "https://github.com/google/benchmark/issues/661 describes the missing UWP support upstream", "$comment": "https://github.com/google/benchmark/issues/661 describes the missing UWP support upstream",
"name": "benchmark", "name": "benchmark",
"version-semver": "1.8.3", "version-semver": "1.8.4",
"port-version": 3,
"description": "A library to benchmark code snippets, similar to unit tests.", "description": "A library to benchmark code snippets, similar to unit tests.",
"homepage": "https://github.com/google/benchmark", "homepage": "https://github.com/google/benchmark",
"license": "Apache-2.0", "license": "Apache-2.0",

View File

@ -83,6 +83,7 @@ bde:x64-windows-static-md =skip
bde:x64-windows-static =skip bde:x64-windows-static =skip
bde:x64-windows =skip bde:x64-windows =skip
bde:x86-windows =skip bde:x86-windows =skip
benchmark:arm-neon-android=fail
bento4:arm-neon-android=fail bento4:arm-neon-android=fail
berkeleydb:arm-neon-android=fail berkeleydb:arm-neon-android=fail
berkeleydb:arm64-android=fail berkeleydb:arm64-android=fail

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "8251c2dbb2913d8128fa08cd98f375c14c329cbf",
"version-semver": "1.8.4",
"port-version": 0
},
{ {
"git-tree": "7d03a7d3688cd7480d28584a4ca4677fe90f3226", "git-tree": "7d03a7d3688cd7480d28584a4ca4677fe90f3226",
"version-semver": "1.8.3", "version-semver": "1.8.3",

View File

@ -581,8 +581,8 @@
"port-version": 0 "port-version": 0
}, },
"benchmark": { "benchmark": {
"baseline": "1.8.3", "baseline": "1.8.4",
"port-version": 3 "port-version": 0
}, },
"bento4": { "bento4": {
"baseline": "1.6.0-641", "baseline": "1.6.0-641",