[NVVM] Support - Followup enhancements

.github/workflows/coverage.yml

@@ -98,10 +98,6 @@ jobs:
         run: |
           .venv/bin/pip install -v ./cuda_pathfinder
 
-      - name: Build cuda-python-test-helpers
-        run: |
-          .venv/bin/pip install -v ./cuda_python_test_helpers
-
       - name: Build cuda-bindings
         run: |
           cd cuda_bindings

.github/workflows/test-wheel-linux.yml

@@ -251,6 +251,7 @@ jobs:
         env:
           CUDA_PATHFINDER_TEST_LOAD_NVIDIA_DYNAMIC_LIB_STRICTNESS: see_what_works
           CUDA_PATHFINDER_TEST_FIND_NVIDIA_HEADERS_STRICTNESS: see_what_works
+          CUDA_PATHFINDER_TEST_FIND_NVIDIA_BITCODE_LIB_STRICTNESS: see_what_works
         run: run-tests pathfinder
 
       - name: Run cuda.bindings tests
@@ -296,4 +297,5 @@ jobs:
         env:
           CUDA_PATHFINDER_TEST_LOAD_NVIDIA_DYNAMIC_LIB_STRICTNESS: all_must_work
           CUDA_PATHFINDER_TEST_FIND_NVIDIA_HEADERS_STRICTNESS: all_must_work
+          CUDA_PATHFINDER_TEST_FIND_NVIDIA_BITCODE_LIB_STRICTNESS: all_must_work
         run: run-tests pathfinder

.github/workflows/test-wheel-windows.yml

@@ -224,6 +224,7 @@ jobs:
         env:
           CUDA_PATHFINDER_TEST_LOAD_NVIDIA_DYNAMIC_LIB_STRICTNESS: see_what_works
           CUDA_PATHFINDER_TEST_FIND_NVIDIA_HEADERS_STRICTNESS: see_what_works
+          CUDA_PATHFINDER_TEST_FIND_NVIDIA_BITCODE_LIB_STRICTNESS: see_what_works
         shell: bash --noprofile --norc -xeuo pipefail {0}
         run: run-tests pathfinder
 
@@ -273,5 +274,6 @@ jobs:
         env:
           CUDA_PATHFINDER_TEST_LOAD_NVIDIA_DYNAMIC_LIB_STRICTNESS: all_must_work
           CUDA_PATHFINDER_TEST_FIND_NVIDIA_HEADERS_STRICTNESS: all_must_work
+          CUDA_PATHFINDER_TEST_FIND_NVIDIA_BITCODE_LIB_STRICTNESS: all_must_work
         shell: bash --noprofile --norc -xeuo pipefail {0}
         run: run-tests pathfinder

ci/tools/run-tests

@@ -30,8 +30,9 @@ popd
 if [[ "${test_module}" == "pathfinder" ]]; then
   pushd ./cuda_pathfinder
   echo "Running pathfinder tests with " \
-      "LD:${CUDA_PATHFINDER_TEST_LOAD_NVIDIA_DYNAMIC_LIB_STRICTNESS} " \
-      "FH:${CUDA_PATHFINDER_TEST_FIND_NVIDIA_HEADERS_STRICTNESS}"
+    "LD:${CUDA_PATHFINDER_TEST_LOAD_NVIDIA_DYNAMIC_LIB_STRICTNESS} " \
+    "FH:${CUDA_PATHFINDER_TEST_FIND_NVIDIA_HEADERS_STRICTNESS} " \
+    "BC:${CUDA_PATHFINDER_TEST_FIND_NVIDIA_BITCODE_LIB_STRICTNESS}"
   pytest -ra -s -v --durations=0 tests/ |& tee /tmp/pathfinder_test_log.txt
   # Report the number of "INFO test_" lines (including zero)
   # to support quick validations based on GHA log archives.

cuda_bindings/tests/conftest.py

@@ -1,9 +1,28 @@
 # SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
+import pathlib
+import sys
+from importlib.metadata import PackageNotFoundError, distribution
+
 import cuda.bindings.driver as cuda
 import pytest
 
+# Import shared test helpers for tests across subprojects.
+# PLEASE KEEP IN SYNC with copies in other conftest.py in this repo.
+_test_helpers_root = pathlib.Path(__file__).resolve().parents[2] / "cuda_python_test_helpers"
+try:
+    distribution("cuda-python-test-helpers")
+except PackageNotFoundError as exc:
+    if not _test_helpers_root.is_dir():
+        raise RuntimeError(
+            f"cuda-python-test-helpers not installed; expected checkout path {_test_helpers_root}"
+        ) from exc
+
+    test_helpers_root = str(_test_helpers_root)
+    if test_helpers_root not in sys.path:
+        sys.path.insert(0, test_helpers_root)
+
 
 @pytest.fixture(scope="module")
 def cuda_driver():

cuda_bindings/tests/test_nvvm.py

@@ -2,143 +2,13 @@
 #
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
-import binascii
 import re
 from contextlib import contextmanager
 
 import pytest
 from cuda.bindings import nvvm
 
-MINIMAL_NVVMIR_TXT_TEMPLATE = b"""\
-target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-i128:128:128-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64"
-
-target triple = "nvptx64-nvidia-cuda"
-
-define void @kernel() {
-entry:
-  ret void
-}
-
-!nvvm.annotations = !{!0}
-!0 = !{void ()* @kernel, !"kernel", i32 1}
-
-!nvvmir.version = !{!1}
-!1 = !{i32 %d, i32 0, i32 %d, i32 0}
-"""  # noqa: E501
-
-MINIMAL_NVVMIR_BITCODE_STATIC = {
-    (1, 3):  # (major, debug_major)
-    "4243c0de3514000005000000620c30244a59be669dfbb4bf0b51804c01000000210c00007f010000"
-    "0b02210002000000160000000781239141c80449061032399201840c250508191e048b62800c4502"
-    "42920b42641032143808184b0a3232884870c421234412878c1041920264c808b1142043468820c9"
-    "01323284182a282a90317cb05c9120c3c8000000892000000b0000003222c80820624600212b2498"
-    "0c212524980c19270c85a4906032645c20246382a01801300128030173046000132677b00778a007"
-    "7cb0033a680377b0877420877408873618877a208770d8e012e5d006f0a0077640077a600774a007"
-    "7640076d900e71a00778a00778d006e980077a80077a80076d900e7160077a100776a0077160076d"
-    "900e7320077a300772a0077320076d900e7640077a600774a0077640076d900e71200778a0077120"
-    "0778a00771200778d006e6300772a0077320077a300772d006e6600774a0077640077a600774d006"
-    "f6100776a0077160077a100776d006f6300772a0077320077a300772d006f6600774a0077640077a"
-    "600774d006f610077280077a10077280077a10077280076de00e7160077a300772a0077640071a21"
-    "4c0e11de9c2e4fbbcfbe211560040000000000000000000000000620b141a0e86000004016080000"
-    "06000000321e980c19114c908c092647c6044362098c009401000000b1180000ac0000003308801c"
-    "c4e11c6614013d88433884c38c4280077978077398710ce6000fed100ef4800e330c421ec2c11dce"
-    "a11c6630053d88433884831bcc033dc8433d8c033dcc788c7470077b08077948877070077a700376"
-    "788770208719cc110eec900ee1300f6e300fe3f00ef0500e3310c41dde211cd8211dc2611e663089"
-    "3bbc833bd04339b4033cbc833c84033bccf0147660077b6807376887726807378087709087706007"
-    "76280776f8057678877780875f08877118877298877998812ceef00eeee00ef5c00eec300362c8a1"
-    "1ce4a11ccca11ce4a11cdc611cca211cc4811dca6106d6904339c84339984339c84339b8c3389443"
-    "3888033b94c32fbc833cfc823bd4033bb0c30cc7698770588772708374680778608774188774a087"
-    "19ce530fee000ff2500ee4900ee3400fe1200eec500e3320281ddcc11ec2411ed2211cdc811edce0"
-    "1ce4e11dea011e66185138b0433a9c833bcc50247660077b68073760877778077898514cf4900ff0"
-    "500e331e6a1eca611ce8211ddec11d7e011ee4a11ccc211df0610654858338ccc33bb0433dd04339"
-    "fcc23ce4433b88c33bb0c38cc50a877998877718877408077a28077298815ce3100eecc00ee5500e"
-    "f33023c1d2411ee4e117d8e11dde011e6648193bb0833db4831b84c3388c4339ccc33cb8c139c8c3"
-    "3bd4033ccc48b471080776600771088771588719dbc60eec600fede006f0200fe5300fe5200ff650"
-    "0e6e100ee3300ee5300ff3e006e9e00ee4500ef83023e2ec611cc2811dd8e117ec211de6211dc421"
-    "1dd8211de8211f66209d3bbc433db80339948339cc58bc7070077778077a08077a488777708719cb"
-    "e70eef300fe1e00ee9400fe9a00fe530c3010373a8077718875f988770708774a08774d087729881"
-    "844139e0c338b0433d904339cc40c4a01dcaa11de0411edec11c662463300ee1c00eec300fe9400f"
-    "e5000000792000001d000000721e482043880c19097232482023818c9191d144a01028643c313242"
-    "8e9021a318100a00060000006b65726e656c0000230802308240042308843082400c330c4230cc40"
-    "0c4441c84860821272b3b36b730973737ba30ba34b7b739b1b2528d271b3b36b4b9373b12b939b4b"
-    "7b731b2530000000a9180000250000000b0a7228877780077a587098433db8c338b04339d0c382e6"
-    "1cc6a10de8411ec2c11de6211de8211ddec11d1634e3600ee7500fe1200fe4400fe1200fe7500ef4"
-    "b08081077928877060077678877108077a28077258709cc338b4013ba4833d94c3026b1cd8211cdc"
-    "e11cdc201ce4611cdc201ce8811ec2611cd0a11cc8611cc2811dd861c1010ff4200fe1500ff4800e"
-    "00000000d11000000600000007cc3ca4833b9c033b94033da0833c94433890c30100000061200000"
-    "06000000130481860301000002000000075010cd14610000000000007120000003000000320e1022"
-    "8400fb020000000000000000650c00001f000000120394f000000000030000000600000006000000"
-    "4c000000010000005800000000000000580000000100000070000000000000000c00000013000000"
-    "1f000000080000000600000000000000700000000000000000000000010000000000000000000000"
-    "060000000000000006000000ffffffff00240000000000005d0c00000d0000001203946700000000"
-    "6b65726e656c31352e302e376e7670747836342d6e76696469612d637564613c737472696e673e00"
-    "00000000",
-    (2, 3):  # (major, debug_major)
-    "4243c0de3514000005000000620c30244a59be669dfbb4bf0b51804c01000000210c000080010000"
-    "0b02210002000000160000000781239141c80449061032399201840c250508191e048b62800c4502"
-    "42920b42641032143808184b0a3232884870c421234412878c1041920264c808b1142043468820c9"
-    "01323284182a282a90317cb05c9120c3c8000000892000000b0000003222c80820624600212b2498"
-    "0c212524980c19270c85a4906032645c20246382a01801300128030173046000132677b00778a007"
-    "7cb0033a680377b0877420877408873618877a208770d8e012e5d006f0a0077640077a600774a007"
-    "7640076d900e71a00778a00778d006e980077a80077a80076d900e7160077a100776a0077160076d"
-    "900e7320077a300772a0077320076d900e7640077a600774a0077640076d900e71200778a0077120"
-    "0778a00771200778d006e6300772a0077320077a300772d006e6600774a0077640077a600774d006"
-    "f6100776a0077160077a100776d006f6300772a0077320077a300772d006f6600774a0077640077a"
-    "600774d006f610077280077a10077280077a10077280076de00e7160077a300772a0077640071a21"
-    "4c0e11de9c2e4fbbcfbe211560040000000000000000000000000620b141a0286100004016080000"
-    "06000000321e980c19114c908c092647c60443620914c10840190000b1180000ac0000003308801c"
-    "c4e11c6614013d88433884c38c4280077978077398710ce6000fed100ef4800e330c421ec2c11dce"
-    "a11c6630053d88433884831bcc033dc8433d8c033dcc788c7470077b08077948877070077a700376"
-    "788770208719cc110eec900ee1300f6e300fe3f00ef0500e3310c41dde211cd8211dc2611e663089"
-    "3bbc833bd04339b4033cbc833c84033bccf0147660077b6807376887726807378087709087706007"
-    "76280776f8057678877780875f08877118877298877998812ceef00eeee00ef5c00eec300362c8a1"
-    "1ce4a11ccca11ce4a11cdc611cca211cc4811dca6106d6904339c84339984339c84339b8c3389443"
-    "3888033b94c32fbc833cfc823bd4033bb0c30cc7698770588772708374680778608774188774a087"
-    "19ce530fee000ff2500ee4900ee3400fe1200eec500e3320281ddcc11ec2411ed2211cdc811edce0"
-    "1ce4e11dea011e66185138b0433a9c833bcc50247660077b68073760877778077898514cf4900ff0"
-    "500e331e6a1eca611ce8211ddec11d7e011ee4a11ccc211df0610654858338ccc33bb0433dd04339"
-    "fcc23ce4433b88c33bb0c38cc50a877998877718877408077a28077298815ce3100eecc00ee5500e"
-    "f33023c1d2411ee4e117d8e11dde011e6648193bb0833db4831b84c3388c4339ccc33cb8c139c8c3"
-    "3bd4033ccc48b471080776600771088771588719dbc60eec600fede006f0200fe5300fe5200ff650"
-    "0e6e100ee3300ee5300ff3e006e9e00ee4500ef83023e2ec611cc2811dd8e117ec211de6211dc421"
-    "1dd8211de8211f66209d3bbc433db80339948339cc58bc7070077778077a08077a488777708719cb"
-    "e70eef300fe1e00ee9400fe9a00fe530c3010373a8077718875f988770708774a08774d087729881"
-    "844139e0c338b0433d904339cc40c4a01dcaa11de0411edec11c662463300ee1c00eec300fe9400f"
-    "e5000000792000001e000000721e482043880c19097232482023818c9191d144a01028643c313242"
-    "8e9021a318100a00060000006b65726e656c0000230802308240042308843082400c23080431c320"
-    "04c30c045118858c04262821373bbb36973037b737ba30bab437b7b95102231d373bbbb6343917bb"
-    "32b9b9b437b7518203000000a9180000250000000b0a7228877780077a587098433db8c338b04339"
-    "d0c382e61cc6a10de8411ec2c11de6211de8211ddec11d1634e3600ee7500fe1200fe4400fe1200f"
-    "e7500ef4b08081077928877060077678877108077a28077258709cc338b4013ba4833d94c3026b1c"
-    "d8211cdce11cdc201ce4611cdc201ce8811ec2611cd0a11cc8611cc2811dd861c1010ff4200fe150"
-    "0ff4800e00000000d11000000600000007cc3ca4833b9c033b94033da0833c94433890c301000000"
-    "6120000006000000130481860301000002000000075010cd14610000000000007120000003000000"
-    "320e10228400fc020000000000000000650c00001f000000120394f0000000000300000006000000"
-    "060000004c000000010000005800000000000000580000000100000070000000000000000c000000"
-    "130000001f0000000800000006000000000000007000000000000000000000000100000000000000"
-    "00000000060000000000000006000000ffffffff00240000000000005d0c00000d00000012039467"
-    "000000006b65726e656c31352e302e376e7670747836342d6e76696469612d637564613c73747269"
-    "6e673e0000000000",
-}
-
-
-@pytest.fixture(params=("txt", "bitcode_static"))
-def minimal_nvvmir(request):
-    major, minor, debug_major, debug_minor = nvvm.ir_version()
-
-    if request.param == "txt":
-        return MINIMAL_NVVMIR_TXT_TEMPLATE % (major, debug_major)
-
-    bitcode_static_binascii = MINIMAL_NVVMIR_BITCODE_STATIC.get((major, debug_major))
-    if bitcode_static_binascii:
-        return binascii.unhexlify(bitcode_static_binascii)
-    raise RuntimeError(
-        "Static bitcode for NVVM IR version "
-        f"{major}.{debug_major} is not available in this test.\n"
-        "Maintainers: Please run the helper script to generate it and add the "
-        "output to the MINIMAL_NVVMIR_BITCODE_STATIC dict:\n"
-        "  ../../toolshed/build_static_bitcode_input.py"
-    )
+pytest_plugins = ("cuda_python_test_helpers.nvvm_bitcode",)
 
 
 @pytest.fixture(params=[nvvm.compile_program, nvvm.verify_program])
@@ -221,7 +91,7 @@ def test_c_or_v_program_fail_invalid_ir(compile_or_verify):
         assert get_program_log(prog) == "FileNameHere.ll (1, 0): parse expected top-level entity\x00"
 
 
-def test_c_or_v_program_fail_bad_option(minimal_nvvmir, compile_or_verify):
+def test_c_or_v_program_fail_bad_option(minimal_nvvmir, compile_or_verify):  # noqa: F401, F811
     with nvvm_program() as prog:
         nvvm.add_module_to_program(prog, minimal_nvvmir, len(minimal_nvvmir), "FileNameHere.ll")
         with pytest.raises(nvvm.nvvmError, match=match_exact("ERROR_INVALID_OPTION (7)")):
@@ -246,7 +116,7 @@ def test_get_buffer_empty(get_size, get_buffer):
 
 
 @pytest.mark.parametrize("options", [[], ["-opt=0"], ["-opt=3", "-g"]])
-def test_compile_program_with_minimal_nvvm_ir(minimal_nvvmir, options):
+def test_compile_program_with_minimal_nvvm_ir(minimal_nvvmir, options):  # noqa: F401, F811
     with nvvm_program() as prog:
         nvvm.add_module_to_program(prog, minimal_nvvmir, len(minimal_nvvmir), "FileNameHere.ll")
         try:
@@ -266,7 +136,7 @@ def test_compile_program_with_minimal_nvvm_ir(minimal_nvvmir, options):
 
 
 @pytest.mark.parametrize("options", [[], ["-opt=0"], ["-opt=3", "-g"]])
-def test_verify_program_with_minimal_nvvm_ir(minimal_nvvmir, options):
+def test_verify_program_with_minimal_nvvm_ir(minimal_nvvmir, options):  # noqa: F401, F811
     with nvvm_program() as prog:
         nvvm.add_module_to_program(prog, minimal_nvvmir, len(minimal_nvvmir), "FileNameHere.ll")
         nvvm.verify_program(prog, len(options), options)

cuda_core/cuda/core/_program.pxd

@@ -13,3 +13,5 @@ cdef class Program:
         object _linker  # Linker
         object _options  # ProgramOptions
         object __weakref__
+        bint _use_libdevice      # Flag for libdevice loading
+        int _module_count