[mlir] Add --force-mlir flag in soltest and a semantic test runner

Author: abinavpp

test/Common.cpp

@@ -124,7 +124,8 @@ void CommonOptions::addOptions()
 		("enforce-gas-cost-min-value", po::value(&enforceGasTestMinValue)->default_value(enforceGasTestMinValue), "Threshold value to enforce adding gas checks to a test.")
 		("abiencoderv1", po::bool_switch(&useABIEncoderV1)->default_value(useABIEncoderV1), "enables abi encoder v1")
 		("show-messages", po::bool_switch(&showMessages)->default_value(showMessages), "enables message output")
-		("show-metadata", po::bool_switch(&showMetadata)->default_value(showMetadata), "enables metadata output");
+		("show-metadata", po::bool_switch(&showMetadata)->default_value(showMetadata), "enables metadata output")
+		("force-mlir", po::bool_switch(&forceMlir)->default_value(forceMlir), "force compilation via MLIR regardless of test metadata");
 }
 
 void CommonOptions::validate() const

test/Common.h

@@ -66,6 +66,7 @@ struct CommonOptions
 	bool useABIEncoderV1 = false;
 	bool showMessages = false;
 	bool showMetadata = false;
+	bool forceMlir = false;
 	size_t batches = 1;
 	size_t selectedBatch = 0;
 

test/libsolidity/SemanticTest.cpp

@@ -112,6 +112,13 @@ SemanticTest::SemanticTest(
 	if (m_testCaseWantsMlirRun)
 		m_testCaseWantsYulRun = m_testCaseWantsLegacyRun = false;
 
+	if (solidity::test::CommonOptions::get().forceMlir)
+	{
+		m_testCaseWantsMlirRun = true;
+		m_testCaseWantsYulRun = false;
+		m_testCaseWantsLegacyRun = false;
+	}
+
 	auto revertStrings = revertStringsFromString(m_reader.stringSetting("revertStrings", "default"));
 	soltestAssert(revertStrings, "Invalid revertStrings setting.");
 	m_revertStrings = revertStrings.value();

test/mlirSemtests.sh

@@ -0,0 +1,113 @@
+#!/usr/bin/env bash
+#
+# Run each semantic test via MLIR in its own soltest process, in parallel.
+#
+# Requires: GNU parallel
+#
+# Usage: ./mlirSemtests.sh --soltest <path> --testpath <path> --vm <path> [filter]
+# Examples:
+#   ./mlirSemtests.sh --soltest build/dbg/test/soltest --testpath test --vm /path/to/libevmone.so
+#   ./mlirSemtests.sh --soltest build/dbg/test/soltest --testpath test --vm /path/to/libevmone.so enums
+
+set -eu
+
+SOLTEST=""
+TESTPATH=""
+VM=""
+FILTER=""
+OUTDIR=$(mktemp -d -t mlir-semtest-XXXXXX)
+JOBLOG=$(mktemp -t mlir-semtest-XXXXXX)
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --soltest)   SOLTEST="$2"; shift 2 ;;
+        --testpath)  TESTPATH="$2"; shift 2 ;;
+        --vm)        VM="$2"; shift 2 ;;
+        -*)          echo "Unknown option: $1"; exit 1 ;;
+        *)           FILTER="$1"; shift ;;
+    esac
+done
+
+if [[ -z "$SOLTEST" || -z "$TESTPATH" || -z "$VM" ]]; then
+    echo "Usage: $0 --soltest <path> --testpath <path> --vm <path> [filter]"
+    exit 1
+fi
+
+SEMTEST_DIR="$TESTPATH/libsolidity/semanticTests"
+
+collect_tests() {
+    local target="$SEMTEST_DIR/$FILTER"
+    if [[ -n "$FILTER" && -f "$target" ]]; then
+        echo "semanticTests/${FILTER%.sol}"
+    elif [[ -z "$FILTER" || -d "$target" ]]; then
+        find "${target:-$SEMTEST_DIR}" -name '*.sol' | sort | \
+            sed "s|^$TESTPATH/libsolidity/||; s|\.sol$||"
+    else
+        echo "Not a file or directory: $target" >&2
+        exit 1
+    fi
+}
+
+tests=()
+while IFS= read -r line; do
+    tests+=("$line")
+done < <(collect_tests)
+total=${#tests[@]}
+
+if [[ $total -eq 0 ]]; then
+    echo "No tests found for filter: $FILTER"
+    exit 1
+fi
+
+trap 'rm -rf "$OUTDIR" "$JOBLOG"' EXIT
+
+echo "Running $total tests in parallel..."
+
+run_one_test() {
+    "$SOLTEST" --catch_system_errors=no --log_level=error --report_level=no \
+        -t "$1" \
+        -- --testpath "$TESTPATH" --vm "$VM" --force-mlir
+}
+export -f run_one_test
+export SOLTEST TESTPATH VM
+
+printf '%s\n' "${tests[@]}" | \
+    parallel --joblog "$JOBLOG" --results "$OUTDIR" \
+    run_one_test {} || true
+
+pass=$(tail -n+2 "$JOBLOG" | awk -F'\t' '$7==0 && $8==0' | wc -l)
+abort=$(tail -n+2 "$JOBLOG" | awk -F'\t' '$8!=0' | wc -l)
+fail=$(tail -n+2 "$JOBLOG" | awk -F'\t' '$7!=0 && $8==0' | wc -l)
+
+echo ""
+echo "=========================================="
+echo "Results: $total tests"
+echo "=========================================="
+echo "  Pass:    $pass"
+echo "  Fail:    $fail"
+echo "  Abort:   $abort"
+echo ""
+
+# Write failures report
+REPORT="semtest-failures.txt"
+: > "$REPORT"
+
+failures=$((fail + abort))
+if [[ $failures -gt 0 ]]; then
+    tail -n+2 "$JOBLOG" | awk -F'\t' '$7!=0 || $8!=0 {print $NF}' | while read -r cmd; do
+        test_name="${cmd##*run_one_test }"
+        encoded=$(echo "$test_name" | sed 's|/|+z|g')
+        stderr_file="$OUTDIR/1/$encoded/stderr"
+        stdout_file="$OUTDIR/1/$encoded/stdout"
+
+        echo "=== $test_name ==="
+        if [[ -s "$stderr_file" ]]; then
+            cat "$stderr_file"
+        elif [[ -s "$stdout_file" ]]; then
+            cat "$stdout_file"
+        fi
+        echo ""
+    done > "$REPORT"
+
+    echo "Failures:  $REPORT"
+fi