github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2025-03-15 19:50:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
821 Commits 7 Branches 28 Tags 6.9 MiB
906749a48e
Commit Graph

354 Commits

Author SHA1 Message Date
Eric Fiselier
c04f703ab4 Fix signed integer overflow UB in complexity computations. 
Previously the FittingCurve functions for n^2 and n^3 did the calculation
using int types. This can overflow and cause UB. This patch changes the
calculations to use std::pow to prevent this.

Also re-enable VC 2013 appveyor bot since I *hope* this is what was causing
the failures.
 2016-08-07 17:33:18 -06:00
Marcin Kolny
dfe0260754 Support multiple ranges in the benchmark (#257) 
* Support multiple ranges in the benchmark

google-benchmark library allows to provide up to two ranges to the
benchmark method (range_x and range_y). However, in many cases it's not
sufficient. The patch introduces multi-range features, so user can easily
define multiple ranges by passing a vector of integers, and access values
through the method range(i).

* Remove redundant API

Functions State::range_x() and State::range_y() have been removed. They should
be replaced by State::range(0) and State::range(1).
Functions Benchmark::ArgPair() and Benchmark::RangePair() have been removed.
They should be replaced by Benchmark::Args() and Benchmark::Ranges().
 2016-08-04 12:30:14 -07:00
Eric Fiselier
44128d87d2 Add --benchmark_out=<filename> and --benchmark_out_format=<format> options. 
These options allow you to write the output of a benchmark to the specified
file and with the specified format. The goal of this change is to help support
tooling.
 2016-08-02 15:12:43 -06:00
Vadym
f68e64c60a add support for step in DenseRange() (#260) 2016-07-25 21:13:09 +02:00
Eric Fiselier
a2ca94dd10 Fix missing SYSTEM_INFO initializers 2016-07-23 16:22:13 -06:00
Sven
ebd37b191c set cpuinfo_num_cpus on Windows (#254) 2016-07-13 13:00:32 -07:00
Elliott Hughes
b805b7c6e0 Add missing volatiles to 32-bit ARM cycleclock assembler. (#253) 
Without these, clang reorders these instructions as if they were
regular loads/stores which causes SIGILL from the kernel because
it performs all the loads before it starts testing the values.
 2016-07-12 12:40:09 -07:00
Ismael
885ca41cf8 added check for SetComplexityN (#248) 2016-06-27 11:26:23 -07:00
Ismael
a0783fd7f6 fix 244 (#247) 2016-06-27 11:25:43 -07:00
Ismael
3fdd76bd14 fix issue 235 (#236) 2016-06-03 09:33:17 -07:00
Dominic Hamon
e498143168 fix warning on loss of integer precision 2016-06-02 14:37:14 -07:00
Dominic Hamon
51c23a9115 Merge branch 'added_lambdas' of git://github.com/ismaelJimenez/benchmark into ismaelJimenez-added_lambdas 2016-06-02 14:33:14 -07:00
Ismael
1a633969b3 changed BigO logic order 2016-06-02 22:23:39 +02:00
Ismael
240ba4e64e changed BigOFunc argument from size_t to int 2016-06-02 22:21:52 +02:00
Ismael
22cb9d9ce0 google formated 2016-06-02 22:01:31 +02:00
Ismael
109f528a40 removed functional library not needed 2016-06-02 19:48:53 +02:00
Ismael
11e3043554 checked format before pull request 2016-06-02 19:42:08 +02:00
Ismael
867f9145a0 added lambdas to complexity report 2016-06-01 23:08:01 +02:00
Billy O'Neal
84cd50b85e Add workaround for VS2013 const-incorrect atomic (#230) 2016-05-31 16:54:02 -07:00
Billy O'Neal
3685cad68c Added new noexcept macros for VS2013 (#229) 2016-05-31 14:52:26 -07:00
Eric Fiselier
519e8d0e56 Fix missing declaration of FLAGS_color_print 2016-05-30 16:52:24 -06:00
Eric Fiselier
7188824c33 Fix windows build in console_reporter.cc. Fixes #228 2016-05-30 15:33:52 -06:00
Eric
1b263fe6d9 Cleanup reporters (#226) 
* Move ComputeStats call out of the reporters

* Cleanup adjusted time calculations in reporters

* Move ComputeBigO call out of reporters

* Remove ReportComplexity interface using ReportRuns instead

* Factor out reporting of basic context information

* Attempt to fix GCC 4.6 build errors

* Move ComputeStats to complexity.cc
 2016-05-27 16:45:25 -06:00
Eric
5686bf1b38 Change reporters to use a specified output and error stream. Add tests for output. (#219) 
* Add test for reporter output.

* setup err_stream tests

* Fix warnings in tests

* whitespace

* Fix build errors caused by super pedantic compilers

* Pass streams by pointer not non-const reference
 2016-05-27 12:34:37 -07:00
Dominic Hamon
d6bc7e1581 Merge branch 'update_complexity' of git://github.com/ismaelJimenez/benchmark into ismaelJimenez-update_complexity 2016-05-26 14:01:28 -07:00
Ismael
c1c7d33279 added benchmar_apit to complexity.cc 2016-05-26 22:39:17 +02:00
Ismael
805e8baee9 small refactor 2016-05-26 21:26:43 +02:00
Ismael
ac3ec2ded3 moved complexity.h into src and BigO enum into benchmark_api 2016-05-26 21:16:40 +02:00
Ismael
d82f0c3131 added includes 2016-05-26 20:57:27 +02:00
Ismael
37ab858e4b initialized doubles to 0.0 2016-05-26 19:44:11 +02:00
Ismael
1715885611 fixed typos 2016-05-25 23:33:25 +02:00
Ismael
340fe557e2 indent 2016-05-25 23:22:53 +02:00
Ismael
1ee11056c1 move include from .h into .cc 2016-05-25 23:13:19 +02:00
Ismael
2f61f8aee0 refactor leastsq into complexity 2016-05-25 22:57:52 +02:00
Ismael
087f0d3f1b upgraded leastsq 2016-05-25 22:26:57 +02:00
Dominic Hamon
9686f1769e Merge branch 'skip_with_error' of git://github.com/efcs/benchmark into efcs-skip_with_error 2016-05-25 09:00:31 -07:00
Eric Fiselier
84bc4d703b Add a per benchmark 'Repetitions' option. 2016-05-24 21:52:23 -06:00
Eric Fiselier
1003a70e5f Fix csv_reporter when reporting errors 2016-05-24 19:45:18 -06:00
Eric Fiselier
6f84ffcd8b fix another bad merge 2016-05-24 18:25:44 -06:00
Eric Fiselier
ee8e37c67d Fix bad merge which caused the benchmark name to be printed twice 2016-05-24 16:19:04 -06:00
Eric Fiselier
6a45324e1d Address review comments. 2016-05-24 16:12:30 -06:00
Eric Fiselier
525858e687 Fix error-handling in reporters 2016-05-24 15:44:58 -06:00
Eric Fiselier
bdeb38718e merge 2016-05-24 15:01:07 -06:00
Dominic Hamon
2440b752fd Formatting updates 2016-05-24 13:26:32 -07:00
Dominic Hamon
a86545874a Merge branch 'ismaelJimenez-complexity' 2016-05-24 13:15:55 -07:00
Dominic Hamon
f126852c8f simplify format string for complexity output 2016-05-24 13:15:16 -07:00
Dominic Hamon
31cdabf6bb Merge pull request #216 from efcs/diagnostic-checks 
Add checks that <Resume|Pause>Timing functions are not called outside of the KeepRunning() loop. Fixes #204
 2016-05-24 13:09:41 -07:00
Ismael
a24ef95e11 adapt complexity_n to leastsq inteface 2016-05-24 20:48:34 +02:00
Ismael
5e10e120db fixed overshadow 2016-05-24 20:26:21 +02:00
Ismael
e5cf020d97 fixed warning 2016-05-24 20:06:54 +02:00
Ismael
36a9ae197f added SetComplexityN 2016-05-24 19:56:49 +02:00
Eric Fiselier
9341d705a1 Change --benchmark_list_tests to respect the benchmark filter. 
This behavior mirrors how GTest handles these two flags.
 2016-05-24 00:42:11 -06:00
Eric Fiselier
e0de8171c6 Change RunSpecifiedBenchmarks to return the number of benchmarks run. Fixes #145 2016-05-23 23:35:09 -06:00
Eric Fiselier
43017f8b15 Add SkipWithError(...) function. 2016-05-23 19:24:56 -06:00
Eric Fiselier
481e06e65a Address review comments 2016-05-23 15:27:43 -06:00
Eric Fiselier
69d1a52407 Add checks that <Resume|Pause>Timing functions are not called outside of the benchmark. Fixes #204 2016-05-23 15:05:55 -06:00
Ismael
0c23d2852f extracted BigO and GetBigO in own file 2016-05-23 22:31:40 +02:00
Ismael
266b3bd635 changed color and remove iterations 2016-05-23 22:09:55 +02:00
Ismael
43ef17441c refactor names 2016-05-23 20:50:35 +02:00
Ismael
d577987fd7 changed indentation 2016-05-23 20:40:41 +02:00
Ismael
ea69a84790 fix 2016-05-23 20:34:54 +02:00
Ismael
fed9b6f211 refactor least square .h 2016-05-23 20:34:01 +02:00
Ismael
266addc3f5 fixed last_benchmark_instance 2016-05-23 20:21:34 +02:00
Ismael
ac05c04533 refactor MinimalLEastSq 2016-05-23 20:12:54 +02:00
Ismael
5e52d2d6c0 refactor fitting curve 2016-05-23 19:19:29 +02:00
Ismael
5f9823bd92 fixed non-const reference arguments 2016-05-23 18:51:29 +02:00
Ismael
290bd60289 Refactor for pull request 2016-05-21 11:51:42 +02:00
Ismael
2e5c397b48 implemented complexity reporting 2016-05-21 08:55:43 +02:00
Ismael
872ff01a49 addaptation of minimal_leastsq library 2016-05-20 16:49:39 +02:00
Ismael
b73dc22944 implemented Complexity for O(1) 2016-05-18 21:25:00 +02:00
Ismael
27f0baa190 Added test file and Complexity() interface 2016-05-18 19:59:34 +02:00
Ismael
d2103de3d3 Modified check for range multiplier 2016-05-16 18:17:11 +02:00
Ismael
c60eefdbb7 added option to change range multiplier 2016-05-14 15:56:34 +02: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
02f409a71f Only output optional fields if they're set 2016-05-02 12:04:16 -07:00
Kai Wolf
1203b3cbe4 Fix missing <tuple> header in csv/json_reporter 2016-03-30 09:14:04 +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
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
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
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
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
Eric Fiselier
f662e8be5b Rename OS_MACOSX macro to new name BENCHMARK_OS_MACOSX. Fix #169 2015-12-14 15:02:30 -07:00
ryobg
a863aead13 Fixes #159: Add inclusion of cstdio to files using stdout, vprintf, printf and etc. 2015-11-06 11:07:26 +02:00
guanqun
65cd2bac6c add static_cast to get rid of warnings for intel compiler on linux platform 2015-10-25 20:43:27 +08:00
Dominic Hamon
90e7cf000e Update macro names in comments. 2015-10-12 09:50:01 -07:00
Anton Danielsson
8c71c307ac Fixed OS macros changed in previous pull request. 2015-10-09 09:09:14 +02:00
Anton Danielsson
a2f2a28b31 Changed date format to ISO 8601. 2015-10-09 09:05:19 +02:00
Anton Danielsson
032c190c4a Removed newline. 2015-10-09 09:00:42 +02:00
Anton Danielsson
7e9800e78a Added a comment why std::vsnprintf is not used. 2015-10-09 08:47:37 +02:00
Anton Danielsson
c8f4690fd4 Sorted include of headers. 2015-10-09 08:47:36 +02:00
Anton Danielsson
0d35f5f68a Only include "sys/sysctl.h" if it is needed. 
sys/sysctl.h is not available in the android-ndk.
 2015-10-09 08:47:34 +02:00
Anton Danielsson
c1e03a4b58 Changed "std::vsnprintf" to "vsnprintf" to be able to build with the android-ndk. 2015-10-09 08:47:34 +02:00
Anton Danielsson
aecd746691 Added include of cstdlib needed for strtol, strtod and getenv. 2015-10-09 08:47:33 +02:00
Mayeul d'Avezac
da80193de9 Fixes compilation issue on Macs 
ba141ac0d9 renamed OS_MACOSX -> BENCHMARK_OS_MACOSX,
except for an include guard in src/cycleclock.h
 2015-10-08 18:35:06 +01:00
Dominic Hamon
e2327733e6 Merge pull request #150 from DiracResearch/visual-studio-warnings-fix 
Visual studio warnings fix
 2015-10-08 10:06:01 -07:00
Anton Danielsson
5cced076d2 Fixed int to char warning. 2015-10-08 10:48:40 +02:00
Anton Danielsson
fcf4e99e01 Use IsWindowsXPOrGreater instead of the deprecated GetVersionEx. 2015-10-08 10:48:34 +02:00
Anton Danielsson
e605cb0802 Changed "while(true)" to "for(;;)" to avoid warning in visual studio. 2015-10-08 10:48:32 +02:00
Anton Danielsson
2589e69e05 Fixed double to float warning. 2015-10-08 10:48:22 +02:00
Anton Danielsson
e7f6c42a79 Fixed bug in "ToExponentAndMantissa" when negative exponents where created. 
Unary minus where applied to an unsigned type.
 2015-10-08 10:48:19 +02:00
Anton Danielsson
a822c71655 Removed default constructor, copy constructor and assignment operator for CheckHandler. 2015-10-08 10:48:16 +02:00
Anton Danielsson
96ca9a7aba Fixed int64 to double cast warning. 2015-10-08 10:48:01 +02:00
Anton Danielsson
ba141ac0d9 Renamed the internal os macros to avoid a name clash in Shlwapi.h where OS_WINDOWS is defined to 0. 2015-10-08 10:47:49 +02:00
izaid
14c4ce5ebf Removed unneeded #include <cstddef> 2015-10-06 15:10:15 +01:00
Eric Fiselier
3dd14f0724 Make the type of kMaxIterations consistent with the type of the iteration count 2015-10-01 18:46:39 -06:00
Eric Fiselier
ed0a2eb741 use size_t instead of int for the iteration count 2015-10-01 15:08:44 -06:00
Eric Fiselier
bcb933a9fb dynamically allocate WallTimeImp 2015-10-01 14:53:46 -06:00
Eric Fiselier
e0441ef5d0 Merge branch 'master' into remove-check 2015-10-01 14:52:46 -06:00
Greg Miller
2463339d0b Updates Initialize() to work with an argv as 'char**' 2015-09-30 16:14:50 -04:00
Jean-Louis Leroy
11042c7fe7 Remove unused FormatKV(..., size_t) overload. 2015-09-25 09:37:03 -04:00
Jean-Louis Leroy
0f5503e9a2 Address Dominic's (stylistic) remarks. 2015-09-08 15:37:07 -04:00
Eric Fiselier
a69f566e0a Remove std::is_trivially_destructible assertion because the trait may not be provided by the STL. 2015-09-07 19:33:23 -06:00
Jean-Louis Leroy
5ec78d7d44 Do not CpuScalingEnabled on Windows. 2015-09-03 15:11:12 -04:00
Jean-Louis Leroy
cf830f731f Fix division in CPU usage calculation on Windows. 2015-09-03 15:11:11 -04:00
Jean-Louis Leroy
2cf277b6f6 Iterations declared as size_t but printf'ed as a long long. Make it a long long. 2015-09-03 15:11:10 -04:00
Jean-Louis Leroy
d49516bc99 Make it compile with Visual Studio 2013. 2015-09-03 15:11:09 -04:00
Jean-Louis Leroy
693967fe19 Remove unnecessary `typename'. 2015-09-03 15:11:08 -04:00
Kaito Udagawa
72ce39de3e Fix the compilation error against G++ on Mac OS X. 
Using `0` as a null pointer is illegal when `-Wzero-as-null-pointer-constant`
is given to G++.  To avoid the warning `zero-as-null-pointer-constant`,
`nullptr` (C++11 keyword) instead of `0` is used in the `sysctl` invocation.
 2015-06-13 19:34:20 +09:00
myd7349
9afa6c986c Fix issue #127 2015-06-05 09:25:11 +08:00
Eric Fiselier
9ed538f511 address review comments 2015-04-06 17:56:05 -04:00
Eric Fiselier
12f4405870 add ability to use benchmark filters 2015-04-06 17:00:06 -04:00
Dominic Hamon
1e0ed3a21c Rearrange the pieces 2015-04-03 13:33:54 -07:00
Geoff Romer
dcb1a3dad4 Drop down to CMake 2.8.11, and drop INTERFACE since that version doesn't 
support it.
 2015-04-03 13:30:59 -07:00
Geoff Romer
3078ce9bc5 Link pthread as an INTERFACE library. 2015-04-03 13:30:59 -07:00
Geoff Romer
89a1edae15 Require cmake 2.8.12 in order to support target_include_directories, and 
simplify thread linking logic.
 2015-04-03 13:30:59 -07:00
Geoff Romer
a6ad799a4d Configure 'benchmark' cmake target so that when other targets depend on it, 
they get the appropriate include directories and link libraries automatically.
 2015-04-03 13:30:59 -07:00
Eric Fiselier
8fcfa81d51 Fix comment about linking threading 2015-04-01 11:40:22 -04:00
Eric Fiselier
8bb991d099 Remove BENCHMARK_ENABLE_SHARED and prefer BUILD_SHARED_LIBS 2015-04-01 11:34:38 -04:00
Dominic Hamon
9934396e1f Add missing paranthesis and documentation 2015-04-01 10:51:37 -04:00
Matt Clarkson
d676c5b375 Libraries are treated as runtime objects on Windows 
When the library is created as a *.dll on Windows it is treated like a
runtime object so we must proivde the destination for the runtime
objects in our install command
 2015-04-01 10:57:08 +01:00
Dominic Hamon
25e46848f9 Clarify build type warning 2015-03-31 14:43:38 -04:00
Eric
006d23ccca Merge pull request #108 from google/list-tests 
Add --benchmark_list_tests option and change filter to match generated name.
 2015-03-31 14:16:58 -04:00
Eric Fiselier
ba1becca1a Add braces for one line conditionals and loops 2015-03-31 13:28:41 -04:00
Matt Clarkson
b2a43b491c NT definition of MyCPUUsage and ChildrenCPUUsage 
The children CPU usage doesn't seem to have a equivalent on NT systems
so it just returns zero.
 2015-03-31 10:13:10 +01:00
Matt Clarkson
05eb1f2545 Use int64_t rather than int64 
For cross platform and cross compiler portability we use the
standard integer type for a 64-bit integer. MinGW on Windows doesn't
have the definition for `int64`.
 2015-03-31 10:13:09 +01:00
Matt Clarkson
65a5ebd638 Use the WINAPI Sleep function 2015-03-31 10:13:09 +01:00
Matt Clarkson
6bc54ba028 Use CMake to link Shlwapi on Windows 
We use the SHGetValueA on Windows to retrieve the MHz of the processor
but this requires the shlwapi library. Previous to this patch the
library was linked with a MSVC specific pragma but there is no
guarantee that on Windows we will be using MSVC. Therefore, it is much
compile agnostic to use the standard CMAKE library linking mechanism
to provide the definition of SHGetValueA
 2015-03-31 10:13:08 +01:00
Matt Clarkson
dd61391c5d Only include the correct platform headers 2015-03-31 10:13:08 +01:00
Eric Fiselier
12f1c5f471 add list test internals 2015-03-30 23:32:37 -04:00
Dominic Hamon
2924aaa747 Deal with names with embedded quotes 2015-03-30 10:41:22 -07:00
Dominic Hamon
b6e4f67d75 Add csv to help output 2015-03-27 14:08:46 -07:00
Dominic Hamon
680a399a93 Add double-quotes where necessary 2015-03-27 14:07:23 -07:00
Dominic Hamon
71c41cde57 Introduce CSV reporter 2015-03-27 14:07:23 -07:00
Eric Fiselier
9ed1082c33 Merge branch 'master' into new-benchmark-interface 2015-03-27 16:36:40 -04:00
Eric Fiselier
e428b9eec3 Add 'benchmark::DoNotOptimize(...)' to help users prevent optimizations 2015-03-27 16:35:46 -04:00
Eric Fiselier
4f9ce87e8c Merge branch 'master' into new-benchmark-interface 2015-03-27 16:26:36 -04:00