Skip to content

Commit

Permalink
Rename some examples still using the "omni" prefix. (#8)
Browse files Browse the repository at this point in the history 
* Rename some examples still using the "omni" prefix.

* CMake formatting
  • Loading branch information
@dgaliffiAMD
dgaliffiAMD authored Oct 17, 2024
1 parent c16f578 commit 656b34b
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 53 deletions.
62 changes: 32 additions & 30 deletions examples/causal-helpers.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ if(NOT coz-profiler_FOUND)
find_package(coz-profiler QUIET)
endif()

if(NOT TARGET omni-causal-examples)
add_custom_target(omni-causal-examples)
if(NOT TARGET rocprofsys-causal-examples)
add_custom_target(rocprofsys-causal-examples)
endif()

function(rocprofiler_systems_causal_example_executable _NAME)
Expand All @@ -27,12 +27,12 @@ function(rocprofiler_systems_causal_example_executable _NAME)
endif()
endfunction()

rocprofiler_systems_causal_example_interface(omni-causal-example-lib-debug)
rocprofiler_systems_causal_example_interface(omni-causal-example-lib-no-debug)
rocprofiler_systems_causal_example_interface(rocprofsys-causal-example-lib-debug)
rocprofiler_systems_causal_example_interface(rocprofsys-causal-example-lib-no-debug)

target_compile_options(omni-causal-example-lib-debug
target_compile_options(rocprofsys-causal-example-lib-debug
INTERFACE -g3 -fno-omit-frame-pointer)
target_compile_options(omni-causal-example-lib-no-debug INTERFACE -g0)
target_compile_options(rocprofsys-causal-example-lib-no-debug INTERFACE -g0)

add_executable(${_NAME} ${CAUSAL_SOURCES})
target_compile_definitions(${_NAME} PRIVATE USE_COZ=0 USE_OMNI=0
Expand All @@ -43,18 +43,19 @@ function(rocprofiler_systems_causal_example_executable _NAME)
${_NAME}
PRIVATE ${CAUSAL_LINK_LIBRARIES}
rocprofiler-systems::rocprofiler-systems-user-library
omni-causal-example-lib-debug)
rocprofsys-causal-example-lib-debug)

add_executable(${_NAME}-omni ${CAUSAL_SOURCES})
target_compile_definitions(${_NAME}-omni PRIVATE USE_COZ=0 USE_OMNI=1
${CAUSAL_DEFINITIONS})
target_include_directories(${_NAME}-omni PRIVATE ${ROCPROFSYS_EXAMPLE_ROOT_DIR}/causal
${CAUSAL_INCLUDE_DIRECTORIES})
add_executable(${_NAME}-rocprofsys ${CAUSAL_SOURCES})
target_compile_definitions(${_NAME}-rocprofsys PRIVATE USE_COZ=0 USE_OMNI=1
${CAUSAL_DEFINITIONS})
target_include_directories(
${_NAME}-rocprofsys PRIVATE ${ROCPROFSYS_EXAMPLE_ROOT_DIR}/causal
${CAUSAL_INCLUDE_DIRECTORIES})
target_link_libraries(
${_NAME}-omni
${_NAME}-rocprofsys
PRIVATE ${CAUSAL_LINK_LIBRARIES}
rocprofiler-systems::rocprofiler-systems-user-library
omni-causal-example-lib-debug)
rocprofsys-causal-example-lib-debug)

add_executable(${_NAME}-ndebug ${CAUSAL_SOURCES})
target_compile_definitions(${_NAME}-ndebug PRIVATE USE_COZ=0 USE_OMNI=0
Expand All @@ -66,26 +67,26 @@ function(rocprofiler_systems_causal_example_executable _NAME)
${_NAME}-ndebug
PRIVATE ${CAUSAL_LINK_LIBRARIES}
rocprofiler-systems::rocprofiler-systems-user-library
omni-causal-example-lib-no-debug)
rocprofsys-causal-example-lib-no-debug)

add_executable(${_NAME}-omni-ndebug ${CAUSAL_SOURCES})
target_compile_definitions(${_NAME}-omni-ndebug PRIVATE USE_COZ=0 USE_OMNI=1
${CAUSAL_DEFINITIONS})
add_executable(${_NAME}-rocprofsys-ndebug ${CAUSAL_SOURCES})
target_compile_definitions(${_NAME}-rocprofsys-ndebug PRIVATE USE_COZ=0 USE_OMNI=1
${CAUSAL_DEFINITIONS})
target_include_directories(
${_NAME}-omni-ndebug PRIVATE ${ROCPROFSYS_EXAMPLE_ROOT_DIR}/causal
${CAUSAL_INCLUDE_DIRECTORIES})
${_NAME}-rocprofsys-ndebug PRIVATE ${ROCPROFSYS_EXAMPLE_ROOT_DIR}/causal
${CAUSAL_INCLUDE_DIRECTORIES})
target_link_libraries(
${_NAME}-omni-ndebug
${_NAME}-rocprofsys-ndebug
PRIVATE ${CAUSAL_LINK_LIBRARIES}
rocprofiler-systems::rocprofiler-systems-user-library
omni-causal-example-lib-no-debug)
rocprofsys-causal-example-lib-no-debug)

add_dependencies(omni-causal-examples ${_NAME} ${_NAME}-omni ${_NAME}-ndebug
${_NAME}-omni-ndebug)
add_dependencies(rocprofsys-causal-examples ${_NAME} ${_NAME}-rocprofsys
${_NAME}-ndebug ${_NAME}-rocprofsys-ndebug)

if(coz-profiler_FOUND)
rocprofiler_systems_causal_example_interface(omni-causal-example-lib-coz)
target_compile_options(omni-causal-example-lib-coz
rocprofiler_systems_causal_example_interface(rocprofsys-causal-example-lib-coz)
target_compile_options(rocprofsys-causal-example-lib-coz
INTERFACE -g3 -gdwarf-3 -fno-omit-frame-pointer)

add_executable(${_NAME}-coz ${CAUSAL_SOURCES})
Expand All @@ -94,15 +95,16 @@ function(rocprofiler_systems_causal_example_executable _NAME)
target_include_directories(
${_NAME}-coz PRIVATE ${ROCPROFSYS_EXAMPLE_ROOT_DIR}/causal
${CAUSAL_INCLUDE_DIRECTORIES})
target_link_libraries(${_NAME}-coz PRIVATE ${CAUSAL_LINK_LIBRARIES}
omni-causal-example-lib-coz coz::coz)
target_link_libraries(
${_NAME}-coz PRIVATE ${CAUSAL_LINK_LIBRARIES}
rocprofsys-causal-example-lib-coz coz::coz)

add_dependencies(omni-causal-examples ${_NAME}-coz)
add_dependencies(rocprofsys-causal-examples ${_NAME}-coz)
endif()

if(ROCPROFSYS_INSTALL_EXAMPLES)
install(
TARGETS ${_NAME} ${_NAME}-omni ${_NAME}-coz
TARGETS ${_NAME} ${_NAME}-rocprofsys ${_NAME}-coz
DESTINATION bin
COMPONENT rocprofiler-systems-examples
OPTIONAL)
Expand Down
46 changes: 23 additions & 23 deletions tests/rocprof-sys-causal-tests.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
# -------------------------------------------------------------------------------------- #

rocprofiler_systems_add_causal_test(
NAME cpu-omni-func
TARGET causal-cpu-omni
NAME cpu-rocprofsys-func
TARGET causal-cpu-rocprofsys
RUN_ARGS 70 10 432525 1000000000
CAUSAL_MODE "function"
CAUSAL_PASS_REGEX
Expand All @@ -15,8 +15,8 @@ rocprofiler_systems_add_causal_test(

rocprofiler_systems_add_causal_test(
SKIP_BASELINE
NAME cpu-omni-func-ndebug
TARGET causal-cpu-omni-ndebug
NAME cpu-rocprofsys-func-ndebug
TARGET causal-cpu-rocprofsys-ndebug
RUN_ARGS 70 10 432525 1000000000
CAUSAL_MODE "function"
CAUSAL_PASS_REGEX
Expand All @@ -25,17 +25,17 @@ rocprofiler_systems_add_causal_test(

rocprofiler_systems_add_causal_test(
SKIP_BASELINE
NAME cpu-omni-line
TARGET causal-cpu-omni
NAME cpu-rocprofsys-line
TARGET causal-cpu-rocprofsys
RUN_ARGS 70 10 432525 1000000000
CAUSAL_MODE "line"
CAUSAL_PASS_REGEX
"Starting causal experiment #1(.*)causal/experiments.json(.*)causal/experiments.coz"
)

rocprofiler_systems_add_causal_test(
NAME both-omni-func
TARGET causal-both-omni
NAME both-rocprofsys-func
TARGET causal-both-rocprofsys
RUN_ARGS 70 10 432525 400000000
CAUSAL_MODE "function"
CAUSAL_ARGS
Expand All @@ -47,9 +47,9 @@ rocprofiler_systems_add_causal_test(
3
--monochrome
-g
${CMAKE_BINARY_DIR}/rocprof-sys-tests-config/causal-both-omni-func
${CMAKE_BINARY_DIR}/rocprof-sys-tests-config/causal-both-rocprofsys-func
-l
causal-both-omni
causal-both-rocprofsys
-v
3
-b
Expand All @@ -61,7 +61,7 @@ rocprofiler_systems_add_causal_test(

rocprofiler_systems_add_causal_test(
NAME lulesh-func
TARGET lulesh-omni
TARGET lulesh-rocprofsys
RUN_ARGS -i 35 -s 50 -p
CAUSAL_MODE "function"
CAUSAL_ARGS -s 0,10,25,50,75
Expand All @@ -72,7 +72,7 @@ rocprofiler_systems_add_causal_test(
rocprofiler_systems_add_causal_test(
SKIP_BASELINE
NAME lulesh-func-ndebug
TARGET lulesh-omni-ndebug
TARGET lulesh-rocprofsys-ndebug
RUN_ARGS -i 35 -s 50 -p
CAUSAL_MODE "function"
CAUSAL_ARGS -s 0,10,25,50,75
Expand All @@ -83,7 +83,7 @@ rocprofiler_systems_add_causal_test(
rocprofiler_systems_add_causal_test(
SKIP_BASELINE
NAME lulesh-line
TARGET lulesh-omni
TARGET lulesh-rocprofsys
RUN_ARGS -i 35 -s 50 -p
CAUSAL_MODE "line"
CAUSAL_ARGS -s 0,10,25,50,75 -S lulesh.cc
Expand All @@ -95,7 +95,7 @@ rocprofiler_systems_add_causal_test(
# 500000000)
set(_causal_e2e_exe_args 80 50 432525 100000000)
set(_causal_common_args
"-n 5 -e -s 0 10 20 30 -B $<TARGET_FILE_BASE_NAME:causal-cpu-omni>")
"-n 5 -e -s 0 10 20 30 -B $<TARGET_FILE_BASE_NAME:causal-cpu-rocprofsys>")

macro(
causal_e2e_args_and_validation
Expand All @@ -113,7 +113,7 @@ macro(

# arguments to validate-causal-json.py
set(${_NAME}_valid
"-n 0 -i rocprof-sys-tests-output/causal-cpu-omni-${_TEST}-e2e/causal/experiments.json -v ${_EXPER} $<TARGET_FILE_BASE_NAME:causal-cpu-omni> 10 ${_V10} ${_TOL} ${_EXPER} $<TARGET_FILE_BASE_NAME:causal-cpu-omni> 20 ${_V20} ${_TOL} ${_EXPER} $<TARGET_FILE_BASE_NAME:causal-cpu-omni> 30 ${_V30} ${_TOL}"
"-n 0 -i rocprof-sys-tests-output/causal-cpu-rocprofsys-${_TEST}-e2e/causal/experiments.json -v ${_EXPER} $<TARGET_FILE_BASE_NAME:causal-cpu-rocprofsys> 10 ${_V10} ${_TOL} ${_EXPER} $<TARGET_FILE_BASE_NAME:causal-cpu-rocprofsys> 20 ${_V20} ${_TOL} ${_EXPER} $<TARGET_FILE_BASE_NAME:causal-cpu-rocprofsys> 30 ${_V30} ${_TOL}"
)

# patch string for command-line
Expand All @@ -135,8 +135,8 @@ endif()

rocprofiler_systems_add_causal_test(
SKIP_BASELINE
NAME cpu-omni-slow-func-e2e
TARGET causal-cpu-omni
NAME cpu-rocprofsys-slow-func-e2e
TARGET causal-cpu-rocprofsys
LABELS "causal-e2e"
RUN_ARGS ${_causal_e2e_exe_args}
CAUSAL_MODE "func"
Expand All @@ -149,8 +149,8 @@ rocprofiler_systems_add_causal_test(

rocprofiler_systems_add_causal_test(
SKIP_BASELINE
NAME cpu-omni-fast-func-e2e
TARGET causal-cpu-omni
NAME cpu-rocprofsys-fast-func-e2e
TARGET causal-cpu-rocprofsys
LABELS "causal-e2e"
RUN_ARGS ${_causal_e2e_exe_args}
CAUSAL_MODE "func"
Expand All @@ -163,8 +163,8 @@ rocprofiler_systems_add_causal_test(

rocprofiler_systems_add_causal_test(
SKIP_BASELINE
NAME cpu-omni-line-100-e2e
TARGET causal-cpu-omni
NAME cpu-rocprofsys-line-100-e2e
TARGET causal-cpu-rocprofsys
LABELS "causal-e2e"
RUN_ARGS ${_causal_e2e_exe_args}
CAUSAL_MODE "line"
Expand All @@ -177,8 +177,8 @@ rocprofiler_systems_add_causal_test(

rocprofiler_systems_add_causal_test(
SKIP_BASELINE
NAME cpu-omni-line-110-e2e
TARGET causal-cpu-omni
NAME cpu-rocprofsys-line-110-e2e
TARGET causal-cpu-rocprofsys
LABELS "causal-e2e"
RUN_ARGS ${_causal_e2e_exe_args}
CAUSAL_MODE "line"
Expand Down

0 comments on commit 656b34b

Please sign in to comment.