gpu_sysman: change configure to use pkg-config for dependency

And enable Sysman plugin automatically when dependency is found.

While GPU plugin uses just Sysman API subset of the Level-Zero API
family, name of the used library / loader is level-zero => dropped
"--with-sysman" option and renamed configure variables.

Also, now that Level-Zero packages are in the distributions, Sysman
API GPU plugin could be enabled by default when pkg-config finds
level-zero. This simplifies config code.

Signed-off-by: Eero Tamminen <eero.t.tamminen@intel.com>

diff --git a/Makefile.am b/Makefile.am
index 9594b533e894c4e855486431a41a2eb57b9f7fb1..8829ac52c06d8aec1c824bc2693492d20c895176 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1177,12 +1177,12 @@ endif
 if BUILD_PLUGIN_GPU_SYSMAN
 pkglib_LTLIBRARIES += gpu_sysman.la
 gpu_sysman_la_SOURCES = src/gpu_sysman.c
-gpu_sysman_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(BUILD_WITH_SYSMAN_CPPFLAGS)
-gpu_sysman_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_SYSMAN_LDFLAGS)
-gpu_sysman_la_LIBADD = $(BUILD_WITH_SYSMAN_LIBS)
+gpu_sysman_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(LEVEL_ZERO_CFLAGS)
+gpu_sysman_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+gpu_sysman_la_LIBADD = $(LEVEL_ZERO_LIBS)
 
 test_plugin_gpu_sysman_SOURCES = src/gpu_sysman_test.c
-test_plugin_gpu_sysman_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(BUILD_WITH_SYSMAN_CPPFLAGS)
+test_plugin_gpu_sysman_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(LEVEL_ZERO_CFLAGS)
 test_plugin_gpu_sysman_LDFLAGS = $(PLUGIN_LDFLAGS)
 test_plugin_gpu_sysman_LDADD =
 check_PROGRAMS += test_plugin_gpu_sysman

diff --git a/configure.ac b/configure.ac
index 03d59d990168c4889d661bf28ba3feb3f29bf4f0..4df85701ee45ccf6e5dcfeea82ecfd575c810e66 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2105,52 +2105,37 @@ AC_SUBST([BUILD_WITH_CUDA_LIBS])
 
 # }}}
 
-# --with-sysman {{{
-AC_ARG_WITH([sysman],
-  [AS_HELP_STRING([--with-sysman@<:@=PREFIX@:>@], [Path to Level-Zero sysman.])],
-  [
-    if test "x$withval" != "xno" && test "x$withval" != "xyes"; then
-      with_sysman_cppflags="-I$withval/include"
-      with_sysman_ldflags="-I$withval/lib"
-      with_sysman="yes"
-    else
-      with_sysman="$withval"
-    fi
-  ],
-  [with_sysman="no"]
+# Level-Zero loader provides Sysman API (subset) for the "gpu_sysman" plugin
+# libze {{{
+PKG_CHECK_MODULES([LEVEL_ZERO], [level-zero],
+  [with_level_zero="yes"],
+  [with_level_zero="no (pkg-config could not find 'level-zero')"]
 )
 
-if test "x$with_sysman" = "xyes"; then
+if test "x$with_level_zero" = "xyes"; then
   SAVE_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $with_sysman_cppflags"
+  CPPFLAGS="$CPPFLAGS $LEVEL_ZERO_CFLAGS"
 
   AC_CHECK_HEADERS([level_zero/ze_api.h level_zero/zes_api.h],
-    [with_sysman="yes"],
-    [with_sysman="no (ze_api.h / zes_api.h not found)"]
+    [with_level_zero="yes"],
+    [with_level_zero="no (ze_api.h / zes_api.h not found)"]
   )
   CPPFLAGS="$SAVE_CPPFLAGS"
 fi
 
-if test "x$with_sysman" = "xyes"; then
+if test "x$with_level_zero" = "xyes"; then
   SAVE_LDFLAGS="$LDFLAGS"
-  LDFLAGS="$LDFLAGS $with_sysman_ldflags"
+  LDFLAGS="$LDFLAGS $LEVEL_ZERO_LIBS"
 
   AC_CHECK_LIB([ze_loader], zeInit,
-    [with_sysman="yes"],
-    [with_sysman="no (libze_loader symbol 'zeInit' not found)"]
+    [with_level_zero="yes"],
+    [with_level_zero="no (libze_loader symbol 'zeInit' not found)"]
   )
   LDFLAGS="$SAVE_LDFLAGS"
 fi
 
-if test "x$with_sysman" = "xyes"; then
-  BUILD_WITH_SYSMAN_CPPFLAGS="$with_sysman_cppflags"
-  BUILD_WITH_SYSMAN_LDFLAGS="$with_sysman_ldflags"
-  BUILD_WITH_SYSMAN_LIBS="-lze_loader"
-fi
-
-AC_SUBST([BUILD_WITH_SYSMAN_CPPFLAGS])
-AC_SUBST([BUILD_WITH_SYSMAN_LDFLAGS])
-AC_SUBST([BUILD_WITH_SYSMAN_LIBS])
+AC_SUBST([LEVEL_ZERO_CFLAGS])
+AC_SUBST([LEVEL_ZERO_LIBS])
 # }}}
 
 # --with-libaquaero5 {{{
@@ -6770,7 +6755,7 @@ plugin_fscache="no"
 plugin_gmond="$with_libganglia"
 plugin_gps="no"
 plugin_gpu_nvidia="$with_cuda"
-plugin_gpu_sysman="$with_sysman"
+plugin_gpu_sysman="$with_level_zero"
 plugin_grpc="yes"
 plugin_hddtemp="yes"
 plugin_hugepages="no"
@@ -7463,7 +7448,7 @@ AC_PLUGIN([fscache],             [$plugin_fscache],           [fscache statistic
 AC_PLUGIN([gmond],               [$plugin_gmond],             [Ganglia plugin])
 AC_PLUGIN([gps],                 [$plugin_gps],               [GPS plugin])
 AC_PLUGIN([gpu_nvidia],          [$plugin_gpu_nvidia],        [NVIDIA GPU plugin])
-AC_PLUGIN([gpu_sysman],          [$plugin_gpu_sysman],        [Level-Zero Sysman GPU plugin])
+AC_PLUGIN([gpu_sysman],          [$plugin_gpu_sysman],        [Intel GPU plugin])
 AC_PLUGIN([grpc],                [$plugin_grpc],              [gRPC plugin])
 AC_PLUGIN([hddtemp],             [$plugin_hddtemp],           [Query hddtempd])
 AC_PLUGIN([hugepages],           [$plugin_hugepages],         [Hugepages statistics])
@@ -7845,7 +7830,6 @@ AC_MSG_RESULT([    libsigrok   . . . . . $with_libsigrok])
 AC_MSG_RESULT([    libssl  . . . . . . . $with_libssl])
 AC_MSG_RESULT([    libslurm .  . . . . . $with_libslurm])
 AC_MSG_RESULT([    libstatgrab . . . . . $with_libstatgrab])
-AC_MSG_RESULT([    libsysman . . . . . . $with_sysman])
 AC_MSG_RESULT([    libtokyotyrant  . . . $with_libtokyotyrant])
 AC_MSG_RESULT([    libudev . . . . . . . $with_libudev])
 AC_MSG_RESULT([    libupsclient  . . . . $with_libupsclient])
@@ -7854,6 +7838,7 @@ AC_MSG_RESULT([    libvirt . . . . . . . $with_libvirt])
 AC_MSG_RESULT([    libxenctrl  . . . . . $with_libxenctrl])
 AC_MSG_RESULT([    libxml2 . . . . . . . $with_libxml2])
 AC_MSG_RESULT([    libyajl . . . . . . . $with_libyajl])
+AC_MSG_RESULT([    libze_loader. . . . . $with_level_zero])
 AC_MSG_RESULT([    oracle  . . . . . . . $with_oracle])
 AC_MSG_RESULT([    protobuf-c  . . . . . $have_protoc_c])
 AC_MSG_RESULT([    protoc 3  . . . . . . $have_protoc3])