Merge branch 'likwid-regions-autotools' into 'master'

Likwid regions autotools

See merge request swift/swiftsim!2254

Author: MatthieuSchaller

configure.ac

@@ -319,6 +319,18 @@ if test "$enable_timers" = "yes"; then
    AC_DEFINE([SWIFT_USE_TIMERS],1,[Enable individual timers])
 fi
 
+AC_ARG_ENABLE([likwid],
+   [AS_HELP_STRING([--enable-likwid],
+      [Enable LIKWID performance monitoring])],
+   [enable_likwid="$enableval"],
+   [enable_likwid="no"]
+)
+
+if test "$enable_likwid" = "yes"; then
+   AC_DEFINE([WITH_LIKWID], 1, [Enable LIKWID performance monitoring])
+   LIBS="$LIBS -llikwid"
+fi
+
 # Check if expensive debugging is on.
 AC_ARG_ENABLE([debugging-checks],
    [AS_HELP_STRING([--enable-debugging-checks],

src/Makefile.am

@@ -520,6 +520,7 @@ nobase_noinst_HEADERS += fvpm_geometry.h fvpm_geometry_struct.h
 nobase_noinst_HEADERS += fvpm_geometry/None/fvpm_geometry.h fvpm_geometry/None/fvpm_geometry_struct.h
 nobase_noinst_HEADERS += fvpm_geometry/Gizmo/fvpm_geometry.h fvpm_geometry/Gizmo/fvpm_geometry_struct.h
 nobase_noinst_HEADERS += fvpm_geometry/Gizmo/MFM/fvpm_geometry.h fvpm_geometry/Gizmo/MFV/fvpm_geometry.h
+nobase_noinst_HEADERS += likwid_wrapper.h
 
 # Sources and special flags for the gravity library
 libgrav_la_SOURCES = runner_doiact_grav.c

src/likwid_wrapper.h

@@ -0,0 +1,43 @@
+#ifndef SWIFT_LIKWID_WRAPPER_H
+#define SWIFT_LIKWID_WRAPPER_H
+
+#include "inline.h"
+
+#include <config.h>
+
+#ifdef WITH_LIKWID
+#define LIKWID_PERFMON
+#include <likwid-marker.h>
+#else
+#define LIKWID_MARKER_INIT
+#define LIKWID_MARKER_REGISTER(regionTag)
+#define LIKWID_MARKER_START(regionTag)
+#define LIKWID_MARKER_STOP(regionTag)
+#define LIKWID_MARKER_CLOSE
+#endif
+
+__attribute__((always_inline)) INLINE void swift_likwid_marker_init(void) {
+  LIKWID_MARKER_INIT;
+}
+
+static __attribute__((always_inline)) INLINE void swift_likwid_marker_register(
+    const char *regionTag) {
+  LIKWID_MARKER_REGISTER(regionTag);
+}
+
+static __attribute__((always_inline)) INLINE void
+swift_likwid_marker_start_region(const char *regionTag) {
+  LIKWID_MARKER_START(regionTag);
+}
+
+static __attribute__((always_inline)) INLINE void
+swift_likwid_marker_stop_region(const char *regionTag) {
+  LIKWID_MARKER_STOP(regionTag);
+}
+
+static __attribute__((always_inline)) INLINE void swift_likwid_marker_close(
+    void) {
+  LIKWID_MARKER_CLOSE;
+}
+
+#endif /* SWIFT_LIKWID_WRAPPER_H */

src/power_spectrum.c

@@ -1287,8 +1287,8 @@ void power_spectrum(const enum power_type type1, const enum power_type type2,
  *
  * @param nr_threads The number of threads used.
  */
-void power_init(struct power_spectrum_data *p, struct swift_params *params,
-                int nr_threads) {
+void power_spectrum_init(struct power_spectrum_data *p,
+                         struct swift_params *params, int nr_threads) {
 
 #ifdef HAVE_FFTW
 

src/power_spectrum.h

@@ -101,8 +101,8 @@ struct power_spectrum_data {
 #endif
 };
 
-void power_init(struct power_spectrum_data *p, struct swift_params *params,
-                int nr_threads);
+void power_spectrum_init(struct power_spectrum_data *p,
+                         struct swift_params *params, int nr_threads);
 void calc_all_power_spectra(struct power_spectrum_data *pow_data,
                             const struct space *s, struct threadpool *tp,
                             const int verbose);

src/runner_main.c

@@ -136,6 +136,11 @@
 #include "runner_doiact_hydro.h"
 #include "runner_doiact_undef.h"
 
+/* likwid markers. */
+#ifdef WITH_LIKWID
+#include "likwid_wrapper.h"
+#endif
+
 /**
  * @brief The #runner main thread routine.
  *
@@ -147,6 +152,9 @@ void *runner_main(void *data) {
   struct engine *e = r->e;
   struct scheduler *sched = &e->sched;
 
+#ifdef WITH_LIKWID
+  swift_likwid_marker_start_region("runner_main");
+#endif
   /* Main loop. */
   while (1) {
 
@@ -591,6 +599,9 @@ void *runner_main(void *data) {
 
     } /* main loop. */
   }
+#ifdef WITH_LIKWID
+  swift_likwid_marker_stop_region("runner_main");
+#endif
 
   /* Be kind, rewind. */
   return NULL;

src/timers.h

@@ -39,7 +39,7 @@
 enum {
   timer_none = 0,
   timer_prepare,
-  timer_init,
+  timer_init_swift,
   timer_init_grav,
   timer_drift_part,
   timer_drift_gpart,

swift.c

@@ -25,6 +25,10 @@
 /* Config parameters. */
 #include <config.h>
 
+#ifdef WITH_LIKWID
+#include "likwid_wrapper.h"
+#endif
+
 /* Some standard headers. */
 #include <errno.h>
 #include <fenv.h>
@@ -152,6 +156,11 @@ int main(int argc, char *argv[]) {
   }
 #endif
 
+#ifdef WITH_LIKWID
+  swift_likwid_marker_init();
+  swift_likwid_marker_register("runner_main");
+#endif
+
   /* Welcome to SWIFT, you made the right choice */
   if (myrank == 0) greetings(/*fof=*/0);
 
@@ -1238,7 +1247,7 @@ int main(int argc, char *argv[]) {
     /* Initialize power spectra calculation */
     if (with_power) {
 #ifdef HAVE_FFTW
-      power_init(&pow_data, params, nr_threads);
+      power_spectrum_init(&pow_data, params, nr_threads);
 #else
       error("No FFTW library found. Cannot compute power spectra.");
 #endif
@@ -1967,6 +1976,10 @@ int main(int argc, char *argv[]) {
   if (restart) output_options_clean(output_options);
   free(output_options);
 
+#ifdef WITH_LIKWID
+  swift_likwid_marker_close();
+#endif
+
 #ifdef WITH_MPI
   partition_clean(&initial_partition, &reparttype);
   if ((res = MPI_Finalize()) != MPI_SUCCESS)