windows?

Author: alexbatashev

SYCL/XPTI/basic_event_collection.cpp

@@ -1,5 +1,5 @@
 // REQUIRES: xptifw, opencl
-// RUN: %clangxx %s -DXPTI_COLLECTOR -DXPTI_CALLBACK_API_EXPORTS -L%xptifw_lib -I%xptifw_includes -shared %fPIC -std=c++17 -o %t_collector.dll -lxptifw
+// 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
 

SYCL/lit.cfg.py

@@ -143,13 +143,15 @@
     config.substitutions.append( ('%debug_option',  '/DEBUG' ) )
     config.substitutions.append( ('%cxx_std_option',  '/std:' ) )
     config.substitutions.append( ('%fPIC', '') )
+    config.substitutions.append( ('%shared_lib', '/LD') )
 else:
     config.substitutions.append( ('%sycl_options', ' -lsycl -I' +
                                 config.sycl_include + ' -I' + os.path.join(config.sycl_include, 'sycl')) )
     config.substitutions.append( ('%include_option',  '-include' ) )
     config.substitutions.append( ('%debug_option',  '-g' ) )
     config.substitutions.append( ('%cxx_std_option',  '-std=' ) )
     config.substitutions.append( ('%fPIC', '-fPIC') )
+    config.substitutions.append( ('%shared_lib', '-shared') )
 
 if not config.gpu_aot_target_opts:
     config.gpu_aot_target_opts = '"-device *"'
@@ -329,17 +331,21 @@
     config.available_features.add('sycl-ls')
 
 # TODO properly set XPTIFW include and runtime dirs
-xptifw_lib = os.path.join(config.dpcpp_root_dir, 'lib')
+xptifw_lib_dir = os.path.join(config.dpcpp_root_dir, 'lib')
 xptifw_dispatcher = ""
 if platform.system() == "Linux":
-    xptifw_dispatcher = os.path.join(xptifw_lib, 'libxptifw.so')
+    xptifw_dispatcher = os.path.join(xptifw_lib_dir, 'libxptifw.so')
 elif platform.system() == "Windows":
     xptifw_dispatcher = os.path.join(config.dpcpp_root_dir, 'bin', 'xptifw.dll')
 xptifw_includes = os.path.join(config.dpcpp_root_dir, 'include')
 if os.path.exists(xptifw_lib) and os.path.exists(os.path.join(xptifw_includes, 'xpti', 'xpti_trace_framework.h')):
     config.available_features.add('xptifw')
-    config.substitutions.append(('%xptifw_lib', "-L{} -I{}".format(xptifw_lib, xptifw_includes)))
     config.substitutions.append(('%xptifw_dispatcher', xptifw_dispatcher))
+    if platform.system() == "Linux":
+        config.substitutions.append(('%xptifw_lib', " {}/xptifw.lib".format(xptifw_lib_dir)))
+    elif platform.system() == "Windows":
+        config.substitutions.append(('%xptifw_lib', "-L{} -I{} -lxptifw".format(xptifw_lib_dir, xptifw_includes)))
+
 
 llvm_tools = ["llvm-spirv", "llvm-link"]
 for llvm_tool in llvm_tools: