[rocprofv3] Unconditionally collect stream and kernel rename data in rocprofv3 for rocpd (#171)
* Remove config checks for stream and kernel rename data collection * Updated csv generation to check if kernel rename is on before calling get_kernel_name * Update metadata to use kernel_rename bool argument * Formatting + unconditionally store kernel name in rocpd * Readded kernel rename parameter after rebase * Fixed rebase conflicts * Updated comment in line with github comments * Added check in rocpd csv.cpp to output kernel name if region name is empty * Add test for kernel rename --------- Co-authored-by: Ian Trowbridge <Ian.Trowbridge@amd.com>
This commit is contained in:
systems-assistant[bot]
committed by
GitHub
GitHub
szülő
156de36a92
commit
b60c0ceddd
@@ -47,3 +47,4 @@ add_subdirectory(minimum-bytes)
|
||||
add_subdirectory(conversion-script)
|
||||
add_subdirectory(python-bindings)
|
||||
add_subdirectory(rocpd)
|
||||
add_subdirectory(rocpd-kernel-rename)
|
||||
|
||||
@@ -0,0 +1,175 @@
|
||||
# MIT License
|
||||
#
|
||||
# Copyright (c) 2023-2025 Advanced Micro Devices, Inc. All rights reserved.
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in all
|
||||
# copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
|
||||
cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)
|
||||
|
||||
project(
|
||||
rocprofiler-sdk-tests-rocprofv3-rocpd-rename
|
||||
LANGUAGES CXX
|
||||
VERSION 0.0.0)
|
||||
|
||||
find_package(rocprofiler-sdk REQUIRED)
|
||||
|
||||
set(rocprofv3-rocpd-env
|
||||
"${ROCPROFILER_MEMCHECK_PRELOAD_ENV}"
|
||||
"PYTHONPATH=${rocprofiler-sdk_LIB_DIR}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages"
|
||||
)
|
||||
|
||||
rocprofiler_configure_pytest_files(CONFIG pytest.ini COPY conftest.py validate.py)
|
||||
|
||||
find_package(Python3 REQUIRED)
|
||||
|
||||
#########################################################################################
|
||||
#
|
||||
# generate rocpd database
|
||||
#
|
||||
#########################################################################################
|
||||
|
||||
add_test(
|
||||
NAME rocprofv3-test-rocpd-no-rename-execute
|
||||
COMMAND
|
||||
$<TARGET_FILE:rocprofiler-sdk::rocprofv3> -d
|
||||
${CMAKE_CURRENT_BINARY_DIR}/rocpd-no-kernel-rename -o out --output-format rocpd
|
||||
json csv --kernel-trace -- $<TARGET_FILE:simple-transpose>)
|
||||
|
||||
set_tests_properties(
|
||||
rocprofv3-test-rocpd-no-rename-execute
|
||||
PROPERTIES TIMEOUT
|
||||
120
|
||||
LABELS
|
||||
"integration-tests;rocpd"
|
||||
ENVIRONMENT
|
||||
"${rocprofv3-rocpd-env}"
|
||||
FAIL_REGULAR_EXPRESSION
|
||||
"${ROCPROFILER_DEFAULT_FAIL_REGEX}"
|
||||
FIXTURES_SETUP
|
||||
rocprofv3-test-rocpd-no-rename)
|
||||
|
||||
add_test(
|
||||
NAME rocprofv3-test-rocpd-rename-execute
|
||||
COMMAND
|
||||
$<TARGET_FILE:rocprofiler-sdk::rocprofv3> -d
|
||||
${CMAKE_CURRENT_BINARY_DIR}/rocpd-kernel-rename -o out --output-format csv
|
||||
--kernel-trace --kernel-rename -- $<TARGET_FILE:simple-transpose>)
|
||||
|
||||
set_tests_properties(
|
||||
rocprofv3-test-rocpd-rename-execute
|
||||
PROPERTIES TIMEOUT
|
||||
120
|
||||
LABELS
|
||||
"integration-tests;rocpd"
|
||||
ENVIRONMENT
|
||||
"${rocprofv3-rocpd-env}"
|
||||
FAIL_REGULAR_EXPRESSION
|
||||
"${ROCPROFILER_DEFAULT_FAIL_REGEX}"
|
||||
FIXTURES_SETUP
|
||||
rocprofv3-test-rocpd-rename)
|
||||
|
||||
#########################################################################################
|
||||
#
|
||||
# CSV generate
|
||||
#
|
||||
#########################################################################################
|
||||
|
||||
add_test(
|
||||
NAME rocprofv3-test-rocpd-rename-csv-generation
|
||||
COMMAND
|
||||
${Python3_EXECUTABLE} -m rocpd convert -f csv --kernel-rename -d
|
||||
${CMAKE_CURRENT_BINARY_DIR}/generated-rename-csv/ -i
|
||||
${CMAKE_CURRENT_BINARY_DIR}/rocpd-no-kernel-rename/out_results.db)
|
||||
|
||||
set_tests_properties(
|
||||
rocprofv3-test-rocpd-rename-csv-generation
|
||||
PROPERTIES TIMEOUT
|
||||
120
|
||||
LABELS
|
||||
"integration-tests;rocpd"
|
||||
ENVIRONMENT
|
||||
"${rocprofv3-rocpd-env}"
|
||||
DEPENDS
|
||||
"rocprofv3-test-rocpd-no-rename-execute"
|
||||
FAIL_REGULAR_EXPRESSION
|
||||
"${ROCPROFILER_DEFAULT_FAIL_REGEX}"
|
||||
FIXTURES_SETUP
|
||||
rocprofv3-test-rocpd-rename-generation
|
||||
FIXTURES_REQUIRED
|
||||
rocprofv3-test-rocpd-no-rename)
|
||||
|
||||
add_test(
|
||||
NAME rocprofv3-test-rocpd-no-rename-csv-generation
|
||||
COMMAND
|
||||
${Python3_EXECUTABLE} -m rocpd convert -f csv -d
|
||||
${CMAKE_CURRENT_BINARY_DIR}/generated-no-rename-csv/ -i
|
||||
${CMAKE_CURRENT_BINARY_DIR}/rocpd-no-kernel-rename/out_results.db)
|
||||
|
||||
set_tests_properties(
|
||||
rocprofv3-test-rocpd-no-rename-csv-generation
|
||||
PROPERTIES TIMEOUT
|
||||
120
|
||||
LABELS
|
||||
"integration-tests;rocpd"
|
||||
ENVIRONMENT
|
||||
"${rocprofv3-rocpd-env}"
|
||||
DEPENDS
|
||||
"rocprofv3-test-rocpd-no-rename-execute"
|
||||
FAIL_REGULAR_EXPRESSION
|
||||
"${ROCPROFILER_DEFAULT_FAIL_REGEX}"
|
||||
FIXTURES_SETUP
|
||||
rocprofv3-test-rocpd-no-rename-generation
|
||||
FIXTURES_REQUIRED
|
||||
rocprofv3-test-rocpd-no-rename)
|
||||
|
||||
#########################################################################################
|
||||
#
|
||||
# Validation
|
||||
#
|
||||
#########################################################################################
|
||||
|
||||
set(VALIDATION_DEPENDS rocprofv3-test-rocpd-rename-csv-generation
|
||||
rocprofv3-test-rocpd-no-rename-csv-generation)
|
||||
|
||||
add_test(
|
||||
NAME rocprofv3-test-rocpd-rename-validation
|
||||
COMMAND
|
||||
${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/validate.py --rename-csv-input
|
||||
${CMAKE_CURRENT_BINARY_DIR}/rocpd-kernel-rename/out_kernel_trace.csv
|
||||
--no-rename-csv-input
|
||||
${CMAKE_CURRENT_BINARY_DIR}/rocpd-no-kernel-rename/out_kernel_trace.csv
|
||||
--generated-rename-csv-input
|
||||
${CMAKE_CURRENT_BINARY_DIR}/generated-rename-csv/out_kernel_trace.csv
|
||||
--generated-no-rename-csv-input
|
||||
${CMAKE_CURRENT_BINARY_DIR}/generated-no-rename-csv/out_kernel_trace.csv)
|
||||
|
||||
set_tests_properties(
|
||||
rocprofv3-test-rocpd-rename-validation
|
||||
PROPERTIES TIMEOUT
|
||||
120
|
||||
LABELS
|
||||
"integration-tests;rocpd"
|
||||
ENVIRONMENT
|
||||
"${rocprofv3-rocpd-env}"
|
||||
DEPENDS
|
||||
"${VALIDATION_DEPENDS}"
|
||||
FAIL_REGULAR_EXPRESSION
|
||||
"${ROCPROFILER_DEFAULT_FAIL_REGEX}"
|
||||
FIXTURES_REQUIRED
|
||||
rocprofv3-test-rocpd-no-rename-generation)
|
||||
@@ -0,0 +1,120 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# MIT License
|
||||
#
|
||||
# Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in
|
||||
# all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
# THE SOFTWARE.
|
||||
|
||||
import csv
|
||||
import pandas as pd
|
||||
import pytest
|
||||
import json
|
||||
import os
|
||||
import io
|
||||
|
||||
from rocprofiler_sdk.pytest_utils.dotdict import dotdict
|
||||
from rocprofiler_sdk.pytest_utils import collapse_dict_list
|
||||
|
||||
|
||||
def pytest_addoption(parser):
|
||||
parser.addoption(
|
||||
"--json-input",
|
||||
action="store",
|
||||
help="Path to JSON file.",
|
||||
)
|
||||
parser.addoption(
|
||||
"--rename-csv-input",
|
||||
action="store",
|
||||
help="Path to kernel rename trace file.",
|
||||
)
|
||||
parser.addoption(
|
||||
"--no-rename-csv-input",
|
||||
action="store",
|
||||
help="Path to non-kernel rename trace file.",
|
||||
)
|
||||
parser.addoption(
|
||||
"--generated-rename-csv-input",
|
||||
action="store",
|
||||
help="Path to generated kernel rename trace file.",
|
||||
)
|
||||
parser.addoption(
|
||||
"--generated-no-rename-csv-input",
|
||||
action="store",
|
||||
help="Path to generted non-kernel rename trace file.",
|
||||
)
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def json_data(request):
|
||||
filename = request.config.getoption("--json-input")
|
||||
with open(filename, "r") as inp:
|
||||
return dotdict(collapse_dict_list(json.load(inp)))
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def rename_csv_data(request):
|
||||
filename = request.config.getoption("--rename-csv-input")
|
||||
data = []
|
||||
if not os.path.isfile(filename):
|
||||
raise FileExistsError(f"{filename} does not exist")
|
||||
with open(filename, "r") as inp:
|
||||
reader = csv.DictReader(inp)
|
||||
for row in reader:
|
||||
data.append(row)
|
||||
return data
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def no_rename_csv_data(request):
|
||||
filename = request.config.getoption("--no-rename-csv-input")
|
||||
data = []
|
||||
if not os.path.isfile(filename):
|
||||
raise FileExistsError(f"{filename} does not exist")
|
||||
with open(filename, "r") as inp:
|
||||
reader = csv.DictReader(inp)
|
||||
for row in reader:
|
||||
data.append(row)
|
||||
return data
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def generated_rename_csv_data(request):
|
||||
filename = request.config.getoption("--generated-rename-csv-input")
|
||||
data = []
|
||||
if not os.path.isfile(filename):
|
||||
raise FileExistsError(f"{filename} does not exist")
|
||||
with open(filename, "r") as inp:
|
||||
reader = csv.DictReader(inp)
|
||||
for row in reader:
|
||||
data.append(row)
|
||||
return data
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def generated_no_rename_csv_data(request):
|
||||
filename = request.config.getoption("--generated-no-rename-csv-input")
|
||||
data = []
|
||||
if not os.path.isfile(filename):
|
||||
raise FileExistsError(f"{filename} does not exist")
|
||||
with open(filename, "r") as inp:
|
||||
reader = csv.DictReader(inp)
|
||||
for row in reader:
|
||||
data.append(row)
|
||||
return data
|
||||
@@ -0,0 +1,5 @@
|
||||
|
||||
[pytest]
|
||||
addopts = --durations=20 -rA -s -vv
|
||||
testpaths = validate.py
|
||||
pythonpath = @ROCPROFILER_SDK_TESTS_BINARY_DIR@/pytest-packages
|
||||
@@ -0,0 +1,55 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# MIT License
|
||||
#
|
||||
# Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in
|
||||
# all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
# THE SOFTWARE.
|
||||
|
||||
import sys
|
||||
import pytest
|
||||
|
||||
|
||||
def test_csv_data(
|
||||
rename_csv_data,
|
||||
no_rename_csv_data,
|
||||
generated_rename_csv_data,
|
||||
generated_no_rename_csv_data,
|
||||
):
|
||||
assert len(rename_csv_data) > 0, "Expected non-empty kernel rename csv data"
|
||||
assert (
|
||||
len(no_rename_csv_data) > 0
|
||||
), "Expected non-empty non-kernel rename kernel csv data"
|
||||
assert (
|
||||
len(generated_rename_csv_data) > 0
|
||||
), "Expected non-empty rocpd kernel rename csv data"
|
||||
assert (
|
||||
len(generated_no_rename_csv_data) > 0
|
||||
), "Expected non-empty rocpd non-kernel rename csv data"
|
||||
|
||||
for row, generated_row in zip(rename_csv_data, generated_rename_csv_data):
|
||||
assert row["Kernel_Name"] == generated_row["Kernel_Name"]
|
||||
|
||||
for row, generated_row in zip(no_rename_csv_data, generated_no_rename_csv_data):
|
||||
assert row["Kernel_Name"] == generated_row["Kernel_Name"]
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
exit_code = pytest.main(["-x", __file__] + sys.argv[1:])
|
||||
sys.exit(exit_code)
|
||||
Reference in New Issue
Block a user