Use gxx

Author: yudongsi

python/test/unit/tools/test_aot.py

@@ -102,19 +102,16 @@ def kernel(C, A, B, M, N, K,
 def gen_kernel_library_xpu(dir, libname):
     cpp_files = glob.glob(os.path.join(dir, "*.cpp"))
     subprocess.run(
-        ["icpx"] + cpp_files + ["-I", COMPILATION_HELPER.include_dir[0], "-c", "-fsycl", "-fPIC"],
+        ["g++"] + cpp_files + ["-I" + include_dir for include_dir in COMPILATION_HELPER.include_dir] +
+        ["-L", COMPILATION_HELPER.libsycl_dir, "-c", "-lsycl", "-fPIC"],
         check=True,
         cwd=dir,
     )
     o_files = glob.glob(os.path.join(dir, "*.o"))
 
-    command = ["icpx", "-fsycl", "-lze_loader", *o_files, "-shared", "-o", libname]
-    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])
-    subprocess.run(command, check=True, cwd=dir)
+    subprocess.run(["g++"] + [*o_files, "-shared", "-o", libname] +
+                   ["-L" + library_dir for library_dir in COMPILATION_HELPER.library_dir] +
+                   ["-L", COMPILATION_HELPER.libsycl_dir, "-lsycl", "-lze_loader"], check=True, cwd=dir)
 
 
 def gen_kernel_library(dir, libname):
@@ -297,15 +294,15 @@ def gen_test_bin(dir, M, N, K, exe="test", algo_id=0):
         command.extend(["-l", "cuda", "-L", dir, "-l", "kernel", "-o", exe])
 
     if is_xpu():
-        command = ["icpx", "test.cpp"]
+        command = ["g++", "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])
-        command.extend(["-fsycl", "-lze_loader", "-L", dir, "-l", "kernel", "-o", exe])
+        command.extend(["-lsycl", "-lze_loader", "-L", dir, "-l", "kernel", "-o", exe])
     subprocess.run(command, check=True, cwd=dir)
 
 
@@ -584,3 +581,4 @@ def test_ttgir_to_spv():
         spv = k.asm['spvdis']
         assert "OpCapability KernelAttributesINTEL" in spv
         assert "SubgroupSize 32" in spv
+