WIP

Author: DavidSpickett

.ci/generate-buildkite-pipeline-premerge

@@ -272,7 +272,7 @@ if [[ "${linux_projects}" != "" ]]; then
   artifact_paths:
   - 'artifacts/**/*'
   - '*_result.json'
-  - 'build/test-results.xml'
+  - 'build/test-results.*.xml'
   agents: ${LINUX_AGENTS}
   retry:
     automatic:
@@ -295,7 +295,7 @@ if [[ "${windows_projects}" != "" ]]; then
   artifact_paths:
   - 'artifacts/**/*'
   - '*_result.json'
-  - 'build/test-results.xml'
+  - 'build/test-results.*.xml'
   agents: ${WINDOWS_AGENTS}
   retry:
     automatic:

.ci/lit-wrapper.py

@@ -0,0 +1,29 @@
+#! /usr/bin/env/python3
+
+import sys
+import os
+import subprocess
+import tempfile
+
+result_path = None
+for idx, option in enumerate(sys.argv):
+    if option == "--xunit-xml-output":
+        result_path = sys.argv[idx + 1]
+        break
+
+dirname, _ = os.path.split(os.path.abspath(__file__))
+res = subprocess.run(
+    [sys.executable, os.path.join(dirname, "llvm-lit-actual.py"), *sys.argv[1:]],
+    check=False,
+)
+
+if result_path is not None:
+    with open(result_path, "rb") as results_file:
+        filename, ext = os.path.splitext(os.path.basename(result_path))
+        fd, _ = tempfile.mkstemp(
+            suffix=ext, prefix=f"{filename}.", dir=os.path.dirname(result_path)
+        )
+        with os.fdopen(fd, "wb") as out:
+            out.write(results_file.read())
+
+sys.exit(res.returncode)

.ci/monolithic-linux.sh

@@ -30,7 +30,7 @@ fi
 
 function at-exit {
   python3 "${MONOREPO_ROOT}"/.ci/generate_test_report.py ":linux: Linux x64 Test Results" \
-    "linux-x64-test-results" "${BUILD_DIR}"/test-results*.xml
+    "linux-x64-test-results" "${BUILD_DIR}"/test-results.*.xml
 
   mkdir -p artifacts
   ccache --print-stats > artifacts/ccache_stats.txt
@@ -39,6 +39,7 @@ trap at-exit EXIT
 
 projects="${1}"
 targets="${2}"
+llvm_lit_args="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml --timeout=1200 --time-tests"
 
 echo "--- cmake"
 pip install -q -r "${MONOREPO_ROOT}"/mlir/python/requirements.txt
@@ -51,13 +52,17 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
       -D LLVM_ENABLE_ASSERTIONS=ON \
       -D LLVM_BUILD_EXAMPLES=ON \
       -D COMPILER_RT_BUILD_LIBFUZZER=OFF \
-      -D LLVM_LIT_ARGS="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml --timeout=1200 --time-tests" \
+      -D LLVM_LIT_ARGS="$llvm_lit_args" \
       -D LLVM_ENABLE_LLD=ON \
       -D CMAKE_CXX_FLAGS=-gmlt \
       -D LLVM_CCACHE_BUILD=ON \
       -D MLIR_ENABLE_BINDINGS_PYTHON=ON \
       -D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
 
+# Configure installs llvm-lit into bin. Replace this with the wrapper script.
+mv "${BUILD_DIR}"/bin/llvm-lit "${BUILD_DIR}"/bin/llvm-lit-actual
+cp "${MONOREPO_ROOT}"/.ci/lit-wrapper.py "${BUILD_DIR}"/bin/llvm-lit
+
 echo "--- ninja"
 # Targets are not escaped as they are passed as separate arguments.
 ninja -C "${BUILD_DIR}" -k 0 ${targets}
@@ -91,7 +96,11 @@ if [[ "${runtimes}" != "" ]]; then
       -D CMAKE_BUILD_TYPE=RelWithDebInfo \
       -D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
       -D LIBCXX_TEST_PARAMS="std=c++03" \
-      -D LIBCXXABI_TEST_PARAMS="std=c++03"
+      -D LIBCXXABI_TEST_PARAMS="std=c++03" \
+      -D LLVM_LIT_ARGS="$llvm_lit_args"
+
+  mv "${RUNTIMES_BUILD_DIR}"/bin/llvm-lit "${BUILD_DIR}"/bin/llvm-lit-actual
+  cp "${MONOREPO_ROOT}"/.ci/lit-wrapper.py "${RUNTIMES_BUILD_DIR}"/bin/llvm-lit
 
   echo "--- ninja runtimes C++03"
 
@@ -108,7 +117,11 @@ if [[ "${runtimes}" != "" ]]; then
       -D CMAKE_BUILD_TYPE=RelWithDebInfo \
       -D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
       -D LIBCXX_TEST_PARAMS="std=c++26" \
-      -D LIBCXXABI_TEST_PARAMS="std=c++26"
+      -D LIBCXXABI_TEST_PARAMS="std=c++26" \
+      -D LLVM_LIT_ARGS="$llvm_lit_args"
+
+  mv "${RUNTIMES_BUILD_DIR}"/bin/llvm-lit "${BUILD_DIR}"/bin/llvm-lit-actual.py
+  cp "${MONOREPO_ROOT}"/.ci/lit-wrapper.py "${RUNTIMES_BUILD_DIR}"/bin/llvm-lit
 
   echo "--- ninja runtimes C++26"
 
@@ -125,7 +138,11 @@ if [[ "${runtimes}" != "" ]]; then
       -D CMAKE_BUILD_TYPE=RelWithDebInfo \
       -D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
       -D LIBCXX_TEST_PARAMS="enable_modules=clang" \
-      -D LIBCXXABI_TEST_PARAMS="enable_modules=clang"
+      -D LIBCXXABI_TEST_PARAMS="enable_modules=clang" \
+      -D LLVM_LIT_ARGS="$llvm_lit_args"
+
+  mv "${RUNTIMES_BUILD_DIR}"/bin/llvm-lit "${BUILD_DIR}"/bin/llvm-lit-actual.py
+  cp "${MONOREPO_ROOT}"/.ci/lit-wrapper.py "${RUNTIMES_BUILD_DIR}"/bin/llvm-lit
 
   echo "--- ninja runtimes clang modules"
 

.ci/monolithic-windows.sh

@@ -29,7 +29,7 @@ fi
 sccache --zero-stats
 function at-exit {
   python "${MONOREPO_ROOT}"/.ci/generate_test_report.py ":windows: Windows x64 Test Results" \
-    "windows-x64-test-results" "${BUILD_DIR}"/test-results*.xml
+    "windows-x64-test-results" "${BUILD_DIR}"/test-results.*.xml
 
   mkdir -p artifacts
   sccache --show-stats >> artifacts/sccache_stats.txt
@@ -68,6 +68,10 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
       -D LLVM_PARALLEL_COMPILE_JOBS=16 \
       -D LLVM_PARALLEL_LINK_JOBS=4
 
+# Configure installs llvm-lit into bin. Replace this with the wrapper script.
+mv "${BUILD_DIR}"/bin/llvm-lit.py "${BUILD_DIR}"/bin/llvm-lit-actual.py
+cp "${MONOREPO_ROOT}"/.ci/lit-wrapper.py "${BUILD_DIR}"/bin/llvm-lit.py
+
 echo "--- ninja"
 # Targets are not escaped as they are passed as separate arguments.
 ninja -C "${BUILD_DIR}" -k 0 ${targets}