This is an archive of the discontinued LLVM Phabricator instance.

Differential D121343

Update benchmarks
ClosedPublic

Authored by mtrofin on Mar 9 2022, 2:53 PM.

Details

Reviewers
lebedev.ri
jdoerfert
Commits
rTb1854dff9165: Update benchmarks
Summary

This mainly updates benchmarks to address an issue with perfcounters
introduced through a refactoring. The issue was fixed in
https://github.com/google/benchmark/pull/1308.

The only other change is in XRay - there was an update in the State
API - field accessors.

Diff Detail

Repository
rT test-suite

Event Timeline

mtrofin created this revision.Mar 9 2022, 2:53 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 9 2022, 2:53 PM
Herald added subscribers: luke957, wenlei, s.egerton and 7 others. · View Herald Transcript
mtrofin requested review of this revision.Mar 9 2022, 2:53 PM
Herald added a reviewer: jdoerfert. · View Herald TranscriptMar 9 2022, 2:53 PM
Herald added subscribers: • pcwang-thead, sstefan1, aheejin. · View Herald Transcript
Harbormaster completed remote builds in B153443: Diff 414220.Mar 9 2022, 2:53 PM
jdoerfert accepted this revision.Mar 10 2022, 11:49 AM

LG, given that this simply updates an external dependence. Assuming nothing breaks...

This revision is now accepted and ready to land.Mar 10 2022, 11:49 AM
Closed by commit rTb1854dff9165: Update benchmarks (authored by mtrofin). · Explain WhyMar 10 2022, 12:11 PM
This revision was automatically updated to reflect the committed changes.
mtrofin added a commit: rTb1854dff9165: Update benchmarks.
daltenty mentioned this in D122316: Guard visibility variables on AIX.Mar 23 2022, 7:59 AM
Jake-Egan added a subscriber: Jake-Egan.Mar 23 2022, 8:15 AM

This patch adds visibility options, which isn't supported on AIX and causes build failure.
https://lab.llvm.org/buildbot/#/builders/214/builds/370/steps/9/logs/stdio

I'm working on a patch to guard visibility on AIX, but please let me know if there is a quick fix.

daltenty added a subscriber: daltenty.Mar 23 2022, 9:11 AM
jroelofs added a subscriber: jroelofs.Apr 2 2022, 8:23 AM
jroelofs added inline comments.
MicroBenchmarks/libs/benchmark/src/CMakeLists.txt
47

This seems to have broken several of the test-suite-verify-machineinstrs bots on GreenDragon:

https://green.lab.llvm.org/green/job/test-suite-verify-machineinstrs-aarch64-O3//11371/consoleFull

I don't understand how it's happening though, since the CheckLibraryExists test for it passes, setting HAVE_LIB_RT true:

-- Looking for shm_open in rt
-- Looking for shm_open in rt - found

But later the link fails with:

ld: library not found for -lrt

Any ideas?

mtrofin added inline comments.Apr 2 2022, 8:43 AM
MicroBenchmarks/libs/benchmark/src/CMakeLists.txt
47

It seems before we were doing find_library, I wonder if there is a nuance in cmake / cmake on OSX that is the issue here? Asking on the github side, too (https://github.com/google/benchmark/commit/eb9100bf4124e69d0c167361acedb8cab1e79f5e#r702892140)

Could you meanwhile try re-adding the find_library here, and if that works, I'll patch both here and upstream accordingly?

mtrofin added inline comments.Apr 2 2022, 9:51 AM
MicroBenchmarks/libs/benchmark/src/CMakeLists.txt
47

Based on the comments on github (https://github.com/google/benchmark/commit/eb9100bf4124e69d0c167361acedb8cab1e79f5e#r702892140), it seems there may be a problem with the bot setup (because llvm-test-suite on linux seems to work, and benchmark on macosx seems to work)

Happy to help, but I only have a x86 mac.

paquette added a subscriber: paquette.Apr 14 2022, 3:58 PM

This is also hitting the x86-64 macOS bots 😢

https://green.lab.llvm.org/green/job/test-suite-verify-machineinstrs-x86_64-O3/

I wonder if the issue is something to do with how we set up the Xcode SDK? Both the AArch64 + x86 test suite builders use this CMake cache:

https://github.com/llvm/llvm-zorg/blob/f785f4216432aa0d249ee3ad1f86515caf4c7b10/tasks/cmake/caches/util/xcode_sdk.cmake

@mtrofin, does anything stand out to you here?

mtrofin added a comment.Apr 14 2022, 7:17 PM
In D121343#3453019, @paquette wrote:

This is also hitting the x86-64 macOS bots 😢

https://green.lab.llvm.org/green/job/test-suite-verify-machineinstrs-x86_64-O3/

I wonder if the issue is something to do with how we set up the Xcode SDK? Both the AArch64 + x86 test suite builders use this CMake cache:

https://github.com/llvm/llvm-zorg/blob/f785f4216432aa0d249ee3ad1f86515caf4c7b10/tasks/cmake/caches/util/xcode_sdk.cmake

@mtrofin, does anything stand out to you here?

Looking - I'll also try building locally, I have a OSX intel I should (hopefully!) be able to repro on.

mtrofin added a comment.Apr 15 2022, 7:03 AM
In D121343#3453019, @paquette wrote:

This is also hitting the x86-64 macOS bots 😢

https://green.lab.llvm.org/green/job/test-suite-verify-machineinstrs-x86_64-O3/

I wonder if the issue is something to do with how we set up the Xcode SDK? Both the AArch64 + x86 test suite builders use this CMake cache:

https://github.com/llvm/llvm-zorg/blob/f785f4216432aa0d249ee3ad1f86515caf4c7b10/tasks/cmake/caches/util/xcode_sdk.cmake

Quick question: do the build directories get wiped out between builds (including cmake caches)?

@mtrofin, does anything stand out to you here?

paquette added a comment.Apr 15 2022, 1:07 PM

@mtrofin Everything these bots does is sets up a fresh environment each time, so there ought to be nothing left over from previous runs. Everything is done in a new directory each time IIRC, so we get a clean build every time.

mtrofin added a comment.Apr 16 2022, 8:58 AM
In D121343#3454611, @paquette wrote:

@mtrofin Everything these bots does is sets up a fresh environment each time, so there ought to be nothing left over from previous runs. Everything is done in a new directory each time IIRC, so we get a clean build every time.

Hmm. When trying to repro locally (Monterey, 12.3.1, Xcode command line tools 13.3.1[*]), librt is not found in the first place. Looking at the logs for the google/benchmark project, the macosx builds there don't find librt either (e.g. https://github.com/google/benchmark/runs/5968639052?check_suite_focus=true)

A bit of searching online indicates that apparently librt shouldn't be on macosx anyway.

I'm not super-familiar with Jenkins, so I'm still digging around logs, but if you are/have access to how the bots are set up, could you check where this librt that shouldn't be there even is? Alternatively, is there a way to run the bots with a patch from a branch - thinking we can add some cmake messages there and figure out what librt is found.

  • couldn't install the version the bots use because 'it was too old'
jroelofs added a comment.Apr 22 2022, 11:48 AM

As a workaround, what if we wrapped the check in an if(NOT APPLE)?

mtrofin added a comment.Apr 22 2022, 12:36 PM
In D121343#3468494, @jroelofs wrote:

As a workaround, what if we wrapped the check in an if(NOT APPLE)?

We could, but it probably doesn't make sense to do in google/benchmarks upstream, because (from the looks of it) the problem is with the build bot setup. If there is an ongoing plan to figure out the latter, I'd support "let's patch locally" to green-up the bots, as a stop-gap measure (with caveats that it'd be best to not go down this path for too long and with too many cases, as we'll get back to maintaining a fork, etc, etc). wdyt?

jroelofs added a subscriber: fhahn.May 9 2022, 3:05 PM

@fhahn suggested this might be an issue with how caches/util/xcode_sdk.cmake configures try_compile, and sure enough:

[14:55:41] ✔ jroelofs@galois build$ cat ../CMakeLists.txt 
project(ReproLibRtDarwin)
cmake_minimum_required(VERSION 3.23)

include(CheckLibraryExists)

# This set is load-bearing:
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY CACHE STRING "")

check_library_exists(rt shm_open "" HAVE_LIB_RT)

if(HAVE_LIB_RT)
  message(WARNING "FAILURE: should not have found librt")
else()
  message(WARNING "SUCCESS")
endif()
[14:55:55] ✔ jroelofs@galois build$ cmake ../ -DCMAKE_SYSTEM_NAME=iOS -GNinja
CMake Warning at CMakeLists.txt:12 (message):
  FAILURE: should not have found librt


-- Configuring done
-- Generating done
-- Build files have been written to: /Users/jroelofs/lrt_repro/build
jroelofs added a comment.May 9 2022, 3:16 PM

https://reviews.llvm.org/D125275

jroelofs mentioned this in D125275: Force HAVE_LIB_RT to NO when building with Xcode toolchains.May 9 2022, 3:18 PM
jroelofs mentioned this in rT33c34454f18c: Force HAVE_LIB_RT to NO when building with Xcode toolchains.May 18 2022, 6:47 PM
jroelofs mentioned this in rZORG793716f3d6bf: Force HAVE_LIB_RT to NO when building with Xcode toolchains.May 19 2022, 8:08 AM
DoyleLi mentioned this in D158142: Improved InformativeMailNotifier..Aug 16 2023, 10:20 PM

Large Diff

This large diff affects 237 files. Files without inline comments have been collapsed. Expand All Files

Revision Contents

PathSize
MicroBenchmarks/
XRay/
FDRMode/
4 lines
libs/
benchmark/
7 lines
4 lines
33 lines
53 lines
3 lines
30 lines
1208 lines
15 lines
bindings/
python/
google_benchmark/
2 lines
10 lines
cmake/
6 lines
19 lines
5 lines
Modules/
7 lines
config/
166 lines
docs/
2 lines
10 lines
48 lines
19 lines
docs/
11 lines
user_guide.md
README.md
508 lines
googletest/
16 lines
12 lines
3 lines
2 lines
19 lines
ci/
4 lines
docs/
121 lines
3 lines
16 lines
4 lines
12 lines
18 lines
24 lines
reference/
24 lines
googlemock/
15 lines
4 lines
include/
gmock/
13 lines
4 lines
123 lines
496 lines
4 lines
4 lines
4 lines
8 lines
8 lines
internal/
custom/
2 lines
3 lines
7 lines
5 lines
21 lines
44 lines
scripts/
generator/
cpp/
src/
88 lines
12 lines
20 lines
60 lines
test/
1 line
2 lines
97 lines
107 lines
6 lines
43 lines
43 lines
2 lines
2 lines
12 lines
2 lines
36 lines
14 lines
googletest/
19 lines
6 lines
cmake/
6 lines
include/
gtest/
232 lines
8 lines
4 lines
5 lines
9 lines
25 lines
3 lines
6 lines
4 lines
212 lines
11 lines
5 lines
internal/
7 lines
6 lines
10 lines
5 lines
2 lines
179 lines
6 lines
4 lines
samples/
8 lines
scripts/
test/
src/
1 line
4 lines
15 lines
28 lines
45 lines
275 lines
src/
gtest-assertion-result.cc/
include/
gtest/
gtest_prod.h
76 lines
test/
1 line
2 lines
12 lines
2 lines
32 lines
2 lines
2 lines
2 lines
18 lines
4 lines
4 lines
2 lines
1 line
20 lines
2 lines
8 lines
2 lines
2 lines
12 lines
29 lines
2 lines
2 lines
2 lines
2 lines
5 lines
2 lines
12 lines
4 lines
2 lines
2 lines
83 lines
2 lines
50 lines
4 lines
4 lines
2 lines
include/
benchmark/
327 lines
3 lines
15 lines
src/
98 lines
150 lines
7 lines
20 lines
1 line
4 lines
35 lines
2 lines
29 lines
14 lines
11 lines
6 lines
39 lines
5 lines
7 lines
53 lines
15 lines
4 lines
7 lines
40 lines
73 lines
44 lines
10 lines
5 lines
6 lines
31 lines
15 lines
23 lines
75 lines
1 line
38 lines
test/
1 line
6 lines
32 lines
8 lines
56 lines
2 lines
9 lines
157 lines
28 lines
1 line
18 lines
7 lines
6 lines
10 lines
8 lines
13 lines
2 lines
12 lines
1 line
4 lines
8 lines
7 lines
6 lines
36 lines
50 lines
4 lines
6 lines
10 lines
171 lines
9 lines
105 lines
7 lines
149 lines
4 lines
37 lines
61 lines
2 lines
3 lines
tools/
gbench/
Inputs/
21 lines
21 lines
213 lines
default.profraw/
MicroBenchmarks/
libs/
benchmark/
googletest/
googlemock/
scripts/
generator/
cpp/
__init__.py

Diff 414453

MicroBenchmarks/XRay/FDRMode/fdrmode-bench.cc

MicroBenchmarks/libs/benchmark/.clang-tidy

MicroBenchmarks/libs/benchmark/AUTHORS

MicroBenchmarks/libs/benchmark/BUILD.bazel

MicroBenchmarks/libs/benchmark/CMakeLists.txt

MicroBenchmarks/libs/benchmark/CONTRIBUTORS

MicroBenchmarks/libs/benchmark/LICENSE

MicroBenchmarks/libs/benchmark/README.md

MicroBenchmarks/libs/benchmark/WORKSPACE

MicroBenchmarks/libs/benchmark/bindings/python/google_benchmark/__init__.py

MicroBenchmarks/libs/benchmark/bindings/python/google_benchmark/benchmark.cc

MicroBenchmarks/libs/benchmark/cmake/Config.cmake.in

MicroBenchmarks/libs/benchmark/cmake/GoogleTest.cmake

MicroBenchmarks/libs/benchmark/cmake/GoogleTest.cmake.in

MicroBenchmarks/libs/benchmark/cmake/Modules/FindPFM.cmake

MicroBenchmarks/libs/benchmark/config/generate_export_header.bzl

MicroBenchmarks/libs/benchmark/dependencies.md

MicroBenchmarks/libs/benchmark/docs/_config.yml

MicroBenchmarks/libs/benchmark/docs/dependencies.md

MicroBenchmarks/libs/benchmark/docs/index.md

MicroBenchmarks/libs/benchmark/docs/platform_specific_build_instructions.md

MicroBenchmarks/libs/benchmark/docs/releasing.md

MicroBenchmarks/libs/benchmark/docs/user_guide.md

MicroBenchmarks/libs/benchmark/googletest/BUILD.bazel

MicroBenchmarks/libs/benchmark/googletest/CMakeLists.txt

MicroBenchmarks/libs/benchmark/googletest/CONTRIBUTING.md

MicroBenchmarks/libs/benchmark/googletest/README.md

MicroBenchmarks/libs/benchmark/googletest/WORKSPACE

MicroBenchmarks/libs/benchmark/googletest/ci/linux-presubmit.sh

MicroBenchmarks/libs/benchmark/googletest/docs/advanced.md

MicroBenchmarks/libs/benchmark/googletest/docs/faq.md

MicroBenchmarks/libs/benchmark/googletest/docs/gmock_cook_book.md

MicroBenchmarks/libs/benchmark/googletest/docs/gmock_faq.md

MicroBenchmarks/libs/benchmark/googletest/docs/gmock_for_dummies.md

MicroBenchmarks/libs/benchmark/googletest/docs/primer.md

MicroBenchmarks/libs/benchmark/googletest/docs/quickstart-bazel.md

MicroBenchmarks/libs/benchmark/googletest/docs/reference/matchers.md

MicroBenchmarks/libs/benchmark/googletest/googlemock/CMakeLists.txt

MicroBenchmarks/libs/benchmark/googletest/googlemock/README.md

MicroBenchmarks/libs/benchmark/googletest/googlemock/include/gmock/gmock-actions.h

MicroBenchmarks/libs/benchmark/googletest/googlemock/include/gmock/gmock-cardinalities.h

MicroBenchmarks/libs/benchmark/googletest/googlemock/include/gmock/gmock-function-mocker.h

MicroBenchmarks/libs/benchmark/googletest/googlemock/include/gmock/gmock-matchers.h

MicroBenchmarks/libs/benchmark/googletest/googlemock/include/gmock/gmock-more-actions.h

MicroBenchmarks/libs/benchmark/googletest/googlemock/include/gmock/gmock-more-matchers.h

MicroBenchmarks/libs/benchmark/googletest/googlemock/include/gmock/gmock-nice-strict.h

MicroBenchmarks/libs/benchmark/googletest/googlemock/include/gmock/gmock-spec-builders.h

MicroBenchmarks/libs/benchmark/googletest/googlemock/include/gmock/gmock.h

MicroBenchmarks/libs/benchmark/googletest/googlemock/include/gmock/internal/custom/README.md

MicroBenchmarks/libs/benchmark/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h

MicroBenchmarks/libs/benchmark/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h

MicroBenchmarks/libs/benchmark/googletest/googlemock/include/gmock/internal/custom/gmock-port.h

MicroBenchmarks/libs/benchmark/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h

MicroBenchmarks/libs/benchmark/googletest/googlemock/include/gmock/internal/gmock-port.h

MicroBenchmarks/libs/benchmark/googletest/googlemock/scripts/README.md

MicroBenchmarks/libs/benchmark/googletest/googlemock/scripts/fuse_gmock_files.py

MicroBenchmarks/libs/benchmark/googletest/googlemock/scripts/generator/LICENSE

MicroBenchmarks/libs/benchmark/googletest/googlemock/scripts/generator/README

MicroBenchmarks/libs/benchmark/googletest/googlemock/scripts/generator/README.cppclean

MicroBenchmarks/libs/benchmark/googletest/googlemock/scripts/generator/cpp/__init__.py

MicroBenchmarks/libs/benchmark/googletest/googlemock/scripts/generator/cpp/ast.py

MicroBenchmarks/libs/benchmark/googletest/googlemock/scripts/generator/cpp/gmock_class.py

MicroBenchmarks/libs/benchmark/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py

MicroBenchmarks/libs/benchmark/googletest/googlemock/scripts/generator/cpp/keywords.py

MicroBenchmarks/libs/benchmark/googletest/googlemock/scripts/generator/cpp/tokenize.py

MicroBenchmarks/libs/benchmark/googletest/googlemock/scripts/generator/cpp/utils.py

MicroBenchmarks/libs/benchmark/googletest/googlemock/scripts/generator/gmock_gen.py

MicroBenchmarks/libs/benchmark/googletest/googlemock/src/gmock-internal-utils.cc

MicroBenchmarks/libs/benchmark/googletest/googlemock/src/gmock-matchers.cc

MicroBenchmarks/libs/benchmark/googletest/googlemock/src/gmock-spec-builders.cc

MicroBenchmarks/libs/benchmark/googletest/googlemock/src/gmock.cc

MicroBenchmarks/libs/benchmark/googletest/googlemock/test/BUILD.bazel

MicroBenchmarks/libs/benchmark/googletest/googlemock/test/gmock-actions_test.cc

MicroBenchmarks/libs/benchmark/googletest/googlemock/test/gmock-internal-utils_test.cc

MicroBenchmarks/libs/benchmark/googletest/googlemock/test/gmock-matchers_test.cc

MicroBenchmarks/libs/benchmark/googletest/googlemock/test/gmock-more-actions_test.cc

MicroBenchmarks/libs/benchmark/googletest/googlemock/test/gmock-nice-strict_test.cc

MicroBenchmarks/libs/benchmark/googletest/googlemock/test/gmock-spec-builders_test.cc

MicroBenchmarks/libs/benchmark/googletest/googlemock/test/gmock_leak_test.py

MicroBenchmarks/libs/benchmark/googletest/googlemock/test/gmock_output_test.py

MicroBenchmarks/libs/benchmark/googletest/googlemock/test/gmock_output_test_.cc

MicroBenchmarks/libs/benchmark/googletest/googlemock/test/gmock_output_test_golden.txt

MicroBenchmarks/libs/benchmark/googletest/googlemock/test/gmock_test.cc

MicroBenchmarks/libs/benchmark/googletest/googlemock/test/gmock_test_utils.py

MicroBenchmarks/libs/benchmark/googletest/googletest/CMakeLists.txt

MicroBenchmarks/libs/benchmark/googletest/googletest/README.md

MicroBenchmarks/libs/benchmark/googletest/googletest/cmake/internal_utils.cmake

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/gtest-assertion-result.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/gtest-death-test.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/gtest-matchers.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/gtest-message.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/gtest-param-test.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/gtest-printers.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/gtest-spi.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/gtest-test-part.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/gtest-typed-test.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/gtest.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/gtest_pred_impl.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/gtest_prod.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/internal/gtest-filepath.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/internal/gtest-internal.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/internal/gtest-param-util.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/internal/gtest-port-arch.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/internal/gtest-port.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/internal/gtest-string.h

MicroBenchmarks/libs/benchmark/googletest/googletest/include/gtest/internal/gtest-type-util.h

MicroBenchmarks/libs/benchmark/googletest/googletest/samples/sample9_unittest.cc

MicroBenchmarks/libs/benchmark/googletest/googletest/scripts/README.md

MicroBenchmarks/libs/benchmark/googletest/googletest/scripts/common.py

MicroBenchmarks/libs/benchmark/googletest/googletest/scripts/fuse_gtest_files.py

MicroBenchmarks/libs/benchmark/googletest/googletest/scripts/gen_gtest_pred_impl.py

MicroBenchmarks/libs/benchmark/googletest/googletest/scripts/gtest-config.in

MicroBenchmarks/libs/benchmark/googletest/googletest/scripts/release_docs.py

MicroBenchmarks/libs/benchmark/googletest/googletest/scripts/run_with_path.py

MicroBenchmarks/libs/benchmark/googletest/googletest/scripts/test/Makefile

MicroBenchmarks/libs/benchmark/googletest/googletest/scripts/upload.py

MicroBenchmarks/libs/benchmark/googletest/googletest/scripts/upload_gtest.py

MicroBenchmarks/libs/benchmark/googletest/googletest/src/gtest-all.cc

MicroBenchmarks/libs/benchmark/googletest/googletest/src/gtest-assertion-result.cc

MicroBenchmarks/libs/benchmark/googletest/googletest/src/gtest-death-test.cc

MicroBenchmarks/libs/benchmark/googletest/googletest/src/gtest-internal-inl.h

MicroBenchmarks/libs/benchmark/googletest/googletest/src/gtest-port.cc

MicroBenchmarks/libs/benchmark/googletest/googletest/src/gtest-printers.cc

MicroBenchmarks/libs/benchmark/googletest/googletest/src/gtest.cc

MicroBenchmarks/libs/benchmark/googletest/googletest/test/BUILD.bazel

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-break-on-failure-unittest.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-catch-exceptions-test.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-color-test.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-death-test-test.cc

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-env-var-test.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-failfast-unittest.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-filter-unittest.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-global-environment-unittest.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-json-outfiles-test.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-json-output-unittest.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-list-tests-unittest.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-listener-test.cc

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-output-test-golden-lin.txt

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-output-test.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-output-test_.cc

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-param-test-invalid-name1-test.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-param-test-invalid-name2-test.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-port-test.cc

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-printers-test.cc

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-setuptestsuite-test.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-shuffle-test.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-throw-on-failure-test.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/googletest-uninitialized-test.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/gtest_help_test.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/gtest_list_output_unittest.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/gtest_pred_impl_unittest.cc

MicroBenchmarks/libs/benchmark/googletest/googletest/test/gtest_repeat_test.cc

MicroBenchmarks/libs/benchmark/googletest/googletest/test/gtest_skip_check_output_test.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/gtest_skip_environment_check_output_test.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/gtest_test_utils.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/gtest_testbridge_test.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/gtest_unittest.cc

MicroBenchmarks/libs/benchmark/googletest/googletest/test/gtest_xml_outfiles_test.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/gtest_xml_output_unittest.py

MicroBenchmarks/libs/benchmark/googletest/googletest/test/gtest_xml_test_utils.py

MicroBenchmarks/libs/benchmark/include/benchmark/benchmark.h

MicroBenchmarks/libs/benchmark/requirements.txt

MicroBenchmarks/libs/benchmark/setup.py

MicroBenchmarks/libs/benchmark/src/CMakeLists.txt

Show All 16 Linesforeach(item ${BENCHMARK_MAIN})
list(REMOVE_ITEM SOURCE_FILES "${item}") list(REMOVE_ITEM SOURCE_FILES "${item}")
endforeach() endforeach()
add_library(benchmark ${SOURCE_FILES}) add_library(benchmark ${SOURCE_FILES})
add_library(benchmark::benchmark ALIAS benchmark) add_library(benchmark::benchmark ALIAS benchmark)
set_target_properties(benchmark PROPERTIES set_target_properties(benchmark PROPERTIES
OUTPUT_NAME "benchmark" OUTPUT_NAME "benchmark"
VERSION ${GENERIC_LIB_VERSION} VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION} SOVERSION 2
) )
target_include_directories(benchmark PUBLIC target_include_directories(benchmark PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
) )
generate_export_header(benchmark
EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/benchmark/export.h)
# libpfm, if available # libpfm, if available
if (HAVE_LIBPFM) if (HAVE_LIBPFM)
target_link_libraries(benchmark libpfm.a) target_link_libraries(benchmark PRIVATE pfm)
add_definitions(-DHAVE_LIBPFM) add_definitions(-DHAVE_LIBPFM)
endif() endif()
# Link threads. # Link threads.
target_link_libraries(benchmark ${BENCHMARK_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(benchmark PRIVATE Threads::Threads)
find_library(LIBRT rt)
if(LIBRT) target_link_libraries(benchmark PRIVATE ${BENCHMARK_CXX_LIBRARIES})
target_link_libraries(benchmark ${LIBRT})
endif() if(HAVE_LIB_RT)
target_link_libraries(benchmark PRIVATE rt)
jroelofsUnsubmitted
Not Done
ReplyInline Actions

This seems to have broken several of the test-suite-verify-machineinstrs bots on GreenDragon:

https://green.lab.llvm.org/green/job/test-suite-verify-machineinstrs-aarch64-O3//11371/consoleFull

I don't understand how it's happening though, since the CheckLibraryExists test for it passes, setting HAVE_LIB_RT true:

-- Looking for shm_open in rt
-- Looking for shm_open in rt - found

But later the link fails with:

ld: library not found for -lrt

Any ideas?

jroelofs: This seems to have broken several of the test-suite-verify-machineinstrs bots on GreenDragon…
mtrofinAuthorUnsubmitted
Done
ReplyInline Actions

It seems before we were doing find_library, I wonder if there is a nuance in cmake / cmake on OSX that is the issue here? Asking on the github side, too (https://github.com/google/benchmark/commit/eb9100bf4124e69d0c167361acedb8cab1e79f5e#r702892140)

Could you meanwhile try re-adding the find_library here, and if that works, I'll patch both here and upstream accordingly?

mtrofin: It seems before we were doing `find_library`, I wonder if there is a nuance in cmake / cmake on…
mtrofinAuthorUnsubmitted
Done
ReplyInline Actions

Based on the comments on github (https://github.com/google/benchmark/commit/eb9100bf4124e69d0c167361acedb8cab1e79f5e#r702892140), it seems there may be a problem with the bot setup (because llvm-test-suite on linux seems to work, and benchmark on macosx seems to work)

Happy to help, but I only have a x86 mac.

mtrofin: Based on the comments on github (https://github.com/google/benchmark/commit/eb9100bf4124e69d0c1…
endif(HAVE_LIB_RT)
if(CMAKE_BUILD_TYPE)
string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UPPER)
endif()
if(NOT CMAKE_THREAD_LIBS_INIT AND "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER}}" MATCHES ".*-fsanitize=[^ ]*address.*")
message(WARNING "CMake's FindThreads.cmake did not fail, but CMAKE_THREAD_LIBS_INIT ended up being empty. This was fixed in https://github.com/Kitware/CMake/commit/d53317130e84898c5328c237186dbd995aaf1c12 Let's guess that -pthread is sufficient.")
target_link_libraries(benchmark -pthread)
endif()
# We need extra libraries on Windows # We need extra libraries on Windows
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
target_link_libraries(benchmark shlwapi) target_link_libraries(benchmark PRIVATE shlwapi)
endif() endif()
# We need extra libraries on Solaris # We need extra libraries on Solaris
if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
target_link_libraries(benchmark kstat) target_link_libraries(benchmark PRIVATE kstat)
endif() endif()
# Benchmark main library # Benchmark main library
add_library(benchmark_main "benchmark_main.cc") add_library(benchmark_main "benchmark_main.cc")
add_library(benchmark::benchmark_main ALIAS benchmark_main) add_library(benchmark::benchmark_main ALIAS benchmark_main)
set_target_properties(benchmark_main PROPERTIES set_target_properties(benchmark_main PROPERTIES
OUTPUT_NAME "benchmark_main" OUTPUT_NAME "benchmark_main"
VERSION ${GENERIC_LIB_VERSION} VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION} SOVERSION 2
DEFINE_SYMBOL benchmark_EXPORTS
) )
target_include_directories(benchmark PUBLIC target_link_libraries(benchmark_main PUBLIC benchmark::benchmark)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
)
target_link_libraries(benchmark_main benchmark::benchmark)
set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") set(generated_dir "${PROJECT_BINARY_DIR}")
set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake") set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake")
set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake") set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
set(pkg_config "${generated_dir}/${PROJECT_NAME}.pc") set(pkg_config "${generated_dir}/${PROJECT_NAME}.pc")
set(targets_to_export benchmark benchmark_main)
set(targets_export_name "${PROJECT_NAME}Targets") set(targets_export_name "${PROJECT_NAME}Targets")
set(namespace "${PROJECT_NAME}::") set(namespace "${PROJECT_NAME}::")
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
configure_package_config_file (
${PROJECT_SOURCE_DIR}/cmake/Config.cmake.in
${project_config}
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
NO_SET_AND_CHECK_MACRO
NO_CHECK_REQUIRED_COMPONENTS_MACRO
)
write_basic_package_version_file( write_basic_package_version_file(
"${version_config}" VERSION ${GENERIC_LIB_VERSION} COMPATIBILITY SameMajorVersion "${version_config}" VERSION ${GENERIC_LIB_VERSION} COMPATIBILITY SameMajorVersion
) )
configure_file("${PROJECT_SOURCE_DIR}/cmake/Config.cmake.in" "${project_config}" @ONLY)
configure_file("${PROJECT_SOURCE_DIR}/cmake/benchmark.pc.in" "${pkg_config}" @ONLY) configure_file("${PROJECT_SOURCE_DIR}/cmake/benchmark.pc.in" "${pkg_config}" @ONLY)
export (
TARGETS ${targets_to_export}
NAMESPACE "${namespace}"
FILE ${generated_dir}/${targets_export_name}.cmake
)
if (BENCHMARK_ENABLE_INSTALL) if (BENCHMARK_ENABLE_INSTALL)
# Install target (will install the library to specified CMAKE_INSTALL_PREFIX variable) # Install target (will install the library to specified CMAKE_INSTALL_PREFIX variable)
install( install(
TARGETS benchmark benchmark_main TARGETS ${targets_to_export}
EXPORT ${targets_export_name} EXPORT ${targets_export_name}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
install( install(
DIRECTORY "${PROJECT_SOURCE_DIR}/include/benchmark" DIRECTORY "${PROJECT_SOURCE_DIR}/include/benchmark"
"${PROJECT_BINARY_DIR}/include/benchmark"
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
FILES_MATCHING PATTERN "*.*h") FILES_MATCHING PATTERN "*.*h")
install( install(
FILES "${project_config}" "${version_config}" FILES "${project_config}" "${version_config}"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
install( install(
FILES "${pkg_config}" FILES "${pkg_config}"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
install( install(
EXPORT "${targets_export_name}" EXPORT "${targets_export_name}"
NAMESPACE "${namespace}" NAMESPACE "${namespace}"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
endif() endif()
if (BENCHMARK_ENABLE_DOXYGEN)
find_package(Doxygen REQUIRED)
set(DOXYGEN_QUIET YES)
set(DOXYGEN_RECURSIVE YES)
set(DOXYGEN_GENERATE_HTML YES)
set(DOXYGEN_GENERATE_MAN NO)
set(DOXYGEN_MARKDOWN_SUPPORT YES)
set(DOXYGEN_BUILTIN_STL_SUPPORT YES)
set(DOXYGEN_EXTRACT_PACKAGE YES)
set(DOXYGEN_EXTRACT_STATIC YES)
set(DOXYGEN_SHOW_INCLUDE_FILES YES)
set(DOXYGEN_BINARY_TOC YES)
set(DOXYGEN_TOC_EXPAND YES)
set(DOXYGEN_USE_MDFILE_AS_MAINPAGE "index.md")
doxygen_add_docs(benchmark_doxygen
docs
include
src
ALL
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMENT "Building documentation with Doxygen.")
if (BENCHMARK_ENABLE_INSTALL AND BENCHMARK_INSTALL_DOCS)
install(
DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html/"
DESTINATION ${CMAKE_INSTALL_DOCDIR})
endif()
else()
if (BENCHMARK_ENABLE_INSTALL AND BENCHMARK_INSTALL_DOCS)
install(
DIRECTORY "${PROJECT_SOURCE_DIR}/docs/"
DESTINATION ${CMAKE_INSTALL_DOCDIR})
endif()
endif()

MicroBenchmarks/libs/benchmark/src/benchmark.cc

MicroBenchmarks/libs/benchmark/src/benchmark_api_internal.h

MicroBenchmarks/libs/benchmark/src/benchmark_api_internal.cc

MicroBenchmarks/libs/benchmark/src/benchmark_main.cc

MicroBenchmarks/libs/benchmark/src/benchmark_register.h

MicroBenchmarks/libs/benchmark/src/benchmark_register.cc

MicroBenchmarks/libs/benchmark/src/benchmark_runner.h

MicroBenchmarks/libs/benchmark/src/benchmark_runner.cc

MicroBenchmarks/libs/benchmark/src/check.h

MicroBenchmarks/libs/benchmark/src/check.cc

MicroBenchmarks/libs/benchmark/src/colorprint.cc

MicroBenchmarks/libs/benchmark/src/commandlineflags.h

MicroBenchmarks/libs/benchmark/src/commandlineflags.cc

MicroBenchmarks/libs/benchmark/src/complexity.cc

MicroBenchmarks/libs/benchmark/src/console_reporter.cc

MicroBenchmarks/libs/benchmark/src/csv_reporter.cc

MicroBenchmarks/libs/benchmark/src/cycleclock.h

MicroBenchmarks/libs/benchmark/src/internal_macros.h

MicroBenchmarks/libs/benchmark/src/json_reporter.cc

MicroBenchmarks/libs/benchmark/src/perf_counters.h

MicroBenchmarks/libs/benchmark/src/perf_counters.cc

MicroBenchmarks/libs/benchmark/src/reporter.cc

MicroBenchmarks/libs/benchmark/src/sleep.cc

MicroBenchmarks/libs/benchmark/src/statistics.h

MicroBenchmarks/libs/benchmark/src/statistics.cc

MicroBenchmarks/libs/benchmark/src/string_util.h

MicroBenchmarks/libs/benchmark/src/string_util.cc

MicroBenchmarks/libs/benchmark/src/sysinfo.cc

MicroBenchmarks/libs/benchmark/src/thread_manager.h

MicroBenchmarks/libs/benchmark/src/timers.cc

MicroBenchmarks/libs/benchmark/test/AssemblyTests.cmake

MicroBenchmarks/libs/benchmark/test/BUILD

MicroBenchmarks/libs/benchmark/test/CMakeLists.txt

MicroBenchmarks/libs/benchmark/test/args_product_test.cc

MicroBenchmarks/libs/benchmark/test/basic_test.cc

MicroBenchmarks/libs/benchmark/test/benchmark_gtest.cc

MicroBenchmarks/libs/benchmark/test/benchmark_random_interleaving_gtest.cc

MicroBenchmarks/libs/benchmark/test/benchmark_setup_teardown_test.cc

MicroBenchmarks/libs/benchmark/test/benchmark_test.cc

MicroBenchmarks/libs/benchmark/test/clobber_memory_assembly_test.cc

MicroBenchmarks/libs/benchmark/test/complexity_test.cc

MicroBenchmarks/libs/benchmark/test/cxx03_test.cc

MicroBenchmarks/libs/benchmark/test/diagnostics_test.cc

MicroBenchmarks/libs/benchmark/test/display_aggregates_only_test.cc

MicroBenchmarks/libs/benchmark/test/donotoptimize_assembly_test.cc

MicroBenchmarks/libs/benchmark/test/donotoptimize_test.cc

MicroBenchmarks/libs/benchmark/test/filter_test.cc

MicroBenchmarks/libs/benchmark/test/fixture_test.cc

MicroBenchmarks/libs/benchmark/test/internal_threading_test.cc

MicroBenchmarks/libs/benchmark/test/map_test.cc

MicroBenchmarks/libs/benchmark/test/multiple_ranges_test.cc

MicroBenchmarks/libs/benchmark/test/options_test.cc

MicroBenchmarks/libs/benchmark/test/output_test.h

MicroBenchmarks/libs/benchmark/test/output_test_helper.cc

MicroBenchmarks/libs/benchmark/test/perf_counters_gtest.cc

MicroBenchmarks/libs/benchmark/test/register_benchmark_test.cc

MicroBenchmarks/libs/benchmark/test/repetitions_test.cc

MicroBenchmarks/libs/benchmark/test/report_aggregates_only_test.cc

MicroBenchmarks/libs/benchmark/test/reporter_output_test.cc

MicroBenchmarks/libs/benchmark/test/skip_with_error_test.cc

MicroBenchmarks/libs/benchmark/test/spec_arg_test.cc

MicroBenchmarks/libs/benchmark/test/statistics_gtest.cc

MicroBenchmarks/libs/benchmark/test/string_util_gtest.cc

MicroBenchmarks/libs/benchmark/test/templated_fixture_test.cc

MicroBenchmarks/libs/benchmark/test/time_unit_gtest.cc

MicroBenchmarks/libs/benchmark/test/user_counters_tabular_test.cc

MicroBenchmarks/libs/benchmark/test/user_counters_test.cc

MicroBenchmarks/libs/benchmark/test/user_counters_thousands_test.cc

MicroBenchmarks/libs/benchmark/tools/gbench/Inputs/test4_run0.json

MicroBenchmarks/libs/benchmark/tools/gbench/Inputs/test4_run1.json

MicroBenchmarks/libs/benchmark/tools/gbench/report.py

default.profraw