Adding caliper annotations

CMakeLists.txt

@@ -81,6 +81,9 @@ option(FETCH_TBB "Fetch (download) the oneTBB library for *supported* models. Th
                   FetchContent feature. Specify version by setting FETCH_TBB_VERSION" OFF)
 set(FETCH_TBB_VERSION "v2021.10.0" CACHE STRING "Specify version of oneTBB to use if FETCH_TBB is ON")
 
+option(ENABLE_CALIPER "Enable Caliper/Adiak support" FALSE)
+
+
 if (FETCH_TBB)
     FetchContent_Declare(
             TBB
@@ -231,6 +234,14 @@ add_executable(${EXE_NAME} ${IMPL_SOURCES} src/main.cpp)
 target_link_libraries(${EXE_NAME} PUBLIC ${LINK_LIBRARIES})
 target_compile_definitions(${EXE_NAME} PUBLIC ${IMPL_DEFINITIONS})
 target_include_directories(${EXE_NAME} PUBLIC ${IMPL_DIRECTORIES})
+#add_executable(main ${IMPL_SOURCES} src/main.cpp)
+
+if (ENABLE_CALIPER)
+    find_package(caliper REQUIRED)
+    find_package(adiak REQUIRED)
+    add_compile_definitions(ENABLE_CALIPER)
+    target_link_libraries(${EXE_NAME} PUBLIC caliper adiak::adiak)
+endif()
 
 if (CXX_EXTRA_LIBRARIES)
     target_link_libraries(${EXE_NAME} PUBLIC ${CXX_EXTRA_LIBRARIES})

src/Stream.h

@@ -10,6 +10,11 @@
 #include <vector>
 #include <string>
 
+#ifdef ENABLE_CALIPER
+#include <caliper/cali.h>
+#include <adiak.h>
+#endif
+
 // Array values
 #define startA (0.1)
 #define startB (0.2)

src/main.cpp

@@ -22,6 +22,13 @@
 #include "StreamModels.h"
 #include "Unit.h"
 
+#ifdef ENABLE_CALIPER
+#include <caliper/cali.h>
+#include <caliper/cali-mpi.h>
+#include <caliper/cali-manager.h>
+#include <adiak.hpp>
+#endif
+
 // Default size of 2^25
 intptr_t ARRAY_SIZE = 33554432;
 size_t num_times = 100;
@@ -83,6 +90,29 @@ void parseArguments(int argc, char *argv[]);
 
 int main(int argc, char *argv[])
 {
+#ifdef ENABLE_CALIPER
+  	cali::ConfigManager calimgr;
+
+     if (calimgr.error()){
+      std::cerr << "caliper config error: " << calimgr.error_msg() << std::endl;
+    }
+    calimgr.start();
+
+    cali_config_preset("CALI_LOG_VERBOSITY", "2");
+    cali_config_preset("CALI_CALIPER_ATTRIBUTE_DEFAULT_SCOPE", "process");
+
+    adiak::init(nullptr);
+    adiak::collect_all();
+
+    cali_config_set("CALI_CALIPER_ATTRIBUTE_DEFAULT_SCOPE", "process");
+
+	adiak::value("BABELSTREAM version", "4.0");
+	adiak::value("num_times", num_times);
+	adiak::value("elements", ARRAY_SIZE);
+
+	CALI_MARK_FUNCTION_BEGIN;
+#endif  
+
   parseArguments(argc, argv);
 
   if (!output_as_csv)
@@ -98,6 +128,10 @@ int main(int argc, char *argv[])
   else
     run<double>();
 
+#ifdef ENABLE_CALIPER
+    adiak::fini();
+    calimgr.flush();
+#endif
   return EXIT_SUCCESS;
 }
 
@@ -150,7 +184,13 @@ std::vector<std::vector<double>> run_all(std::unique_ptr<Stream<T>>& stream, T&
     for (size_t k = 0; k < num_times; k++) {
       for (size_t i = 0; i < num_benchmarks; ++i) {
 	if (!run_benchmark(bench[i])) continue;
+#ifdef ENABLE_CALIPER
+    CALI_MARK_BEGIN(bench[i].label);
+#endif 
 	timings[i].push_back(dt(bench[i]));
+#ifdef ENABLE_CALIPER
+    CALI_MARK_END(bench[i].label);
+#endif 
       }
     }
     break;
@@ -256,7 +296,13 @@ void run()
   }
 
   std::unique_ptr<Stream<T>> stream = make_stream<T>(ARRAY_SIZE, deviceIndex);
+#ifdef ENABLE_CALIPER
+    CALI_MARK_BEGIN("init_arrays");
+#endif 
   auto initElapsedS = time([&] { stream->init_arrays(startA, startB, startC); });
+#ifdef ENABLE_CALIPER
+    CALI_MARK_END("init_arrays");
+#endif
 
   // Result of the Dot kernel, if used.
   T sum{};