feat: add nix build script for lmbench, seperate syscall test script and bin

Author: Samuka007

user/apps/default.nix

@@ -5,50 +5,71 @@
   system,
   target,
   fenix,
-  testOpt
+  testOpt,
 }:
 
 # Return a list of app derivations to be copied into the rootfs.
 let
-  cross = if system == "x86_64-linux" && target == "x86_64" then pkgs
-    else if target == "riscv64" then pkgs.pkgsCross.riscv64
-    else import nixpkgs {
-      localSystem = system;
-      crossSystem = if target == "x86_64" then "x86_64-unknown-linux-gnu"
-        else abort "Unsupported target: ${target}}";
-    };
+  cross =
+    if system == "x86_64-linux" && target == "x86_64" then
+      pkgs
+    else if target == "riscv64" then
+      pkgs.pkgsCross.riscv64
+    else
+      import nixpkgs {
+        localSystem = system;
+        crossSystem =
+          if target == "x86_64" then "x86_64-unknown-linux-gnu" else abort "Unsupported target: ${target}}";
+      };
 
-  cross-musl = if system == "x86_64-linux" && target == "x86_64" then pkgs.pkgsMusl
-    else if target == "riscv64" then pkgs.pkgsCross.riscv64-musl
-    else import nixpkgs {
-      localSystem = system;
-      crossSystem = if target == "x86_64" then "x86_64-unknown-linux-musl"
-        else abort "Unsupported target: ${target}-musl}";
-    };
+  cross-musl =
+    if system == "x86_64-linux" && target == "x86_64" then
+      pkgs.pkgsMusl
+    else if target == "riscv64" then
+      pkgs.pkgsCross.riscv64-musl
+    else
+      import nixpkgs {
+        localSystem = system;
+        crossSystem =
+          if target == "x86_64" then
+            "x86_64-unknown-linux-musl"
+          else
+            abort "Unsupported target: ${target}-musl}";
+      };
 
-  static = if system == "x86_64-linux" && target == "x86_64" then pkgs.pkgsStatic
-    else if target == "riscv64" then import nixpkgs {
-      crossSystem = lib.systems.examples.riscv64-musl;
-      isStatic = true;
-    } else abort "Unsupported static target: ${target}";
+  static =
+    if system == "x86_64-linux" && target == "x86_64" then
+      pkgs.pkgsStatic
+    else if target == "riscv64" then
+      import nixpkgs {
+        crossSystem = lib.systems.examples.riscv64-musl;
+        isStatic = true;
+      }
+    else
+      abort "Unsupported static target: ${target}";
 
-  gvisor-syscall-tests = (pkgs.callPackage ./tests/syscall/gvisor {
-    inherit fenix system;
-    installDir = testOpt.syscall.testDir;
-    version = testOpt.syscall.version;
-  });
-in [
+  gvisor-syscall-tests = (
+    pkgs.callPackage ./tests/syscall/gvisor {
+      inherit fenix system;
+      installDir = testOpt.syscall.testDir;
+      version = testOpt.syscall.version;
+    }
+  );
+
+  lmbench-benchmark-tests = (pkgs.callPackage ./tests/benchmark/lmbench { });
+in
+[
   static.busybox
   static.curl
   static.dropbear
   cross.glibc
 
   # Simple C utility
-  (static.callPackage ./about {})
-
+  (static.callPackage ./about { })
 ]
 ++ lib.optionals (target == "x86_64" && testOpt.syscall.enable) [
   # gvisor test case only included on x86_64
   gvisor-syscall-tests
+  lmbench-benchmark-tests
   # TODO: Add debian libcxx deps or FHS
 ]

user/apps/tests/benchmark/lmbench/.gitignore

@@ -0,0 +1 @@
+result

user/apps/tests/benchmark/lmbench/default.nix

@@ -0,0 +1,75 @@
+{
+  lib,
+  pkgs,
+  installDir ? "/opt/lmbench",
+}:
+
+let
+  lmbenchBin = pkgs.fetchurl {
+    url = "https://mirrors.dragonos.org.cn/pub/third_party/lmbench/lmbench-ubuntu2404-202511301014-36c2fb2d084343e098b5e343576d4fc0.tar.xz";
+    sha256 = "sha256-/iP7oKc2n0CXpA0OgVQX86quNfbtjXBZ83RBl1MEBhE=";
+  };
+
+  testScript = pkgs.stdenv.mkDerivation {
+    pname = "lmbench-test-script";
+    version = "3.0-a9";
+
+    src = lib.sourceByRegex ./. [
+      "^test_cases"
+      "^.*\.sh$"
+    ];
+
+    installPhase = ''
+      mkdir -p $out/${installDir}
+
+      install -m755 *.sh $out/${installDir}/
+      cp -r test_cases $out/${installDir}/
+      chmod +x $out/${installDir}/test_cases/*.sh
+    '';
+  };
+
+  lmbench = pkgs.stdenv.mkDerivation {
+    pname = "lmbench";
+    version = "3.0-a9";
+
+    src = lmbenchBin;
+
+    nativeBuildInputs = [ pkgs.autoPatchelfHook ];
+
+    buildInputs = [
+      pkgs.stdenv.cc.cc.lib
+      pkgs.glibc
+      pkgs.bzip2
+    ];
+
+    sourceRoot = ".";
+
+    installPhase = ''
+      # Keep Ubuntu package's original directory structure, but flatten sysroot
+      mkdir -p $out
+
+      # If there's a sysroot directory, flatten it
+      if [ -d sysroot ]; then
+        cp -r sysroot/* $out/
+      else
+        cp -r * $out/
+      fi
+
+      # Make all binaries executable
+      find $out -type f -executable -exec chmod +x {} \;
+
+      # Remove broken symlinks (mainly documentation files from sysroot)
+      find $out -xtype l -delete
+    '';
+
+    # autoPatchelfHook will automatically run after installPhase
+    # to patch all ELF binaries with correct library paths
+  };
+in
+pkgs.symlinkJoin {
+  name = "lmbench-with-tests";
+  paths = [
+    lmbench
+    testScript
+  ];
+}

user/apps/tests/benchmark/lmbench/flake.lock

@@ -0,0 +1,44 @@
+{
+  description = "LMbench benchmark suite packaged for nix (x86_64-linux only)";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  };
+
+  outputs =
+    { self, nixpkgs }:
+    let
+      system = "x86_64-linux";
+      pkgs = nixpkgs.legacyPackages.${system};
+
+      # Default installation directory
+      defaultInstallDir = "tests/benchmark/lmbench";
+
+      # Import the package definition
+      lmbench = import ./default.nix {
+        inherit (pkgs) lib pkgs;
+        installDir = defaultInstallDir;
+      };
+    in
+    {
+      packages.${system} = {
+        default = lmbench;
+        lmbench = lmbench;
+      };
+
+      # Allow overriding installDir
+      lib.${system}.mkLmbench =
+        {
+          installDir ? defaultInstallDir,
+        }:
+        import ./default.nix {
+          inherit (pkgs) lib pkgs;
+          inherit installDir;
+        };
+
+      apps.${system}.default = {
+        type = "app";
+        program = "${lmbench}/${defaultInstallDir}/run_tests.sh";
+      };
+    };
+}

user/apps/tests/benchmark/lmbench/flake.nix

@@ -38,45 +38,57 @@ let
     '';
   };
 
-  # 2. Prepare the test data, scripts, and patched binaries
-  # This derivation handles downloading, extracting, and patching the tests.
-  tests = pkgs.stdenv.mkDerivation {
-    pname = "gvisor-tests-data";
+  # 2. Extract and patch test binaries
+  # This derivation handles downloading, extracting, and patching the test binaries.
+  # Separated from scripts so that whitelist/blocklist changes don't trigger repatching.
+  testBinaries = pkgs.stdenv.mkDerivation {
+    pname = "gvisor-tests-binaries";
+    version = "0.1.0";
+
+    src = testsArchive;
+
+    nativeBuildInputs = [ pkgs.autoPatchelfHook ];
+
+    buildInputs = [ pkgs.stdenv.cc.cc.lib ];
+
+    sourceRoot = ".";
+
+    installPhase = ''
+      mkdir -p $out/${installDir}/tests
+      cp -r * $out/${installDir}/tests/
+
+      runHook preInstall
+      find $out/${installDir}/tests -type f -name '*_test' -exec chmod 755 {} \; || true
+      runHook postInstall
+    '';
+  };
+
+  # 3. Prepare test scripts and configuration files
+  # This derivation contains frequently modified files (whitelist, blocklists, scripts).
+  # Changes here won't trigger binary repatching.
+  testScripts = pkgs.stdenv.mkDerivation {
+    pname = "gvisor-tests-scripts";
     version = "0.1.0";
 
-    # Use sourceByRegex to only depend on relevant files.
-    # This prevents rebuilds when files in ./runner change.
     src = lib.sourceByRegex ./. [
       "^whitelist\.txt$"
       "^blocklists"
       "^blocklists/.*"
       "^run_tests\.sh$"
     ];
 
-    nativeBuildInputs = [ pkgs.autoPatchelfHook ];
-
-    buildInputs = [ pkgs.stdenv.cc.cc.lib ];
-
     installPhase = ''
       mkdir -p $out/${installDir}
 
       install -m644 whitelist.txt $out/${installDir}/
       cp -r blocklists $out/${installDir}/
       install -m755 run_tests.sh $out/${installDir}/
-
-      # Bundle tests archive for offline systems
-      mkdir -p $out/${installDir}/tests
-      tar -xf ${testsArchive} -C $out/${installDir}/tests --strip-components=1
-
-      runHook preInstall
-      find $out/${installDir}/tests -type f -name '*_test' -exec install -m755 {} $out/${installDir}/tests \; || true
-      runHook postInstall
     '';
   };
 
 in pkgs.symlinkJoin {
   name = "gvisor-tests";
-  paths = [ runner tests ];
+  paths = [ runner testBinaries testScripts ];
   meta = with lib; {
     description = "gVisor syscall test runner and scripts";
     platforms = platforms.linux;