decouple: benchmark.run

OpenXiangShan · Nov 12, 2024 · 6cf02b5 · 6cf02b5
1 parent 96cdd7c
commit 6cf02b5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/imgBuilder/linux/initramfs/default.nix b/imgBuilder/linux/initramfs/default.nix
@@ -11,6 +11,8 @@
   base = callPackage ./base {};
   initramfs_overlays = callPackage ./overlays {
     inherit riscv64-cc riscv64-libc-static riscv64-busybox;
+    # TODO: check if `run` doest not exist, throw an error
+    benchmark-run = benchmark.run;
   };
 in runCommand "${benchmark.name}.cpio" {} ''
   cp ${base}/init.cpio $out

diff --git a/imgBuilder/linux/initramfs/overlays/default.nix b/imgBuilder/linux/initramfs/overlays/default.nix
@@ -5,6 +5,7 @@
 , riscv64-cc
 , riscv64-libc-static
 , riscv64-busybox
+, benchmark-run
 }:
 let
   name = "initramfs-overlays";
@@ -20,8 +21,7 @@ let
   run_sh = writeText "run.sh" ''
     before_workload
     echo start
-    cd /run
-    sh ./run-spec.sh
+    ${benchmark-run}
     echo exit
     ${trapCommand}
   '';

diff --git a/spec2006/default.nix b/spec2006/default.nix
@@ -44,9 +44,15 @@ in builtins.listToAttrs (
   builtins.map (testcase: {
     # change `.` to `_`, e.g. "403.gcc" to "403_gcc"
     name = builtins.replaceStrings ["."] ["_"] testcase;
-    value = runCommand "${testcase}" {} ''
+    value = (runCommand "${testcase}" {
+      # sh script to run a testcase
+      run = ''
+        cd /run
+        sh ./run-spec.sh
+      '';
+    } ''
       mkdir -p $out
       cp -r ${build-all}/${testcase}/* $out/
-    '';
+    '');
   }) testCases
 )