[SYCL] Cleanup bindless images lit setup (#18220)

* Add link-directx substitution
* Move bindless specific substitutions to bindless directory

Follow up from: intel/llvm#18202

Author: npmiller

sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp

@@ -1,8 +1,7 @@
 // REQUIRES: aspect-ext_oneapi_bindless_images
 // REQUIRES: windows
 
-// DEFINE: %{link-flags}=%if cl_options %{ /clang:-ld3d12 /clang:-ldxgi /clang:-ldxguid %} %else %{ -ld3d12 -ldxgi -ldxguid %}
-// RUN: %{build} %{link-flags} -o %t.out
+// RUN: %{build} %link-directx -o %t.out
 // RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 #pragma clang diagnostic ignored "-Waddress-of-temporary"

sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled_semaphore.cpp

@@ -4,8 +4,7 @@
 // XFAIL: run-mode
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15851
 
-// DEFINE: %{link-flags}=%if cl_options %{ /clang:-ld3d12 /clang:-ldxgi /clang:-ldxguid %} %else %{ -ld3d12 -ldxgi -ldxguid %}
-// RUN: %{build} %{link-flags} -o %t.out
+// RUN: %{build} %link-directx -o %t.out
 // RUN: %{run-unfiltered-devices} %t.out
 
 #define TEST_SEMAPHORE_IMPORT

sycl/test-e2e/bindless_images/lit.local.cfg

@@ -1,3 +1,27 @@
+import platform
+
 # Support of this feature is waiting for the upstream PR
 # https://github.com/llvm/llvm-project/pull/127737 to be merged with intel/llvm.
 config.unsupported_features += ['spirv-backend']
+
+cl_options = 'cl_options' in config.available_features
+
+link_vulkan = "-I %s " % (config.vulkan_include_dir)
+if platform.system() == "Windows":
+    if cl_options:
+        link_vulkan += "/clang:-l%s" % (config.vulkan_lib)
+    else:
+        link_vulkan += "-l %s" % (config.vulkan_lib)
+else:
+    vulkan_lib_path = os.path.dirname(config.vulkan_lib)
+    link_vulkan += "-L %s -lvulkan" % (vulkan_lib_path)
+config.substitutions.append(("%link-vulkan", link_vulkan))
+
+if platform.system() == "Windows":
+    dx12libs = ['-ld3d12', '-ldxgi', '-ldxguid']
+    if cl_options:
+        dx12libs = ['/clang:' + l for l in dx12libs]
+    config.substitutions.append(("%link-directx", ' '.join(dx12libs)))
+
+if config.vulkan_found == "TRUE":
+    config.available_features.add("vulkan")

sycl/test-e2e/lit.cfg.py

@@ -605,23 +605,6 @@ def open_check_file(file_name):
 else:
     config.substitutions.append(("%verbose_print", ""))
 
-config.substitutions.append(("%vulkan_include_dir", config.vulkan_include_dir))
-config.substitutions.append(("%vulkan_lib", config.vulkan_lib))
-
-link_vulkan = "-I %s " % (config.vulkan_include_dir)
-if platform.system() == "Windows":
-    if cl_options:
-        link_vulkan += "/clang:-l%s" % (config.vulkan_lib)
-    else:
-        link_vulkan += "-l %s" % (config.vulkan_lib)
-else:
-    vulkan_lib_path = os.path.dirname(config.vulkan_lib)
-    link_vulkan += "-L %s -lvulkan" % (vulkan_lib_path)
-config.substitutions.append(("%link-vulkan", link_vulkan))
-
-if config.vulkan_found == "TRUE":
-    config.available_features.add("vulkan")
-
 if not config.gpu_aot_target_opts:
     config.gpu_aot_target_opts = '"-device *"'