Add ability for users to specify PAPI events in Dr Hook

CMakeLists.txt

@@ -23,13 +23,17 @@ set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 ### Options
 
 ecbuild_add_option( FEATURE OMP
-                    DESCRIPTION "support for OpenMP shared memory parallelism"
+                    DESCRIPTION "Support for OpenMP shared memory parallelism"
                     REQUIRED_PACKAGES "OpenMP COMPONENTS Fortran" )
 
 ecbuild_add_option( FEATURE MPI
                     DESCRIPTION "Support for MPI distributed parallelism"
                     REQUIRED_PACKAGES "MPI COMPONENTS Fortran" )
 
+ecbuild_add_option( FEATURE DR_HOOK_PAPI
+                    DESCRIPTION "Support for HW counters in DR_HOOK via PAPI"
+                    REQUIRED_PACKAGES "PAPI")
+
 ecbuild_find_package( fckit QUIET )
 ecbuild_add_option( FEATURE FCKIT
                     DESCRIPTION "Support for fckit"
@@ -51,7 +55,6 @@ ecbuild_add_option( FEATURE WARNINGS
                     DEFAULT ON
                     DESCRIPTION "Add warnings to compiler" )
 
-
 ecbuild_add_option( FEATURE DR_HOOK_NVTX
                     DEFAULT ${DEFAULT_DR_HOOK_NVTX}
                     DESCRIPTION "Support for NVTX in DR_HOOK"

cmake/FindPAPI.cmake

@@ -0,0 +1,44 @@
+# Try to find PAPI headers and libraries.
+#
+# Usage of this module as follows:
+#
+#     find_package(PAPI)
+#
+# Variables used by this module, they can change the default behaviour and need
+# to be set before calling find_package:
+#
+#  PAPI_ROOT         Set this variable to the root installation of
+#                      libpapi if the module has problems finding the
+#                      proper installation path.
+#
+# Variables defined by this module:
+#
+#  PAPI_FOUND              System has PAPI libraries and headers
+#  PAPI_LIBRARIES          The PAPI library
+#  PAPI_INCLUDE_DIRS       The location of PAPI headers
+
+find_path(PAPI_ROOT
+    NAMES include/papi.h
+)
+
+find_library(PAPI_LIBRARIES
+    # Pick the static library first for easier run-time linking.
+    NAMES libpapi.so libpapi.a papi
+    HINTS ${PAPI_ROOT}/lib
+)
+
+find_path(PAPI_INCLUDE_DIRS
+    NAMES papi.h
+    HINTS ${PAPI_ROOT}/include
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PAPI DEFAULT_MSG
+    PAPI_LIBRARIES
+    PAPI_INCLUDE_DIRS
+)
+
+mark_as_advanced(
+    PAPI_LIBRARIES
+    PAPI_INCLUDE_DIRS
+)

src/fiat/CMakeLists.txt

@@ -83,6 +83,19 @@ if (HAVE_DR_HOOK_NVTX)
     endif()
 endif()
 
+
+if (HAVE_DR_HOOK_PAPI)
+    # Files from within DrHook
+    ecbuild_list_add_pattern( LIST fiat_papi_src GLOB *.c SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/drhook/extensions/papi)
+    target_sources(fiat PRIVATE ${fiat_papi_src})
+    target_include_directories(fiat PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/drhook/extensions/papi)
+
+    # Files defined externally
+    target_link_libraries      ( fiat PRIVATE ${PAPI_LIBRARIES} )
+    target_include_directories ( fiat PRIVATE ${PAPI_INCLUDE_DIRS} )
+    target_compile_definitions ( fiat PRIVATE DR_HOOK_HAVE_PAPI=1 )
+endif()
+
 if( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
   # Following should not be necessary; 
   # Probably a bug in the M1 prerelease of gfortran 10.2.0.4
@@ -103,7 +116,7 @@ else()
 endif()
 
 if( HAVE_OMP )
-    target_link_libraries( fiat PRIVATE OpenMP::OpenMP_Fortran )
+  target_link_libraries( fiat PRIVATE OpenMP::OpenMP_Fortran )
 endif()
 
 fiat_target_ignore_missing_symbols( TARGET fiat SYMBOLS