From 41d06ae9c30e5dbe393690ea5c82c16313ebdd16 Mon Sep 17 00:00:00 2001 From: "Jonathan R. Madsen" Date: Tue, 21 Nov 2023 11:35:39 -0600 Subject: [PATCH] Install samples (#252) - install samples into /share/rocprofiler - update samples for testing --- cmake/rocprofiler_config_install.cmake | 3 +++ samples/CMakeLists.txt | 14 +++++++++++--- samples/api_buffered_tracing/CMakeLists.txt | 2 +- samples/api_callback_tracing/CMakeLists.txt | 2 +- samples/code_object_tracing/CMakeLists.txt | 2 +- samples/counter_collection/CMakeLists.txt | 4 ++-- samples/intercept_table/CMakeLists.txt | 2 +- tests/kernel-tracing/CMakeLists.txt | 12 +++++++++--- 8 files changed, 29 insertions(+), 12 deletions(-) diff --git a/cmake/rocprofiler_config_install.cmake b/cmake/rocprofiler_config_install.cmake index ee39022c39..baa366a383 100644 --- a/cmake/rocprofiler_config_install.cmake +++ b/cmake/rocprofiler_config_install.cmake @@ -5,6 +5,9 @@ include(CMakePackageConfigHelpers) set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME config) +install(DIRECTORY ${PROJECT_SOURCE_DIR}/samples + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}) + install( EXPORT rocprofiler-library-targets FILE rocprofiler-library-targets.cmake diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index ac7619b7b6..8a4fb0fecf 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -5,6 +5,15 @@ cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR) project(rocprofiler-samples LANGUAGES C CXX) +if(CMAKE_BUILD_TYPE STREQUAL "") + set(CMAKE_BUILD_TYPE + "RelWithDebInfo" + CACHE STRING "Build type" FORCE) +endif() + +enable_testing() +include(CTest) + add_library(rocprofiler-samples-build-flags INTERFACE) add_library(rocprofiler::samples-build-flags ALIAS rocprofiler-samples-build-flags) target_compile_options(rocprofiler-samples-build-flags INTERFACE -W -Wall -Wextra @@ -14,10 +23,9 @@ if(ROCPROFILER_BUILD_CI OR ROCPROFILER_BUILD_WERROR) target_compile_options(rocprofiler-samples-build-flags INTERFACE -Werror) endif() -# add_subdirectory(api_tracing) -add_subdirectory(pc_sampling) add_subdirectory(api_callback_tracing) add_subdirectory(api_buffered_tracing) +add_subdirectory(code_object_tracing) add_subdirectory(counter_collection) add_subdirectory(intercept_table) -add_subdirectory(code_object_tracing) +add_subdirectory(pc_sampling) diff --git a/samples/api_buffered_tracing/CMakeLists.txt b/samples/api_buffered_tracing/CMakeLists.txt index 2903c24412..3afc6d943f 100644 --- a/samples/api_buffered_tracing/CMakeLists.txt +++ b/samples/api_buffered_tracing/CMakeLists.txt @@ -56,6 +56,6 @@ set_tests_properties( LABELS "samples" ENVIRONMENT - "${ROCPROFILER_MEMCHECK_PRELOAD_ENV};HSA_TOOLS_LIB=$" + "${ROCPROFILER_MEMCHECK_PRELOAD_ENV};HSA_TOOLS_LIB=$" FAIL_REGULAR_EXPRESSION "threw an exception") diff --git a/samples/api_callback_tracing/CMakeLists.txt b/samples/api_callback_tracing/CMakeLists.txt index ebcac38eac..387869ccb8 100644 --- a/samples/api_callback_tracing/CMakeLists.txt +++ b/samples/api_callback_tracing/CMakeLists.txt @@ -56,6 +56,6 @@ set_tests_properties( LABELS "samples" ENVIRONMENT - "${ROCPROFILER_MEMCHECK_PRELOAD_ENV};HSA_TOOLS_LIB=$" + "${ROCPROFILER_MEMCHECK_PRELOAD_ENV};HSA_TOOLS_LIB=$" FAIL_REGULAR_EXPRESSION "threw an exception") diff --git a/samples/code_object_tracing/CMakeLists.txt b/samples/code_object_tracing/CMakeLists.txt index a1d1df215c..36ac56567e 100644 --- a/samples/code_object_tracing/CMakeLists.txt +++ b/samples/code_object_tracing/CMakeLists.txt @@ -55,6 +55,6 @@ set_tests_properties( LABELS "samples" ENVIRONMENT - "${ROCPROFILER_MEMCHECK_PRELOAD_ENV};HSA_TOOLS_LIB=$" + "${ROCPROFILER_MEMCHECK_PRELOAD_ENV};HSA_TOOLS_LIB=$" FAIL_REGULAR_EXPRESSION "threw an exception") diff --git a/samples/counter_collection/CMakeLists.txt b/samples/counter_collection/CMakeLists.txt index 9229cccf39..639aafa26d 100644 --- a/samples/counter_collection/CMakeLists.txt +++ b/samples/counter_collection/CMakeLists.txt @@ -48,7 +48,7 @@ set_tests_properties( LABELS "samples" ENVIRONMENT - "${ROCPROFILER_MEMCHECK_PRELOAD_ENV};HSA_TOOLS_LIB=$" + "${ROCPROFILER_MEMCHECK_PRELOAD_ENV};HSA_TOOLS_LIB=$" FAIL_REGULAR_EXPRESSION "threw an exception") @@ -74,6 +74,6 @@ set_tests_properties( LABELS "samples" ENVIRONMENT - "${ROCPROFILER_MEMCHECK_PRELOAD_ENV};HSA_TOOLS_LIB=$" + "${ROCPROFILER_MEMCHECK_PRELOAD_ENV};HSA_TOOLS_LIB=$" FAIL_REGULAR_EXPRESSION "threw an exception") diff --git a/samples/intercept_table/CMakeLists.txt b/samples/intercept_table/CMakeLists.txt index c472d663ad..fdbdd6b259 100644 --- a/samples/intercept_table/CMakeLists.txt +++ b/samples/intercept_table/CMakeLists.txt @@ -55,6 +55,6 @@ set_tests_properties( LABELS "samples" ENVIRONMENT - "${ROCPROFILER_MEMCHECK_PRELOAD_ENV};HSA_TOOLS_LIB=$" + "${ROCPROFILER_MEMCHECK_PRELOAD_ENV};HSA_TOOLS_LIB=$" FAIL_REGULAR_EXPRESSION "threw an exception") diff --git a/tests/kernel-tracing/CMakeLists.txt b/tests/kernel-tracing/CMakeLists.txt index 3c9b34bfb3..7066470cd3 100644 --- a/tests/kernel-tracing/CMakeLists.txt +++ b/tests/kernel-tracing/CMakeLists.txt @@ -34,9 +34,15 @@ add_test(NAME test-kernel-tracing-execute COMMAND $" - FAIL_REGULAR_EXPRESSION "threw an exception") + PROPERTIES + TIMEOUT + 45 + LABELS + "integration-tests" + ENVIRONMENT + "${PRELOAD_ENV};HSA_TOOLS_LIB=$" + FAIL_REGULAR_EXPRESSION + "threw an exception") foreach(FILENAME validate.py pytest.ini conftest.py) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}