sync

Author: helly25

toolchain/internal/llvm_distributions.bzl

@@ -787,23 +787,19 @@ def _get_llvm_version(rctx):
         )
     return llvm_version
 
-def _get_all_llvm_distributions(*, extra_llvm_distributions):
-    dists = {
-        basename: struct(
+def _get_all_llvm_distributions(*, llvm_distributions, extra_llvm_distributions, parsed_llvm_version):
+    distributions = {}
+    for dist, sha256 in llvm_distributions.items() + (extra_llvm_distributions.items() if extra_llvm_distributions else []):
+        basename = _distribution_basename(dist)
+        version = _distribution_version(basename)
+        if parsed_llvm_version and parsed_llvm_version != version:
+            continue
+        distributions[basename] = struct(
             distribution = basename,
             sha256 = sha256,
+            version = version,
         )
-        for basename, sha256 in _llvm_distributions.items()
-    }
-    if extra_llvm_distributions:
-        dists = dists | {
-            _distribution_basename(dist): struct(
-                distribution = dist,
-                sha256 = sha256,
-            )
-            for dist, sha256 in extra_llvm_distributions.items()
-        }
-    return dists
+    return distributions
 
 _UBUNTU_NAMES = [
     "arch",
@@ -1130,7 +1126,11 @@ def _required_llvm_release_name(*, version_or_requirements, all_llvm_distributio
     return None, None, "ERROR: No matching distribution found."
 
 def required_llvm_release_name_rctx(rctx, llvm_version):
-    all_llvm_distributions = _get_all_llvm_distributions(rctx)
+    all_llvm_distributions = _get_all_llvm_distributions(
+        llvm_distributions = _llvm_distributions,
+        extra_llvm_distributions = rctx.attr.extra_llvm_distributions,
+        parsed_llvm_version = _parse_version(llvm_version),
+    )
     return _required_llvm_release_name(
         version_or_requirements = llvm_version,
         all_llvm_distributions = all_llvm_distributions,
@@ -1215,17 +1215,18 @@ def _distributions_test_writer_impl(ctx):
     verify that predicted distributions have been configured. Otherwise the
     algorithm could not know the hash value.
     """
-    all_llvm_distributions = _get_all_llvm_distributions(
-        # Inject version '0.0.0' that verifies additional behavior using `extra_llvm_distributions`.
-        extra_llvm_distributions = {
-            "LLVM-0.0.0-Linux-ARM64.tar.xz": "a6b8679be46bdaa383e0c7f13a473ca8f7a4f87233f2cc0e0a7ab19e1b6265e7",
-            "/foo/bar/LLVM-0.0.0-Linux-X64.tar.xz?xyz": "0a764a8ca521606532ca9ec4e5745c933b16b7d30f4701a47ee851d448fcdb74",
-            "http://server/foo/bar/LLVM-0.0.0-macOS-ARM64.tar.xz#xyz": "9da86f64a99f5ce9b679caf54e938736ca269c5e069d0c94ad08b995c5f25c16",
-            "http://server/foo/bar/LLVM-0.0.0-macOS-X64.tar.xz": "264f2f1e8b67f066749349ae8b4943d346cd44e099464164ef21b42a57663540",
-            "http://server/clang%2Bllvm-0.0.0-aarch64-pc-windows-msvc.tar.xz": "5916d93bf80e3ae504022cdd8cb8887be001f9b68a7a08bd268727e8d858afa4",
-            "http://server/path-to-file/clang%2Bllvm-0.0.0-x86_64-pc-windows-msvc.tar.xz#bla": "5916d93bf80e3ae504022cdd8cb8887be001f9b68a7a08bd268727e8d858afa4",
-        },
-    )
+    use_llvm_distributions = _llvm_distributions
+
+    # Inject version '0.0.0' that verifies additional behavior using `extra_llvm_distributions`.
+    extra_llvm_distributions = {
+        "LLVM-0.0.0-Linux-ARM64.tar.xz": "a6b8679be46bdaa383e0c7f13a473ca8f7a4f87233f2cc0e0a7ab19e1b6265e7",
+        "/foo/bar/LLVM-0.0.0-Linux-X64.tar.xz?xyz": "0a764a8ca521606532ca9ec4e5745c933b16b7d30f4701a47ee851d448fcdb74",
+        "http://server/foo/bar/LLVM-0.0.0-macOS-ARM64.tar.xz#xyz": "9da86f64a99f5ce9b679caf54e938736ca269c5e069d0c94ad08b995c5f25c16",
+        "http://server/foo/bar/LLVM-0.0.0-macOS-X64.tar.xz": "264f2f1e8b67f066749349ae8b4943d346cd44e099464164ef21b42a57663540",
+        "http://server/clang%2Bllvm-0.0.0-aarch64-pc-windows-msvc.tar.xz": "5916d93bf80e3ae504022cdd8cb8887be001f9b68a7a08bd268727e8d858afa4",
+        "http://server/path-to-file/clang%2Bllvm-0.0.0-x86_64-pc-windows-msvc.tar.xz#bla": "5916d93bf80e3ae504022cdd8cb8887be001f9b68a7a08bd268727e8d858afa4",
+    }
+
     arch_list = [
         "aarch64",
         "armv7a",
@@ -1251,7 +1252,6 @@ def _distributions_test_writer_impl(ctx):
     dist_dict_list = {
         "linux": [
             # keep sorted
-            struct(name = "ibm-aix", version = "7.2"),
             struct(name = "amzn", version = ANY_VERSION),
             struct(name = "arch", version = ANY_VERSION),
             struct(name = "centos", version = "6"),
@@ -1266,6 +1266,7 @@ def _distributions_test_writer_impl(ctx):
             struct(name = "freebsd", version = "11"),
             struct(name = "freebsd", version = "12"),
             struct(name = "freebsd", version = "13"),
+            struct(name = "ibm-aix", version = "7.2"),
             struct(name = "linuxmint", version = "18"),
             struct(name = "linuxmint", version = "19"),
             struct(name = "pc-solaris", version = "2.11"),
@@ -1298,7 +1299,7 @@ def _distributions_test_writer_impl(ctx):
     MAX_VERSION = _parse_version("20.1.3")
     version_dict = {
         _distribution_version(basename): None
-        for basename in all_llvm_distributions.keys()
+        for basename in use_llvm_distributions.keys() + extra_llvm_distributions.keys()
     } | {
         _parse_version(v): None
         for v in _llvm_distributions_base_url.keys()
@@ -1314,8 +1315,8 @@ def _distributions_test_writer_impl(ctx):
     # We keep track of versions in `not_found` and remove the ones we found.
     # So at the end all version that were not found remain, hence the name.
     not_found = {
-        basename: None
-        for basename in all_llvm_distributions.keys()
+        _distribution_basename(distribution): None
+        for distribution in use_llvm_distributions.keys() + extra_llvm_distributions.keys()
     }
 
     # While computing we add predicted versions that are not configured as True.
@@ -1327,6 +1328,11 @@ def _distributions_test_writer_impl(ctx):
 
     # For all versions X arch X os check if we can compute the distribution.
     for version in versions:
+        all_llvm_distributions = _get_all_llvm_distributions(
+            llvm_distributions = use_llvm_distributions,
+            extra_llvm_distributions = extra_llvm_distributions,
+            parsed_llvm_version = version,
+        )
         for arch in arch_list:
             for os in os_list:
                 if version < MIN_VERSION:
@@ -1353,17 +1359,17 @@ def _distributions_test_writer_impl(ctx):
                             all_llvm_distributions,
                             host_info,
                         )
+                        skip_output = False
                         if error:
                             if error.startswith("ERROR: No matching config could be found for version"):
-                                # Simplify test output:
-                                error = "ERROR: No version selected"
+                                skip_output = True
                         else:
                             if predicted.endswith(".exe"):
                                 error = "ERROR: Windows .exe is not supported: " + predicted
                             elif predicted not in all_llvm_distributions:
                                 error = "ERROR: Unavailable prediction: " + predicted
                             elif len(basenames) == 0:
-                                error = "ERROR: No version selected"
+                                skip_output = True
                             elif len(basenames) == 1:
                                 predicted = basenames[0]
                             else:
@@ -1372,14 +1378,15 @@ def _distributions_test_writer_impl(ctx):
                                 arch_found = [arch for arch in arch_list if arch in predicted]
                                 if len(arch_found) == 1 and arch_found[0] not in arch_alias_dict.get(arch, [arch]):
                                     error = "ERROR: Bad arch selection: " + predicted
-                        select.append("{version}-{arch}-{os}/{dist_name}/{dist_version} -> {basename}".format(
-                            version = _version_string(version),
-                            arch = arch,
-                            os = os,
-                            dist_name = dist.name,
-                            dist_version = dist.version,
-                            basename = error or predicted,
-                        ))
+                        if not skip_output:
+                            select.append("{version}-{arch}-{os}/{dist_name}/{dist_version} -> {basename}".format(
+                                version = _version_string(version),
+                                arch = arch,
+                                os = os,
+                                dist_name = dist.name,
+                                dist_version = dist.version,
+                                basename = error or predicted,
+                            ))
                     if len(basenames) != 1:
                         if basenames:
                             dupes.append("dup: {version}-{arch}-{os}-{dist_name}-{dist_version} -> {count}".format(
@@ -1408,7 +1415,7 @@ def _distributions_test_writer_impl(ctx):
     ctx.actions.write(ctx.outputs.select, "\n".join(select) + "\n")
 
 write_distributions = rule(
-    implementation = _write_distributions_impl,
+    implementation = _distributions_test_writer_impl,
     attrs = {
         "output": attr.output(mandatory = True),
         "select": attr.output(mandatory = True),