已合并
[msprof]冒烟用例校验项修改 #95
yuliangbin创建于 3月2日
[msprof]冒烟用例校验项修改 #95
已合并
yuliangbin创建于 3月2日
14 个文件变更+2-24
Rtest/st/ l1_test_ascend_msprof_app_sample_based_memory.shtest/st/l1_test_ascend_msprof_app_sample_based_memory.sh+0-0
文件重命名但无更改。
Mtest/st/src/base_ascend_msprof_checker.py+1-1
@@ -213,7 +213,7 @@ class BaseAscendMsprofChecker(ABC):
213 if not msprof_log_paths:213 if not msprof_log_paths:
214 raise FileNotFoundError(f"No msprof log file found in {self.prof_path}")214 raise FileNotFoundError(f"No msprof log file found in {self.prof_path}")
215 for msprof_log_path in msprof_log_paths:215 for msprof_log_path in msprof_log_paths:
216- FileChecker.check_file_for_keyword(msprof_log_path, "error")216+ FileChecker.check_file_for_keyword(msprof_log_path, "[ERROR]")
217 217 
218 def check_msprof_db_file(self):218 def check_msprof_db_file(self):
219 db_path = glob.glob(f"{self.prof_path}/PROF_*/msprof_*.db")219 db_path = glob.glob(f"{self.prof_path}/PROF_*/msprof_*.db")
Mtest/st/src/l0_test_ascend_msprof_all_switch.py+0-1
@@ -19,7 +19,6 @@ import logging
19 19 
20from utils.file_check import FileChecker20from utils.file_check import FileChecker
21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker
22-from utils.mark_utils import arg_mark
23 22 
24logging.basicConfig(level=logging.INFO,23logging.basicConfig(level=logging.INFO,
25 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')24 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')
Mtest/st/src/l0_test_ascend_msprof_all_sys_switch.py+1-2
@@ -19,7 +19,6 @@ import logging
19 19 
20from utils.file_check import FileChecker20from utils.file_check import FileChecker
21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker
22-from utils.mark_utils import arg_mark
23 22 
24logging.basicConfig(level=logging.INFO,23logging.basicConfig(level=logging.INFO,
25 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')24 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')
@@ -158,7 +157,7 @@ def test_ascend_msprof_all_sys_switch(prof_path):
158 expect_db_tables = ["ACC_PMU", "AICORE_FREQ", "CANN_API", "COMPUTE_TASK_INFO", "ENUM_API_TYPE",157 expect_db_tables = ["ACC_PMU", "AICORE_FREQ", "CANN_API", "COMPUTE_TASK_INFO", "ENUM_API_TYPE",
159 "ENUM_HCCL_DATA_TYPE", "ENUM_HCCL_LINK_TYPE", "ENUM_HCCL_RDMA_TYPE", "ENUM_HCCL_TRANSPORT_TYPE",158 "ENUM_HCCL_DATA_TYPE", "ENUM_HCCL_LINK_TYPE", "ENUM_HCCL_RDMA_TYPE", "ENUM_HCCL_TRANSPORT_TYPE",
160 "ENUM_MEMCPY_OPERATION", "ENUM_MODULE", "ENUM_MSTX_EVENT_TYPE", "HBM", "HCCS", "HOST_INFO",159 "ENUM_MEMCPY_OPERATION", "ENUM_MODULE", "ENUM_MSTX_EVENT_TYPE", "HBM", "HCCS", "HOST_INFO",
161- "LLC", "MEMCPY_INFO", "META_DATA", "NETDEV_STATS", "NIC", "NPU_INFO", "NPU_MEM",160+ "LLC", "META_DATA", "NETDEV_STATS", "NIC", "NPU_INFO", "NPU_MEM",
162 "NPU_MODULE_MEM", "PCIE", "QOS", "RANK_DEVICE_MAP", "ROCE", "SESSION_TIME_INFO",161 "NPU_MODULE_MEM", "PCIE", "QOS", "RANK_DEVICE_MAP", "ROCE", "SESSION_TIME_INFO",
163 "SOC_BANDWIDTH_LEVEL", "STRING_IDS", "TASK", "TASK_PMU_INFO"]162 "SOC_BANDWIDTH_LEVEL", "STRING_IDS", "TASK", "TASK_PMU_INFO"]
164 test_ascend_msprof = TestAscendMsprofAllSysSwitch(prof_path, expect_db_tables)163 test_ascend_msprof = TestAscendMsprofAllSysSwitch(prof_path, expect_db_tables)
Mtest/st/src/l0_test_ascend_msprof_app_sample_based_pipeutilization.py+0-1
@@ -19,7 +19,6 @@ import logging
19 19 
20from utils.file_check import FileChecker20from utils.file_check import FileChecker
21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker
22-from utils.mark_utils import arg_mark
23 22 
24logging.basicConfig(level=logging.INFO,23logging.basicConfig(level=logging.INFO,
25 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')24 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')
Mtest/st/src/l0_test_ascend_msprof_app_task_based_pipeutilization.py+0-3
@@ -13,13 +13,10 @@
13# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.13# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
14# See the Mulan PSL v2 for more details.14# See the Mulan PSL v2 for more details.
15# -------------------------------------------------------------------------15# -------------------------------------------------------------------------
16-import glob
17import sys16import sys
18import logging17import logging
19 18 
20-from utils.file_check import FileChecker
21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker19from src.base_ascend_msprof_checker import BaseAscendMsprofChecker
22-from utils.mark_utils import arg_mark
23 20 
24logging.basicConfig(level=logging.INFO,21logging.basicConfig(level=logging.INFO,
25 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')22 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')
Mtest/st/src/l1_test_ascend_msprof_app_sample_based_arithmetic_utilization.py+0-1
@@ -19,7 +19,6 @@ import logging
19 19 
20from utils.file_check import FileChecker20from utils.file_check import FileChecker
21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker
22-from utils.mark_utils import arg_mark
23 22 
24logging.basicConfig(level=logging.INFO,23logging.basicConfig(level=logging.INFO,
25 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')24 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')
Mtest/st/src/l1_test_ascend_msprof_app_sample_based_memory_ub.py+0-1
@@ -19,7 +19,6 @@ import logging
19 19 
20from utils.file_check import FileChecker20from utils.file_check import FileChecker
21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker
22-from utils.mark_utils import arg_mark
23 22 
24logging.basicConfig(level=logging.INFO,23logging.basicConfig(level=logging.INFO,
25 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')24 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')
Mtest/st/src/l1_test_ascend_msprof_app_sample_based_resource_conflict_ratio.py+0-1
@@ -19,7 +19,6 @@ import logging
19 19 
20from utils.file_check import FileChecker20from utils.file_check import FileChecker
21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker
22-from utils.mark_utils import arg_mark
23 22 
24logging.basicConfig(level=logging.INFO,23logging.basicConfig(level=logging.INFO,
25 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')24 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')
Mtest/st/src/l1_test_ascend_msprof_app_task_based_arithmetic_utilization.py+0-3
@@ -13,13 +13,10 @@
13# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.13# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
14# See the Mulan PSL v2 for more details.14# See the Mulan PSL v2 for more details.
15# -------------------------------------------------------------------------15# -------------------------------------------------------------------------
16-import glob
17import sys16import sys
18import logging17import logging
19 18 
20-from utils.file_check import FileChecker
21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker19from src.base_ascend_msprof_checker import BaseAscendMsprofChecker
22-from utils.mark_utils import arg_mark
23 20 
24logging.basicConfig(level=logging.INFO,21logging.basicConfig(level=logging.INFO,
25 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')22 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')
Mtest/st/src/l1_test_ascend_msprof_app_task_based_memory.py+0-2
@@ -13,11 +13,9 @@
13# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.13# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
14# See the Mulan PSL v2 for more details.14# See the Mulan PSL v2 for more details.
15# -------------------------------------------------------------------------15# -------------------------------------------------------------------------
16-import glob
17import sys16import sys
18import logging17import logging
19 18 
20-from utils.file_check import FileChecker
21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker19from src.base_ascend_msprof_checker import BaseAscendMsprofChecker
22 20 
23logging.basicConfig(level=logging.INFO,21logging.basicConfig(level=logging.INFO,
Mtest/st/src/l1_test_ascend_msprof_app_task_based_memory_l0.py+0-2
@@ -13,11 +13,9 @@
13# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.13# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
14# See the Mulan PSL v2 for more details.14# See the Mulan PSL v2 for more details.
15# -------------------------------------------------------------------------15# -------------------------------------------------------------------------
16-import glob
17import sys16import sys
18import logging17import logging
19 18 
20-from utils.file_check import FileChecker
21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker19from src.base_ascend_msprof_checker import BaseAscendMsprofChecker
22 20 
23logging.basicConfig(level=logging.INFO,21logging.basicConfig(level=logging.INFO,
Mtest/st/src/l1_test_ascend_msprof_app_task_based_memory_ub.py+0-3
@@ -13,13 +13,10 @@
13# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.13# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
14# See the Mulan PSL v2 for more details.14# See the Mulan PSL v2 for more details.
15# -------------------------------------------------------------------------15# -------------------------------------------------------------------------
16-import glob
17import sys16import sys
18import logging17import logging
19 18 
20-from utils.file_check import FileChecker
21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker19from src.base_ascend_msprof_checker import BaseAscendMsprofChecker
22-from utils.mark_utils import arg_mark
23 20 
24logging.basicConfig(level=logging.INFO,21logging.basicConfig(level=logging.INFO,
25 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')22 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')
Mtest/st/src/l1_test_ascend_msprof_app_task_based_resource_conflict_ratio.py+0-3
@@ -13,13 +13,10 @@
13# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.13# MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
14# See the Mulan PSL v2 for more details.14# See the Mulan PSL v2 for more details.
15# -------------------------------------------------------------------------15# -------------------------------------------------------------------------
16-import glob
17import sys16import sys
18import logging17import logging
19 18 
20-from utils.file_check import FileChecker
21from src.base_ascend_msprof_checker import BaseAscendMsprofChecker19from src.base_ascend_msprof_checker import BaseAscendMsprofChecker
22-from utils.mark_utils import arg_mark
23 20 
24logging.basicConfig(level=logging.INFO,21logging.basicConfig(level=logging.INFO,
25 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')22 format='\n%(asctime)s %(filename)s [line:%(lineno)d] [%(levelname)s] %(message)s')