Refactored vector bench. Better output , more robust benchmarking (cloberring, minimal timing).

Author: igaztanaga

bench/bench_deque.cpp

@@ -21,12 +21,13 @@
 #include "bench_vector_common.hpp"
 
 template<class IntType, class Operation>
-void run_containers(unsigned numit, unsigned numele, bool bp)
+void run_containers(runner<IntType, Operation>& r)
 {
-   vector_test_template< std::deque<IntType, std::allocator<IntType> >, Operation >(numit, numele, "std::deque     ", bp);
-   vector_test_template< bc::deque<IntType, std::allocator<IntType> >,  Operation >(numit, numele, "deque          ", bp);
-   vector_test_template< bc::deque<IntType, std::allocator<IntType>,
-      typename bc::deque_options<bc::reservable<true> >::type        >, Operation >(numit, numele, "deque(reserv)  ", bp);
+   //First registered container is the baseline (denominator).
+   r.template add< std::deque<IntType, std::allocator<IntType> > >("std::deque");
+   r.template add< bc::deque<IntType, std::allocator<IntType> >  >("deque");
+   r.template add< bc::deque<IntType, std::allocator<IntType>,
+      typename bc::deque_options<bc::reservable<true> >::type>   >("deque(resv)");
 }
 
 int main()

bench/bench_devector.cpp

@@ -21,11 +21,12 @@
 #include "bench_vector_common.hpp"
 
 template<class IntType, class Operation>
-void run_containers(unsigned numit, unsigned numele, bool bp)
+void run_containers(runner<IntType, Operation>& r)
 {
-   vector_test_template< bc::devector<IntType, std::allocator<IntType> >, Operation >(numit, numele, "devector       ", bp);
-   vector_test_template< bc::deque<IntType, std::allocator<IntType> >,    Operation >(numit, numele, "deque          ", bp);
-   vector_test_template< bc::vector<IntType, std::allocator<IntType> >,   Operation >(numit, numele, "vector         ", bp);
+   //First registered container is the baseline (denominator).
+   r.template add< bc::vector<IntType, std::allocator<IntType> >   >("vector");
+   r.template add< bc::deque<IntType, std::allocator<IntType> >    >("deque");
+   r.template add< bc::devector<IntType, std::allocator<IntType> > >("devector");
 }
 
 int main()

bench/bench_segtor.cpp

@@ -21,14 +21,15 @@
 #include "bench_vector_common.hpp"
 
 template<class IntType, class Operation>
-void run_containers(unsigned numit, unsigned numele, bool bp)
+void run_containers(runner<IntType, Operation>& r)
 {
-   vector_test_template< bc::deque<IntType, std::allocator<IntType> >,  Operation >(numit, numele, "deque          ", bp);
-   vector_test_template< bc::deque<IntType, std::allocator<IntType>,
-      typename bc::deque_options<bc::reservable<true> >::type        >, Operation >(numit, numele, "deque(reserv)  ", bp);
-   vector_test_template< bc::segtor<IntType, std::allocator<IntType> >, Operation >(numit, numele, "segtor         ", bp);
-   vector_test_template< bc::segtor<IntType, std::allocator<IntType>,
-      typename bc::segtor_options<bc::reservable<true> >::type        >, Operation >(numit, numele, "segtor(reserv) ", bp);
+   //First registered container is the baseline (denominator).
+   r.template add< bc::deque<IntType, std::allocator<IntType> >   >("deque");
+   r.template add< bc::deque<IntType, std::allocator<IntType>,
+      typename bc::deque_options<bc::reservable<true> >::type>    >("deque(resv)");
+   r.template add< bc::segtor<IntType, std::allocator<IntType> >  >("segtor");
+   r.template add< bc::segtor<IntType, std::allocator<IntType>,
+      typename bc::segtor_options<bc::reservable<true> >::type>   >("segtor(resv)");
 }
 
 int main()

bench/bench_small_vector.cpp

@@ -21,11 +21,12 @@
 #include "bench_vector_common.hpp"
 
 template<class IntType, class Operation>
-void run_containers(unsigned numit, unsigned numele, bool bp)
+void run_containers(runner<IntType, Operation>& r)
 {
-   vector_test_template< bc::small_vector<IntType, 0, std::allocator<IntType> >, Operation >(numit, numele, "small_vector   ", bp);
-   vector_test_template< std::vector<IntType, std::allocator<IntType> >,         Operation >(numit, numele, "std::vector    ", bp);
-   vector_test_template< bc::vector<IntType, std::allocator<IntType> >,          Operation >(numit, numele, "vector         ", bp);
+   //First registered container is the baseline (denominator).
+   r.template add< std::vector<IntType, std::allocator<IntType> >        >("std::vector");
+   r.template add< bc::vector<IntType, std::allocator<IntType> >         >("vector");
+   r.template add< bc::small_vector<IntType, 0, std::allocator<IntType> > >("small_vector");
 }
 
 int main()

bench/bench_static_vector.cpp

@@ -21,13 +21,14 @@
 #include "bench_vector_common.hpp"
 
 template<class IntType, class Operation>
-void run_containers(unsigned numit, unsigned numele, bool bp)
+void run_containers(runner<IntType, Operation>& r)
 {
+   //First registered container is the baseline (denominator).
+   r.template add< std::vector<IntType, std::allocator<IntType> > >("std::vector");
+   r.template add< bc::vector<IntType, std::allocator<IntType> >  >("vector");
    //static_vector has a fixed capacity, so it must be sized for the largest
    //element count exercised by the harness.
-   vector_test_template< bc::static_vector<IntType, bench_max_numele>,  Operation >(numit, numele, "static_vector  ", bp);
-   vector_test_template< std::vector<IntType, std::allocator<IntType> >, Operation >(numit, numele, "std::vector    ", bp);
-   vector_test_template< bc::vector<IntType, std::allocator<IntType> >,  Operation >(numit, numele, "vector         ", bp);
+   r.template add< bc::static_vector<IntType, bench_max_numele>   >("static_vector");
 }
 
 int main()

bench/bench_vector.cpp

@@ -19,10 +19,11 @@
 #include "bench_vector_common.hpp"
 
 template<class IntType, class Operation>
-void run_containers(unsigned numit, unsigned numele, bool bp)
+void run_containers(runner<IntType, Operation>& r)
 {
-   vector_test_template< std::vector<IntType, std::allocator<IntType> >, Operation >(numit, numele, "std::vector    ", bp);
-   vector_test_template< bc::vector<IntType, std::allocator<IntType> >,  Operation >(numit, numele, "vector         ", bp);
+   //First registered container is the baseline (denominator).
+   r.template add< std::vector<IntType, std::allocator<IntType> > >("std::vector");
+   r.template add< bc::vector<IntType, std::allocator<IntType> >  >("vector");
 }
 
 int main()