[XLA:CPU] Add support for riscv64

Co-authored-by: Levi Zim <[email protected]>

Author: 2 people

third_party/xla/third_party/hwloc/hwloc.BUILD

@@ -272,6 +272,10 @@ cc_library(
             "hwloc/topology-linux.c",
             "include/hwloc/linux.h",
         ],
+        "@local_xla//xla/tsl:linux_riscv64": [
+            "hwloc/topology-linux.c",
+            "include/hwloc/linux.h",
+        ],
         "@local_xla//xla/tsl:linux_s390x": [
             "hwloc/topology-linux.c",
             "include/hwloc/linux.h",

third_party/xla/third_party/llvm/toolchains.patch

@@ -44,7 +44,7 @@ diff --git a/utils/bazel/llvm-project-overlay/llvm/config.bzl b/utils/bazel/llvm
 index 2e3bff53ead9..8d01617effdc 100644
 --- a/utils/bazel/llvm-project-overlay/llvm/config.bzl
 +++ b/utils/bazel/llvm-project-overlay/llvm/config.bzl
-@@ -98,8 +98,9 @@ builtin_thread_pointer = select({
+@@ -98,8 +98,10 @@ builtin_thread_pointer = select({
  # TODO: We should split out host vs. target here.
  llvm_config_defines = os_defines + builtin_thread_pointer + select({
      "@bazel_tools//src/conditions:windows": native_arch_defines("X86", "x86_64-pc-win32"),
@@ -53,6 +53,7 @@ index 2e3bff53ead9..8d01617effdc 100644
 +    "//llvm:macos_arm64": native_arch_defines("AArch64", "arm64-apple-darwin"),
 +    "//llvm:macos_x86_64": native_arch_defines("X86", "x86_64-unknown-darwin"),
 +    "//llvm:macos_x86_64_default": native_arch_defines("X86", "x86_64-unknown-darwin"),
++    "@bazel_tools//src/conditions:linux_riscv64": native_arch_defines("RISCV", "riscv64-unknown-linux-gnu"),
      "@bazel_tools//src/conditions:linux_aarch64": native_arch_defines("AArch64", "aarch64-unknown-linux-gnu"),
      "@bazel_tools//src/conditions:linux_ppc64le": native_arch_defines("PowerPC", "powerpc64le-unknown-linux-gnu"),
      "@bazel_tools//src/conditions:linux_s390x": native_arch_defines("SystemZ", "systemz-unknown-linux_gnu"),

third_party/xla/third_party/mkl_dnn/mkldnn_v1.BUILD

@@ -220,6 +220,7 @@ cc_library(
         "@local_xla//xla/tsl:linux_aarch64": ["-lrt"],
         "@local_xla//xla/tsl:linux_x86_64": ["-lrt"],
         "@local_xla//xla/tsl:linux_ppc64le": ["-lrt"],
+        "@local_xla//xla/tsl:linux_riscv64": ["-lrt"],
         "//conditions:default": [],
     }),
     textual_hdrs = _TEXTUAL_HDRS_LIST,

third_party/xla/third_party/py/manylinux_compliance_test.py

@@ -46,6 +46,11 @@ def parse_args():
       required=True,
       help="ManyLinux compliance tag for ppc64le",
   )
+  parser.add_argument(
+      "--riscv64-compliance-tag",
+      required=True,
+      help="ManyLinux compliance tag for riscv64",
+  )
   return parser.parse_args()
 
 
@@ -106,7 +111,7 @@ def verify_manylinux_compliance(
 
 def test_manylinux_compliance(args):
   machine_type = platform.uname().machine
-  supported_machine_types = ["x86_64", "aarch64", "ppc64le"]
+  supported_machine_types = ["x86_64", "aarch64", "ppc64le", "riscv64"]
   if machine_type not in supported_machine_types:
     raise RuntimeError(
         "Unsupported machine type {machine_type}. The supported are:"
@@ -118,8 +123,10 @@ def test_manylinux_compliance(args):
     compliance_tag = args.x86_64_compliance_tag
   elif machine_type == "aarch64":
     compliance_tag = args.aarch64_compliance_tag
-  else:
+  elif machine_type == "ppc64le":
     compliance_tag = args.ppc64le_compliance_tag
+  else:  # machine_type == "riscv64"
+    compliance_tag = args.riscv64_compliance_tag
   auditwheel_output = get_auditwheel_output(args.wheel_path)
   verify_manylinux_compliance(
       auditwheel_output,

third_party/xla/third_party/py/py_manylinux_compliance_test.bzl

@@ -8,6 +8,7 @@ def verify_manylinux_compliance_test(
         aarch64_compliance_tag,
         x86_64_compliance_tag,
         ppc64le_compliance_tag,
+        riscv64_compliance_tag,
         test_tags = []):
     py_test(
         name = name,
@@ -21,6 +22,7 @@ def verify_manylinux_compliance_test(
             "--aarch64-compliance-tag={}".format(aarch64_compliance_tag),
             "--x86_64-compliance-tag={}".format(x86_64_compliance_tag),
             "--ppc64le-compliance-tag={}".format(ppc64le_compliance_tag),
+            "--riscv64-compliance-tag={}".format(riscv64_compliance_tag),
         ],
         main = "manylinux_compliance_test.py",
         tags = ["manual"] + test_tags,

third_party/xla/third_party/py/python_init_rules.bzl

@@ -44,5 +44,6 @@ def python_init_rules(extra_patches = []):
             Label("//third_party/py:rules_python_pip_version.patch"),
             Label("//third_party/py:rules_python_freethreaded.patch"),
             Label("//third_party/py:rules_python_versions.patch"),
+            Label("//third_party/py:rules_python_riscv64_pypi.patch"),
         ] + extra_patches,
     )

third_party/xla/third_party/py/rules_python_riscv64_pypi.patch

@@ -0,0 +1,138 @@
+From: Levi Zim <[email protected]>
+Date: Tue, 14 Oct 2025 19:45:36 +0800
+Subject: [PATCH] fix: Add linux_riscv64 to _pip_repository_impl
+
+Fix https://github.com/bazel-contrib/rules_python/discussions/2729
+---
+ python/private/pypi/pip_repository.bzl                   | 1 +
+ python/private/pypi/whl_installer/platform.py            | 3 +++
+ python/private/pypi/whl_target_platforms.bzl             | 1 +
+ tests/pypi/whl_installer/platform_test.py                | 6 +++---
+ .../whl_target_platforms/whl_target_platforms_tests.bzl  | 9 +++++++++
+ 5 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/python/private/pypi/pip_repository.bzl b/python/private/pypi/pip_repository.bzl
+index e9a4c44da3..d635651039 100644
+--- a/python/private/pypi/pip_repository.bzl
++++ b/python/private/pypi/pip_repository.bzl
+@@ -96,6 +96,7 @@ def _pip_repository_impl(rctx):
+                 "linux_aarch64",
+                 "linux_arm",
+                 "linux_ppc",
++                "linux_riscv64",
+                 "linux_s390x",
+                 "linux_x86_64",
+                 "osx_aarch64",
+diff --git a/python/private/pypi/whl_installer/platform.py b/python/private/pypi/whl_installer/platform.py
+index ff267fe4aa..0757d86990 100644
+--- a/python/private/pypi/whl_installer/platform.py
++++ b/python/private/pypi/whl_installer/platform.py
+@@ -45,6 +45,7 @@ class Arch(Enum):
+     ppc64le = 5
+     s390x = 6
+     arm = 7
++    riscv64 = 8
+     amd64 = x86_64
+     arm64 = aarch64
+     i386 = x86_32
+@@ -269,6 +270,8 @@ def platform_machine(self) -> str:
+             return "ppc"
+         elif self.arch == Arch.ppc64le:
+             return "ppc64le"
++        elif self.arch == Arch.riscv64:
++            return "riscv64"
+         elif self.arch == Arch.s390x:
+             return "s390x"
+         else:
+diff --git a/python/private/pypi/whl_target_platforms.bzl b/python/private/pypi/whl_target_platforms.bzl
+index 6c3dd5da83..28547c679c 100644
+--- a/python/private/pypi/whl_target_platforms.bzl
++++ b/python/private/pypi/whl_target_platforms.bzl
+@@ -30,6 +30,7 @@ _CPU_ALIASES = {
+     "ppc": "ppc",
+     "ppc64": "ppc",
+     "ppc64le": "ppc64le",
++    "riscv64": "riscv64",
+     "s390x": "s390x",
+     "arm": "arm",
+     "armv6l": "arm",
+diff --git a/tests/pypi/whl_installer/platform_test.py b/tests/pypi/whl_installer/platform_test.py
+index ad65650779..0d944bb196 100644
+--- a/tests/pypi/whl_installer/platform_test.py
++++ b/tests/pypi/whl_installer/platform_test.py
+@@ -38,17 +38,17 @@ def test_can_get_specific_from_string(self):
+ 
+     def test_can_get_all_for_py_version(self):
+         cp39 = Platform.all(minor_version=9, micro_version=0)
+-        self.assertEqual(21, len(cp39), f"Got {cp39}")
++        self.assertEqual(24, len(cp39), f"Got {cp39}")
+         self.assertEqual(cp39, Platform.from_string("cp39.0_*"))
+ 
+     def test_can_get_all_for_os(self):
+         linuxes = Platform.all(OS.linux, minor_version=9)
+-        self.assertEqual(7, len(linuxes))
++        self.assertEqual(8, len(linuxes))
+         self.assertEqual(linuxes, Platform.from_string("cp39_linux_*"))
+ 
+     def test_can_get_all_for_os_for_host_python(self):
+         linuxes = Platform.all(OS.linux)
+-        self.assertEqual(7, len(linuxes))
++        self.assertEqual(8, len(linuxes))
+         self.assertEqual(linuxes, Platform.from_string("linux_*"))
+ 
+     def test_platform_sort(self):
+diff --git a/tests/pypi/whl_target_platforms/whl_target_platforms_tests.bzl b/tests/pypi/whl_target_platforms/whl_target_platforms_tests.bzl
+index a976a0cf95..8b7f0ad02b 100644
+--- a/tests/pypi/whl_target_platforms/whl_target_platforms_tests.bzl
++++ b/tests/pypi/whl_target_platforms/whl_target_platforms_tests.bzl
+@@ -34,6 +34,9 @@ def _test_simple(env):
+         "musllinux_1_1_ppc64le": [
+             struct(os = "linux", cpu = "ppc64le", abi = None, target_platform = "linux_ppc64le", version = (1, 1)),
+         ],
++        "musllinux_1_2_riscv64": [
++            struct(os = "linux", cpu = "riscv64", abi = None, target_platform = "linux_riscv64", version = (1, 2)),
++        ],
+         "win_amd64": [
+             struct(os = "windows", cpu = "x86_64", abi = None, target_platform = "windows_x86_64", version = (0, 0)),
+         ],
+@@ -66,6 +69,9 @@ def _test_with_abi(env):
+         "musllinux_1_1_ppc64le": [
+             struct(os = "linux", cpu = "ppc64le", abi = "cp311", target_platform = "cp311_linux_ppc64le", version = (1, 1)),
+         ],
++        "musllinux_1_2_riscv64": [
++            struct(os = "linux", cpu = "riscv64", abi = "cp311", target_platform = "cp311_linux_riscv64", version = (1, 2)),
++        ],
+         "win_amd64": [
+             struct(os = "windows", cpu = "x86_64", abi = "cp311", target_platform = "cp311_windows_x86_64", version = (0, 0)),
+         ],
+@@ -96,6 +102,7 @@ def _can_parse_existing_tags(env):
+         "manylinux2014_i686": 1,
+         "manylinux2014_ppc64": 1,
+         "manylinux2014_ppc64le": 1,
++        "manylinux2014_riscv64": 1,
+         "manylinux2014_s390x": 1,
+         "manylinux2014_x86_64": 1,
+         "manylinux_11_12_aarch64": 1,
+@@ -103,6 +110,7 @@ def _can_parse_existing_tags(env):
+         "manylinux_11_12_i686": 1,
+         "manylinux_11_12_ppc64": 1,
+         "manylinux_11_12_ppc64le": 1,
++        "manylinux_11_12_riscv64": 1,
+         "manylinux_11_12_s390x": 1,
+         "manylinux_11_12_x86_64": 1,
+         "manylinux_1_2_aarch64": 1,
+@@ -111,6 +119,7 @@ def _can_parse_existing_tags(env):
+         "musllinux_11_12_armv7l": 1,
+         "musllinux_11_12_i686": 1,
+         "musllinux_11_12_ppc64le": 1,
++        "musllinux_11_12_riscv64": 1,
+         "musllinux_11_12_s390x": 1,
+         "musllinux_11_12_x86_64": 1,
+         "win32": 1,
+
+From f03ff72726015e64aa3e9af6adf34cb651a92c88 Mon Sep 17 00:00:00 2001
+From: Levi Zim <[email protected]>
+Date: Tue, 14 Oct 2025 20:26:34 +0800
+Subject: [PATCH 2/2] Empty commit to retry CI
+
+CI fails with connection timed out

third_party/xla/xla/backends/cpu/codegen/BUILD

@@ -5,6 +5,7 @@ load(
     "//xla/tsl/platform:build_config_root.bzl",
     "if_llvm_aarch64_available",
     "if_llvm_powerpc_available",
+    "if_llvm_riscv_available",
     "if_llvm_system_z_available",
     "if_llvm_x86_available",
 )
@@ -129,6 +130,8 @@ xla_cc_test(
         "@llvm-project//llvm:AArch64CodeGen",  # fixdeps: keep
     ]) + if_llvm_powerpc_available([
         "@llvm-project//llvm:PowerPCCodeGen",  # fixdeps: keep
+    ]) + if_llvm_riscv_available([
+        "@llvm-project//llvm:RISCVCodeGen",  # fixdeps: keep
     ]) + if_llvm_system_z_available([
         "@llvm-project//llvm:SystemZCodeGen",  # fixdeps: keep
     ]) + if_llvm_x86_available([
@@ -249,6 +252,8 @@ cc_library(
         "@llvm-project//llvm:AArch64CodeGen",  # fixdeps: keep
     ]) + if_llvm_powerpc_available([
         "@llvm-project//llvm:PowerPCCodeGen",  # fixdeps: keep
+    ]) + if_llvm_riscv_available([
+        "@llvm-project//llvm:RISCVCodeGen",  # fixdeps: keep
     ]) + if_llvm_system_z_available([
         "@llvm-project//llvm:SystemZCodeGen",  # fixdeps: keep
     ]) + if_llvm_x86_available([

third_party/xla/xla/backends/cpu/codegen/tools/BUILD

@@ -4,6 +4,7 @@ load(
     "//xla/tsl/platform:build_config_root.bzl",
     "if_llvm_aarch64_available",
     "if_llvm_powerpc_available",
+    "if_llvm_riscv_available",
     "if_llvm_system_z_available",
     "if_llvm_x86_available",
 )
@@ -38,6 +39,8 @@ cc_library(
         "@llvm-project//llvm:AArch64CodeGen",  # fixdeps: keep
     ]) + if_llvm_powerpc_available([
         "@llvm-project//llvm:PowerPCCodeGen",  # fixdeps: keep
+    ]) + if_llvm_riscv_available([
+        "@llvm-project//llvm:RISCVCodeGen",  # fixdeps: keep
     ]) + if_llvm_system_z_available([
         "@llvm-project//llvm:SystemZCodeGen",  # fixdeps: keep
     ]) + if_llvm_x86_available([

third_party/xla/xla/codegen/intrinsic/BUILD

@@ -3,6 +3,7 @@ load(
     "//xla/tsl/platform:build_config_root.bzl",
     "if_llvm_aarch64_available",
     "if_llvm_powerpc_available",
+    "if_llvm_riscv_available",
     "if_llvm_system_z_available",
     "if_llvm_x86_available",
 )
@@ -157,6 +158,9 @@ cc_library(
     ]) + if_llvm_powerpc_available([
         "@llvm-project//llvm:PowerPCAsmParser",  # fixdeps: keep
         "@llvm-project//llvm:PowerPCCodeGen",  # fixdeps: keep
+    ]) + if_llvm_riscv_available([
+        "@llvm-project//llvm:RISCVAsmParser",  # fixdeps: keep
+        "@llvm-project//llvm:RISCVCodeGen",  # fixdeps: keep
     ]) + if_llvm_system_z_available([
         "@llvm-project//llvm:SystemZAsmParser",  # fixdeps: keep
         "@llvm-project//llvm:SystemZCodeGen",  # fixdeps: keep