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: c4716afd1c]
Этот коммит содержится в:
Trowbridge, Ian
2025-04-22 14:09:01 -05:00
коммит произвёл GitHub
родитель 93abda4cfd
Коммит 3b63300a67
4 изменённых файлов: 37 добавлений и 21 удалений
+8 -4
Просмотреть файл
@@ -18,12 +18,16 @@ else()
set(PRELOAD_ENV "LD_PRELOAD=$<TARGET_FILE:rocprofiler-sdk-json-tool>")
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(
+8 -4
Просмотреть файл
@@ -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
$<NOT:$<TARGET_EXISTS:rocjpeg-demo>>)
"${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
$<NOT:$<TARGET_EXISTS:rocjpeg-demo>>)
"${IS_DISABLED}")
+10 -6
Просмотреть файл
@@ -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
$<NOT:$<TARGET_EXISTS:rocdecode-demo>>)
"${IS_DISABLED}")
add_test(
NAME rocprofv3-test-rocdecode-tracing-validate
@@ -68,4 +72,4 @@ set_tests_properties(
FAIL_REGULAR_EXPRESSION
"AssertionError"
DISABLED
$<NOT:$<TARGET_EXISTS:rocdecode-demo>>)
"${IS_DISABLED}")
+11 -7
Просмотреть файл
@@ -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 --
$<IF:$<TARGET_EXISTS:rocjpeg-demo>,$<$<TARGET_EXISTS:rocjpeg-demo>:$<TARGET_FILE:rocjpeg-demo>>,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
$<NOT:$<TARGET_EXISTS:rocjpeg-demo>>)
"${IS_DISABLED}")
add_test(
NAME rocprofv3-test-rocjpeg-tracing-validate
@@ -89,4 +93,4 @@ set_tests_properties(
FAIL_REGULAR_EXPRESSION
"AssertionError"
DISABLED
$<NOT:$<TARGET_EXISTS:rocjpeg-demo>>)
"${IS_DISABLED}")