From 3b63300a6772c4cefa932272234fd2e5ed006243 Mon Sep 17 00:00:00 2001 From: "Trowbridge, Ian" Date: Tue, 22 Apr 2025 14:09:01 -0500 Subject: [PATCH] Video file location change for rocDecode (#353) * Video file location change for rocDecode * Formatting * Changed rocJPEG images directory not found to a warning as well * Minor name update * Fix rocJPEG disable variable [ROCm/rocprofiler-sdk commit: c4716afd1c15095aaddbf321bf3cc8db5cd5a919] --- .../tests/rocdecode/CMakeLists.txt | 12 ++++++++---- .../tests/rocjpeg/CMakeLists.txt | 12 ++++++++---- .../rocprofv3/rocdecode-trace/CMakeLists.txt | 16 ++++++++++------ .../rocprofv3/rocjpeg-trace/CMakeLists.txt | 18 +++++++++++------- 4 files changed, 37 insertions(+), 21 deletions(-) diff --git a/projects/rocprofiler-sdk/tests/rocdecode/CMakeLists.txt b/projects/rocprofiler-sdk/tests/rocdecode/CMakeLists.txt index 7406ba00ca..2170e03912 100644 --- a/projects/rocprofiler-sdk/tests/rocdecode/CMakeLists.txt +++ b/projects/rocprofiler-sdk/tests/rocdecode/CMakeLists.txt @@ -18,12 +18,16 @@ else() set(PRELOAD_ENV "LD_PRELOAD=$") endif() -set(ROCDECODE_VIDEO_FILE - "${rocDecode_ROOT_DIR}/share/rocdecode/video/AMD_driving_virtual_20-H265.265") +file(GLOB_RECURSE ROCDECODE_VIDEO_FILE + "${rocDecode_ROOT_DIR}/share/rocdecode/video/*AMD_driving_virtual_20-H265.265") if(TARGET rocdecode-demo AND NOT EXISTS "${ROCDECODE_VIDEO_FILE}") message( - FATAL_ERROR - "Unable to find video file for rocdecode tests: ${ROCDECODE_VIDEO_FILE}") + WARNING "Unable to find video file for rocdecode tests: ${ROCDECODE_VIDEO_FILE}") + set(IS_DISABLED ON) +endif() + +if(NOT TARGET rocdecode-demo) + set(IS_DISABLED ON) endif() add_test( diff --git a/projects/rocprofiler-sdk/tests/rocjpeg/CMakeLists.txt b/projects/rocprofiler-sdk/tests/rocjpeg/CMakeLists.txt index a5000001c6..88b7f2f593 100644 --- a/projects/rocprofiler-sdk/tests/rocjpeg/CMakeLists.txt +++ b/projects/rocprofiler-sdk/tests/rocjpeg/CMakeLists.txt @@ -38,8 +38,12 @@ set(rocjpeg-tracing-env "${PRELOAD_ENV}") set(rocJPEG_IMAGE_DIR "${rocJPEG_ROOT_DIR}/share/rocjpeg/images") if(TARGET rocjpeg-demo AND NOT EXISTS "${rocJPEG_IMAGE_DIR}") message( - FATAL_ERROR - "Unable to find image directory for rocjpeg tests: ${rocJPEG_IMAGE_DIR}") + WARNING "Unable to find image directory for rocjpeg tests: ${rocJPEG_IMAGE_DIR}") + set(IS_DISABLED ON) +endif() + +if(NOT TARGET rocjpeg-demo) + set(IS_DISABLED ON) endif() add_test( @@ -65,7 +69,7 @@ set_tests_properties( FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}" DISABLED - $>) + "${IS_DISABLED}") # copy to binary directory rocprofiler_configure_pytest_files(COPY validate.py conftest.py CONFIG pytest.ini) @@ -85,4 +89,4 @@ set_tests_properties( FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}" DISABLED - $>) + "${IS_DISABLED}") diff --git a/projects/rocprofiler-sdk/tests/rocprofv3/rocdecode-trace/CMakeLists.txt b/projects/rocprofiler-sdk/tests/rocprofv3/rocdecode-trace/CMakeLists.txt index d5708fe830..0c1e7a08fc 100644 --- a/projects/rocprofiler-sdk/tests/rocprofv3/rocdecode-trace/CMakeLists.txt +++ b/projects/rocprofiler-sdk/tests/rocprofv3/rocdecode-trace/CMakeLists.txt @@ -18,12 +18,16 @@ string(REPLACE "LD_PRELOAD=" "ROCPROF_PRELOAD=" PRELOAD_ENV set(rocdecode-tracing-env "${PRELOAD_ENV}") -set(ROCDECODE_VIDEO_FILE - "${rocDecode_ROOT_DIR}/share/rocdecode/video/AMD_driving_virtual_20-H265.265") +file(GLOB_RECURSE ROCDECODE_VIDEO_FILE + "${rocDecode_ROOT_DIR}/share/rocdecode/video/*AMD_driving_virtual_20-H265.265") if(TARGET rocdecode-demo AND NOT EXISTS "${ROCDECODE_VIDEO_FILE}") message( - FATAL_ERROR - "Unable to find video file for rocdecode tests: ${ROCDECODE_VIDEO_FILE}") + WARNING "Unable to find video file for rocdecode tests: ${ROCDECODE_VIDEO_FILE}") + set(IS_DISABLED ON) +endif() + +if(NOT TARGET rocdecode-demo) + set(IS_DISABLED ON) endif() add_test( @@ -46,7 +50,7 @@ set_tests_properties( FAIL_REGULAR_EXPRESSION "threw an exception" DISABLED - $>) + "${IS_DISABLED}") add_test( NAME rocprofv3-test-rocdecode-tracing-validate @@ -68,4 +72,4 @@ set_tests_properties( FAIL_REGULAR_EXPRESSION "AssertionError" DISABLED - $>) + "${IS_DISABLED}") diff --git a/projects/rocprofiler-sdk/tests/rocprofv3/rocjpeg-trace/CMakeLists.txt b/projects/rocprofiler-sdk/tests/rocprofv3/rocjpeg-trace/CMakeLists.txt index 9bf86781d8..da826441df 100644 --- a/projects/rocprofiler-sdk/tests/rocprofv3/rocjpeg-trace/CMakeLists.txt +++ b/projects/rocprofiler-sdk/tests/rocprofv3/rocjpeg-trace/CMakeLists.txt @@ -38,11 +38,15 @@ string(REPLACE "LD_PRELOAD=" "ROCPROF_PRELOAD=" PRELOAD_ENV set(rocjpeg-tracing-env "${PRELOAD_ENV}") -set(ROCJPEG_IMAGE_DIR "${ROCM_PATH}/share/rocjpeg/images") -if(TARGET rocjpeg-demo AND NOT EXISTS "${ROCJPEG_IMAGE_DIR}") +set(rocJPEG_IMAGE_DIR "${ROCM_PATH}/share/rocjpeg/images") +if(TARGET rocjpeg-demo AND NOT EXISTS "${rocJPEG_IMAGE_DIR}") message( - FATAL_ERROR - "Unable to find image directory for rocjpeg tests: ${ROCJPEG_IMAGE_DIR}") + WARNING "Unable to find image directory for rocjpeg tests: ${rocJPEG_IMAGE_DIR}") + set(IS_DISABLED ON) +endif() + +if(NOT TARGET rocjpeg-demo) + set(IS_DISABLED ON) endif() # CI Sanitizer run gives the following error: No target "rocjpeg-demo" Adding if-statement @@ -54,7 +58,7 @@ add_test( ${CMAKE_CURRENT_BINARY_DIR}/%tag%-trace -o out --output-format json csv --log-level env -- $,$<$:$>,rocjpeg-demo> - -i ${ROCJPEG_IMAGE_DIR}) + -i ${rocJPEG_IMAGE_DIR}) set_tests_properties( rocprofv3-test-rocjpeg-tracing-execute @@ -67,7 +71,7 @@ set_tests_properties( FAIL_REGULAR_EXPRESSION "threw an exception" DISABLED - $>) + "${IS_DISABLED}") add_test( NAME rocprofv3-test-rocjpeg-tracing-validate @@ -89,4 +93,4 @@ set_tests_properties( FAIL_REGULAR_EXPRESSION "AssertionError" DISABLED - $>) + "${IS_DISABLED}")