group harnesses by file

Author: Carolyn Zech

scripts/run-kani.sh

@@ -153,13 +153,29 @@ get_kani_path() {
 
 get_harnesses() {
     local kani_path="$1"
-    # Run kani list with JSON format and process with jq to extract all harness names
-    # Note: This code is based on `kani list` JSON version 0.1 -- if the version changes, this logic may need to change as well.
-    "$kani_path" list -Z list -Z function-contracts -Z mem-predicates -Z float-lib -Z c-ffi ./library --std --format json \
+    "$kani_path" list -Z list -Z function-contracts -Z mem-predicates -Z float-lib -Z c-ffi ./library --std --format json | \
+    # Note: this command is based on kani list JSON version 0.1.
+    # If the JSON format changes, this command may need to be updated.
+    # We group each file's standard and contract harnesses together, so that standard and contract harnesses for a single file are
+    # more likely to run on the same partition.
     jq -r '
-        ([.["standard-harnesses"] | to_entries | .[] | .value[]] + 
-         [.["contract-harnesses"] | to_entries | .[] | .value[]]) | 
-        .[]
+        # Merge standard and contract harnesses by file
+        (reduce (.["standard-harnesses"] | to_entries[]) as $entry ({};
+            . + { ($entry.key): $entry.value }
+        )) as $std |
+        (reduce (.["contract-harnesses"] | to_entries[]) as $entry ({};
+            . + { ($entry.key): $entry.value }
+        )) as $contract |
+        # Get all unique files, sorted alphabetically
+        ($std | keys + $contract | keys | unique | sort) as $all_files |
+        # For each file, output its harnesses in order
+        reduce $all_files[] as $file ({};
+            . + { 
+                ($file): (($std[$file] // []) + ($contract[$file] // []))
+            }
+        ) |
+        to_entries |
+        .[].value[]
     '
 }