Merge branch 'main' into user/sumita/dot2add

Author: sumitsays

.ci/compute-projects.sh

@@ -18,14 +18,15 @@ function compute-projects-to-test() {
   shift
   projects=${@}
   for project in ${projects}; do
+    echo "${project}"
     case ${project} in
     lld)
-      for p in lld bolt cross-project-tests; do
+      for p in bolt cross-project-tests; do
         echo $p
       done
     ;;
     llvm)
-      for p in llvm bolt clang clang-tools-extra lld lldb mlir polly; do
+      for p in bolt clang clang-tools-extra lld lldb mlir polly; do
         echo $p
       done
       # Flang is not stable in Windows CI at the moment
@@ -35,30 +36,21 @@ function compute-projects-to-test() {
     ;;
     clang)
       # lldb is temporarily removed to alleviate Linux pre-commit CI waiting times
-      for p in clang clang-tools-extra compiler-rt cross-project-tests; do
+      for p in clang-tools-extra compiler-rt cross-project-tests; do
         echo $p
       done
     ;;
     clang-tools-extra)
-      for p in clang-tools-extra libc; do
-        echo $p
-      done
+      echo libc
     ;;
     mlir)
-      echo mlir
-      # Flang is not stable in Windows CI at the moment
-      if [[ $isForWindows == 0 ]]; then
-        echo flang
-      fi
-    ;;
-    flang-rt)
       # Flang is not stable in Windows CI at the moment
       if [[ $isForWindows == 0 ]]; then
         echo flang
       fi
     ;;
     *)
-      echo "${project}"
+      # Nothing to do
     ;;
     esac
   done
@@ -73,11 +65,6 @@ function compute-runtimes-to-test() {
         echo $p
       done
     ;;
-    flang)
-      for p in flang-rt; do
-        echo $p
-      done
-    ;;
     *)
       # Nothing to do
     ;;

.ci/compute_projects.py

@@ -0,0 +1,226 @@
+# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+"""Computes the list of projects that need to be tested from a diff.
+
+Does some things, spits out a list of projects.
+"""
+
+from collections.abc import Set
+import pathlib
+import platform
+import sys
+
+# This mapping lists out the dependencies for each project. These should be
+# direct dependencies. The code will handle transitive dependencies. Some
+# projects might have optional dependencies depending upon how they are built.
+# The dependencies listed here should be the dependencies required for the
+# configuration built/tested in the premerge CI.
+PROJECT_DEPENDENCIES = {
+    "llvm": set(),
+    "clang": {"llvm"},
+    "bolt": {"clang", "lld", "llvm"},
+    "clang-tools-extra": {"clang", "llvm"},
+    "compiler-rt": {"clang", "lld"},
+    "libc": {"clang", "lld"},
+    "openmp": {"clang", "lld"},
+    "flang": {"llvm", "clang"},
+    "lldb": {"llvm", "clang"},
+    "libclc": {"llvm", "clang"},
+    "lld": {"llvm"},
+    "mlir": {"llvm"},
+    "polly": {"llvm"},
+}
+
+# This mapping describes the additional projects that should be tested when a
+# specific project is touched. We enumerate them specifically rather than
+# just invert the dependencies list to give more control over what exactly is
+# tested.
+DEPENDENTS_TO_TEST = {
+    "llvm": {
+        "bolt",
+        "clang",
+        "clang-tools-extra",
+        "lld",
+        "lldb",
+        "mlir",
+        "polly",
+        "flang",
+    },
+    "lld": {"bolt", "cross-project-tests"},
+    # TODO(issues/132795): LLDB should be enabled on clang changes.
+    "clang": {"clang-tools-extra", "compiler-rt", "cross-project-tests"},
+    "clang-tools-extra": {"libc"},
+    "mlir": {"flang"},
+}
+
+DEPENDENT_RUNTIMES_TO_TEST = {"clang": {"libcxx", "libcxxabi", "libunwind"}}
+
+EXCLUDE_LINUX = {
+    "cross-project-tests",  # TODO(issues/132796): Tests are failing.
+    "openmp",  # https://github.com/google/llvm-premerge-checks/issues/410
+}
+
+EXCLUDE_WINDOWS = {
+    "cross-project-tests",  # TODO(issues/132797): Tests are failing.
+    "compiler-rt",  # TODO(issues/132798): Tests take excessive time.
+    "openmp",  # TODO(issues/132799): Does not detect perl installation.
+    "libc",  # No Windows Support.
+    "lldb",  # TODO(issues/132800): Needs environment setup.
+    "bolt",  # No Windows Support.
+}
+
+# These are projects that we should test if the project itself is changed but
+# where testing is not yet stable enough for it to be enabled on changes to
+# dependencies.
+EXCLUDE_DEPENDENTS_WINDOWS = {
+    "flang",  # TODO(issues/132803): Flang is not stable.
+}
+
+EXCLUDE_MAC = {
+    "bolt",
+    "compiler-rt",
+    "cross-project-tests",
+    "flang",
+    "libc",
+    "libcxx",
+    "libcxxabi",
+    "libunwind",
+    "lldb",
+    "openmp",
+    "polly",
+}
+
+PROJECT_CHECK_TARGETS = {
+    "clang-tools-extra": "check-clang-tools",
+    "compiler-rt": "check-compiler-rt",
+    "cross-project-tests": "check-cross-project",
+    "libcxx": "check-cxx",
+    "libcxxabi": "check-cxxabi",
+    "libunwind": "check-unwind",
+    "lldb": "check-lldb",
+    "llvm": "check-llvm",
+    "clang": "check-clang",
+    "bolt": "check-bolt",
+    "lld": "check-lld",
+    "flang": "check-flang",
+    "libc": "check-libc",
+    "lld": "check-lld",
+    "lldb": "check-lldb",
+    "mlir": "check-mlir",
+    "openmp": "check-openmp",
+    "polly": "check-polly",
+}
+
+RUNTIMES = {"libcxx", "libcxxabi", "libunwind"}
+
+
+def _add_dependencies(projects: Set[str]) -> Set[str]:
+    projects_with_dependents = set(projects)
+    current_projects_count = 0
+    while current_projects_count != len(projects_with_dependents):
+        current_projects_count = len(projects_with_dependents)
+        for project in list(projects_with_dependents):
+            if project not in PROJECT_DEPENDENCIES:
+                continue
+            projects_with_dependents.update(PROJECT_DEPENDENCIES[project])
+    return projects_with_dependents
+
+
+def _compute_projects_to_test(modified_projects: Set[str], platform: str) -> Set[str]:
+    projects_to_test = set()
+    for modified_project in modified_projects:
+        # Skip all projects where we cannot run tests.
+        if modified_project not in PROJECT_CHECK_TARGETS:
+            continue
+        if modified_project in RUNTIMES:
+            continue
+        projects_to_test.add(modified_project)
+        if modified_project not in DEPENDENTS_TO_TEST:
+            continue
+        for dependent_project in DEPENDENTS_TO_TEST[modified_project]:
+            if (
+                platform == "Windows"
+                and dependent_project in EXCLUDE_DEPENDENTS_WINDOWS
+            ):
+                continue
+            projects_to_test.add(dependent_project)
+    if platform == "Linux":
+        for to_exclude in EXCLUDE_LINUX:
+            if to_exclude in projects_to_test:
+                projects_to_test.remove(to_exclude)
+    elif platform == "Windows":
+        for to_exclude in EXCLUDE_WINDOWS:
+            if to_exclude in projects_to_test:
+                projects_to_test.remove(to_exclude)
+    elif platform == "Darwin":
+        for to_exclude in EXCLUDE_MAC:
+            if to_exclude in projects_to_test:
+                projects_to_test.remove(to_exclude)
+    else:
+        raise ValueError("Unexpected platform.")
+    return projects_to_test
+
+
+def _compute_projects_to_build(projects_to_test: Set[str]) -> Set[str]:
+    return _add_dependencies(projects_to_test)
+
+
+def _compute_project_check_targets(projects_to_test: Set[str]) -> Set[str]:
+    check_targets = set()
+    for project_to_test in projects_to_test:
+        if project_to_test not in PROJECT_CHECK_TARGETS:
+            continue
+        check_targets.add(PROJECT_CHECK_TARGETS[project_to_test])
+    return check_targets
+
+
+def _compute_runtimes_to_test(projects_to_test: Set[str]) -> Set[str]:
+    runtimes_to_test = set()
+    for project_to_test in projects_to_test:
+        if project_to_test not in DEPENDENT_RUNTIMES_TO_TEST:
+            continue
+        runtimes_to_test.update(DEPENDENT_RUNTIMES_TO_TEST[project_to_test])
+    return runtimes_to_test
+
+
+def _compute_runtime_check_targets(runtimes_to_test: Set[str]) -> Set[str]:
+    check_targets = set()
+    for runtime_to_test in runtimes_to_test:
+        check_targets.add(PROJECT_CHECK_TARGETS[runtime_to_test])
+    return check_targets
+
+
+def _get_modified_projects(modified_files: list[str]) -> Set[str]:
+    modified_projects = set()
+    for modified_file in modified_files:
+        modified_projects.add(pathlib.Path(modified_file).parts[0])
+    return modified_projects
+
+
+def get_env_variables(modified_files: list[str], platform: str) -> Set[str]:
+    modified_projects = _get_modified_projects(modified_files)
+    projects_to_test = _compute_projects_to_test(modified_projects, platform)
+    projects_to_build = _compute_projects_to_build(projects_to_test)
+    projects_check_targets = _compute_project_check_targets(projects_to_test)
+    runtimes_to_test = _compute_runtimes_to_test(projects_to_test)
+    runtimes_check_targets = _compute_runtime_check_targets(runtimes_to_test)
+    # We use a semicolon to separate the projects/runtimes as they get passed
+    # to the CMake invocation and thus we need to use the CMake list separator
+    # (;). We use spaces to separate the check targets as they end up getting
+    # passed to ninja.
+    return {
+        "projects_to_build": ";".join(sorted(projects_to_build)),
+        "project_check_targets": " ".join(sorted(projects_check_targets)),
+        "runtimes_to_build": ";".join(sorted(runtimes_to_test)),
+        "runtimes_check_targets": " ".join(sorted(runtimes_check_targets)),
+    }
+
+
+if __name__ == "__main__":
+    current_platform = platform.system()
+    if len(sys.argv) == 2:
+        current_platform = sys.argv[1]
+    env_variables = get_env_variables(sys.stdin.readlines(), current_platform)
+    for env_variable in env_variables:
+        print(f"{env_variable}='{env_variables[env_variable]}'")