misc: escape spec2006 testcase name

OpenXiangShan · Nov 11, 2024 · 1fa606f · 1fa606f
1 parent a989d7a
commit 1fa606f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -49,14 +49,14 @@ h
 
 it will show you some usage tips
 ```
-   DETERMINISTIC_CHECKPOINTS USAGE TIPS                                                                               
-                                                                                                                      
-  • Set SPEC CPU 2006 source code: edit  config.nix :  spec2006_path = [...]                    
+   DETERMINISTIC_CHECKPOINTS USAGE TIPS
+
+  • Set SPEC CPU 2006 source code: edit  config.nix :  spec2006_path = [...]
   • Set input size: edit  config.nix :  size = xxx  (default input is ref)
-  • Change other configs in  config.nix                           
-  • Generate the checkpoints of all testCases into  result/ :  nom-build -A checkpoints                               
-  • Generate the checkpoints of a specific testCase into  result/ :  nom-build -A 'checkpoints."<testCase>"'                  
-    • E.g.:  nom-build -A 'checkpoints."403.gcc"' 
+  • Change other configs in  config.nix
+  • Generate the checkpoints of all testCases into  result/ :  nom-build -A checkpoints
+  • Generate the checkpoints of a specific testCase into  result/ :  nom-build -A checkpoints.<testCase>
+    • E.g.:  nom-build -A checkpoints.403_gcc
   • Running nom-build without parameters will generate results-* directory containing all intermediate build results, symlinked to the corresponding /nix/store/....nix. You can then use dump_result.py to read the log files within and obtain the dynamic instruction count of the program.
     • E.g.:  nom-build
 ```

diff --git a/shell.nix b/shell.nix
@@ -8,8 +8,8 @@ let
     * Set input size: edit `config.nix`: `size = xxx` (default input is ref)
     * Change other configs in `config.nix`
     * Generate the checkpoints of all testCases into `result/`: `nom-build -A checkpoints`
-    * Generate the checkpoints of a specific <testCase> into `result/`: `nom-build -A 'checkpoints."<testCase>"'`
-      * E.g.: `nom-build -A 'checkpoints."403.gcc"'`
+    * Generate the checkpoints of a specific <testCase> into `result/`: `nom-build -A checkpoints.<testCase>`
+      * E.g.: `nom-build -A checkpoints.403_gcc`
     * Running nom-build without parameters will generate results-* directory, used by dump_result.py
       * E.g.: `nom-build`
     * Generate html doc into `book/`: `make doc`, 

diff --git a/spec2006/default.nix b/spec2006/default.nix
@@ -42,7 +42,8 @@
   };
 in builtins.listToAttrs (
   builtins.map (testcase: {
-    name = testcase;
+    # change `.` to `_`, e.g. "403.gcc" to "403_gcc"
+    name = builtins.replaceStrings ["."] ["_"] testcase;
     value = runCommand "${testcase}" {} ''
       mkdir -p $out
       cp -r ${build-all}/${testcase}/* $out/