Get NUM_CPUS from env, pass it to parallel simtest (MystenLabs#9209)

.github/workflows/simulator-nightly.yml

@@ -42,17 +42,18 @@ jobs:
       NUM_CPUS: 24
 
     steps:
-    - name: Cargo clean
+    - name: Environment clean
       run: |
         cd ~/sui && cargo clean && git restore Cargo.lock
+        sudo rm -rf /tmp/*.*
 
     - name: Tmpfs clean
       run: |
         sudo rm -rf /tmp/*.*
 
     - name: Checkout sui repo
       run: |
-        cd ~/sui && git fetch origin && git rebase origin/main
+        cd ~/sui && git fetch origin main && git rebase origin/main
 
     - name: Install simtest
       run: |

scripts/simtest/simtest-run.sh

@@ -2,9 +2,9 @@
 # Copyright (c) Mysten Labs, Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-NUM_CPUS=$(cat /proc/cpuinfo | grep processor | wc -l) # ubuntu
-# NUM_CPUS=$(sysctl -n hw.ncpu) # mac
-# NUM_CPUS=64 # We can increase this later if needed
+if [ -z "$NUM_CPUS" ]; then
+  NUM_CPUS=$(cat /proc/cpuinfo | grep processor | wc -l) # ubuntu
+fi
 
 # filter out some tests that give spurious failures.
 TEST_FILTER="(not test(~cli_tests))"
@@ -21,6 +21,7 @@ MSIM_WATCHDOG_TIMEOUT_MS=60000 \
 MSIM_TEST_NUM=30 \
 scripts/simtest/cargo-simtest simtest \
   --package sui \
+  --test-threads "$NUM_CPUS" \
   --package sui-core \
   --profile simtestnightly \
   -E "$TEST_FILTER"
@@ -45,7 +46,7 @@ for SUB_SEED in `seq 1 $NUM_CPUS`; do
     --profile simtestnightly \
     -E "$TEST_FILTER" > "$LOG_FILE" 2>&1 &
 
-    grep -Hn FAIL "$LOG_FILE"
+  grep -Hn FAIL "$LOG_FILE"
 done
 
 # wait for all the jobs to end