Skip to content

F
folly
Commit c72b52a3 authored by Phil Willoughby's avatar Phil Willoughby Committed by Facebook Github Bot
Browse files
Options

Modernise and clang-format existing formatting benchmark 

Summary: Changes nothing fundamental, just makes it easier to work on in the future.

Reviewed By: yfeldblum

Differential Revision: D4435805

fbshipit-source-id: 725944a12922abde137bb7e21726c97beb558b5f
parent 7feeb55d
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 62 deletions
folly/test/FormatBenchmark.cpp
View file @ c72b52a3
...@@ -18,54 +18,59 @@ ...@@ -18,54 +18,59 @@
#include <glog/logging.h> #include <glog/logging.h>
#include <folly/FBVector.h>
#include <folly/Benchmark.h> #include <folly/Benchmark.h>
#include <folly/FBVector.h>
#include <folly/dynamic.h> #include <folly/dynamic.h>
#include <folly/init/Init.h>
#include <folly/json.h> #include <folly/json.h>
using namespace folly; using namespace folly;
namespace { namespace {
char bigBuf[300]; std::array<char, 300> bigBuf;
} // namespace } // namespace
BENCHMARK(octal_sprintf, iters) { BENCHMARK(octal_snprintf, iters) {
while (iters--) { while (iters--) {
sprintf(bigBuf, "%o", static_cast<unsigned int>(iters)); snprintf(
bigBuf.data(), bigBuf.size(), "%o", static_cast<unsigned int>(iters));
} }
} }
BENCHMARK_RELATIVE(octal_uintToOctal, iters) { BENCHMARK_RELATIVE(octal_uintToOctal, iters) {
while (iters--) { while (iters--) {
detail::uintToOctal(bigBuf, detail::kMaxOctalLength, detail::uintToOctal(
static_cast<unsigned int>(iters)); bigBuf.data(),
detail::kMaxOctalLength,
static_cast<unsigned int>(iters));
} }
} }
BENCHMARK_DRAW_LINE() BENCHMARK_DRAW_LINE()
BENCHMARK(hex_sprintf, iters) { BENCHMARK(hex_snprintf, iters) {
while (iters--) { while (iters--) {
sprintf(bigBuf, "%x", static_cast<unsigned int>(iters)); snprintf(
bigBuf.data(), bigBuf.size(), "%x", static_cast<unsigned int>(iters));
} }
} }
BENCHMARK_RELATIVE(hex_uintToHex, iters) { BENCHMARK_RELATIVE(hex_uintToHex, iters) {
while (iters--) { while (iters--) {
detail::uintToHexLower(bigBuf, detail::kMaxHexLength, detail::uintToHexLower(
static_cast<unsigned int>(iters)); bigBuf.data(), detail::kMaxHexLength, static_cast<unsigned int>(iters));
} }
} }
BENCHMARK_DRAW_LINE() BENCHMARK_DRAW_LINE()
BENCHMARK(intAppend_sprintf) { BENCHMARK(intAppend_snprintf) {
fbstring out; fbstring out;
for (int i = -1000; i < 1000; i++) { for (int i = -1000; i < 1000; i++) {
sprintf(bigBuf, "%d", i); snprintf(bigBuf.data(), bigBuf.size(), "%d", i);
out.append(bigBuf); out.append(bigBuf.data());
} }
} }
...@@ -85,40 +90,52 @@ BENCHMARK_RELATIVE(intAppend_format) { ...@@ -85,40 +90,52 @@ BENCHMARK_RELATIVE(intAppend_format) {
BENCHMARK_DRAW_LINE() BENCHMARK_DRAW_LINE()
BENCHMARK(bigFormat_sprintf, iters) { template <size_t... Indexes>
int snprintf20Numbers(int i, std::index_sequence<Indexes...>) {
static_assert(20 == sizeof...(Indexes), "Must have exactly 20 indexes");
return snprintf(
bigBuf.data(),
bigBuf.size(),
"%d %d %d %d %d"
"%d %d %d %d %d"
"%d %d %d %d %d"
"%d %d %d %d %d",
(i + static_cast<int>(Indexes))...);
}
BENCHMARK(bigFormat_snprintf, iters) {
while (iters--) { while (iters--) {
for (int i = -100; i < 100; i++) { for (int i = -100; i < 100; i++) {
sprintf(bigBuf, snprintf20Numbers(i, std::make_index_sequence<20>());
"%d %d %d %d %d"
"%d %d %d %d %d"
"%d %d %d %d %d"
"%d %d %d %d %d",
i, i+1, i+2, i+3, i+4,
i+5, i+6, i+7, i+8, i+9,
i+10, i+11, i+12, i+13, i+14,
i+15, i+16, i+17, i+18, i+19);
} }
} }
} }
template <size_t... Indexes>
decltype(auto) format20Numbers(int i, std::index_sequence<Indexes...>) {
static_assert(20 == sizeof...(Indexes), "Must have exactly 20 indexes");
return format(
"{} {} {} {} {}"
"{} {} {} {} {}"
"{} {} {} {} {}"
"{} {} {} {} {}",
(i + static_cast<int>(Indexes))...);
}
BENCHMARK_RELATIVE(bigFormat_format, iters) { BENCHMARK_RELATIVE(bigFormat_format, iters) {
BenchmarkSuspender suspender;
char* p; char* p;
auto writeToBuf = [&p] (StringPiece sp) mutable { auto writeToBuf = [&p](StringPiece sp) mutable {
memcpy(p, sp.data(), sp.size()); memcpy(p, sp.data(), sp.size());
p += sp.size(); p += sp.size();
}; };
while (iters--) { while (iters--) {
for (int i = -100; i < 100; i++) { for (int i = -100; i < 100; i++) {
p = bigBuf; p = bigBuf.data();
format("{} {} {} {} {}" suspender.dismissing([&] {
"{} {} {} {} {}" format20Numbers(i, std::make_index_sequence<20>())(writeToBuf);
"{} {} {} {} {}" });
"{} {} {} {} {}",
i, i+1, i+2, i+3, i+4,
i+5, i+6, i+7, i+8, i+9,
i+10, i+11, i+12, i+13, i+14,
i+15, i+16, i+17, i+18, i+19)(writeToBuf);
} }
} }
} }
...@@ -126,62 +143,78 @@ BENCHMARK_RELATIVE(bigFormat_format, iters) { ...@@ -126,62 +143,78 @@ BENCHMARK_RELATIVE(bigFormat_format, iters) {
BENCHMARK_DRAW_LINE() BENCHMARK_DRAW_LINE()
BENCHMARK(format_nested_strings, iters) { BENCHMARK(format_nested_strings, iters) {
BenchmarkSuspender suspender;
while (iters--) { while (iters--) {
fbstring out;
for (int i = 0; i < 1000; ++i) { for (int i = 0; i < 1000; ++i) {
out.clear(); fbstring out;
format(&out, "{} {}", suspender.dismissing([&]() {
format("{} {}", i, i + 1).str(), format(
format("{} {}", -i, -i - 1).str()); &out,
"{} {}",
format("{} {}", i, i + 1).str(),
format("{} {}", -i, -i - 1).str());
});
} }
} }
} }
BENCHMARK_RELATIVE(format_nested_fbstrings, iters) { BENCHMARK_RELATIVE(format_nested_fbstrings, iters) {
BenchmarkSuspender suspender;
while (iters--) { while (iters--) {
fbstring out;
for (int i = 0; i < 1000; ++i) { for (int i = 0; i < 1000; ++i) {
out.clear(); fbstring out;
format(&out, "{} {}", suspender.dismissing([&] {
format("{} {}", i, i + 1).fbstr(), format(
format("{} {}", -i, -i - 1).fbstr()); &out,
"{} {}",
format("{} {}", i, i + 1).fbstr(),
format("{} {}", -i, -i - 1).fbstr());
});
} }
} }
} }
BENCHMARK_RELATIVE(format_nested_direct, iters) { BENCHMARK_RELATIVE(format_nested_direct, iters) {
BenchmarkSuspender suspender;
while (iters--) { while (iters--) {
fbstring out;
for (int i = 0; i < 1000; ++i) { for (int i = 0; i < 1000; ++i) {
out.clear(); fbstring out;
format(&out, "{} {}", suspender.dismissing([&] {
format("{} {}", i, i + 1), format(
format("{} {}", -i, -i - 1)); &out,
"{} {}",
format("{} {}", i, i + 1),
format("{} {}", -i, -i - 1));
});
} }
} }
} }
// Benchmark results on my dev server (dual-CPU Xeon L5520 @ 2.7GHz) // Benchmark results on my dev server (20-core Intel Xeon E5-2660 v2 @ 2.20GHz)
// //
// ============================================================================ // ============================================================================
// folly/test/FormatTest.cpp relative ns/iter iters/s // folly/test/FormatBenchmark.cpp relative time/iter iters/s
// ============================================================================ // ============================================================================
// octal_sprintf 100.57 9.94M // octal_snprintf 79.30ns 12.61M
// octal_uintToOctal 2599.47% 3.87 258.46M // octal_uintToOctal 3452.19% 2.30ns 435.35M
// ----------------------------------------------------------------------------
// hex_snprintf 73.59ns 13.59M
// hex_uintToHex 4507.53% 1.63ns 612.49M
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// hex_sprintf 100.13 9.99M // intAppend_snprintf 191.50us 5.22K
// hex_uintToHex 3331.75% 3.01 332.73M // intAppend_to 552.46% 34.66us 28.85K
// intAppend_format 215.76% 88.76us 11.27K
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// intAppend_sprintf 406.07K 2.46K // bigFormat_snprintf 178.03us 5.62K
// intAppend_to 166.03% 244.58K 4.09K // bigFormat_format 90.41% 196.91us 5.08K
// intAppend_format 147.57% 275.17K 3.63K
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// bigFormat_sprintf 255.40K 3.92K // format_nested_strings 317.65us 3.15K
// bigFormat_format 102.18% 249.94K 4.00K // format_nested_fbstrings 99.89% 318.01us 3.14K
// format_nested_direct 116.52% 272.62us 3.67K
// ============================================================================ // ============================================================================
int main(int argc, char *argv[]) { int main(int argc, char* argv[]) {
gflags::ParseCommandLineFlags(&argc, &argv, true); init(&argc, &argv, true);
runBenchmarks(); runBenchmarks();
return 0; return 0;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment