improvements to performance scripts

Author: xunilrj

scripts/perf/perf-diff.sh

@@ -20,47 +20,67 @@ if [[ "$output_format" != "md" && "$output_format" != "csv" ]]; then
     exit 2
 fi
 
-# Validate test name order and equality.
-# We trim leading/trailing whitespace on the first column before comparing.
-tmpdiff="$(mktemp)"
-if ! diff -u \
-    --label "names before ($before_file)" --label "names after ($after_file)" \
-    <(awk -F',' '{n=$1; sub(/^[ \t]+/,"",n); sub(/[ \t]+$/,"",n); print n}' "$before_file") \
-    <(awk -F',' '{n=$1; sub(/^[ \t]+/,"",n); sub(/[ \t]+$/,"",n); print n}' "$after_file") \
-    >"$tmpdiff"; then
-    echo "ERROR: Test names differ between:"
-    echo " before: $before_file"
-    echo "  and"
-    echo " after:  $after_file"
-    echo " files."
-    echo "Both files must have the same tests in the same order."
-    echo
-    cat "$tmpdiff"
-    rm -f "$tmpdiff"
-    exit 3
-fi
-rm -f "$tmpdiff"
-
 if [ "$output_format" == "csv" ]; then
     echo "Test,Before,After,Percentage"
 else
     echo "| Test | Before | After | Percentage |"
     echo "| ---- | -----: | ----: | ---------: |"
 fi
 
-paste -d, "$before_file" "$after_file" | while IFS=',' read -r test1 before test2 after; do
-    if [ "$before" != "$after" ]; then
-        diff=$((before - after))
-        if [ "$before" -eq 0 ] 2>/dev/null; then
+BEFORE_FILE_CONTENTS="$(cat $before_file | sort | uniq)"
+AFTER_FILE_CONTENTS="$(cat $after_file | sort | uniq)"
+
+TESTS_ONLY_BEFORE=""
+
+shopt -s lastpipe # needed for the allow the above variable scope inside the loop
+echo "$BEFORE_FILE_CONTENTS" | while read BEFORE_LINE 
+do
+    TESTNAME="$(echo "$BEFORE_LINE" | cut -d"," -f1)"
+    AFTER_LINE="$(echo "$AFTER_FILE_CONTENTS" | grep "$TESTNAME")"
+
+    BEFORE="$(echo "$BEFORE_LINE" | cut -d"," -f2)"
+
+    if [ -z "${AFTER_LINE}" ]; then
+        # test only on before
+        if [ "$output_format" == "csv" ]; then
+            TESTS_ONLY_BEFORE="$TESTS_ONLY_BEFORE$TESTNAME,$BEFORE,,\\n"
+        else
+            TESTS_ONLY_BEFORE="$TESTS_ONLY_BEFORE| $TESTNAME | $BEFORE | | |\\n"
+        fi
+    else
+        # test is on both files
+        AFTER="$(echo "$AFTER_LINE" | cut -d"," -f2)"
+
+        diff=$(LC_NUMERIC=C awk -v after="$AFTER" -v before="$BEFORE" 'BEGIN { printf "%.2f", before - after }')
+        if [ "$BEFORE" -eq 0 ] 2>/dev/null; then
             percent="NaN"
         else
-            percent=$(LC_NUMERIC=C awk -v d="$diff" -v b="$before" 'BEGIN { printf "%.2f", (d / b) * 100 }')
+            percent=$(LC_NUMERIC=C awk -v d="$diff" -v b="$BEFORE" 'BEGIN { printf "%.2f", (d / b) * 100 }')
         fi
+    
+        if [ "$output_format" == "csv" ]; then
+            echo "$TESTNAME,$BEFORE,$AFTER,$percent"
+        else
+            echo "| $TESTNAME | $BEFORE | $AFTER | ${percent}% |"
+        fi
+    fi
+done
+
+echo -n -e "$TESTS_ONLY_BEFORE"
+
+echo "$AFTER_FILE_CONTENTS" | while read AFTER_LINE 
+do
+    TESTNAME="$(echo "$AFTER_LINE" | cut -d"," -f1)"
+    BEFORE_LINE="$(echo "$BEFORE_FILE_CONTENTS" | grep "$TESTNAME")"
+
+    AFTER="$(echo "$AFTER_LINE" | cut -d"," -f2)"
 
+    if [ -z "${BEFORE_LINE}" ]; then
+        # test only on after
         if [ "$output_format" == "csv" ]; then
-            echo "$test1,$before,$after,$percent"
+            echo "$TESTNAME,,$AFTER,"
         else
-            echo "| $test1 | $before | $after | ${percent}% |"
+            echo "| $TESTNAME | | $AFTER | |"
         fi
     fi
 done

test/src/e2e_vm_tests/mod.rs

@@ -829,7 +829,7 @@ impl TestContext {
                         }
                         for test in pkg.tests.into_iter() {
                             perf_data.gas_usages.push(GasUsage::with_unit_test_name(
-                                test.name.clone(),
+                                format!("{}::{}", pkg.built.descriptor.name, test.name),
                                 test.gas_used as usize,
                             ));
                             if verbose {