Enable tools/test_aot.py for Windows+msvc (#3637)

Signed-off-by: Anatoly Myachev <[email protected]>
Co-authored-by: Pavel Chekin <[email protected]>

Author: anmyachev

python/test/unit/tools/test_aot.py

@@ -111,23 +111,59 @@ def select_compiler():
     return cxx
 
 
+def _cxx_compile_cmd(cxx: str, src: list, include_dirs: list, only_compile: bool = True) -> list:
+    if "cl.EXE" in cxx or "clang-cl" in cxx:
+        command = [cxx] + src + ["/I" + include_dir for include_dir in include_dirs
+                                 ] + ["/Zc:__cplusplus", "/std:c++17", "/MD", "/nologo", "/O2", "/EHsc", "/wd4996"]
+        if only_compile:
+            command += ["/c"]
+    else:
+        command = [cxx] + src + ["-I" + include_dir for include_dir in include_dirs
+                                 ] + ["-fPIC" if os.name != "nt" else "-Wno-deprecated-declarations"]
+        if only_compile:
+            command += ["-c"]
+    return command
+
+
+def _cxx_link_cmd(cxx: str, o_files: list, out: str, extra_library_dirs: list = [], extra_libraries: list = [],
+                  shared_lib: bool = True) -> list:
+    extra_link_args = []
+    if os.name == "nt":
+        libname_without_ext = out.split(".")[0]
+        extra_link_args = [f"/IMPLIB:{libname_without_ext}.lib"]
+
+    library_dirs = COMPILATION_HELPER.library_dir + COMPILATION_HELPER.libsycl_dir + extra_library_dirs
+    if "cl.EXE" in cxx or "clang-cl" in cxx:
+        command = [cxx] + [*o_files, *(["/LD"] if shared_lib else []), "/link", f"/OUT:{out}"] + [
+            "/LIBPATH:" + library_dir for library_dir in library_dirs
+        ] + ["sycl8.lib", "ze_loader.lib"] + [f"{lib}.lib" for lib in extra_libraries] + extra_link_args
+    else:
+        command = [cxx] + [*o_files, *(["-shared"] if shared_lib else []), "-o", out] + [
+            "-L" + library_dir for library_dir in library_dirs
+        ] + ["-lsycl8" if os.name == "nt" else "-lsycl", "-lze_loader"] + [f"-l{lib}"
+                                                                           for lib in extra_libraries] + extra_link_args
+
+    return command
+
+
+def _cxx_cmd(cxx: str, src: list, out: str, include_dirs: list, extra_library_dirs: list,
+             extra_libraries: list) -> list:
+    compile_command = _cxx_compile_cmd(cxx, src, include_dirs, only_compile=False)
+    link_command = _cxx_link_cmd(cxx, [], out, extra_library_dirs, extra_libraries, shared_lib=False)
+    return compile_command + link_command[1:]
+
+
 def gen_kernel_library_xpu(dir, libname):
     cpp_files = glob.glob(os.path.join(dir, "*.cpp"))
     cxx = select_compiler()
-    command = [cxx] + cpp_files + ["-I" + include_dir for include_dir in COMPILATION_HELPER.include_dir
-                                   ] + ["-c", "-fPIC" if os.name != "nt" else "-Wno-deprecated-declarations"]
+    command = _cxx_compile_cmd(cxx, cpp_files, COMPILATION_HELPER.include_dir)
     subprocess.run(command, check=True, cwd=dir)
-    o_files = glob.glob(os.path.join(dir, "*.o"))
-
-    extra_link_args = []
-    if "icpx" in cxx and os.name == "nt":
-        libname_without_ext = libname.split(".")[0]
-        extra_link_args = [f"/IMPLIB:{libname_without_ext}.lib"]
 
-    command = [cxx] + [*o_files, "-shared", "-o", libname] + [
-        "-L" + library_dir for library_dir in COMPILATION_HELPER.library_dir
-    ] + ["-L" + dir for dir in COMPILATION_HELPER.libsycl_dir
-         ] + ["-lsycl8" if os.name == "nt" else "-lsycl", "-lze_loader"] + extra_link_args
+    if "cl.EXE" in cxx or "clang-cl" in cxx:
+        o_files = glob.glob(os.path.join(dir, "*.obj"))
+    else:
+        o_files = glob.glob(os.path.join(dir, "*.o"))
+    command = _cxx_link_cmd(cxx, o_files, libname)
     subprocess.run(command, check=True, cwd=dir)
 
 
@@ -250,7 +286,7 @@ def gen_test_bin(dir, M, N, K, exe="test", algo_id=0):
     fclose(file);
 }}
 int main(int argc, char ** argv) {{
-    int M = {M}, N = {N}, K = {K};
+    constexpr int M = {M}, N = {N}, K = {K};
 
     // initialize sycl handles
     sycl::queue q{{sycl::gpu_selector_v}};
@@ -314,17 +350,7 @@ def gen_test_bin(dir, M, N, K, exe="test", algo_id=0):
 
     if is_xpu():
         cxx = select_compiler()
-        command = [cxx, "test.cpp"]
-        for inc_dir in COMPILATION_HELPER.include_dir:
-            command.extend(["-I", inc_dir])
-        for lib_dir in COMPILATION_HELPER.library_dir:
-            command.extend(["-L", lib_dir])
-        if COMPILATION_HELPER.libsycl_dir:
-            for lib_dir in COMPILATION_HELPER.libsycl_dir:
-                command.extend(["-L", lib_dir])
-        if os.name == "nt":
-            command.extend(["-Wno-deprecated-declarations"])
-        command.extend(["-lsycl8" if os.name == "nt" else "-lsycl", "-lze_loader", "-L", dir, "-lkernel", "-o", exe])
+        command = _cxx_cmd(cxx, ["test.cpp"], exe, COMPILATION_HELPER.include_dir, [dir], ["kernel"])
     subprocess.run(command, check=True, cwd=dir)
 
 

third_party/intel/tools/intel/compile.cpp

@@ -134,7 +134,7 @@ int32_t {kernel_name}(sycl::queue &stream, {signature}) {{
   sycl::range<3> local_range(local_range_z, local_range_y, local_range_x);
   sycl::nd_range<3> parallel_work_size(global_range, local_range);
 
-  if ({shared}) {{
+  if (static_cast<bool>({shared})) {{
     expected_num_params -= 1;
   }}
   assert(num_params == expected_num_params && "number of kernel param not matched");
@@ -153,7 +153,7 @@ int32_t {kernel_name}(sycl::queue &stream, {signature}) {{
         set_argument(cgh, idx, type, params[idx]);
         idx++;
     }}
-    if ({shared}) {{
+    if (static_cast<bool>({shared})) {{
         using share_mem_t = sycl::local_accessor<int8_t, 1>;
         share_mem_t local_buffer = share_mem_t({shared}, cgh);
         cgh.set_arg(num_params, local_buffer);