Welton, Benjamin
2c4e20b951
* [SWDEV-516561][1/2] Add MARKER_RANGE_EXTENT to capture ROCTX ranges
Range extent to capture all work between roctxpush/pop operations. Entry callback takes place during roxtxpush and exit callback takes place in roctxpop. This is primarily to allow us to keep an ancestor id on the ancestor stack such that all operations that take place within the push/pop context can be annotated as being apart of this range. With the current setup (where push and pop are two separate operations that need to be combined externally), we cannot keep an ancestor id on the stack and thus cannot tie tracing events to particular ranges.
Correlation id information is inherited from the push operation. Ancestor id needs to be added in a future commit that also outputs this ancestor to CSV.
Output:
```
[ctest] {'size': 64, 'kind': 7, 'operation': 1, 'correlation_id': {'internal': 1525, 'external': 0, 'ancestor': 1524}, 'start_timestamp': 2932551479402642, 'end_timestamp': 2932551491178449, 'thread_id': 3254861}
[ctest] {'size': 64, 'kind': 8, 'operation': 2, 'correlation_id': {'internal': 1525, 'external': 0, 'ancestor': 1524}, 'start_timestamp': 2932551479405878, 'end_timestamp': 2932551491181214, 'thread_id': 3254861}
```
Note: Kind 8 = range extent op.
* Merge fix
Revert several changes
source/lib/rocprofiler-sdk/marker/range_marker.*
- separate out range marker implementation for standard marker implementation
Update public API with marker core range
Support marker core range in sdk (source/lib/rocprofiler-sdk)
Transition rocprofiler-sdk-tool and output lib to use marker core range
Misc fixes for tests
Fix logic in lib/output/generate{CSV,Stats}.cpp
Update tests/rocprofv3/tracing-hip-in-libraries (marker validation)
Fix test_otf2_data
* Test fixes
---------
Co-authored-by: Benjamin Welton <bewelton@amd.com>
122 строки
3.6 KiB
Python
122 строки
3.6 KiB
Python
#!/usr/bin/env python3
|
|
|
|
import sys
|
|
import pytest
|
|
import re
|
|
import os
|
|
|
|
from collections import Counter
|
|
|
|
|
|
def test_agent_info(agent_info_input_data):
|
|
logical_node_id = max([int(itr["Logical_Node_Id"]) for itr in agent_info_input_data])
|
|
|
|
assert logical_node_id + 1 == len(agent_info_input_data)
|
|
|
|
for row in agent_info_input_data:
|
|
agent_type = row["Agent_Type"]
|
|
assert agent_type in ("CPU", "GPU")
|
|
if agent_type == "CPU":
|
|
assert int(row["Cpu_Cores_Count"]) > 0
|
|
assert int(row["Simd_Count"]) == 0
|
|
assert int(row["Max_Waves_Per_Simd"]) == 0
|
|
else:
|
|
assert int(row["Cpu_Cores_Count"]) == 0
|
|
assert int(row["Simd_Count"]) > 0
|
|
assert int(row["Max_Waves_Per_Simd"]) > 0
|
|
|
|
|
|
def extract_number(pattern, string):
|
|
match = re.match(pattern, string)
|
|
if match:
|
|
return int(match.group(1))
|
|
else:
|
|
raise ValueError(f"Pattern '{pattern}' not found in '{string}'.")
|
|
|
|
|
|
def find_key_with_substring(data, substring):
|
|
return next((k for k in data.keys() if substring in k), None)
|
|
|
|
|
|
def check_tot_data(tot_data):
|
|
iteration_msg = find_key_with_substring(tot_data, "iterations:")
|
|
assert tot_data[iteration_msg] == 1
|
|
|
|
num_iterations = extract_number(r"iterations: (\d+)", iteration_msg)
|
|
assert tot_data["main loop"] == num_iterations
|
|
|
|
if num_iterations > 0:
|
|
run_msg = find_key_with_substring(tot_data, "run")
|
|
if run_msg is not None:
|
|
value = extract_number(r"run\((\d+)\)", run_msg)
|
|
|
|
assert tot_data[f"run({value})"] == num_iterations
|
|
|
|
assert "fib" in tot_data.keys()
|
|
assert tot_data[f"fib(n={value})"] == num_iterations
|
|
for n in range(value, int(max([value / 2, value - 10]))):
|
|
assert f"fib(n={n})" in tot_data.keys()
|
|
|
|
assert tot_data[f"inefficient({value})"] == num_iterations
|
|
assert tot_data[f"sum"] == num_iterations
|
|
sum_msg = find_key_with_substring(tot_data, "sum(nelem=")
|
|
assert tot_data[sum_msg] == num_iterations
|
|
|
|
|
|
def test_marker_api_trace(marker_input_data):
|
|
functions = []
|
|
|
|
for row in marker_input_data:
|
|
assert row["Domain"] in [
|
|
"MARKER_CORE_API",
|
|
"MARKER_CORE_RANGE_API",
|
|
"MARKER_CONTROL_API",
|
|
"MARKER_NAME_API",
|
|
]
|
|
assert int(row["Process_Id"]) > 0
|
|
assert int(row["Thread_Id"]) == 0 or int(row["Thread_Id"]) >= int(
|
|
row["Process_Id"]
|
|
)
|
|
assert int(row["End_Timestamp"]) >= int(row["Start_Timestamp"])
|
|
|
|
functions.append(row["Function"])
|
|
|
|
check_tot_data(Counter(functions))
|
|
|
|
|
|
def test_marker_api_trace_json(json_data):
|
|
data = json_data["rocprofiler-sdk-tool"]
|
|
|
|
def get_kind_name(kind_id):
|
|
return data.strings.buffer_records[kind_id]["kind"]
|
|
|
|
valid_domain = (
|
|
"MARKER_CORE_API",
|
|
"MARKER_CONTROL_API",
|
|
"MARKER_NAME_API",
|
|
"MARKER_CORE_RANGE_API",
|
|
)
|
|
|
|
marker_data = data.buffer_records.marker_api
|
|
|
|
for marker in marker_data:
|
|
assert get_kind_name(marker["kind"]) in valid_domain
|
|
assert marker["thread_id"] >= data["metadata"]["pid"]
|
|
assert marker["end_timestamp"] >= marker["start_timestamp"]
|
|
|
|
tot_data = Counter([m["value"] for m in data.strings.marker_api])
|
|
check_tot_data(tot_data)
|
|
|
|
|
|
def test_perfetto_data(pftrace_data, json_data):
|
|
import rocprofiler_sdk.tests.rocprofv3 as rocprofv3
|
|
|
|
rocprofv3.test_perfetto_data(
|
|
pftrace_data, json_data, ("hip", "hsa", "marker", "kernel", "memory_copy")
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
exit_code = pytest.main(["-x", __file__] + sys.argv[1:])
|
|
sys.exit(exit_code)
|