misc: rename gcpt-bin => gcpt

OpenXiangShan · Nov 14, 2024 · a78855b · a78855b
1 parent b609a62
commit a78855b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/builders/cptBuilder/1.profiling.nix b/builders/cptBuilder/1.profiling.nix
@@ -3,15 +3,15 @@
 
 , qemu
 , nemu
-, gcpt-bin
+, gcpt
 }:
 let
-  name = "${lib.removeSuffix ".gcpt" gcpt-bin.name}.1_profiling";
+  name = "${lib.removeSuffix ".gcpt" gcpt.name}.1_profiling";
   config = import ../../config.nix;
 
   qemuCommand = [
     "${qemu}/bin/qemu-system-riscv64"
-    "-bios ${gcpt-bin}"
+    "-bios ${gcpt}"
     "-M nemu"
     "-nographic"
     "-m 8G"
@@ -23,7 +23,7 @@ let
 
   nemuCommand = [
     "${nemu}/bin/riscv64-nemu-interpreter"
-    "${gcpt-bin}"
+    "${gcpt}"
     "-b"
     "-D $out"
     "-C ${name}"

diff --git a/builders/cptBuilder/3.checkpoint.nix b/builders/cptBuilder/3.checkpoint.nix
@@ -3,15 +3,15 @@
 
 , qemu
 , nemu
-, gcpt-bin
+, gcpt
 , stage2-cluster
 }:
 let
   config = import ../../config.nix;
 
   qemuCommand = [
     "${qemu}/bin/qemu-system-riscv64"
-    "-bios ${gcpt-bin}"
+    "-bios ${gcpt}"
     "-M nemu,simpoint-path=${stage2-cluster},workload=.,cpt-interval=${toString config.intervals},output-base-dir=$out,config-name=${config.workload},checkpoint-mode=SimpointCheckpoint"
     "-nographic"
     "-m 8G"
@@ -22,7 +22,7 @@ let
 
   nemuCommand = [
     "${nemu}/bin/riscv64-nemu-interpreter"
-    "${gcpt-bin}"
+    "${gcpt}"
     "-b"
     "-D $out"
     "-C checkpoint"

diff --git a/builders/cptBuilder/default.nix b/builders/cptBuilder/default.nix
@@ -1,19 +1,19 @@
 { pkgs
-, gcpt-bin
+, gcpt
 }: let
   riscv64-cc = pkgs.pkgsCross.riscv64.stdenv.cc;
   # TODO: move folders to cptBuilder/
   qemu = pkgs.callPackage ./qemu {};
   nemu = pkgs.callPackage ./nemu {inherit riscv64-cc;};
   stage1-profiling = pkgs.callPackage ./1.profiling.nix {
-    inherit qemu nemu gcpt-bin;
+    inherit qemu nemu gcpt;
   };
   simpoint = pkgs.callPackage ./simpoint {};
   stage2-cluster = pkgs.callPackage ./2.cluster.nix {
     inherit simpoint stage1-profiling;
   };
   stage3-checkpoint = pkgs.callPackage ./3.checkpoint.nix {
-    inherit qemu nemu gcpt-bin stage2-cluster;
+    inherit qemu nemu gcpt stage2-cluster;
   };
 in stage3-checkpoint.overrideAttrs (old: {
   passthru = {

diff --git a/builders/default.nix b/builders/default.nix
@@ -1,7 +1,6 @@
 { pkgs,
 benchmark
 }: let
-  # TODO: rename gcpt-bin => gcpt
-  gcpt-bin = import ./imgBuilder { inherit pkgs benchmark; };
-  checkpoints = import ./cptBuilder { inherit pkgs gcpt-bin; };
+  gcpt = import ./imgBuilder { inherit pkgs benchmark; };
+  checkpoints = import ./cptBuilder { inherit pkgs gcpt; };
 in checkpoints