Commit Graph

900 Commits

Author SHA1 Message Date
Dominic Hamon 539da11250 Merge pull request #209 from BillyONeal/fix-appveyor
Fix appveyor's older MSVC++ builds by working around 2015 Update 2 bugfix
2016-05-11 09:06:55 -07:00
Billy Robert O'Neal III df9ab80113 Use nanoseconds instead of duration<double, milli>
MSVC++ before 2015 Update 2 has a bug in sleep_for where it tries to
implicitly += the input with a nanoseconds variable. Work around this by
using nanoseconds directly (which can be implicitly +='d with
chrono::nanoseconds).
2016-05-10 18:02:02 -07:00
Billy Robert O'Neal III 09edc486b8 Added GCC/Clang support for other rel configs 2016-05-10 16:47:06 -07:00
Billy Robert O'Neal III d89ab075fd Added support for CMake's other rel configs
In addition to release, CMake supports RELWITHDEBINFO and MINSIZEREL
build configurations. In particular, debug info is necessary for many
profilers to do anything useful, making RELWITHDEBINFO important here.

MINSIZEREL was added for completeness' sake.
2016-05-10 16:47:06 -07:00
Billy Robert O'Neal III 9bb1ba6b76 Fix clobbering of default CMAKE_CXX_FLAGS_RELEASE
BENCHMARK_ENABLE_LTO=true was completely replacing
CMAKE_CXX_FLAGS_RELEASE; meaning neither CMake's release defaults nor
user customizations were being applied.
2016-05-10 16:47:06 -07:00
Billy Robert O'Neal III 60b5921735 Remove redundant MSVC++ /W3 triggering warnings
This change looks for CMake's default setting for MSVC++, /W3 (and any
other level should that change in the future), and removes it before
adding /W4. This stops the build for MSVC++ emitting warnings about
/W4 overriding /W3 earlier on the command line.
2016-05-10 16:47:06 -07:00
Billy Robert O'Neal III fa8b2d6171 Add myself to the contributors list 2016-05-10 16:46:26 -07:00
Dominic Hamon 354b14d1a0 Merge pull request #199 from jknuuttila/master
Support for manual timing (see issue #198, https://github.com/google/benchmark/issues/198)
2016-05-05 14:07:46 -07:00
Jussi Knuuttila e253a28402 Manual timing support. 2016-05-05 23:24:13 +03:00
Jussi Knuuttila dce2ebb403 Fixed a warning caused by an implicit narrowing cast. 2016-05-05 20:34:44 +03:00
Dominic Hamon 277e7aafe6 Merge pull request #201 from google/200
Only output optional fields if they're set
2016-05-02 12:10:54 -07:00
Dominic Hamon 02f409a71f Only output optional fields if they're set 2016-05-02 12:04:16 -07:00
Dominic Hamon 9fa66eb130 Merge branch 'NewProggie-feature/add-ms-time-report' 2016-05-02 11:17:36 -07:00
Kai Wolf fb733897c5 Remove sleep.h dependency for tests 2016-05-02 19:53:45 +02:00
Kai Wolf f352c30f1c Merge branch 'master' into feature/add-ms-time-report 2016-04-29 21:42:21 +02:00
Dominic Hamon 0500ec0ab8 Merge pull request #174 from alycm/fix-leak
Close a memory leak in configuration code
2016-04-25 09:11:57 -07:00
Dominic Hamon 27f8a62313 Merge pull request #196 from google/iterationdoc
Add section on iterations.
2016-04-20 08:31:33 -07:00
Dominic Hamon d6f96ed639 Add section on iterations.
Also add some subheadings, and fix up the line lengths.

Fixes #194
2016-04-19 09:34:13 -07:00
Dominic Hamon 075a8a6fbf Merge pull request #195 from dvyukov/patch-1
Fix SetLabel usage example
2016-04-18 09:54:56 -07:00
Dmitry Vyukov 838719dc02 Update benchmark_api.h 2016-04-18 14:24:13 +02:00
Kai Wolf 1203b3cbe4 Fix missing <tuple> header in csv/json_reporter 2016-03-30 09:14:04 +02:00
Kai Wolf 1043f45bed Add explanatory comment why src headers are needed in test/CMakeLists.txt 2016-03-29 22:10:07 +02:00
Kai Wolf e6d62fd135 Add GetTimeAndMultiplier to json and csv reporter as well 2016-03-29 20:35:38 +02:00
Kai Wolf 0b4111c3b3 Refactor GetTimeUnitAndMultiplier and add example 2016-03-28 21:32:11 +02:00
Kai Wolf 7c69b36078 Add an additional parameter for time units 2016-03-26 01:04:17 +01:00
Kai Wolf 3a02c462c7 Add myself to the contributors list 2016-03-24 22:34:23 +01:00
Kai Wolf cded70a166 Add optional ms time unit for console reporter
Some benchmarks may run a few milliseconds which makes it kind of hard to visually compare, since the currently only available nanoseconds numbers can get very large in this case. Therefore this commit adds an optional command line flag --benchmark_time_unit which lets the user choose between ns and ms time units for displaying the mean execution time.
2016-03-24 22:18:55 +01:00
Dominic Hamon b2e7340875 Merge pull request #187 from insertinterestingnamehere/libcpp_include_fix
Fix missing include in map_test.cc
2016-02-26 02:39:44 +01:00
Ian Henriksen 0dca953b13 Include cstdlib in map_test to make sure std::rand is available when
building with libc++.
2016-02-24 12:31:31 -07:00
Dominic Hamon e4ad1afa1f Merge pull request #186 from amin-jabri/multithreaded_Fixture_TearDown
Pass const State to Fixture::TearDown. Fix memory leak in fixture_test
2016-02-24 16:46:44 +01:00
Mohamed Amin JABRI 53aca9bc71 Pass const State to Fixture::TearDown. Fix memory leak in fixture_test 2016-02-24 17:36:34 +09:00
Dominic Hamon c5b80ff1ac Merge pull request #184 from KindDragon/patch-1
Format json in README.md
2016-02-17 11:45:59 +01:00
Arkady Shapkin 8da907c2c2 Update README.md 2016-02-16 23:29:24 +03:00
Dominic Hamon 31e71be77c Merge pull request #181 from google/map_test
Pass const state to Fixture::SetUp. Add map_test.
2016-02-16 02:08:29 -08:00
Dominic Hamon 7fd3fa8e3c Merge pull request #182 from buchgr/state_threads
Add number of threads to State.
2016-02-16 02:08:02 -08:00
Jakob Buchgraber 007efee751 Add number of threads to State.
Having access to the thread count from within a benchmark is useful,
for when one wants to distribute a workload dynamically among the
benchmarks running in parallel e.g when using ThreadRange() or
ThreadPerCpu().
2016-02-15 21:39:15 +01:00
Dominic Hamon 53068f974c Pass const state to Fixture::SetUp. Add map_test. 2016-02-15 03:04:19 -08:00
Dominic Hamon bdb9f697d7 Merge pull request #180 from google/release
Add section on optimisations to README
2016-02-14 09:29:40 -08:00
Dominic Hamon 211f23ee13 Add section on optimisations to README 2016-02-14 09:28:10 -08:00
Dominic Hamon af489cd4a3 Merge pull request #176 from enh/cycle-timer-aarch64
Add aarch64 support to src/cycleclock.h.
2016-02-13 13:05:16 -08:00
Dominic Hamon cff1541b0c Merge pull request #177 from enh/cpuinfo-arm
Fix ARM /proc/cpuinfo parsing.
2016-02-13 13:05:09 -08:00
Dominic Hamon 1c4df750c4 Merge pull request #175 from KindDragon/master
Support MSVC on appveyor
2016-02-13 13:04:57 -08:00
Arkadiy Shapkin 9e37d69b23 Support MSVC on appveyor 2016-02-12 23:12:29 +03:00
Elliott Hughes 930d3af052 Fix ARM /proc/cpuinfo parsing.
Also fix related warning message typos.
2016-02-10 16:20:05 -08:00
Elliott Hughes d9630aee88 Add aarch64 support to src/cycleclock.h.
From google3's base/cycleclock.
2016-02-10 15:48:27 -08:00
Alastair Murray a574110048 Close a memory leak in configuration code
This was causing configuration failures on address sanitizer builds.
2016-02-09 13:08:56 +00:00
Dominic Hamon cd525ae85d Merge pull request #171 from eliben/update-doc-userealtime
Update README to mention UseRealTime for wallclock time measurements.
2015-12-30 10:22:39 -08:00
Eli Bendersky c7ab1b987b Update README to mention UseRealTime for wallclock time measurements.
Also adding a use case in the API header.

Fixes #170
2015-12-30 06:01:19 -08:00
Eric Fiselier f662e8be5b Rename OS_MACOSX macro to new name BENCHMARK_OS_MACOSX. Fix #169 2015-12-14 15:02:30 -07:00
Dominic Hamon 0a1f4849a6 Merge pull request #166 from disconnect3d/master
Fixes #165: CustomArguments ret type in README
2015-11-30 09:50:29 -08:00