Skip to content

Revert "[Offload][lit] Link against SPIR-V DeviceRTL if present"#180211

Merged
sarnex merged 1 commit intomainfrom
revert-180030-offloadlit
Feb 6, 2026
Merged

Revert "[Offload][lit] Link against SPIR-V DeviceRTL if present"#180211
sarnex merged 1 commit intomainfrom
revert-180030-offloadlit

Conversation

@sarnex
Copy link
Copy Markdown
Member

@sarnex sarnex commented Feb 6, 2026

Reverts #180030

Need to make changes to buildbot first

@sarnex sarnex enabled auto-merge (squash) February 6, 2026 15:04
@llvmbot llvmbot added the offload label Feb 6, 2026
@sarnex sarnex disabled auto-merge February 6, 2026 15:04
@llvmbot
Copy link
Copy Markdown
Member

llvmbot commented Feb 6, 2026

@llvm/pr-subscribers-offload

Author: Nick Sarnie (sarnex)

Changes

Need to make changes to buildbot first


Full diff: https://github.com/llvm/llvm-project/pull/180211.diff

1 Files Affected:

  • (modified) offload/test/lit.cfg (+2-3)
diff --git a/offload/test/lit.cfg b/offload/test/lit.cfg
index 898258f3e3cd0..0d5a9c95c1d95 100644
--- a/offload/test/lit.cfg
+++ b/offload/test/lit.cfg
@@ -166,8 +166,7 @@ elif config.operating_system == 'Darwin':
     config.test_flags += " -Wl,-rpath," + config.library_dir
     config.test_flags += " -Wl,-rpath," + config.omp_host_rtl_directory
 else: # Unices
-    if config.libomptarget_current_target != "nvptx64-nvidia-cuda" and \
-       not config.libomptarget_current_target.startswith('spirv'):
+    if config.libomptarget_current_target != "nvptx64-nvidia-cuda":
         config.test_flags += " -nogpulib"
     config.test_flags += " -Wl,-rpath," + config.library_dir
     config.test_flags += " -Wl,-rpath," + config.omp_host_rtl_directory
@@ -215,7 +214,7 @@ def add_libraries(source):
     if "gpu" not in config.available_features:
         return source
     if "intelgpu" in config.available_features:
-        # SPIR-V uses an out-of-tree linker and libc doesn't work.
+        # There is no DeviceRTL for Intel yet and libc doesn't work.
         return source
     if config.libomptarget_has_libc:
         return source + " -Xoffload-linker -lc " + \

@sarnex sarnex merged commit 6844af1 into main Feb 6, 2026
9 of 12 checks passed
@sarnex sarnex deleted the revert-180030-offloadlit branch February 6, 2026 15:05
AlexisPerry pushed a commit to llvm-project-tlp/llvm-project that referenced this pull request Feb 6, 2026
rishabhmadan19 pushed a commit to rishabhmadan19/llvm-project that referenced this pull request Feb 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants