Commit bc4bb891 authored by Xiao Shi's avatar Xiao Shi Committed by Facebook Github Bot

EASY: clang-format fbvector benchmark

Summary: format changes, purely generated by clang-format.

Differential Revision: D7035579

fbshipit-source-id: 8452e1613adefe7dcfbbed4a3ef97be681790416
parent b25dd31a
...@@ -48,8 +48,8 @@ template <class String> ...@@ -48,8 +48,8 @@ template <class String>
void randomString(String* toFill, unsigned int maxSize = 1000) { void randomString(String* toFill, unsigned int maxSize = 1000) {
assert(toFill); assert(toFill);
toFill->resize(random(0, maxSize)); toFill->resize(random(0, maxSize));
FOR_EACH (i, *toFill) { for (auto& c : *toFill) {
*i = random('a', 'z'); c = random('a', 'z');
} }
} }
...@@ -69,13 +69,16 @@ std::list<char> RandomList(unsigned int maxSize) { ...@@ -69,13 +69,16 @@ std::list<char> RandomList(unsigned int maxSize) {
return lst; return lst;
} }
template <class T> T randomObject(); template <class T>
T randomObject();
template <> int randomObject<int>() { template <>
int randomObject<int>() {
return random(0, 1024); return random(0, 1024);
} }
template <> folly::fbstring randomObject<folly::fbstring>() { template <>
folly::fbstring randomObject<folly::fbstring>() {
folly::fbstring result; folly::fbstring result;
randomString(&result); randomString(&result);
return result; return result;
......
...@@ -31,9 +31,7 @@ TESTFUN(clause_23_3_6_1_3) { ...@@ -31,9 +31,7 @@ TESTFUN(clause_23_3_6_1_3) {
auto const n = random(0U, 10000U); auto const n = random(0U, 10000U);
VECTOR v(n); VECTOR v(n);
EXPECT_EQ(v.size(), n); EXPECT_EQ(v.size(), n);
FOR_EACH (i, v) { FOR_EACH (i, v) { EXPECT_EQ(*i, VECTOR::value_type()); }
EXPECT_EQ(*i, VECTOR::value_type());
}
} }
TESTFUN(clause_23_3_6_1_9) { TESTFUN(clause_23_3_6_1_9) {
...@@ -87,9 +85,7 @@ TESTFUN(clause_23_3_6_1_12) { ...@@ -87,9 +85,7 @@ TESTFUN(clause_23_3_6_1_12) {
auto const obj = randomObject<VECTOR::value_type>(); auto const obj = randomObject<VECTOR::value_type>();
v.assign(n, obj); v.assign(n, obj);
EXPECT_EQ(v.size(), n); EXPECT_EQ(v.size(), n);
FOR_EACH (i, v) { FOR_EACH (i, v) { EXPECT_EQ(*i, obj); }
EXPECT_EQ(*i, obj);
}
} }
TESTFUN(clause_23_3_6_2_1) { TESTFUN(clause_23_3_6_2_1) {
...@@ -108,24 +104,16 @@ TESTFUN(clause_23_3_6_2_7) { ...@@ -108,24 +104,16 @@ TESTFUN(clause_23_3_6_2_7) {
v1.swap(v2); v1.swap(v2);
EXPECT_EQ(v1.size(), n2); EXPECT_EQ(v1.size(), n2);
EXPECT_EQ(v2.size(), n1); EXPECT_EQ(v2.size(), n1);
FOR_EACH (i, v1) { FOR_EACH (i, v1) { EXPECT_EQ(*i, obj2); }
EXPECT_EQ(*i, obj2); FOR_EACH (i, v2) { EXPECT_EQ(*i, obj1); }
}
FOR_EACH (i, v2) {
EXPECT_EQ(*i, obj1);
}
} }
TESTFUN(clause_23_3_6_2_9) { TESTFUN(clause_23_3_6_2_9) {
VECTOR v; VECTOR v;
auto const n1 = random(0U, 10000U); auto const n1 = random(0U, 10000U);
v.resize(n1); v.resize(n1);
FOR_EACH (i, v) { FOR_EACH (i, v) { EXPECT_EQ(*i, VECTOR::value_type()); }
EXPECT_EQ(*i, VECTOR::value_type()); FOR_EACH (i, v) { EXPECT_EQ(*i, VECTOR::value_type()); }
}
FOR_EACH (i, v) {
EXPECT_EQ(*i, VECTOR::value_type());
}
} }
TESTFUN(clause_23_3_6_2_11) { TESTFUN(clause_23_3_6_2_11) {
...@@ -133,16 +121,12 @@ TESTFUN(clause_23_3_6_2_11) { ...@@ -133,16 +121,12 @@ TESTFUN(clause_23_3_6_2_11) {
auto const n1 = random(0U, 10000U); auto const n1 = random(0U, 10000U);
auto const obj1 = randomObject<VECTOR::value_type>(); auto const obj1 = randomObject<VECTOR::value_type>();
v.resize(n1, obj1); v.resize(n1, obj1);
FOR_EACH (i, v) { FOR_EACH (i, v) { EXPECT_EQ(*i, obj1); }
EXPECT_EQ(*i, obj1);
}
auto const n2 = random(0U, 10000U); auto const n2 = random(0U, 10000U);
auto const obj2 = randomObject<VECTOR::value_type>(); auto const obj2 = randomObject<VECTOR::value_type>();
v.resize(n2, obj2); v.resize(n2, obj2);
if (n1 < n2) { if (n1 < n2) {
FOR_EACH_RANGE (i, n1, n2) { FOR_EACH_RANGE (i, n1, n2) { EXPECT_EQ(v[i], obj2); }
EXPECT_EQ(v[i], obj2);
}
} }
} }
...@@ -188,12 +172,8 @@ TESTFUN(clause_23_3_6_4_1_a) { ...@@ -188,12 +172,8 @@ TESTFUN(clause_23_3_6_4_1_a) {
EXPECT_EQ(v.size(), w.size() + 1); EXPECT_EQ(v.size(), w.size() + 1);
EXPECT_EQ(r - v.begin(), n2); EXPECT_EQ(r - v.begin(), n2);
EXPECT_EQ(*r, obj2); EXPECT_EQ(*r, obj2);
FOR_EACH_RANGE (i, 0, r - v.begin()) { FOR_EACH_RANGE (i, 0, r - v.begin()) { EXPECT_EQ(v[i], w[i]); }
EXPECT_EQ(v[i], w[i]); FOR_EACH_RANGE (i, r - v.begin() + 1, v.size()) { EXPECT_EQ(v[i], w[i - 1]); }
}
FOR_EACH_RANGE (i, r - v.begin() + 1, v.size()) {
EXPECT_EQ(v[i], w[i - 1]);
}
} }
TESTFUN(clause_23_3_6_4_1_c) { TESTFUN(clause_23_3_6_4_1_c) {
...@@ -205,7 +185,7 @@ TESTFUN(clause_23_3_6_4_1_c) { ...@@ -205,7 +185,7 @@ TESTFUN(clause_23_3_6_4_1_c) {
v.push_back(obj1); v.push_back(obj1);
w.push_back(obj1); w.push_back(obj1);
} }
auto const n2 = random(0U, n1-1); auto const n2 = random(0U, n1 - 1);
auto pos = v.begin() + n2; auto pos = v.begin() + n2;
auto const obj2 = randomObject<VECTOR::value_type>(); auto const obj2 = randomObject<VECTOR::value_type>();
auto const n3 = random(0U, 10000U); auto const n3 = random(0U, 10000U);
...@@ -214,9 +194,7 @@ TESTFUN(clause_23_3_6_4_1_c) { ...@@ -214,9 +194,7 @@ TESTFUN(clause_23_3_6_4_1_c) {
EXPECT_EQ(v.size(), w.size() + n3); EXPECT_EQ(v.size(), w.size() + n3);
EXPECT_EQ(r - v.begin(), n2); EXPECT_EQ(r - v.begin(), n2);
FOR_EACH_RANGE (i, 0, r - v.begin()) { FOR_EACH_RANGE (i, 0, r - v.begin()) { EXPECT_EQ(v[i], w[i]); }
EXPECT_EQ(v[i], w[i]);
}
FOR_EACH_RANGE (i, r - v.begin(), r - v.begin() + n3) { FOR_EACH_RANGE (i, r - v.begin(), r - v.begin() + n3) {
EXPECT_EQ(v[i], obj2); EXPECT_EQ(v[i], obj2);
} }
...@@ -240,9 +218,7 @@ TESTFUN(clause_23_3_6_4_1_d) { ...@@ -240,9 +218,7 @@ TESTFUN(clause_23_3_6_4_1_d) {
EXPECT_EQ(v.back(), obj2); EXPECT_EQ(v.back(), obj2);
EXPECT_EQ(v.size(), w.size() + 1); EXPECT_EQ(v.size(), w.size() + 1);
FOR_EACH_RANGE (i, 0, w.size()) { FOR_EACH_RANGE (i, 0, w.size()) { EXPECT_EQ(v[i], w[i]); }
EXPECT_EQ(v[i], w[i]);
}
} }
TESTFUN(clause_23_3_6_4_3) { TESTFUN(clause_23_3_6_4_3) {
...@@ -259,13 +235,9 @@ TESTFUN(clause_23_3_6_4_3) { ...@@ -259,13 +235,9 @@ TESTFUN(clause_23_3_6_4_3) {
auto it = v.erase(v.begin() + n2); auto it = v.erase(v.begin() + n2);
EXPECT_EQ(v.size() + 1, w.size()); EXPECT_EQ(v.size() + 1, w.size());
FOR_EACH_RANGE (i, 0, it - v.begin()) { FOR_EACH_RANGE (i, 0, it - v.begin()) { EXPECT_EQ(v[i], w[i]); }
EXPECT_EQ(v[i], w[i]);
}
FOR_EACH_RANGE (i, it - v.begin(), v.size()) { FOR_EACH_RANGE (i, it - v.begin(), v.size()) { EXPECT_EQ(v[i], w[i + 1]); }
EXPECT_EQ(v[i], w[i + 1]);
}
} }
TESTFUN(clause_23_3_6_4_4) { TESTFUN(clause_23_3_6_4_4) {
...@@ -283,9 +255,7 @@ TESTFUN(clause_23_3_6_4_4) { ...@@ -283,9 +255,7 @@ TESTFUN(clause_23_3_6_4_4) {
auto it = v.erase(v.begin() + n2, v.begin() + n3); auto it = v.erase(v.begin() + n2, v.begin() + n3);
EXPECT_EQ(v.size() + (n3 - n2), w.size()); EXPECT_EQ(v.size() + (n3 - n2), w.size());
FOR_EACH_RANGE (i, 0, it - v.begin()) { FOR_EACH_RANGE (i, 0, it - v.begin()) { EXPECT_EQ(v[i], w[i]); }
EXPECT_EQ(v[i], w[i]);
}
FOR_EACH_RANGE (i, it - v.begin(), v.size()) { FOR_EACH_RANGE (i, it - v.begin(), v.size()) {
EXPECT_EQ(v[i], w[i + (n3 - n2)]); EXPECT_EQ(v[i], w[i + (n3 - n2)]);
...@@ -304,7 +274,7 @@ TESTFUN(clause_23_3_6_4_clear) { ...@@ -304,7 +274,7 @@ TESTFUN(clause_23_3_6_4_clear) {
} }
BENCHMARK(BENCHFUN(zzInitRNG)) { BENCHMARK(BENCHFUN(zzInitRNG)) {
//LOG(INFO) << "\nTesting with type " << typeid(VECTOR).name() << "\n"; // LOG(INFO) << "\nTesting with type " << typeid(VECTOR).name() << "\n";
srand(seed); srand(seed);
} }
...@@ -339,9 +309,7 @@ void BENCHFUN(pushBack)(int iters, int size) { ...@@ -339,9 +309,7 @@ void BENCHFUN(pushBack)(int iters, int size) {
auto const obj = randomObject<VECTOR::value_type>(); auto const obj = randomObject<VECTOR::value_type>();
FOR_EACH_RANGE (i, 0, iters) { FOR_EACH_RANGE (i, 0, iters) {
VECTOR v; VECTOR v;
FOR_EACH_RANGE (j, 0, size) { FOR_EACH_RANGE (j, 0, size) { v.push_back(obj); }
v.push_back(obj);
}
} }
} }
BENCHMARK_PARAM(BENCHFUN(pushBack), 128); BENCHMARK_PARAM(BENCHFUN(pushBack), 128);
...@@ -353,9 +321,7 @@ BENCHMARK_PARAM(BENCHFUN(pushBack), 512000); ...@@ -353,9 +321,7 @@ BENCHMARK_PARAM(BENCHFUN(pushBack), 512000);
void BENCHFUN(reserve)(int iters, int /* size */) { void BENCHFUN(reserve)(int iters, int /* size */) {
auto const obj = randomObject<VECTOR::value_type>(); auto const obj = randomObject<VECTOR::value_type>();
VECTOR v(random(0U, 10000U), obj); VECTOR v(random(0U, 10000U), obj);
FOR_EACH_RANGE (i, 0, iters) { FOR_EACH_RANGE (i, 0, iters) { v.reserve(random(0U, 100000U)); }
v.reserve(random(0U, 100000U));
}
} }
BENCHMARK_PARAM(BENCHFUN(reserve), 128); BENCHMARK_PARAM(BENCHFUN(reserve), 128);
BENCHMARK_PARAM(BENCHFUN(reserve), 1024); BENCHMARK_PARAM(BENCHFUN(reserve), 1024);
...@@ -365,9 +331,7 @@ void BENCHFUN(insert)(int iters, int /* size */) { ...@@ -365,9 +331,7 @@ void BENCHFUN(insert)(int iters, int /* size */) {
auto const obj1 = randomObject<VECTOR::value_type>(); auto const obj1 = randomObject<VECTOR::value_type>();
auto const obj2 = randomObject<VECTOR::value_type>(); auto const obj2 = randomObject<VECTOR::value_type>();
VECTOR v(random(0U, 1U), obj1); VECTOR v(random(0U, 1U), obj1);
FOR_EACH_RANGE (i, 0, iters / 100) { FOR_EACH_RANGE (i, 0, iters / 100) { v.insert(v.begin(), obj2); }
v.insert(v.begin(), obj2);
}
} }
BENCHMARK_PARAM(BENCHFUN(insert), 100); BENCHMARK_PARAM(BENCHFUN(insert), 100);
......
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