misc: add passthru, thus every nodes in workflow can be accessed by n…

…ix commands
OpenXiangShan · Nov 15, 2024 · 5b09a3b · 5b09a3b
1 parent 68e6586
commit 5b09a3b
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 13 deletions.
diff --git a/builders/cptBuilder/default.nix b/builders/cptBuilder/default.nix
@@ -1,10 +1,11 @@
 { callPackage
 
-, gcpt
+, imgBuilder
 }: let
   # TODO: move folders to cptBuilder/
   qemu = callPackage ./qemu {};
   nemu = callPackage ./nemu {};
+  gcpt = imgBuilder.gcpt;
   stage1-profiling = callPackage ./1.profiling.nix {
     inherit qemu nemu gcpt;
   };

diff --git a/builders/default.nix b/builders/default.nix
@@ -2,6 +2,8 @@
 
 , benchmark
 }: let
-  gcpt = callPackage ./imgBuilder { inherit benchmark; };
-  checkpoints = callPackage ./cptBuilder { inherit gcpt; };
-in checkpoints
+  imgBuilder = callPackage ./imgBuilder { inherit benchmark; };
+  cptBuilder = callPackage ./cptBuilder { inherit imgBuilder; };
+in cptBuilder.overrideAttrs (old: {
+  passthru = { inherit imgBuilder cptBuilder; };
+})
diff --git a/builders/imgBuilder/default.nix b/builders/imgBuilder/default.nix
@@ -1,13 +1,8 @@
 { callPackage
-, riscv64-cc
-, riscv64-libc-static
 
 , benchmark
 }: let
   gcpt = callPackage ./gcpt { inherit benchmark; };
-# TODO: not passthru here, in gcpt
 in gcpt.overrideAttrs (old: {
-  passthru = {
-    inherit riscv64-cc riscv64-libc-static benchmark;
-  };
+  passthru = { inherit gcpt; };
 })
diff --git a/builders/imgBuilder/gcpt/default.nix b/builders/imgBuilder/gcpt/default.nix
@@ -31,4 +31,5 @@ in stdenv.mkDerivation {
     installPhase = ''
         cp build/gcpt.bin $out
     '';
+    passthru = { inherit opensbi; };
 }
diff --git a/builders/imgBuilder/linux/default.nix b/builders/imgBuilder/linux/default.nix
@@ -37,4 +37,5 @@ in stdenv.mkDerivation {
   installPhase = ''
     cp arch/riscv/boot/Image $out
   '';
+  passthru = { inherit initramfs common-build; };
 }
diff --git a/builders/imgBuilder/linux/initramfs/base/default.nix b/builders/imgBuilder/linux/initramfs/base/default.nix
@@ -27,7 +27,9 @@ let
     nod /dev/null     644 0 0 c 1 3
   '';
   gen_init_cpio = callPackage ./gen_init_cpio {};
-in runCommand name {} ''
+in runCommand name {
+  inherit cpio_list gen_init_cpio;
+} ''
   mkdir -p $out
   ${gen_init_cpio}/bin/gen_init_cpio -t 0 ${cpio_list} > $out/${name}
 ''
diff --git a/builders/imgBuilder/linux/initramfs/default.nix b/builders/imgBuilder/linux/initramfs/default.nix
@@ -10,7 +10,9 @@
     # TODO: check if `run` doest not exist, throw an error
     benchmark-run = benchmark.run;
   };
-in runCommand "${benchmark.name}.cpio" {} ''
+in runCommand "${benchmark.name}.cpio" {
+  inherit base overlays;
+} ''
   cp ${base}/init.cpio $out
   chmod +w $out
   cd ${benchmark}

diff --git a/builders/imgBuilder/linux/initramfs/overlays/default.nix b/builders/imgBuilder/linux/initramfs/overlays/default.nix
@@ -27,7 +27,10 @@ let
     echo exit
     ${trapCommand}
   '';
-in runCommand name {} ''
+in runCommand name {
+  inherit before_workload qemu_trap nemu_trap;
+  inherit inittab run_sh;
+} ''
   mkdir -p $out/bin
   cp ${riscv64-busybox}/bin/busybox $out/bin/
   ln -s /bin/busybox $out/init

diff --git a/builders/imgBuilder/opensbi/default.nix b/builders/imgBuilder/opensbi/default.nix
@@ -59,4 +59,5 @@ in stdenv.mkDerivation {
   installPhase = ''
     cp build/platform/generic/firmware/fw_payload.bin $out
   '';
+  passthru = { inherit linux dts common-build; };
 }