Skip to content

merge aomp-dev into amd-staging #1735

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

Closed
z1-cciauto wants to merge 5 commits into from
Closed

merge aomp-dev into amd-staging #1735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce3b372
[CK] Fix CMake generator string (#1732)
jplehr Dec 2, 2025
4c503f5
[calculate_divergence.sh] removes default component "driver"
nicebert Dec 2, 2025
564e56a
[CK] Replace hardcoded 'ninja' with $CKBuildTool (#1734)
jplehr Dec 2, 2025
ff99402
Merge pull request #1733 from ROCm/amd/dev/nicebert/divergence
nicebert Dec 2, 2025
8154b9f
merge aomp-dev into amd-staging
z1-cciauto Dec 2, 2025
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
2 changes: 1 addition & 1 deletion bin/calculate_divergence.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ declare -A directories=(
)

declare -A diff_args=(
[component]=${COMPONENT:="driver"}
[component]=${COMPONENT:=""}
[options]="stat patch"
)

Expand Down
23 changes: 11 additions & 12 deletions bin/run_composable-kernels.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,15 +261,14 @@ elif [ "${ShouldUpdateCKRepo}" == 'yes' ]; then
popd
fi

if ! command -v ninja >/dev/null ; then
echo "Ninja not found, falling back to make"
CmakeGenerator="Unix Makefiles"
else
CmakeGenerator="Ninja"
CKBuildTool='make'
if command -v ninja >/dev/null ; then
CmakeGenerator="-GNinja"
CKBuildTool='ninja'
fi

# TODO Fix / Finalize the cmake command
CKCmakeCmd="cmake -G${CmakeGenerator} -B ${CK_BUILD} -S ${CK_REPO} -DCMAKE_PREFIX_PATH=${ROCM_PATH} -DCMAKE_INSTALL_PREFIX=${CK_INSTALL} "
CKCmakeCmd="cmake ${CmakeGenerator} -B ${CK_BUILD} -S ${CK_REPO} -DCMAKE_PREFIX_PATH=${ROCM_PATH} -DCMAKE_INSTALL_PREFIX=${CK_INSTALL} "
CKCmakeCmd+="-DCMAKE_CXX_COMPILER=${AOMP}/bin/clang++ -DCMAKE_HIP_COMPILER=${AOMP}/bin/clang++ "
CKCmakeCmd+="-DCMAKE_BUILD_TYPE=Release -DGPU_TARGETS=${CK_GPU_TARGETS} "
# For some reason, CK on gfx12 wants this set.
Expand Down Expand Up @@ -299,7 +298,7 @@ fi
if [ "${ShouldRebuildCK}" == 'yes' ] || [ "${ShouldInstallCK}" == 'yes' ]; then
pushd ${CK_BUILD} || exit 1

time ninja -j ${CKBuildParallelism}
time ${CKBuildTool} -j ${CKBuildParallelism}
if [ $? -ne 0 ]; then
exit 1
fi
Expand All @@ -312,7 +311,7 @@ if [ "${ShouldInstallCK}" == 'yes' ]; then
pushd ${CK_BUILD} || exit 1

# TODO: Check parallelism. This may use all available threads.
time ninja install
time ${CKBuildTool} install
if [ $? -ne 0 ]; then
exit 1
fi
Expand Down Expand Up @@ -340,7 +339,7 @@ if [ "${SelectedSuite}" == 'smoke' ]; then
mkdir -p "${CK_TESTS_LOG_LOCATION}" || exit 1
fi
pushd ${CK_BUILD} || exit 1
ninja -j 16 smoke 2>&1 | tee "${CK_TESTS_LOG_LOCATION}/smoke_tests.log"
${CKBuildTool} -j 16 smoke 2>&1 | tee "${CK_TESTS_LOG_LOCATION}/smoke_tests.log"
echo "Log at ${CK_TESTS_LOG_LOCATION}/smoke_tests.log"
popd
fi
Expand All @@ -351,7 +350,7 @@ if [ "${SelectedSuite}" == 'regression' ]; then
mkdir -p "${CK_TESTS_LOG_LOCATION}" || exit 1
fi
pushd ${CK_BUILD} || exit 1
ninja -j 16 regression 2>&1 | tee "${CK_TESTS_LOG_LOCATION}/regression_tests.log"
${CKBuildTool} -j 16 regression 2>&1 | tee "${CK_TESTS_LOG_LOCATION}/regression_tests.log"
echo "Log at ${CK_TESTS_LOG_LOCATION}/regression_tests.log"
popd
fi
Expand Down Expand Up @@ -415,7 +414,7 @@ fi
# Handle CK client examples
if [ "${SelectedSuite}" == 'client-examples' ]; then
# Configure and build the client examples
CKCmakeCmd="cmake -G ${CmakeGenerator} "
CKCmakeCmd="cmake ${CmakeGenerator} "
CKCmakeCmd+="-B ${CK_CLIENT_EXAMPLES_BUILD} -S ${CK_CLIENT_EXAMPLES_SOURCE} "
CKCmakeCmd+="-DCMAKE_CXX_COMPILER=${AOMP}/bin/clang++ "
CKCmakeCmd+="-DCMAKE_HIP_COMPILER=${AOMP}/bin/clang++ "
Expand Down Expand Up @@ -443,7 +442,7 @@ if [ "${SelectedSuite}" == 'client-examples' ]; then

pushd ${CK_CLIENT_EXAMPLES_BUILD} || exit 1

ninja
${CKBuildTool}
if [ $? -ne 0 ]; then
exit 1
fi
Expand Down