Fix benchmark names.

Author: jenskeiner

benchmarks/bench_nfft_direct.cpp

@@ -28,9 +28,9 @@
 #include "util.h"
 
 #ifdef _OPENMP
-  #define X(name) CONCAT(name,_omp)
+  #define SUFFIX "_omp"
 #else
-  #define X(name) name
+  #define SUFFIX ""
 #endif
 
 static void DoSetup(const benchmark::State& state) {
@@ -57,7 +57,7 @@ static void init_random_data(NFFT(plan)* plan) {
 }
 
 // Benchmark for NFFT direct transform (trafo_direct)
-static void X(nfft_forward_direct_1d)(benchmark::State& state) {
+static void nfft_forward_direct_1d(benchmark::State& state) {
     int N = state.range(0);
     int M = state.range(1);
 
@@ -74,7 +74,7 @@ static void X(nfft_forward_direct_1d)(benchmark::State& state) {
 }
 
 // Benchmark for NFFT adjoint direct transform (adjoint_direct)
-static void X(nfft_adjoint_direct_1d)(benchmark::State& state) {
+static void nfft_adjoint_direct_1d(benchmark::State& state) {
     int N = state.range(0);
     int M = state.range(1);
 
@@ -91,7 +91,7 @@ static void X(nfft_adjoint_direct_1d)(benchmark::State& state) {
 }
 
 // Benchmark for 2D NFFT direct transform
-static void X(nfft_forward_direct_2d)(benchmark::State& state) {
+static void nfft_forward_direct_2d(benchmark::State& state) {
     int N1 = state.range(0);
     int N2 = state.range(1);
     int M = state.range(2);
@@ -109,7 +109,7 @@ static void X(nfft_forward_direct_2d)(benchmark::State& state) {
 }
 
 // Benchmark for 2D NFFT adjoint direct transform
-static void X(nfft_adjoint_direct_2d)(benchmark::State& state) {
+static void nfft_adjoint_direct_2d(benchmark::State& state) {
     int N1 = state.range(0);
     int N2 = state.range(1);
     int M = state.range(2);
@@ -127,7 +127,7 @@ static void X(nfft_adjoint_direct_2d)(benchmark::State& state) {
 }
 
 // Benchmark for 3D NFFT direct transform
-static void X(nfft_forward_direct_3d)(benchmark::State& state) {
+static void nfft_forward_direct_3d(benchmark::State& state) {
     int N1 = state.range(0);
     int N2 = state.range(1);
     int N3 = state.range(2);
@@ -146,7 +146,7 @@ static void X(nfft_forward_direct_3d)(benchmark::State& state) {
 }
 
 // Benchmark for 3D NFFT adjoint direct transform
-static void X(nfft_adjoint_direct_3d)(benchmark::State& state) {
+static void nfft_adjoint_direct_3d(benchmark::State& state) {
     int N1 = state.range(0);
     int N2 = state.range(1);
     int N3 = state.range(2);
@@ -165,7 +165,7 @@ static void X(nfft_adjoint_direct_3d)(benchmark::State& state) {
 }
 
 // Register benchmarks for direct transforms
-BENCH(X(nfft_forward_direct_1d))
+BENCH(nfft_forward_direct_1d, SUFFIX)
     ->Args({32, 100})
     ->Args({64, 200})
     ->Args({128, 400})
@@ -175,7 +175,7 @@ BENCH(X(nfft_forward_direct_1d))
     ->Teardown(DoTeardown)
     ->Complexity();
 
-BENCH(X(nfft_adjoint_direct_1d))
+BENCH(nfft_adjoint_direct_1d, SUFFIX)
     ->Args({32, 100})
     ->Args({64, 200})
     ->Args({128, 400})
@@ -185,31 +185,31 @@ BENCH(X(nfft_adjoint_direct_1d))
     ->Teardown(DoTeardown)
     ->Complexity();
 
-BENCH(X(nfft_forward_direct_2d))
+BENCH(nfft_forward_direct_2d, SUFFIX)
     ->Args({16, 16, 500})
     ->Args({32, 32, 1000})
     ->Args({64, 64, 2000})
     ->Setup(DoSetup)
     ->Teardown(DoTeardown)
     ->Complexity();
 
-BENCH(X(nfft_adjoint_direct_2d))
+BENCH(nfft_adjoint_direct_2d, SUFFIX)
     ->Args({16, 16, 500})
     ->Args({32, 32, 1000})
     ->Args({64, 64, 2000})
     ->Setup(DoSetup)
     ->Teardown(DoTeardown)
     ->Complexity();
 
-BENCH(X(nfft_forward_direct_3d))
+BENCH(nfft_forward_direct_3d, SUFFIX)
     ->Args({4, 4, 4, 250})
     ->Args({8, 8, 8, 500})
     ->Args({16, 16, 16, 1000})
     ->Setup(DoSetup)
     ->Teardown(DoTeardown)
     ->Complexity();
 
-BENCH(X(nfft_adjoint_direct_3d))
+BENCH(nfft_adjoint_direct_3d, SUFFIX)
     ->Args({4, 4, 4, 250})
     ->Args({8, 8, 8, 500})
     ->Args({16, 16, 16, 1000})

benchmarks/util.h

@@ -22,6 +22,6 @@
 #include "config.h"
 
 // Macro to register benchmark with optional prefix
-#define BENCH(function) BENCHMARK(function)->Name("benchmarks/" __FILE__ "::" BENCHMARKS_PREFIX #function)
+#define BENCH(function, suffix) BENCHMARK(function)->Name("benchmarks/" __FILE__ "::" BENCHMARKS_PREFIX #function suffix)
 
 #endif // NFFT_BENCHMARKS_UTIL_H