Refactor babelstream and use catch2 benchmarking

benchmarks/babelstream/CMakeLists.txt

@@ -19,9 +19,31 @@ if(NOT TARGET alpaka::alpaka)
     endif()
 endif()
 
-alpaka_add_executable(${PROJECT_NAME} src/main.cpp src/Stream.h src/AlpakaStream.cpp src/AlpakaStream.h)
-target_compile_definitions(${PROJECT_NAME} PUBLIC ALPAKA)
-target_link_libraries(${PROJECT_NAME} PUBLIC alpaka::alpaka)
-set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER benchmarks)
 
-# add_test(NAME ${_TARGET_NAME} COMMAND ${_TARGET_NAME})
+set(_TARGET_NAME "babelstream")
+append_recursive_files_add_to_src_group("src/" "src/" "cpp" _FILES_SOURCE)
+
+alpaka_add_executable(
+    ${_TARGET_NAME}
+    ${_FILES_SOURCE})
+
+target_include_directories(
+ ${_TARGET_NAME}
+ PRIVATE "src")
+
+target_link_libraries(
+    ${_TARGET_NAME}
+    PRIVATE common)
+
+# alpaka_add_executable(${PROJECT_NAME} src/main.cpp src/Stream.h src/AlpakaStream.cpp src/AlpakaStream.h)
+# target_compile_definitions(${PROJECT_NAME} PUBLIC ALPAKA)
+# target_link_libraries(${PROJECT_NAME} PUBLIC alpaka::alpaka)
+# set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER benchmarks)
+
+if(alpaka_CI)
+        # To prevent timeout, the number of samples needs to be limited. In the catch2 benchmarking; the code is run samples x iterations times.
+        add_test(NAME ${_TARGET_NAME} COMMAND ${_TARGET_NAME} ${_alpaka_TEST_OPTIONS} --benchmark-samples 2)
+else()
+        # For a normal benchmark test, number of samples should be equal to the default value.
+        add_test(NAME ${_TARGET_NAME} COMMAND ${_TARGET_NAME})
+endif()

benchmarks/babelstream/src/README.md

@@ -1,6 +1,3 @@
-This is a port of [BabelStream](https://github.com/UoB-HPC/BabelStream) to alpaka.
-This work is based on the [cupla port of BabelStream](https://github.com/jyoung3131/BabelStream) from Jeff Young.
-The benchmark driver (`main.cpp` and `Stream.h`) is taken from BabelStream.
-No other backends are available, only alpaka.
-Thus, there is no need to select a backend, just run the executable.
-Please refer to the BabelStream documentation of more information on how to run the benchmark.
+This work was initially based on the [cupla port of BabelStream](https://github.com/jyoung3131/BabelStream) from Jeff Young. Then refactored.
+The benchmark BabelStream is developed by Tom Deakin, Simon McIntosh-Smith, University of Bristol HPC; based on John D. McCalpin's original STREAM benchmark for CPUs
+Some implementations and the documents are accessible through https://github.com/UoB-HPC