Move to use generation of flamegraphs as a CLEANUP_FIXTURE

Author: oshadura

cmake/modules/AddRootBench.cmake

@@ -29,6 +29,29 @@ function(RB_ADD_SETUP_FIXTURE benchmark)
 endfunction(RB_ADD_SETUP_FIXTURE)
 
 
+#----------------------------------------------------------------------------
+# function RB_ADD_FLAMEGRAPHCPU_FIXTURE(<benchmark>)
+#----------------------------------------------------------------------------
+function(RB_ADD_FLAMEGRAPHCPU_FIXTURE benchmark)
+  cmake_parse_arguments(ARG "" "" "" ${ARGN})
+  add_test(NAME rootbench-fixture-flamegraphcpu-${benchmark}
+           COMMAND ${PROJECT_BINARY_DIR}/tools/flamegraph.sh -d ${PROJECT_BINARY_DIR} -b ${CMAKE_CURRENT_BINARY_DIR}/${benchmark} -c)
+  set_tests_properties(rootbench-fixture-flamegraphcpu-${benchmark} PROPERTIES FIXTURES_CLEANUP flamegraphcpu-${benchmark})
+endfunction(RB_ADD_FLAMEGRAPHCPU_FIXTURE)
+
+
+#----------------------------------------------------------------------------
+# function RB_ADD_FLAMEGRAPHMEM_FIXTURE(<benchmark>)
+#----------------------------------------------------------------------------
+function(RB_ADD_FLAMEGRAPHMEM_FIXTURE benchmark)
+  cmake_parse_arguments(ARG "" "" "" ${ARGN})
+  add_test(NAME rootbench-fixture-flamegraphmem-${benchmark}
+  COMMAND ${PROJECT_BINARY_DIR}/tools/flamegraph.sh -d ${PROJECT_BINARY_DIR} -b ${CMAKE_CURRENT_BINARY_DIR}/${benchmark} -m)
+  set_tests_properties(rootbench-fixture-flamegraphmem-${benchmark} PROPERTIES FIXTURES_CLEANUP flamegraphmem-${benchmark})
+endfunction(RB_ADD_FLAMEGRAPHMEM_FIXTURE)
+
+
+
 #----------------------------------------------------------------------------
 # function RB_ADD_GBENCHMARK(<benchmark> source1 source2... LIBRARIES libs)
 #----------------------------------------------------------------------------
@@ -44,18 +67,6 @@ function(RB_ADD_GBENCHMARK benchmark)
   # against. For example, tests in Core should link only against libCore. This could be tricky
   # to implement because some ROOT components create more than one library.
   target_link_libraries(${benchmark} ${ARG_LIBRARIES} gbenchmark RBSupport)
-  #ROOT_PATH_TO_STRING(mangled_name ${benchmark} PATH_SEPARATOR_REPLACEMENT "-")
-  if(ARG_POSTCMD)
-    set(postcmd POSTCMD ${ARG_POSTCMD})
-  endif()
-  if(flamegraphCPU)
-      set(postcmd ${postcmd} "${PROJECT_SOURCE_DIR}/rootbench-scripts/flamegraph.sh -d ${PROJECT_BINARY_DIR} -b ${CMAKE_CURRENT_BINARY_DIR}/${benchmark} -c")
-      add_dependencies(${benchmark} flamegraph-download)
-  endif()
-  if(flamegraphMem)
-      set(postcmd ${postcmd} "${PROJECT_SOURCE_DIR}/rootbench-scripts/flamegraph.sh -d ${PROJECT_BINARY_DIR} -b ${CMAKE_CURRENT_BINARY_DIR}/${benchmark} -m")
-      add_dependencies(${benchmark} flamegraph-download)
-  endif()
   if(${ARG_LABEL} STREQUAL "long")
     set(${TIMEOUT_VALUE} 1200)
   elseif($ARG_LABEL STREQUAL "short")
@@ -74,13 +85,21 @@ function(RB_ADD_GBENCHMARK benchmark)
      RB_ADD_SETUP_FIXTURE(${benchmark} SETUP ${ARG_SETUP})
   endif()
 
+  # Flamegraphs (both mem and cpu)
+  if(flamegraphCPU)
+    RB_ADD_FLAMEGRAPHCPU_FIXTURE(${benchmark})
+  endif()
+  if(flamegraphMem)
+    RB_ADD_FLAMEGRAPHMEM_FIXTURE(${benchmark})
+  endif()
+
   # Add benchmark as a CTest
   add_test(NAME rootbench-${benchmark}
            COMMAND ${benchmark} --benchmark_out_format=csv --benchmark_out=rootbench-gbenchmark-${benchmark}.csv --benchmark_color=false)
   set_tests_properties(rootbench-${benchmark} PROPERTIES
                        ENVIRONMENT LD_LIBRARY_PATH=${ROOT_LIBRARY_DIR}:$ENV{LD_LIBRARY_PATH}
                        TIMEOUT "${TIMEOUT_VALUE}" LABELS "${ARG_LABEL}" RUN_SERIAL TRUE
-                       FIXTURES_REQUIRED "setup-${benchmark};download-${benchmark}-datafiles")
+                       FIXTURES_REQUIRED "setup-${benchmark};download-${benchmark}-datafiles;flamegraphcpu-${benchmark};flamegraphmem-${benchmark}")
 endfunction(RB_ADD_GBENCHMARK)