Add install check for OpenMP{,-V}

Fix openmp buildInputs
Remove unused sys-devices requirement in ld test
2025-12-10 15:56:37 +01:00 · 2025-12-10 15:56:37 +01:00 · 2025-12-10 15:56:36 +01:00 · 2025-12-10 15:56:36 +01:00 · 2025-12-10 15:56:36 +01:00 · 2025-12-10 15:56:36 +01:00
33 changed files with 246 additions and 15 deletions
--- a/overlay.nix
+++ b/overlay.nix
@@ -49,6 +49,7 @@ let
    osumb = callPackage ./pkgs/osu/default.nix { };
    ovni = callPackage ./pkgs/ovni/default.nix { };
    ovniGit = final.ovni.override { useGit = true; };
+    papi = callPackage ./pkgs/papi/default.nix { papi = prev.papi; };
    paraverKernel = callPackage ./pkgs/paraver/kernel.nix { };
    prometheus-slurm-exporter = prev.callPackage ./pkgs/slurm-exporter/default.nix { };
    #pscom = callPackage ./pkgs/parastation/pscom.nix { }; # Unmaintaned
--- a/pkgs/amd-uprof/default.nix
+++ b/pkgs/amd-uprof/default.nix
@@ -47,6 +47,7 @@ in
    inherit version;
    src = uprofSrc;
    dontStrip = true;
+    strictDeps = true;
    phases = [ "installPhase" "fixupPhase" ];
    nativeBuildInputs = [ autoPatchelfHook radare2 ];
    buildInputs = [
--- a/pkgs/amd-uprof/driver.nix
+++ b/pkgs/amd-uprof/driver.nix
@@ -18,6 +18,7 @@ in stdenv.mkDerivation {
    set +x
  '';
  hardeningDisable = [ "pic" "format" ];
+  strictDeps = true;
  nativeBuildInputs = kernel.moduleBuildDependencies;
  patches = [ ./makefile.patch ./hrtimer.patch ./remove-wr-rdmsrq.patch ];
  makeFlags = [
--- a/pkgs/bench6/default.nix
+++ b/pkgs/bench6/default.nix
@@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
  ];
  hardeningDisable = [ "all" ];
  dontStrip = true;
+  strictDeps = true;

  meta = {
    homepage = "https://gitlab.pm.bsc.es/rarias/bench6";
--- a/pkgs/bigotes/default.nix
+++ b/pkgs/bigotes/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation {
  };
  nativeBuildInputs = [ cmake ];

+  strictDeps = true;
+
  meta = {
    homepage = "https://github.com/rodarima/bigotes";
    description = "Versatile benchmark tool";
--- a/pkgs/cudainfo/default.nix
+++ b/pkgs/cudainfo/default.nix
@@ -10,11 +10,14 @@
 stdenv.mkDerivation (finalAttrs: {
  name = "cudainfo";
  src = ./.;
-  buildInputs = [
+  strictDeps = true;
+  nativeBuildInputs = [
    cudatoolkit # Required for nvcc
-    (lib.getOutput "static" cudaPackages.cuda_cudart) # Required for -lcudart_static
    autoAddDriverRunpath
  ];
+  buildInputs = [
+    (lib.getOutput "static" cudaPackages.cuda_cudart) # Required for -lcudart_static
+  ];
  installPhase = ''
    mkdir -p $out/bin
    cp -a cudainfo $out/bin
@@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
    name = "cudainfo-test";
    requiredSystemFeatures = [ "cuda" ];
    dontBuild = true;
+    strictDeps = true;
    nativeCheckInputs = [
      finalAttrs.finalPackage # The cudainfo package from above
      strace # When it fails, it will show the trace
--- a/pkgs/extrae/default.nix
+++ b/pkgs/extrae/default.nix
@@ -20,7 +20,7 @@
 #, python3Packages
 , installShellFiles
 , symlinkJoin
-, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
+, enablePapi ? true
 }:

 let
--- a/pkgs/gpi-2/default.nix
+++ b/pkgs/gpi-2/default.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
  };

  enableParallelBuilding = true;
+  strictDeps = true;

  patches = [ ./rdma-core.patch ./max-mem.patch ];

--- a/pkgs/intel-oneapi/2023.nix
+++ b/pkgs/intel-oneapi/2023.nix
@@ -128,6 +128,7 @@ let

    phases = [ "installPhase" "fixupPhase" ];
    dontStrip = true;
+    strictDeps = true;
    installPhase = ''
      mkdir -p $out/{bin,etc,lib,include}
      mkdir -p $out/share/man
@@ -179,6 +180,7 @@ let
    ];
    phases = [ "installPhase" "fixupPhase" ];
    dontStrip = true;
+    strictDeps = true;

    autoPatchelfIgnoreMissingDeps = [ "libhwloc.so.5" ];

@@ -222,6 +224,7 @@ let
    ];
    phases = [ "installPhase" "fixupPhase" ];
    dontStrip = true;
+    strictDeps = true;

    autoPatchelfIgnoreMissingDeps = [ "libsycl.so.6" ];

@@ -289,6 +292,7 @@ let
    phases = [ "installPhase" "fixupPhase" ];

    dontStrip = true;
+    strictDeps = true;

    installPhase = ''
      mkdir -p $out/{bin,lib,include}
@@ -377,6 +381,7 @@ let
    phases = [ "installPhase" "fixupPhase" ];

    dontStrip = true;
+    strictDeps = true;

    installPhase = ''
      mkdir -p $out/{bin,lib}
--- a/pkgs/llvm-ompss2/clang.nix
+++ b/pkgs/llvm-ompss2/clang.nix
@@ -48,6 +48,7 @@ in stdenv.mkDerivation {
  inherit (source) src version;

  enableParallelBuilding = true;
+  strictDeps = true;

  passthru = {
    CC = "clang";
--- a/pkgs/llvm-ompss2/openmp.nix
+++ b/pkgs/llvm-ompss2/openmp.nix
@@ -39,7 +39,9 @@ stdenv.mkDerivation rec {
    perl
    pkg-config
    python3
-  ] ++ lib.optionals enableNosv [
+  ];
+
+  buildInputs = lib.optionals enableNosv [
    nosv
  ] ++ lib.optionals enableOvni [
    ovni
@@ -54,6 +56,7 @@ stdenv.mkDerivation rec {
  dontStrip = enableDebug;

  separateDebugInfo = true;
+  strictDeps = true;

  cmakeFlags = [
    "-DLIBOMP_OMPD_SUPPORT=OFF"
@@ -71,6 +74,28 @@ stdenv.mkDerivation rec {
    rm -f $out/libllvmrt/libomp.*
  '';

+  doInstallCheck = true;
+  # There are not cmake flags to force nOS-V, it enables it when found through
+  # pkg-config. If enableNosv is set, but we fail to find it at build time,
+  # the build will succeed but won't use nOS-V (libompv won't be created).
+  # This is a sanity check to ensure that after install we have the proper
+  # files.
+  installCheckPhase =
+    if enableNosv then
+      ''
+        test -f $out/lib/libompv.so
+        test -f $out/libllvmrt/libompv.so
+        test ! -f $out/lib/libomp.so
+        test ! -f $out/libllvmrt/libomp.so
+      ''
+    else
+      ''
+        test -f $out/lib/libomp.so
+        test -f $out/libllvmrt/libomp.so
+        test ! -f $out/lib/libompv.so
+        test ! -f $out/libllvmrt/libompv.so
+      '';
+
  passthru = {
    inherit nosv;
  };
--- a/pkgs/lmbench/default.nix
+++ b/pkgs/lmbench/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
  hardeningDisable = [ "all" ];

  enableParallelBuilding = false;
+  strictDeps = true;

  preBuild = ''
    makeFlagsArray+=(
--- a/pkgs/meteocat-exporter/default.nix
+++ b/pkgs/meteocat-exporter/default.nix
@@ -9,6 +9,7 @@ python3Packages.buildPythonApplication {
  src = ./.;

  doCheck = false;
+  strictDeps = true;

  build-system = with python3Packages; [
    setuptools
--- a/pkgs/mpich/default.nix
+++ b/pkgs/mpich/default.nix
@@ -53,6 +53,7 @@ in mpich.overrideAttrs (old: {
  '';

  hardeningDisable = [ "all" ];
+  strictDeps = true;

  meta = old.meta // {
    maintainers = old.meta.maintainers ++ (with lib.maintainers.bsc; [ rarias ]);
--- a/pkgs/nanos6/check-papi-version-with-pkgconfig.patch
+++ b/pkgs/nanos6/check-papi-version-with-pkgconfig.patch
@@ -0,0 +1,67 @@
+diff --git a/m4/papi.m4 b/m4/papi.m4
+--- a/m4/papi.m4
+++ b/m4/papi.m4
+@@ -24,12 +24,13 @@ AC_DEFUN([AC_CHECK_PAPI],
+ 		else
+ 			PKG_CHECK_MODULES(
+ 				[papi],
+-				[papi],
+				[papi >= 5.6.0],
+ 				[
+ 					AC_MSG_CHECKING([the PAPI installation prefix])
+ 					AC_MSG_RESULT([retrieved from pkg-config])
+ 					papi_CPPFLAGS="${papi_CFLAGS}"
+ 					ac_use_papi=yes
+					ac_papi_version_correct=yes
+ 				], [
+ 					AC_MSG_CHECKING([the PAPI installation prefix])
+ 					AC_MSG_RESULT([not available])
+@@ -67,27 +68,29 @@ AC_DEFUN([AC_CHECK_PAPI],
+ 		fi
+ 
+ 		if test x"${ac_use_papi}" = x"yes" ; then
+-			if test x"${ac_cv_use_papi_prefix}" != x"" ; then
+-				papiBinary=${ac_cv_use_papi_prefix}/bin/papi_version
+-			else
+-				papiBinary=papi_version
+-			fi
+-			papiVersion=`$papiBinary | sed 's/[[^0-9.]]*\([[0-9.]]*\).*/\1/'`
+			if test x"${ac_papi_version_correct}" != x"yes" ; then
+				if test x"${ac_cv_use_papi_prefix}" != x"" ; then
+					papiBinary=${ac_cv_use_papi_prefix}/bin/papi_version
+				else
+					papiBinary=papi_version
+				fi
+				papiVersion=`$papiBinary | sed 's/[[^0-9.]]*\([[0-9.]]*\).*/\1/'`
+ 
+-			AX_COMPARE_VERSION(
+-				[[${papiVersion}]],
+-				[[ge]],
+-				[[5.6.0]],
+-				[[ac_papi_version_correct=yes]],
+-				[[ac_papi_version_correct=no]]
+-			)
+				AX_COMPARE_VERSION(
+					[[${papiVersion}]],
+					[[ge]],
+					[[5.6.0]],
+					[[ac_papi_version_correct=yes]],
+					[[ac_papi_version_correct=no]]
+				)
+ 
+-			if test x"${ac_papi_version_correct}" != x"yes" ; then
+-				AC_MSG_ERROR([PAPI version must be >= 5.6.0.])
+-				ac_use_papi=no
+-			else
+-				AC_MSG_CHECKING([if the PAPI version >= 5.6.0.])
+-				AC_MSG_RESULT([${ac_papi_version_correct}])
+				if test x"${ac_papi_version_correct}" != x"yes" ; then
+					AC_MSG_ERROR([PAPI version must be >= 5.6.0.])
+					ac_use_papi=no
+				else
+					AC_MSG_CHECKING([if the PAPI version >= 5.6.0.])
+					AC_MSG_RESULT([${ac_papi_version_correct}])
+				fi
+ 			fi
+ 		fi
+ 
--- a/pkgs/nanos6/default.nix
+++ b/pkgs/nanos6/default.nix
@@ -16,7 +16,7 @@
 , jemallocNanos6 ? null
 , cachelineBytes ? 64
 , enableGlibcxxDebug ? false
-, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
+, enablePapi ? true
 , useGit ? false
 , gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6"
 , gitBranch ? "master"
@@ -95,16 +95,15 @@ in
    dontStrip = enableDebug;
    separateDebugInfo = true;

+    strictDeps = true;
+    patches = [ ./check-papi-version-with-pkgconfig.patch ];
+
    nativeBuildInputs = [
      autoconf
      automake
      libtool
      pkg-config
-
-      # TODO: papi_version is needed for configure:
-      # ./configure: line 27378: papi_version: command not found
-      # This probably breaks cross-compilation
-    ] ++ lib.optionals enablePapi [ papi ];
+    ];

    buildInputs = [
      boost
--- a/pkgs/nixgen/default.nix
+++ b/pkgs/nixgen/default.nix
@@ -8,6 +8,7 @@ stdenv.mkDerivation {
  version = "0.0.1";
  src = ./nixgen;
  dontUnpack = true;
+  strictDeps = true;
  phases = [ "installPhase" ];
  installPhase = ''
    mkdir -p $out/bin
--- a/pkgs/nixtools/default.nix
+++ b/pkgs/nixtools/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
  makeFlags = [ "DESTDIR=$(out)" ];
  preBuild = "env";
  dontPatchShebangs = true;
+  strictDeps = true;

  meta = {
    homepage = "https://gitlab.pm.bsc.es/rarias/nixtools";
--- a/pkgs/nodes/default.nix
+++ b/pkgs/nodes/default.nix
@@ -48,6 +48,7 @@ in
    enableParallelBuilding = true;
    dontStrip = true;
    separateDebugInfo = true;
+    strictDeps = true;

    configureFlags = [
      "--with-nosv=${nosv}"
--- a/pkgs/nosv/check-papi-version-with-pkgconfig.patch
+++ b/pkgs/nosv/check-papi-version-with-pkgconfig.patch
@@ -0,0 +1,68 @@
+diff --git a/m4/papi.m4 b/m4/papi.m4
+index de905848..fa3db9a1 100644
+--- a/m4/papi.m4
+++ b/m4/papi.m4
+@@ -24,12 +24,13 @@ AC_DEFUN([AC_CHECK_PAPI],
+ 		else
+ 			PKG_CHECK_MODULES(
+ 				[papi],
+-				[papi],
+				[papi >= 5.6.0],
+ 				[
+ 					AC_MSG_CHECKING([the PAPI installation prefix])
+ 					AC_MSG_RESULT([retrieved from pkg-config])
+ 					papi_CFLAGS="${papi_CFLAGS}"
+ 					ac_use_papi=yes
+					ac_papi_version_correct=yes
+ 				], [
+ 					AC_MSG_CHECKING([the PAPI installation prefix])
+ 					AC_MSG_RESULT([not available])
+@@ -67,27 +68,29 @@ AC_DEFUN([AC_CHECK_PAPI],
+ 		fi
+ 
+ 		if test x"${ac_use_papi}" = x"yes" ; then
+-			if test x"${ac_cv_use_papi_prefix}" != x"" ; then
+-				papiBinary=${ac_cv_use_papi_prefix}/bin/papi_version
+-			else
+-				papiBinary=papi_version
+-			fi
+-			papiVersion=`$papiBinary | sed 's/[[^0-9.]]*\([[0-9.]]*\).*/\1/'`
+			if test x"${ac_papi_version_correct}" != x"yes" ; then
+				if test x"${ac_cv_use_papi_prefix}" != x"" ; then
+					papiBinary=${ac_cv_use_papi_prefix}/bin/papi_version
+				else
+					papiBinary=papi_version
+				fi
+				papiVersion=`$papiBinary | sed 's/[[^0-9.]]*\([[0-9.]]*\).*/\1/'`
+ 
+-			AX_COMPARE_VERSION(
+-				[[${papiVersion}]],
+-				[[ge]],
+-				[[5.6.0]],
+-				[[ac_papi_version_correct=yes]],
+-				[[ac_papi_version_correct=no]]
+-			)
+				AX_COMPARE_VERSION(
+					[[${papiVersion}]],
+					[[ge]],
+					[[5.6.0]],
+					[[ac_papi_version_correct=yes]],
+					[[ac_papi_version_correct=no]]
+				)
+ 
+-			if test x"${ac_papi_version_correct}" != x"yes" ; then
+-				AC_MSG_ERROR([PAPI version must be >= 5.6.0.])
+-				ac_use_papi=no
+-			else
+-				AC_MSG_CHECKING([if the PAPI version >= 5.6.0.])
+-				AC_MSG_RESULT([${ac_papi_version_correct}])
+				if test x"${ac_papi_version_correct}" != x"yes" ; then
+					AC_MSG_ERROR([PAPI version must be >= 5.6.0.])
+					ac_use_papi=no
+				else
+					AC_MSG_CHECKING([if the PAPI version >= 5.6.0.])
+					AC_MSG_RESULT([${ac_papi_version_correct}])
+				fi
+ 			fi
+ 		fi
+ 
--- a/pkgs/nosv/default.nix
+++ b/pkgs/nosv/default.nix
@@ -7,7 +7,7 @@
 , numactl
 , hwloc
 , papi
-, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
+, enablePapi ? true
 , cacheline ? 64 # bits
 , ovni ? null
 , useGit ? false
@@ -40,12 +40,14 @@ let

  source = if (useGit) then git else release;
 in
-  stdenv.mkDerivation rec {
+  stdenv.mkDerivation {
    pname = "nosv";
    inherit (source) src version;
    hardeningDisable = [ "all" ];
    dontStrip = true;
    separateDebugInfo = true;
+    strictDeps = true;
+    patches = [ ./check-papi-version-with-pkgconfig.patch ];
    configureFlags = [
      "--with-ovni=${ovni}"
      "CACHELINE_WIDTH=${toString cacheline}"
--- a/pkgs/osu/default.nix
+++ b/pkgs/osu/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {

  doCheck = true;
  enableParallelBuilding = true;
+  strictDeps = true;
  nativeBuildInputs = [ mpiAll ];
  buildInputs = [ mpiAll ];
  hardeningDisable = [ "all" ];
--- a/pkgs/ovni/default.nix
+++ b/pkgs/ovni/default.nix
@@ -40,6 +40,7 @@ in
    inherit (source) src version;
    dontStrip = true;
    separateDebugInfo = true;
+    strictDeps = true;
    postPatch = ''
      patchShebangs --build test/
    '';
--- a/pkgs/papi/default.nix
+++ b/pkgs/papi/default.nix
@@ -0,0 +1,22 @@
+{
+  stdenv,
+  papi,
+}:
+
+if stdenv.hostPlatform == stdenv.buildPlatform then
+  papi
+else
+  papi.overrideAttrs (old: {
+    configureFlags = (old.configureFlags or [ ]) ++ [
+      "--enable-perf_event_uncore=no"
+      "--with-sysdetect=no"
+      "--with-ffsll"
+      "--with-tls=__thread"
+      "--with-virtualtimer=clock_thread_cputime_id"
+      "--with-walltimer=clock_realtime"
+      "--with-perf-events"
+      "--with-CPU=${stdenv.hostPlatform.uname.processor}"
+      "--with-arch=${stdenv.hostPlatform.uname.processor}"
+    ];
+    patches = (old.patches or [ ]) ++ [ ./fix-ar-cross.patch ];
+  })
--- a/pkgs/papi/fix-ar-cross.patch
+++ b/pkgs/papi/fix-ar-cross.patch
@@ -0,0 +1,19 @@
+diff --git a/sde_lib/Makefile b/sde_lib/Makefile
+index 8518f92..90a9953 100644
+--- a/sde_lib/Makefile
+++ b/sde_lib/Makefile
+@@ -1,4 +1,5 @@
+ CC ?= gcc
+AR ?= ar
+ SDE_INC = -I. -I..
+ SDE_LD = -ldl -pthread
+ CFLAGS += -Wextra -Wall -O2
+@@ -18,7 +19,7 @@ dynamic: $(DOBJS)
+ 	rm -f *_d.o
+ 
+ static: $(SOBJS)
+-	ar rs libsde.a $(SOBJS)
+	$(AR) rs libsde.a $(SOBJS)
+ 	rm -f *_s.o
+ 
+ clean:
--- a/pkgs/paraver/default.nix
+++ b/pkgs/paraver/default.nix
@@ -47,6 +47,7 @@ stdenv.mkDerivation rec {

  dontStrip = true;
  enableParallelBuilding = true;
+  strictDeps = true;

  preConfigure = ''
    export CFLAGS="-O3"
--- a/pkgs/paraver/kernel.nix
+++ b/pkgs/paraver/kernel.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
  enableParallelBuilding = true;

  dontStrip = true;
+  strictDeps = true;

  preConfigure = ''
    export CFLAGS="-O3 -DPARALLEL_ENABLED"
--- a/pkgs/slurm-exporter/default.nix
+++ b/pkgs/slurm-exporter/default.nix
@@ -13,6 +13,7 @@ buildGoModule rec {

  vendorHash = "sha256-A1dd9T9SIEHDCiVT2UwV6T02BSLh9ej6LC/2l54hgwI=";
  doCheck = false;
+  strictDeps = true;

  meta = with lib; {
    description = "Prometheus SLURM Exporter";
--- a/pkgs/sonar/default.nix
+++ b/pkgs/sonar/default.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
  };
  hardeningDisable = [ "all" ];
  dontStrip = true;
+  strictDeps = true;
  configureFlags = [ "--with-ovni=${ovni}" ];

  nativeBuildInputs = [
--- a/pkgs/tagaspi/default.nix
+++ b/pkgs/tagaspi/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
  pname = "tagaspi";
  enableParallelBuilding = true;
  separateDebugInfo = true;
+  strictDeps = true;

  version = "2.0";
  src = fetchFromGitHub {
--- a/pkgs/tampi/default.nix
+++ b/pkgs/tampi/default.nix
@@ -45,6 +45,7 @@ in stdenv.mkDerivation {
  inherit (source) src version;
  enableParallelBuilding = true;
  separateDebugInfo = true;
+  strictDeps = true;

  nativeBuildInputs = [
    autoconf
--- a/pkgs/upc-qaire-exporter/default.nix
+++ b/pkgs/upc-qaire-exporter/default.nix
@@ -9,6 +9,7 @@ python3Packages.buildPythonApplication {
  src = ./.;

  doCheck = false;
+  strictDeps = true;

  build-system = with python3Packages; [
    setuptools
--- a/test/compilers/clang-openmp-ld.nix
+++ b/test/compilers/clang-openmp-ld.nix
@@ -23,9 +23,6 @@ in stdenv.mkDerivation {
  dontUnpack = true;
  dontConfigure = true;

-  # nOS-V requires access to /sys/devices to request NUMA information
-  requiredSystemFeatures = [ "sys-devices" ];
-
  buildInputs = [ openmp ];

  buildPhase = ''
Author	SHA1	Message	Date
Aleix Boné	a0f2e2639b	Add install check for OpenMP{,-V}	2025-12-10 15:56:37 +01:00
Aleix Boné	bda1f10dd7	Fix openmp buildInputs	2025-12-10 15:56:37 +01:00
Aleix Boné	734b3f0450	Remove unused sys-devices requirement in ld test	2025-12-10 15:56:36 +01:00
Aleix Boné	109ec07800	Enable papi when cross-compiling	2025-12-10 15:56:36 +01:00
Aleix Boné	881a08dd37	Fix papi cross compilation	2025-12-10 15:56:36 +01:00
Aleix Boné	fad79643fa	Use pkg-config instead of papi_version_check	2025-12-10 15:56:36 +01:00
Aleix Boné	1e36c3b204	Fix cudainfo buildInputs	2025-12-10 15:56:33 +01:00
Aleix Boné	972518c2d8	Set strictDeps to true on all our packages	2025-12-10 15:56:33 +01:00