[SYCL] Fix kernel-bundle-merge-options-env.cpp (#1445)

Calling link API is not supported for ESIMD kernels. Use simple kernel
instead, as it is not important for the purpose of the test.

Author: romanovvlad

SYCL/KernelAndProgram/kernel-bundle-merge-options-env.cpp

@@ -8,24 +8,22 @@
 // UNSUPPORTED: hip
 // UNSUPPORTED: ze_debug-1,ze_debug4
 
-// Temporary while the failure is being investigated.
-// UNSUPPORTED: windows
 #include "kernel-bundle-merge-options.hpp"
 
 // CHECK: piProgramBuild
 // CHECK-NEXT: <unknown>
 // CHECK-NEXT: <unknown>
 // CHECK-NEXT: <unknown>
-// CHECK-NEXT: <const char *>:{{.*}}-DENV_COMPILE_OPTS{{.*}}-vc-codegen
+// CHECK: <const char *>:{{[^bar]*}}-DENV_COMPILE_OPTS{{[^bar]*}}-DENV_LINK_OPTS{{[^bar]*}}
 
 // CHECK: piProgramCompile(
 // CHECK-NEXT: <unknown>
 // CHECK-NEXT: <unknown>
 // CHECK-NEXT: <unknown>
-// CHECK-NEXT: <const char *>: -DENV_COMPILE_OPTS -vc-codegen
+// CHECK: <const char *>:{{[^bar]*}}-DENV_COMPILE_OPTS{{[^bar]*}}
 
 // CHECK: piProgramLink(
 // CHECK-NEXT: <unknown>
 // CHECK-NEXT: <unknown>
 // CHECK-NEXT: <unknown>
-// CHECK-NEXT: <const char *>: -DENV_LINK_OPTS
+// CHECK: <const char *>:{{[^bar]*}}-DENV_LINK_OPTS{{[^bar]*}}

SYCL/KernelAndProgram/kernel-bundle-merge-options.cpp

@@ -13,17 +13,17 @@
 // CHECK-NEXT: <unknown>
 // CHECK-NEXT: <unknown>
 // CHECK-NEXT: <unknown>
-// CHECK-NEXT: <const char *>:{{.*}} -g {{.*}}-vc-codegen
+// CHECK-NEXT: <const char *>:{{.*}}-g
 
 // TODO: Uncomment when build options are properly passed to compile and link
 //       commands for kernel_bundle
 // xCHECK: piProgramCompile(
 // xCHECK-NEXT: <unknown>
 // xCHECK-NEXT: <unknown>
 // xCHECK-NEXT: <unknown>
-// xCHECK-NEXT: <const char *>: -g -vc-codegen
+// xCHECK-NEXT: <const char *>:{{.*}}-g
 // xCHECK: piProgramLink(
 // xCHECK-NEXT: <unknown>
 // xCHECK-NEXT: <unknown>
 // xCHECK-NEXT: <unknown>
-// xCHECK-NEXT: <const char *>: -g -vc-codegen
+// xCHECK-NEXT: <const char *>:{{.*}}-g

SYCL/KernelAndProgram/kernel-bundle-merge-options.hpp

@@ -1,5 +1,5 @@
 #define SYCL2020_DISABLE_DEPRECATION_WARNINGS
-#include <sycl/ext/intel/esimd.hpp>
+
 #include <sycl/sycl.hpp>
 
 class KernelName;
@@ -16,8 +16,7 @@ int main() {
 
   if (0)
     Queue.submit([&](sycl::handler &CGH) {
-      CGH.single_task<KernelName>(
-          [=]() SYCL_ESIMD_KERNEL {}); // Actual kernel does not matter
+      CGH.single_task<KernelName>([=]() {}); // Actual kernel does not matter
     });
 
   try {