[SYCL][XPTI] Fix test (#659)

Author: vladimirlaz

SYCL/XPTI/basic_event_collection.cpp

@@ -1,4 +1,4 @@
-// REQUIRES: xptifw, opencl, TEMPORARILY_DISABLED
+// REQUIRES: xptifw, opencl
 // RUN: %clangxx %s -DXPTI_COLLECTOR -DXPTI_CALLBACK_API_EXPORTS %xptifw_lib %shared_lib %fPIC %cxx_std_optionc++17 -o %t_collector.dll
 // RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: env XPTI_TRACE_ENABLE=1 env XPTI_FRAMEWORK_DISPATCHER=%xptifw_dispatcher env XPTI_SUBSCRIBERS=%t_collector.dll env SYCL_DEVICE_FILTER=opencl %t.out | FileCheck %s 2>&1
@@ -36,6 +36,7 @@ int main() {
 
 #endif
 
+// CHECK: xptiTraceInit: Stream Name = sycl.experimental.mem_alloc
 // CHECK: xptiTraceInit: Stream Name = sycl
 // CHECK-NEXT: Graph create
 // CHECK-NEXT: xptiTraceInit: Stream Name = sycl.pi

SYCL/lit.cfg.py

@@ -342,9 +342,12 @@
     config.available_features.add('xptifw')
     config.substitutions.append(('%xptifw_dispatcher', xptifw_dispatcher))
     if platform.system() == "Linux":
-        config.substitutions.append(('%xptifw_lib', " {}/xptifw.lib".format(xptifw_lib_dir)))
+        config.substitutions.append(('%xptifw_lib', " -L{} -lxptifw -I{} ".format(xptifw_lib_dir, xptifw_includes)))
     elif platform.system() == "Windows":
-        config.substitutions.append(('%xptifw_lib', "-L{} -I{} -lxptifw".format(xptifw_lib_dir, xptifw_includes)))
+        if cl_options:
+            config.substitutions.append(('%xptifw_lib', " {}/xptifw.lib /I{} ".format(xptifw_lib_dir, xptifw_includes)))
+        else:
+            config.substitutions.append(('%xptifw_lib', " {}/xptifw.lib -I{} ".format(xptifw_lib_dir, xptifw_includes)))
 
 
 llvm_tools = ["llvm-spirv", "llvm-link"]