Rebase on benchmark prototype branch

Author: sdebionne

bench/CMakeLists.txt

@@ -61,3 +61,15 @@ endforeach()
 
 unset(_benchmarks)
 unset(_benchmark)
+
+if(BOOST_GIL_BUILD_BENCHMARKS_OPENCV)
+    add_subdirectory(opencv)
+endif()
+
+if(BOOST_GIL_BUILD_BENCHMARKS_BLAZE)
+    add_subdirectory(blaze)
+endif()
+
+if(BOOST_GIL_BUILD_BENCHMARKS_IPP)
+    add_subdirectory(ipp)
+endif()

bench/blaze/CMakeLists.txt

@@ -0,0 +1,36 @@
+# Copyright (C) 2020 Samuel Debionne, ESRF.
+
+# Use, modification and distribution is subject to the Boost Software
+# License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+#-----------------------------------------------------------------------------
+# Find package Blaze
+#-----------------------------------------------------------------------------
+find_package(blaze REQUIRED)
+
+#-----------------------------------------------------------------------------
+# Build benchmarks
+#-----------------------------------------------------------------------------
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12.0)
+  file(GLOB_RECURSE _benchmarks ${CMAKE_CURRENT_LIST_DIR}/*.cpp CONFIGURE_DEPEND)
+else()
+  file(GLOB_RECURSE _benchmarks ${CMAKE_CURRENT_LIST_DIR}/*.cpp)
+endif()
+
+foreach(_benchmark ${_benchmarks})
+  get_filename_component(_name ${_benchmark} NAME_WE)
+  set(_target benchmark_google_blaze_${_name})
+  add_executable(${_target} ${_name}.cpp)
+  target_compile_definitions(${_target} PRIVATE BOOST_GIL_USE_CONCEPT_CHECK=1)
+  target_link_libraries(${_target}
+    PRIVATE
+      gil_compile_options
+      gil_include_directories
+      gil_dependencies
+      gil_googlebenchmark
+      blaze::blaze)
+endforeach()
+
+unset(_benchmarks)
+unset(_benchmark)

bench/ipp/CMakeLists.txt

@@ -30,6 +30,7 @@ static void blaze_transpose(benchmark::State& state)
     size_t dim = state.range(0);
 
     gray8_image_t in(dim, dim);
+    generate_pixels(view(in), [i = 0]() mutable -> std::uint8_t { return ++i; });
     gray8_image_t out(dim, dim);
 
     auto mat_in = as_matrix(view(in));
@@ -39,6 +40,9 @@ static void blaze_transpose(benchmark::State& state)
         // The code to benchmark
         mat_out = blaze::trans(mat_in);
     }
+    
+    if (!equal_pixels(transposed_view(const_view(in)), const_view(in))))
+        state.SkipWithError("blaze_transpose wrong result");
 }
 BENCHMARK(blaze_transpose)->RangeMultiplier(2)->Range(256, 8 << 10);
 
@@ -49,13 +53,18 @@ static void blaze_transpose_inplace(benchmark::State& state)
     size_t dim = state.range(0);
 
     gray8_image_t in(dim, dim);
+    generate_pixels(view(in), [i = 0]() mutable -> std::uint8_t { return ++i; });
+    gray8_image_t in_ref(in);
 
     auto mat_in_out = as_matrix(view(in));
 
     for (auto _ : state) {
         // The code to benchmark
         blaze::transpose(mat_in_out);
     }
+    
+    if (!equal_pixels(transposed_view(const_view(in_ref)), const_view(in))))
+        state.SkipWithError("blaze_transpose_inplace wrong result");
 }
 BENCHMARK(blaze_transpose_inplace)->RangeMultiplier(2)->Range(256, 8 << 10);
 

bench/ipp/test_transpose.cpp

@@ -0,0 +1,33 @@
+# Copyright (C) 2020 Samuel Debionne, ESRF.
+
+# Use, modification and distribution is subject to the Boost Software
+# License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+#-----------------------------------------------------------------------------
+# Find package IPP
+#-----------------------------------------------------------------------------
+#find_package(IPP REQUIRED)
+find_path(IPP_INCLUDE_DIR ipp.h PATHS ${IPP_ROOT}/include)
+message("IPP_INCLUDE_DIR: ${IPP_INCLUDE_DIR}")
+find_library(IPP_LIB_CORE ippcore PATHS ${IPP_ROOT}/lib)
+find_library(IPP_LIB_I ippi PATHS ${IPP_ROOT}/lib)
+message("IPP_LIB_CORE: ${IPP_LIB_CORE}")
+message("IPP_LIB_I: ${IPP_LIB_I}")
+add_library(ipp::ipp INTERFACE IMPORTED)
+target_include_directories(ipp::ipp INTERFACE ${IPP_INCLUDE_DIR})
+target_link_libraries(ipp::ipp INTERFACE ${IPP_LIB_CORE} ${IPP_LIB_I})
+
+foreach(_benchmark ${_benchmarks})
+  get_filename_component(_name ${_benchmark} NAME_WE)
+  set(_target benchmark_google_ipp_${_name})
+  add_executable(${_target} ${_name}.cpp)
+  target_compile_definitions(${_target} PRIVATE BOOST_GIL_USE_CONCEPT_CHECK=1)
+  target_link_libraries(${_target}
+    PRIVATE
+      gil_compile_options
+      gil_include_directories
+      gil_dependencies
+      gil_googlebenchmark
+      ipp::ipp)
+endforeach()