AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pytest remove kernel verbose (#314)

Browse Source 
* Remove kernel-verbose from pytests

Signed-off-by: Jose Santos <josantos@amd.com>

* remove kernel-vebose from profile in cmake

Signed-off-by: Jose Santos <josantos@amd.com>

* update expected csvs for test_block_TCC

Signed-off-by: Jose Santos <josantos@amd.com>

* Remove stubbed binary

Signed-off-by: Jose Santos <josantos@amd.com>

* always clean workload_dir
Signed-off-by: Jose Santos <josantos@amd.com>

---------

Signed-off-by: Jose Santos <josantos@amd.com>

[ROCm/rocprofiler-compute commit: 4a86e39a25]
This commit is contained in:
JoseSantosAMD
2024-03-13 11:30:28 -05:00
committed by GitHub
parent 0b4ee818ba
commit ead7537cba
2 changed files with 17 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocprofiler-compute/CMakeLists.txt
-8
View File
@@ -209,13 +209,6 @@ add_test(
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
set_property(TEST test_profile_ipblocks PROPERTY COST 5) set_property(TEST test_profile_ipblocks PROPERTY COST 5)
add_test(
NAME test_profile_verbosity
COMMAND pytest -m verbosity --junitxml=tests/test_profile_verbosity.xml ${COV_OPTION}
${PROJECT_SOURCE_DIR}/tests/test_profile_general.py
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
set_property(TEST test_profile_ipblocks PROPERTY COST 10)
add_test( add_test(
NAME test_profile_mem NAME test_profile_mem
COMMAND pytest -m mem --junitxml=tests/test_profile_mem.xml ${COV_OPTION} COMMAND pytest -m mem --junitxml=tests/test_profile_mem.xml ${COV_OPTION}
@@ -244,7 +237,6 @@ set_tests_properties(
test_profile_kernel_execution test_profile_kernel_execution
test_profile_ipblocks test_profile_ipblocks
test_profile_dispatch test_profile_dispatch
test_profile_verbosity
test_profile_mem test_profile_mem
test_profile_join test_profile_join
test_profile_sort test_profile_sort
projects/rocprofiler-compute/tests/test_profile_general.py
+17 -133
View File
@@ -26,9 +26,6 @@ config["METRIC_LOGGING"] = False
baseline_opts = ["omniperf", "profile", "-n", "app_1", "-VVV"] baseline_opts = ["omniperf", "profile", "-n", "app_1", "-VVV"]
# app_1 = ["./tests/vcopy", "-n", "1048576", "-b", "256", "-i", "3"]
# app_1 = ["./sample/vcopy", "-n", "1048576", "-b", "256", "-i", "3"]
num_kernels = 3 num_kernels = 3
num_devices = 1 num_devices = 1
dispatch_id = 0 dispatch_id = 0
@@ -107,7 +104,6 @@ ROOF_ONLY_FILES = [
"timestamps.csv", "timestamps.csv",
] ]
# Must not change relative difference is zero
METRIC_THRESHOLDS = { METRIC_THRESHOLDS = {
"2.1.12": {"absolute": 0, "relative": 8}, "2.1.12": {"absolute": 0, "relative": 8},
"3.1.1": {"absolute": 0, "relative": 10}, "3.1.1": {"absolute": 0, "relative": 10},
@@ -587,7 +583,7 @@ def test_device_filter():
file_dict, file_dict,
) )
# test_utils.clean_output_dir(config["cleanup"], workload_dir) test_utils.clean_output_dir(config["cleanup"], workload_dir)
@pytest.mark.kernel_execution @pytest.mark.kernel_execution
@@ -692,7 +688,7 @@ def test_block_SQ():
file_dict, file_dict,
) )
# test_utils.clean_output_dir(config["cleanup"], workload_dir) test_utils.clean_output_dir(config["cleanup"], workload_dir)
@pytest.mark.block @pytest.mark.block
@@ -857,7 +853,21 @@ def test_block_TCC():
"timestamps.csv", "timestamps.csv",
] ]
if soc == "MI200": if soc == "MI200":
expected_csvs.insert(12, "roofline.csv") expected_csvs = [
"pmc_perf.csv",
"pmc_perf_0.csv",
"pmc_perf_1.csv",
"pmc_perf_2.csv",
"pmc_perf_3.csv",
"pmc_perf_4.csv",
"pmc_perf_5.csv",
"pmc_perf_6.csv",
"pmc_perf_7.csv",
"pmc_perf_8.csv",
"roofline.csv",
"sysinfo.csv",
"timestamps.csv",
]
assert sorted(list(file_dict.keys())) == expected_csvs assert sorted(list(file_dict.keys())) == expected_csvs
@@ -1338,132 +1348,6 @@ def test_dispatch_2():
test_utils.clean_output_dir(config["cleanup"], workload_dir) test_utils.clean_output_dir(config["cleanup"], workload_dir)
@pytest.mark.verbosity
def test_kernel_verbose_0():
options = baseline_opts + ["--kernel-verbose", "0"]
workload_dir = test_utils.get_output_dir()
test_utils.launch_omniperf(config, options, workload_dir)
file_dict = test_utils.check_csv_files(workload_dir, num_devices, num_kernels)
if soc == "MI200":
assert sorted(list(file_dict.keys())) == ALL_CSVS_MI200
else:
assert sorted(list(file_dict.keys())) == ALL_CSVS
validate(
inspect.stack()[0][3],
workload_dir,
file_dict,
)
# test_utils.clean_output_dir(config["cleanup"], workload_dir)
@pytest.mark.verbosity
def test_kernel_verbose_1():
options = baseline_opts + ["--kernel-verbose", "1"]
workload_dir = test_utils.get_output_dir()
test_utils.launch_omniperf(config, options, workload_dir)
file_dict = test_utils.check_csv_files(workload_dir, num_devices, num_kernels)
if soc == "MI200":
assert sorted(list(file_dict.keys())) == ALL_CSVS_MI200
else:
assert sorted(list(file_dict.keys())) == ALL_CSVS
validate(
inspect.stack()[0][3],
workload_dir,
file_dict,
)
test_utils.clean_output_dir(config["cleanup"], workload_dir)
@pytest.mark.verbosity
def test_kernel_verbose_2():
options = baseline_opts + ["--kernel-verbose", "2"]
workload_dir = test_utils.get_output_dir()
test_utils.launch_omniperf(config, options, workload_dir)
file_dict = test_utils.check_csv_files(workload_dir, num_devices, num_kernels)
if soc == "MI200":
assert sorted(list(file_dict.keys())) == ALL_CSVS_MI200
else:
assert sorted(list(file_dict.keys())) == ALL_CSVS
validate(
inspect.stack()[0][3],
workload_dir,
file_dict,
)
test_utils.clean_output_dir(config["cleanup"], workload_dir)
@pytest.mark.verbosity
def test_kernel_verbose_3():
options = baseline_opts + ["--kernel-verbose", "3"]
workload_dir = test_utils.get_output_dir()
test_utils.launch_omniperf(config, options, workload_dir)
file_dict = test_utils.check_csv_files(workload_dir, num_devices, num_kernels)
if soc == "MI200":
assert sorted(list(file_dict.keys())) == ALL_CSVS_MI200
else:
assert sorted(list(file_dict.keys())) == ALL_CSVS
validate(
inspect.stack()[0][3],
workload_dir,
file_dict,
)
test_utils.clean_output_dir(config["cleanup"], workload_dir)
@pytest.mark.verbosity
def test_kernel_verbose_4():
options = baseline_opts + ["--kernel-verbose", "4"]
workload_dir = test_utils.get_output_dir()
test_utils.launch_omniperf(config, options, workload_dir)
file_dict = test_utils.check_csv_files(workload_dir, num_devices, num_kernels)
if soc == "MI200":
assert sorted(list(file_dict.keys())) == ALL_CSVS_MI200
else:
assert sorted(list(file_dict.keys())) == ALL_CSVS
validate(
inspect.stack()[0][3],
workload_dir,
file_dict,
)
test_utils.clean_output_dir(config["cleanup"], workload_dir)
@pytest.mark.verbosity
def test_kernel_verbose_5():
options = baseline_opts + ["--kernel-verbose", "5"]
workload_dir = test_utils.get_output_dir()
test_utils.launch_omniperf(config, options, workload_dir)
file_dict = test_utils.check_csv_files(workload_dir, num_devices, num_kernels)
if soc == "MI200":
assert sorted(list(file_dict.keys())) == ALL_CSVS_MI200
else:
assert sorted(list(file_dict.keys())) == ALL_CSVS
validate(
inspect.stack()[0][3],
workload_dir,
file_dict,
)
test_utils.clean_output_dir(config["cleanup"], workload_dir)
@pytest.mark.join @pytest.mark.join
def test_join_type_grid(): def test_join_type_grid():
options = baseline_opts + ["--join-type", "grid"] options = baseline_opts + ["--join-type", "grid"]