[SYCLomatic] Use icx-cl/icpx -fsycl as new compiler driver in test script (#127)

Signed-off-by: Wang, Yihan <[email protected]>

Author: Yihan Wang

behavior_tests/src/bt-custom-helper-file-name2/do_test.py

@@ -38,12 +38,12 @@ def migrate_test():
     if (platform.system() == 'Windows'):
         os.environ["INCLUDE"] = header_path
         print(os.environ["INCLUDE"])
-        ret_val = call_subprocess("dpcpp /EHsc out/test.dp.cpp -o out/run")
+        ret_val = call_subprocess("icx-cl -fsycl /EHsc out/test.dp.cpp -o out/run")
         os.environ["INCLUDE"] = path_env
     else:
         os.environ["CPATH"] = header_path
         call_subprocess("env | grep CPATH")
-        ret_val = call_subprocess("dpcpp out/test.dp.cpp -o out/run")
+        ret_val = call_subprocess("icpx -fsycl out/test.dp.cpp -o out/run")
         os.environ["CPATH"] = path_env
     return ret_val
 

help_function/test_help.py

@@ -63,12 +63,12 @@ def build_test():
     if test_config.current_test == "test_default_queue_2":
         srcs.append("test_default_queue_1.cpp")
     if test_config.current_test == "kernel_function_lin":
-        ret = call_subprocess("dpcpp -shared -fPIC -o module.so kernel_module_lin.cpp")
+        ret = call_subprocess("icpx -fsycl -shared -fPIC -o module.so kernel_module_lin.cpp")
         if not ret:
             print("kernel_function_lin created the shared lib failed.")
             return False
     if test_config.current_test == "kernel_function_win":
-        ret = call_subprocess("dpcpp /EHsc -shared -o module.dll kernel_module_win.cpp")
+        ret = call_subprocess("icx-cl -fsycl /EHsc /LD kernel_module_win.cpp /link /OUT:module.dll")
         if not ret:
             print("kernel_function_win created the shared lib failed.")
             return False

test_utils.py

@@ -56,9 +56,9 @@ def change_dir(dir):
 
 def set_default_compiler():
     if (platform.system() == 'Windows'):
-        test_config.DPCXX_COM = "dpcpp-cl"
+        test_config.DPCXX_COM = "icx-cl -fsycl"
     else:
-        test_config.DPCXX_COM = "dpcpp"
+        test_config.DPCXX_COM = "icpx -fsycl"
 
 def print_debug_log(desc, *args):
     if (test_config.VERBOSE_LEVEL != 0):
@@ -94,7 +94,7 @@ def compile_and_link(srcs, cmpopts = [], objects = [], linkopt = []):
         if new_obj not in obj_files:
             obj_files.append(new_obj)
     cmd = test_config.DPCXX_COM + ' '  + ' '.join(obj_files) + ' ' + \
-                        ' '.join(linkopt) + ' ' + ' '.join(objects) + ' -o ' + test_config.current_test + '.run \n'
+                        ' '.join(linkopt) + ' ' + ' '.join(objects) + ' -o ' + test_config.current_test + '.run'
     return call_subprocess(cmd)
 
 

user_guide_samples/src/vector_add/vector_add.py

@@ -35,11 +35,11 @@
 
 # check run result
 if platform.system() == "Windows":
-    compiler = "dpcpp-cl "
+    compiler = "icx-cl -fsycl "
     out_exe = ".\\\\vector_add.dp.exe"
     options = "/EHsc" 
 else:
-    compiler = "dpcpp "
+    compiler = "icpx -fsycl "
     out_exe = "./a.out"
     options = ""