Welton, Benjamin
007285272b
* [SWDEV-518071] Return HSA not loaded status (device counter collection) This is a state that a caller would want to know about to understand if they got no counters because of a failure or if they were trying to collect counters too early (as is the case in the sample, which can attempt to collect counters before HSA is inited). * Minor edit * format * [SWDEV-518081] Simplify Metric Loading (#243) * [SWDEV-518071] Return HSA not loaded status (device counter collection) This is a state that a caller would want to know about to understand if they got no counters because of a failure or if they were trying to collect counters too early (as is the case in the sample, which can attempt to collect counters before HSA is inited). * [SWDEV-518324] Add AST update support Allows the ability for ASTs to be updated (instead of an unchangable static value). Adds a shared pointer return type to protect against static destructors/modifications from invalidating potentially in use AST definitions. No functionality/use changes in this PR. * [SWDEV-518593] Add updatable dimension cache + fix string issues (#252) * [SWDEV-518593] Add updatable dimension cache + fix string issues Updates dimension cache to use the same design pattern as AST/Metrics. Fixes the string scoping issue seen in ASTs, which appears here as well. * Add rocprofiler_create_counter Creates derived counters based on input from the API. This PR does three things: 1. Adds the API + test case 2. Validates that an AST can be constructed from the counter supplied. 3. Updates metrics, ast, and dimension caches to include the new metric. Metric should be available for use immediately after the call completes. Due to the regeneration of ASTs, this call should not be performed in performance sensitive code. * Suggestion fixes --------- Co-authored-by: Benjamin Welton <bewelton@amd.com> * Minor tweak --------- Co-authored-by: Benjamin Welton <bewelton@amd.com> Co-authored-by: Venkateshwar Reddy Kandula <vkandula@amd.com> --------- Co-authored-by: Benjamin Welton <bewelton@amd.com> Co-authored-by: Venkateshwar Reddy Kandula <vkandula@amd.com> * Fixes for comments --------- Co-authored-by: Benjamin Welton <bewelton@amd.com> Co-authored-by: Kandula, Venkateshwar reddy <Venkateshwarreddy.Kandula@amd.com> Co-authored-by: Venkateshwar Reddy Kandula <vkandula@amd.com> --------- Co-authored-by: Benjamin Welton <bewelton@amd.com> Co-authored-by: Kandula, Venkateshwar reddy <Venkateshwarreddy.Kandula@amd.com> Co-authored-by: Venkateshwar Reddy Kandula <vkandula@amd.com>
119 строки
4.3 KiB
CMake
119 строки
4.3 KiB
CMake
rocprofiler_deactivate_clang_tidy()
|
|
|
|
include(GoogleTest)
|
|
|
|
find_program(
|
|
amdclangpp_EXECUTABLE REQUIRED
|
|
NAMES amdclang++
|
|
HINTS ${ROCM_PATH} ENV ROCM_PATH /opt/rocm
|
|
PATHS ${ROCM_PATH} ENV ROCM_PATH /opt/rocm
|
|
PATH_SUFFIXES bin llvm/bin NO_CACHE)
|
|
|
|
function(generate_hsaco TARGET_ID INPUT_FILE OUTPUT_FILE)
|
|
separate_arguments(
|
|
CLANG_ARG_LIST
|
|
UNIX_COMMAND
|
|
"-O2 -x cl -Xclang -finclude-default-header -cl-denorms-are-zero -cl-std=CL2.0 -Wl,--build-id=sha1
|
|
-target amdgcn-amd-amdhsa -mcpu=${TARGET_ID} -o ${OUTPUT_FILE} ${INPUT_FILE}")
|
|
add_custom_command(
|
|
OUTPUT ${PROJECT_BINARY_DIR}/${OUTPUT_FILE}
|
|
COMMAND ${amdclangpp_EXECUTABLE} ${CLANG_ARG_LIST}
|
|
COMMAND
|
|
${CMAKE_COMMAND} -E copy
|
|
${PROJECT_BINARY_DIR}/source/lib/rocprofiler-sdk/counters/tests/${OUTPUT_FILE}
|
|
${CMAKE_BINARY_DIR}/bin/${OUTPUT_FILE}
|
|
OUTPUT ${CMAKE_BINARY_DIR}/bin/${OUTPUT_FILE}
|
|
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/bin/${OUTPUT_FILE}
|
|
${CMAKE_BINARY_DIR}/bin/${OUTPUT_FILE}
|
|
COMMENT "Building ${OUTPUT_FILE}...")
|
|
set(HSACO_TARGET_LIST
|
|
${HSACO_TARGET_LIST} ${PROJECT_BINARY_DIR}/${OUTPUT_FILE}
|
|
PARENT_SCOPE)
|
|
endfunction(generate_hsaco)
|
|
|
|
foreach(target_id ${GPU_TARGETS})
|
|
# generate kernel bitcodes
|
|
generate_hsaco(${target_id} ${CMAKE_CURRENT_SOURCE_DIR}/agent_kernels.cl
|
|
${target_id}_agent_kernels.hsaco)
|
|
endforeach()
|
|
|
|
add_custom_target(agent_hasco_targets DEPENDS ${HSACO_TARGET_LIST})
|
|
|
|
add_library(counter_test_constants OBJECT)
|
|
add_library(rocprofiler-sdk::counter-test-constants ALIAS counter_test_constants)
|
|
set(ROCPROFILER_LIB_COUNTER_TEST_CONSTANTS_SOURCES hsa_tables.cpp)
|
|
set(ROCPROFILER_LIB_COUNTER_TEST_CONSTANTS_HEADERS hsa_tables.hpp)
|
|
target_sources(
|
|
counter_test_constants
|
|
PUBLIC ${ROCPROFILER_LIB_COUNTER_TEST_CONSTANTS_HEADERS}
|
|
PRIVATE ${ROCPROFILER_LIB_COUNTER_TEST_CONSTANTS_SOURCES})
|
|
|
|
target_link_libraries(
|
|
counter_test_constants
|
|
PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library
|
|
rocprofiler-sdk::rocprofiler-sdk-static-library
|
|
rocprofiler-sdk::rocprofiler-sdk-hip
|
|
rocprofiler-sdk::rocprofiler-sdk-hsa-runtime)
|
|
|
|
set(ROCPROFILER_LIB_COUNTER_TEST_SOURCES
|
|
metrics_test.cpp evaluate_ast_test.cpp dimension.cpp core.cpp code_object_loader.cpp
|
|
device_counting.cpp)
|
|
set(ROCPROFILER_LIB_COUNTER_TEST_HEADERS code_object_loader.hpp device_counting.hpp)
|
|
|
|
add_executable(counter-test)
|
|
|
|
target_sources(counter-test PRIVATE ${ROCPROFILER_LIB_COUNTER_TEST_SOURCES}
|
|
${ROCPROFILER_LIB_COUNTER_TEST_HEADERS})
|
|
|
|
add_dependencies(counter-test agent_hasco_targets)
|
|
|
|
target_link_libraries(
|
|
counter-test
|
|
PRIVATE rocprofiler-sdk::counter-test-constants
|
|
rocprofiler-sdk::rocprofiler-sdk-hsa-runtime
|
|
rocprofiler-sdk::rocprofiler-sdk-hip
|
|
rocprofiler-sdk::rocprofiler-sdk-common-library
|
|
rocprofiler-sdk::rocprofiler-sdk-static-library
|
|
GTest::gtest
|
|
GTest::gtest_main)
|
|
|
|
gtest_add_tests(
|
|
TARGET counter-test
|
|
SOURCES ${ROCPROFILER_LIB_COUNTER_TEST_SOURCES}
|
|
TEST_LIST counter-tests_TESTS
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
|
|
|
|
set_tests_properties(
|
|
${counter-tests_TESTS}
|
|
PROPERTIES
|
|
TIMEOUT
|
|
45
|
|
LABELS
|
|
"unittests"
|
|
FAIL_REGULAR_EXPRESSION
|
|
"${ROCPROFILER_DEFAULT_FAIL_REGEX}"
|
|
SKIP_REGULAR_EXPRESSION
|
|
"Running non-intercept test(.*)could not be locked for profiling due to lack of permissions.*"
|
|
)
|
|
|
|
set(ROCPROFILER_LIB_CONSUMER_TEST_SOURCES consumer_test.cpp)
|
|
|
|
add_executable(consumer-test)
|
|
target_sources(consumer-test PRIVATE ${ROCPROFILER_LIB_CONSUMER_TEST_SOURCES})
|
|
|
|
target_link_libraries(
|
|
consumer-test rocprofiler-sdk::rocprofiler-sdk-hsa-runtime
|
|
rocprofiler-sdk::rocprofiler-sdk-hip rocprofiler-sdk::rocprofiler-sdk-common-library
|
|
rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest GTest::gtest_main)
|
|
|
|
gtest_add_tests(
|
|
TARGET consumer-test
|
|
SOURCES ${ROCPROFILER_LIB_CONSUMER_TEST_SOURCES}
|
|
TEST_LIST consumer-tests_TESTS
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
|
|
|
|
set_tests_properties(
|
|
${consumer-tests_TESTS}
|
|
PROPERTIES TIMEOUT 45 LABELS "unittests" FAIL_REGULAR_EXPRESSION
|
|
"${ROCPROFILER_DEFAULT_FAIL_REGEX}")
|