fix naming

Author: vidsinghal

benchrunner/cxx/benchmarks.h

@@ -18,9 +18,9 @@ template <typename T> void copyArray(T *b, T* a, int n);
 
 // Relating to C++ templatized versions
 extern "C" {
-extern int64_t *bottom_up_merge_sort_cxx_int(int64_t *pbase, size_t total_elems);
-extern int64_t *insertionsort_cxx_int(int64_t *pbase, size_t total_elems);
-extern int64_t *quicksort_cxx_int(int64_t *pbase, size_t total_elems);
+    extern int64_t *bottom_up_merge_sort_cxx_int(int64_t *pbase, size_t total_elems);
+    extern int64_t *insertionsort_cxx_int(int64_t *pbase, size_t total_elems);
+    extern int64_t *quicksort_cxx_int(int64_t *pbase, size_t total_elems);
 }
 
 // Microbenchmarks.

benchrunner/cxx/helpers.h

@@ -26,7 +26,7 @@ int64_t* __attribute__ ((noinline)) fill_array_rand_seq(size_t total_elems)
     return (int64_t *) nums;
 }
 
-static inline void slice_assert_sorted_2(int64_t *arr, int size)
+static inline void slice_assert_sorted(int64_t *arr, int size)
 {
     size_t len = size;
     int64_t a, b;

benchrunner/cxx/main.cpp

@@ -21,7 +21,7 @@ int main(int argc, char *argv[]) {
         printf("itertime: %lf\n", elapsed_seconds.count());
     }
 
-    slice_assert_sorted_2(out, arr_size);
+    slice_assert_sorted(out, arr_size);
 
     std::cout << std::endl;
     std::cout << "Benchmarking quicksort inplace: " << std::endl;
@@ -34,7 +34,7 @@ int main(int argc, char *argv[]) {
         printf("itertime: %lf\n", elapsed_seconds.count());
     }
 
-    slice_assert_sorted_2(out, arr_size);
+    slice_assert_sorted(out, arr_size);
 
     std::cout << std::endl;
     std::cout << "Benchmarking mergesort sequential: " << std::endl;
@@ -49,7 +49,7 @@ int main(int argc, char *argv[]) {
         printf("itertime: %lf\n", elapsed_seconds.count());
     }
 
-    slice_assert_sorted_2(out, arr_size);
+    slice_assert_sorted(out, arr_size);
 
     return 0;
 }

benchrunner/cxx/quicksort.cpp

@@ -12,7 +12,7 @@ T *quicksort_inplace(T *_a, size_t n){
 }
 
 template<typename T>
-static inline void SWAP2(T *a, int i, int j)
+static inline void SWAP(T *a, int i, int j)
 {
     T _tmp = a[i];
     a[i] = a[j];
@@ -27,16 +27,16 @@ inline void quicksort_inplace_helper(T *_a, size_t n)
     int pi, pj, pn;
     if (n <= 1) return;
     pi = (rand() % n);
-    SWAP2(a, 0, pi);
+    SWAP(a, 0, pi);
     pi = 0;
     pj = pn = n;
     for (;;) {
         do {pi++;} while (pi < pn && a[pi] < a[0]);
         do {pj--;} while (a[pj] > a[0]);
         if (pj < pi) break;
-        SWAP2(a, pi, pj);
+        SWAP(a, pi, pj);
     }
-    SWAP2(a, 0, pj);
+    SWAP(a, 0, pj);
     j = pj;
     quicksort_inplace_helper(a, j);
     quicksort_inplace_helper(&a[j+1], n-j-1);