2017-03-02 00:23:42 +00:00
|
|
|
// Copyright 2015 Google Inc. All rights reserved.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
#include "counter.h"
|
|
|
|
|
|
|
|
namespace benchmark {
|
|
|
|
namespace internal {
|
|
|
|
|
Iteration counts should be `uint64_t` globally. (#817)
This is a shameless rip-off of https://github.com/google/benchmark/pull/646
I did promise to look into why that proposed PR was producing
so much worse assembly, and so i finally did.
The reason is - that diff changes `size_t` (unsigned) to `int64_t` (signed).
There is this nice little `assert`:
https://github.com/google/benchmark/blob/7a1c37028359ca9d386d719a6ad527743cf1b753/include/benchmark/benchmark.h#L744
It ensures that we didn't magically decide to advance our iterator
when we should have finished benchmarking.
When `cached_` was unsigned, the `assert` was `cached_ UGT 0`.
But we only ever get to that `assert` if `cached_ NE 0`,
and naturally if `cached_` is not `0`, then it is bigger than `0`,
so the `assert` is tautological, and gets folded away.
But now that `cached_` became signed, the assert became `cached_ SGT 0`.
And we still only know that `cached_ NE 0`, so the assert can't be
optimized out, or at least it doesn't currently.
Regardless of whether or not that is a bug in itself,
that particular diff would have regressed the normal 64-bit systems,
by halving the maximal iteration space (since we go from unsigned counter
to signed one, of the same bit-width), which seems like a bug.
And just so it happens, fixing *this* bug, fixes the other bug.
This produces fully (bit-by-bit) identical state_assembly_test.s
The filecheck change is actually needed regardless of this patch,
else this test does not pass for me even without this diff.
2019-05-13 09:33:11 +00:00
|
|
|
double Finish(Counter const& c, IterationCount iterations, double cpu_time,
|
2018-06-27 14:45:30 +00:00
|
|
|
double num_threads) {
|
2017-03-02 00:23:42 +00:00
|
|
|
double v = c.value;
|
|
|
|
if (c.flags & Counter::kIsRate) {
|
|
|
|
v /= cpu_time;
|
|
|
|
}
|
|
|
|
if (c.flags & Counter::kAvgThreads) {
|
|
|
|
v /= num_threads;
|
|
|
|
}
|
2018-06-27 14:45:30 +00:00
|
|
|
if (c.flags & Counter::kIsIterationInvariant) {
|
|
|
|
v *= iterations;
|
|
|
|
}
|
|
|
|
if (c.flags & Counter::kAvgIterations) {
|
|
|
|
v /= iterations;
|
|
|
|
}
|
2019-08-12 14:47:46 +00:00
|
|
|
|
|
|
|
if (c.flags & Counter::kInvert) { // Invert is *always* last.
|
|
|
|
v = 1.0 / v;
|
|
|
|
}
|
2017-03-02 00:23:42 +00:00
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
Iteration counts should be `uint64_t` globally. (#817)
This is a shameless rip-off of https://github.com/google/benchmark/pull/646
I did promise to look into why that proposed PR was producing
so much worse assembly, and so i finally did.
The reason is - that diff changes `size_t` (unsigned) to `int64_t` (signed).
There is this nice little `assert`:
https://github.com/google/benchmark/blob/7a1c37028359ca9d386d719a6ad527743cf1b753/include/benchmark/benchmark.h#L744
It ensures that we didn't magically decide to advance our iterator
when we should have finished benchmarking.
When `cached_` was unsigned, the `assert` was `cached_ UGT 0`.
But we only ever get to that `assert` if `cached_ NE 0`,
and naturally if `cached_` is not `0`, then it is bigger than `0`,
so the `assert` is tautological, and gets folded away.
But now that `cached_` became signed, the assert became `cached_ SGT 0`.
And we still only know that `cached_ NE 0`, so the assert can't be
optimized out, or at least it doesn't currently.
Regardless of whether or not that is a bug in itself,
that particular diff would have regressed the normal 64-bit systems,
by halving the maximal iteration space (since we go from unsigned counter
to signed one, of the same bit-width), which seems like a bug.
And just so it happens, fixing *this* bug, fixes the other bug.
This produces fully (bit-by-bit) identical state_assembly_test.s
The filecheck change is actually needed regardless of this patch,
else this test does not pass for me even without this diff.
2019-05-13 09:33:11 +00:00
|
|
|
void Finish(UserCounters* l, IterationCount iterations, double cpu_time,
|
|
|
|
double num_threads) {
|
2018-06-01 10:14:19 +00:00
|
|
|
for (auto& c : *l) {
|
2018-06-27 14:45:30 +00:00
|
|
|
c.second.value = Finish(c.second, iterations, cpu_time, num_threads);
|
2017-03-02 00:23:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-06-01 10:14:19 +00:00
|
|
|
void Increment(UserCounters* l, UserCounters const& r) {
|
2017-03-02 00:23:42 +00:00
|
|
|
// add counters present in both or just in *l
|
2018-06-01 10:14:19 +00:00
|
|
|
for (auto& c : *l) {
|
2017-03-02 00:23:42 +00:00
|
|
|
auto it = r.find(c.first);
|
|
|
|
if (it != r.end()) {
|
2017-04-27 15:56:43 +00:00
|
|
|
c.second.value = c.second + it->second;
|
2017-03-02 00:23:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// add counters present in r, but not in *l
|
2018-06-01 10:14:19 +00:00
|
|
|
for (auto const& tc : r) {
|
2017-03-02 00:23:42 +00:00
|
|
|
auto it = l->find(tc.first);
|
|
|
|
if (it == l->end()) {
|
|
|
|
(*l)[tc.first] = tc.second;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-02 00:50:19 +00:00
|
|
|
bool SameNames(UserCounters const& l, UserCounters const& r) {
|
2017-03-02 00:23:42 +00:00
|
|
|
if (&l == &r) return true;
|
|
|
|
if (l.size() != r.size()) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
for (auto const& c : l) {
|
2017-03-02 02:55:36 +00:00
|
|
|
if (r.find(c.first) == r.end()) {
|
2017-03-02 00:23:42 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2018-06-01 10:14:19 +00:00
|
|
|
} // end namespace internal
|
|
|
|
} // end namespace benchmark
|