org: move jemalloc from spec2006 to benchmarks

OpenXiangShan · Dec 18, 2024 · f50912a · f50912a
1 parent ea1c10c
commit f50912a
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 24 deletions.
diff --git a/benchmarks/default.nix b/benchmarks/default.nix
@@ -1,6 +1,26 @@
 { lib
 , callPackage
+, riscv64-pkgs
 }: lib.makeScope lib.callPackageWith (self: {
-  spec2006 = callPackage ./spec2006 {};
+  riscv64-jemalloc = riscv64-pkgs.jemalloc.overrideAttrs (oldAttrs: {
+    configureFlags = (oldAttrs.configureFlags or []) ++ [
+      "--enable-static"
+      "--disable-shared"
+    ];
+    preBuild = ''
+      # Add weak attribute to C++ operators, same as jemalloc_cpp.patch
+      sed -i 's/void \*operator new(size_t)/void *operator new(size_t) __attribute__((weak))/g' src/jemalloc_cpp.cpp
+      sed -i 's/void operator delete(void \*)/void operator delete(void *) __attribute__((weak))/g' src/jemalloc_cpp.cpp
+    '';
+    # Ensure static libraries are installed
+    postInstall = ''
+      ${oldAttrs.postInstall or ""}
+      cp -v lib/libjemalloc.a $out/lib/
+    '';
+  });
+  spec2006 = callPackage ./spec2006 {
+    inherit (self) riscv64-jemalloc;
+  };
+
   openblas = callPackage ./openblas {};
 })
diff --git a/benchmarks/spec2006/build-all.nix b/benchmarks/spec2006/build-all.nix
@@ -2,34 +2,18 @@
 , lib
 , fetchFromGitHub
 , libxcrypt-legacy
-
-, riscv64-pkgs
 , riscv64-cc
 , riscv64-fortran
 , riscv64-libc-static
+
+, riscv64-jemalloc
 , src
 , size
 , enableVector # TODO: enable vector in libc and jemalloc
 , optimize
 , march
 }:
 let
-  customJemalloc = riscv64-pkgs.jemalloc.overrideAttrs (oldAttrs: {
-    configureFlags = (oldAttrs.configureFlags or []) ++ [
-      "--enable-static"
-      "--disable-shared"
-    ];
-    preBuild = ''
-      # Add weak attribute to C++ operators, same as jemalloc_cpp.patch
-      sed -i 's/void \*operator new(size_t)/void *operator new(size_t) __attribute__((weak))/g' src/jemalloc_cpp.cpp
-      sed -i 's/void operator delete(void \*)/void operator delete(void *) __attribute__((weak))/g' src/jemalloc_cpp.cpp
-    '';
-    # Ensure static libraries are installed
-    postInstall = ''
-      ${oldAttrs.postInstall or ""}
-      cp -v lib/libjemalloc.a $out/lib/
-    '';
-  });
   CPU2006LiteWrapper = fetchFromGitHub {
     owner = "OpenXiangShan";
     repo = "CPU2006LiteWrapper";
@@ -50,7 +34,7 @@ in stdenv.mkDerivation {
     riscv64-cc
     riscv64-fortran
     riscv64-libc-static
-    customJemalloc
+    riscv64-jemalloc
   ];
 
   prePatch = ''
@@ -88,9 +72,9 @@ in stdenv.mkDerivation {
     export OPTIMIZE="${optimize} -march=${march}"
     export SUBPROCESS_NUM=5
 
-    export CFLAGS="$CFLAGS -static -Wno-format-security -I${customJemalloc}/include "
-    export CXXFLAGS="$CXXFLAGS -static -Wno-format-security -I${customJemalloc}/include"
-    export LDFLAGS="$LDFLAGS -static -ljemalloc -L${customJemalloc}/lib"
+    export CFLAGS="$CFLAGS -static -Wno-format-security -I${riscv64-jemalloc}/include "
+    export CXXFLAGS="$CXXFLAGS -static -Wno-format-security -I${riscv64-jemalloc}/include"
+    export LDFLAGS="$LDFLAGS -static -ljemalloc -L${riscv64-jemalloc}/lib"
 
     pushd $SPEC && source shrc && popd
     make copy-all-src

diff --git a/benchmarks/spec2006/build-one.nix b/benchmarks/spec2006/build-one.nix
@@ -1,6 +1,7 @@
 { runCommand
-
 , callPackage
+
+, riscv64-jemalloc
 , src
 , size
 , enableVector
@@ -9,6 +10,7 @@
 , testCase
 }: let
   build-all = callPackage ./build-all.nix {
+    inherit riscv64-jemalloc;
     inherit src size enableVector optimize march;
   };
 in runCommand "${testCase}" {

diff --git a/benchmarks/spec2006/default.nix b/benchmarks/spec2006/default.nix
@@ -1,5 +1,6 @@
 { callPackage
 
+, riscv64-jemalloc
 , src
 , size
 , enableVector
@@ -42,6 +43,7 @@ in builtins.listToAttrs (
     # change `.` to `_`, e.g. "403.gcc" to "403_gcc"
     name = builtins.replaceStrings ["."] ["_"] testCase;
     value = callPackage ./build-one.nix {
+      inherit riscv64-jemalloc;
       inherit src size enableVector optimize march;
       inherit testCase;
     };