Adapt test for DPC++ 2025.1

Signed-off-by: Lukas Sommer <[email protected]>

Author: sommerlukas

dpctl/tests/test_sycl_program.py

@@ -330,10 +330,22 @@ def test_create_program_from_sycl_source():
 
     assert type(prog.addressof_ref()) is int
     assert prog.has_sycl_kernel("vector_add")
-    assert prog.has_sycl_kernel("vector_add_template<int>")
-
     regularKernel = prog.get_sycl_kernel("vector_add")
-    templateKernel = prog.get_sycl_kernel("vector_add_template<int>")
+
+    # DPC++ version 2025.1 supports compilation of SYCL template kernels, but
+    # does not yet support referencing them with the unmangled name.
+    hasTemplateName = prog.has_sycl_kernel("vector_add_template<int>")
+    hasMangledName = prog.has_sycl_kernel(
+        "_Z33__sycl_kernel_vector_add_templateIiEvPT_S1_S1_"
+    )
+    assert hasTemplateName or hasMangledName
+
+    if hasTemplateName:
+        templateKernel = prog.get_sycl_kernel("vector_add_template<int>")
+    else:
+        templateKernel = prog.get_sycl_kernel(
+            "_Z33__sycl_kernel_vector_add_templateIiEvPT_S1_S1_"
+        )
 
     assert "vector_add" == regularKernel.get_function_name()
     assert type(regularKernel.addressof_ref()) is int

libsyclinterface/tests/test_sycl_kernel_bundle_interface.cpp

@@ -371,15 +371,26 @@ TEST_P(TestSYCLKernelBundleFromSource, CheckCreateFromSYCLSource)
 {
     ASSERT_TRUE(KBRef != nullptr);
     ASSERT_TRUE(DPCTLKernelBundle_HasSyclKernel(KBRef, "vector_add"));
+    // DPC++ version 2025.1 supports compilation of SYCL template kernels,
+    // but does not yet support referencing them with the unmangled name.
     ASSERT_TRUE(
-        DPCTLKernelBundle_HasSyclKernel(KBRef, "vector_add_template<int>"));
+        DPCTLKernelBundle_HasSyclKernel(KBRef, "vector_add_template<int>") ||
+        DPCTLKernelBundle_HasSyclKernel(
+            KBRef, "_Z33__sycl_kernel_vector_add_templateIiEvPT_S1_S1_"));
 }
 
 TEST_P(TestSYCLKernelBundleFromSource, CheckGetKernelSYCLSource)
 {
     auto AddKernel = DPCTLKernelBundle_GetSyclKernel(KBRef, "vector_add");
     auto AxpyKernel =
         DPCTLKernelBundle_GetSyclKernel(KBRef, "vector_add_template<int>");
+    if (AxpyKernel == nullptr) {
+        // DPC++ version 2025.1 supports compilation of SYCL template kernels,
+        // but does not yet support referencing them with the unmangled name.
+        AxpyKernel = DPCTLKernelBundle_GetSyclKernel(
+            KBRef, "_Z33__sycl_kernel_vector_add_templateIiEvPT_S1_S1_");
+    }
+
     ASSERT_TRUE(AddKernel != nullptr);
     ASSERT_TRUE(AxpyKernel != nullptr);
     DPCTLKernel_Delete(AddKernel);