merge UT test script for all devices

test/xpu/extended/run_test_with_skip.py

@@ -1,11 +1,22 @@
 import os
 import sys
-from skip_list_common import skip_dict
-from skip_list_win import skip_dict as skip_dict_win
+from os.path import abspath, join, dirname
+sys.path.insert(0, join(abspath(dirname(__file__)), ".."))
+from extended.skip_list_common import skip_dict
+from extended.skip_list_win import skip_dict as skip_dict_win
+from xpu_test_utils import get_device_name
 
 IS_WINDOWS = sys.platform == "win32"
+dev_name = get_device_name()
+if dev_name == "ARC":
+    from extended.skip_list_arc import skip_dict as skip_dict_specifical
+    from extended.skip_list_win_arc import skip_dict as skip_dict_win_arc
 
 skip_list = skip_dict["test_ops_xpu.py"]
+if dev_name == "ARC":
+    skip_list += skip_dict_specifical["test_ops_xpu.py"]
+    if IS_WINDOWS:
+        skip_list += skip_dict_win_arc["test_ops_xpu.py"]
 if IS_WINDOWS:
     skip_list += skip_dict_win["test_ops_xpu.py"]
 

test/xpu/run_test_with_skip.py

@@ -2,22 +2,42 @@
 import sys
 
 from skip_list_common import skip_dict
-from xpu_test_utils import launch_test
+from xpu_test_utils import get_device_name, launch_test
 
+dev_name = get_device_name()
+if dev_name == "ARC":
+    from skip_list_arc import skip_dict as skip_dict_specifical
+    from skip_list_win import skip_dict as skip_dict_win
+    from skip_list_win_arc import skip_dict as skip_dict_win_arc
+elif dev_name == "MTL":
+    from skip_list_mtl import skip_dict as skip_dict_specifical
+    from skip_list_win import skip_dict as skip_dict_win
 
 res = 0
 fail_test = []
+IS_WINDOWS = sys.platform == "win32"
 
 for key in skip_dict:
     skip_list = skip_dict[key]
+    if dev_name == "ARC":
+        if key in skip_dict_specifical:
+            skip_list += skip_dict_specifical[key]
+        if IS_WINDOWS and key in skip_dict_win:
+            skip_list += skip_dict_win[key]
+        if IS_WINDOWS and key in skip_dict_win_arc:
+            skip_list += skip_dict_win_arc[key]
+    elif dev_name == "MTL":
+        if key in skip_dict_specifical:
+            skip_list += skip_dict_specifical[key]
+        if IS_WINDOWS and key in skip_dict_win:
+            skip_list += skip_dict_win[key]
     fail = launch_test(key, skip_list)
     res += fail
     if fail:
         fail_test.append(key)
 if fail_test:
     print(",".join(fail_test) + " have failures")
 
-
 if os.name == "nt":
     sys.exit(res)
 else:    

test/xpu/xpu_test_utils.py

@@ -346,6 +346,21 @@
 }
 
 
+ARC_DEVICE_MAPPING = [
+    "Intel(R) Arc(TM) Pro A60 Graphics",
+    "Intel(R) Arc(TM) A770 Graphics",
+    "Intel(R) Arc(TM) A750 Graphics",
+]
+MTL_DEVICE_MAPPING = [
+    "Intel(R) Arc(TM) Graphics",
+]
+
+
+def get_device_name():
+    dev = torch.xpu.get_device_name()
+    return "ARC" if dev in ARC_DEVICE_MAPPING else "MTL" if dev in MTL_DEVICE_MAPPING else "PVC"
+
+
 def get_wrapped_fn(fn):
     if hasattr(fn, "__wrapped__"):
         wrapped = fn.__wrapped__