conflicts

Author: ArashAhmadian

.github/kokoro/steps/vtr-test.sh

@@ -69,7 +69,10 @@ find vtr_flow/benchmarks/titan_blif/ -type f -not -name 'README.*' -delete
 find . -type f -regex ".*\.tar\.\(gz\|xz\)" -delete
 
 #Gzip output files from vtr_reg_nightly tests to lower working directory disk space
-find vtr_flow/tasks/regression_tests/vtr_reg_nightly/ -type f -print0 | xargs -0 -P $(nproc) gzip
+find vtr_flow/tasks/regression_tests/vtr_reg_nightly_test1/ -type f -print0 | xargs -0 -P $(nproc) gzip
+find vtr_flow/tasks/regression_tests/vtr_reg_nightly_test2/ -type f -print0 | xargs -0 -P $(nproc) gzip
+find vtr_flow/tasks/regression_tests/vtr_reg_nightly_test3/ -type f -print0 | xargs -0 -P $(nproc) gzip
+
 
 # Make sure working directory doesn't exceed disk space limit!
 echo "Working directory size: $(du -sh)"

README.developers.md

@@ -280,6 +280,9 @@ You can also run multiple regression tests together:
 #Run both the basic and strong regression, with up to 4 tests in parallel
 $ ./run_reg_test.py vtr_reg_basic vtr_reg_strong -j4
 ```
+## Running in a large cluster using SLURM
+For the very large runs, you can submit your runs on a large cluster. A template of submission script to 
+a Slurm-managed cluster can be found under vtr_flow/tasks/slurm/
 
 ## Odin Functionality Tests
 

vtr_flow/scripts/slurm/README.md

@@ -0,0 +1,21 @@
+submission_template.sh is a template used to submit jobs using SLURM on a large cluster
+- This script is tested on computecanada cluster (Niagara) system
+
+To use this script:
+- First, generate all the shell scripts to run a task using:
+    * run_vtr_task.py -system scripts (Sec. 3.9.3 in the documentation)
+    * this will create a new run directory under the specified task (e.g. run001)
+
+- Second, edit the submission_template.sh script to match your run
+    * All lines starting with #SBATCH go to SLURM
+    * Edit all these line depending on the number of cores you want, number of parallel jobs you want,
+      the job name, your email and the job time limit
+    * Edit the relative path to your task (path_to_task) and the specific run directory where the 
+      generated shell scripts are (dir)
+
+- Third, submit these jobs to SLURM using the following command
+    * sbatch submission_template.sh
+
+You can check the state of the submitted job (or all the jobs that you submitted) using
+squeue --me
+

vtr_flow/scripts/slurm/submission_template.sh

@@ -0,0 +1,40 @@
+#! /bin/bash
+
+#======================================================================================
+#Please Make a copy of this template in the same directory and edit it to fit your run.
+#Please do not submit your copy of this template to the repo.
+#======================================================================================
+
+
+#The following section controls the parameters of your run, feel free to edit:
+#=============================================================================
+#SBATCH --nodes=1                                       # Number of nodes in our pool
+#SBATCH --ntasks=80                                     # Number of parallel tasks
+#SBATCH --ntasks-per-node=40                            # maximum number of tasks simultaneously running on a node
+#SBATCH --job-name=vtr_test                             # Job name
+#SBATCH --mail-type=FAIL,END                            # When to send an email
+#SBATCH [email protected]               # The user's email
+#SBATCH --output=parallel_%j.log                        # Determine the output log file; (%j) is the jobid
+#SBATCH --error=error_%j.log                            # Determine the error log file
+#SBATCH --time=10:00:00                                 # The job time limit in hh:mm:ss
+
+#You can also overwrite the values of some of these paramters using environment variables
+#========================================================================================
+# - SBATCH_JOB_NAME instead of --job-name
+# - SBATCH_TIMELIMIT instead of --time
+
+#Preload the required environment modules
+module load gcc/9.2.0
+module load python/3.8.5
+
+#Choose the run directory 
+path_to_task="../../tasks/regression_tests/vtr_reg_nightly/vtr_reg_qor_chain_large"
+dir="run001"
+
+
+for script in ${path_to_task}/${dir}/*/*/common*/vtr_flow.sh
+do
+        echo $script
+        $script &
+done
+wait

vtr_flow/tasks/regression_tests/README_nightly_regression_parallelism.md

@@ -1,4 +1,5 @@
 # Parallesim Startegy for vtr_reg_nightly: 
+## Current Sub-suites: 
 
   * The nightly regression suite is broken up into multiple sub-suites to minimize the wall-clock when ran by CI using Kokoro machines. 
   * The lower bound for the run-time of the nightly regression tests is the longest vtr_flow run in all suites (currently this flow is in vtr_reg_nightly_test2/vtr_reg_qor) 
@@ -9,5 +10,9 @@
     of all suites (~2 hours using -j8). 
   * If tasks with long flows that exceed ~1.5-2 hours are to be added, it is best to seperate them from the other suites and put it in a seperate test
     at the bottom of the task list. 
+
+## Adding Sub-suites: 
+  * To add additional suites, a config file (.cfg) has to be added to [the config list for Kokoro machines](https://github.com/verilog-to-routing/vtr-verilog-to-routing/tree/master/.github/kokoro/presubmit). The new config should be indentical to the other config file for nightly tests, with the only difference being the value for VTR_TEST (i.e. the value should be changed to the directory name for the new suite). 
+
 
 

vtr_flow/tasks/regression_tests/vtr_reg_nightly_test1/task_list.txt

@@ -1,7 +1,9 @@
+#Refer to Issue #1770 for details. 
+#regression_tests/vtr_reg_nightly_test1/arithmetic_tasks/adder_trees
+
 regression_tests/vtr_reg_nightly_test1/vpr_reg_mcnc
 regression_tests/vtr_reg_nightly_test1/vtr_reg_fpu_soft_logic_arch
 regression_tests/vtr_reg_nightly_test1/vtr_reg_fpu_hard_block_arch
-regression_tests/vtr_reg_nightly_test1/arithmetic_tasks/adder_trees
 regression_tests/vtr_reg_nightly_test1/arithmetic_tasks/figure_8
 regression_tests/vtr_reg_nightly_test1/arithmetic_tasks/FIR_filters
 regression_tests/vtr_reg_nightly_test1/arithmetic_tasks/FIR_filters_frac