Skip to content

ci(rocjitsu): Add missing dependencies on executables #10960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amd-eochoalo merged 3 commits into from
Sep 3, 2026
Merged

ci(rocjitsu): Add missing dependencies on executables #10960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ebe2be
[rocjitsu] Add missing dependencies
amd-eochoalo Aug 31, 2026
16c270c
Check for kfd access
amd-eochoalo Aug 28, 2026
a8bd59a
Revert "Check for kfd access"
amd-eochoalo Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions emulation/rocjitsu/cmake/rj_add_device_kernel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function(rj_add_device_kernel name offload_arch)
COMMAND
${AMDCXX} -x hip --offload-arch=${offload_arch}
--rocm-path=${ROCM_PATH} -fPIC -c -O2 -o ${out} ${src}
DEPENDS ${src}
DEPENDS ${src} ${AMDCXX}
COMMENT "Compiling device kernel: ${output_name} (${offload_arch})"
)

Expand Down Expand Up @@ -88,7 +88,7 @@ function(rj_add_probe_object name offload_arch)
COMMAND
${AMDCXX} -x hip --offload-arch=${offload_arch}
--rocm-path=${ROCM_PATH} --cuda-device-only -O2 -o ${bundle} ${src}
DEPENDS ${src}
DEPENDS ${src} ${AMDCXX}
COMMENT
"Compiling probe object (device-only): ${output_name} (${offload_arch})"
)
Expand All @@ -101,7 +101,7 @@ function(rj_add_probe_object name offload_arch)
${CLANG_OFFLOAD_BUNDLER} --type=o --unbundle
--targets=hipv4-amdgcn-amd-amdhsa--${offload_arch} --input=${bundle}
--output=${hsaco}
DEPENDS ${bundle}
DEPENDS ${bundle} ${CLANG_OFFLOAD_BUNDLER}
COMMENT "Unbundling probe object: ${output_name} (${offload_arch})"
)

Expand Down
3 changes: 2 additions & 1 deletion emulation/rocjitsu/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2567,6 +2567,7 @@ if(RJ_ENABLE_HIP_TESTS)
${RJ_HIP_SANITIZER_LINK_FLAGS}
DEPENDS
${HIP_TEST_SRC}
${AMDCXX}
${ARG_DEPENDENCIES}
GTest::gtest
GTest::gtest_main
Expand Down Expand Up @@ -3034,7 +3035,7 @@ if(RJ_ENABLE_HIP_TESTS AND RJ_HIP_RUNTIME_SUPPORTS_GFX950)
-o ${CVT_NARROW_BIN}
${CMAKE_CURRENT_SOURCE_DIR}/hip_cvt_narrow_test.cpp
${RJ_HIP_SANITIZER_LINK_FLAGS}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/hip_cvt_narrow_test.cpp
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/hip_cvt_narrow_test.cpp ${AMDCXX}
COMMENT "Building hip_cvt_narrow_test with amdclang++ -x hip (gfx950)"
VERBATIM
)
Expand Down
4 changes: 2 additions & 2 deletions emulation/rocjitsu/tests/kernels/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,15 @@ function(rj_add_asm_fixture name target)
${AMDCXX} -x assembler -target amdgcn-amd-amdhsa -mcpu=${target}
--rocm-path=${ROCM_PATH} -c -o ${asm_obj}
${CMAKE_CURRENT_SOURCE_DIR}/${name}.s
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${name}.s
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${name}.s ${AMDCXX}
COMMENT "Assembling Triton fixture: ${name} (${target})"
)
add_custom_command(
OUTPUT ${hsaco}
COMMAND
${AMDCXX} -target amdgcn-amd-amdhsa -mcpu=${target}
--rocm-path=${ROCM_PATH} -nostdlib -shared -o ${hsaco} ${asm_obj}
DEPENDS ${asm_obj}
DEPENDS ${asm_obj} ${AMDCXX}
COMMENT "Linking Triton fixture: ${name} (${target})"
)
add_custom_target(kernel_${name} DEPENDS ${hsaco})
Expand Down
Loading