Skip to content

[HIPIFY][merge] merge amd-develop into amd-staging #2658

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
ranapratap55 merged 5 commits into from
Jul 8, 2026
Merged

[HIPIFY][merge] merge amd-develop into amd-staging #2658

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b062e53
[HIPIFY][cuDNN] cuDNN 9.23.0 is the latest supported version (#2646)
ranapratap55 Jul 6, 2026
86ffce1
[HIPIFY][doc] `LLVM 22.1.8` is the latest stable supported version (#…
emankov Jul 6, 2026
6a9ac70
[HIPIFY][#2563][SPARSELt][feature] `cuSPARSELt` support - Step 4 - `c…
emankov Jul 7, 2026
776554c
[HIPIFY][tests][refactor] Simplify test harness (#2654)
emankov Jul 8, 2026
3aeacb7
merge amd-develop into amd-staging
z1-cciauto Jul 8, 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
87 changes: 13 additions & 74 deletions tests/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,80 +315,19 @@ if config.cuda_tensor_root and config.cuda_tensor_root != "OFF":
if config.cuda_file_root and config.cuda_file_root != "OFF":
clang_arguments += " -I'%s'"

i_subst = 0
if config.cuda_sdk_root != "OFF":
i_subst = 1
if config.cuda_dnn_root != "OFF":
i_subst += 2
if config.cuda_cub_root != "OFF":
i_subst += 4
if config.cuda_tensor_root != "OFF":
i_subst += 8
if config.cuda_file_root != "OFF":
i_subst += 16

if i_subst == 31:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_sdk_root, config.cuda_dnn_root, config.cuda_cub_root, config.cuda_tensor_root, config.cuda_file_root)))
elif i_subst == 30:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_dnn_root, config.cuda_cub_root, config.cuda_tensor_root, config.cuda_file_root)))
elif i_subst == 29:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_sdk_root, config.cuda_cub_root, config.cuda_tensor_root, config.cuda_file_root)))
elif i_subst == 28:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_cub_root, config.cuda_tensor_root, config.cuda_file_root)))
elif i_subst == 27:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_sdk_root, config.cuda_dnn_root, config.cuda_tensor_root, config.cuda_file_root)))
elif i_subst == 26:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_dnn_root, config.cuda_tensor_root, config.cuda_file_root)))
elif i_subst == 25:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_sdk_root, config.cuda_tensor_root, config.cuda_file_root)))
elif i_subst == 24:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_tensor_root, config.cuda_file_root)))
elif i_subst == 23:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_sdk_root, config.cuda_dnn_root, config.cuda_cub_root, config.cuda_file_root)))
elif i_subst == 22:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_dnn_root, config.cuda_cub_root, config.cuda_file_root)))
elif i_subst == 21:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_sdk_root, config.cuda_cub_root, config.cuda_file_root)))
elif i_subst == 20:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_cub_root, config.cuda_file_root)))
elif i_subst == 19:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_sdk_root, config.cuda_dnn_root, config.cuda_file_root)))
elif i_subst == 18:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_dnn_root, config.cuda_file_root)))
elif i_subst == 17:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_sdk_root, config.cuda_file_root)))
elif i_subst == 16:
config.substitutions.append(("%clang_args", clang_arguments % config.cuda_file_root))
elif i_subst == 15:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_sdk_root, config.cuda_dnn_root, config.cuda_cub_root, config.cuda_tensor_root)))
elif i_subst == 14:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_dnn_root, config.cuda_cub_root, config.cuda_tensor_root)))
elif i_subst == 13:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_sdk_root, config.cuda_cub_root, config.cuda_tensor_root)))
elif i_subst == 12:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_cub_root, config.cuda_tensor_root)))
elif i_subst == 11:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_sdk_root, config.cuda_dnn_root, config.cuda_tensor_root)))
elif i_subst == 10:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_dnn_root, config.cuda_tensor_root)))
elif i_subst == 9:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_sdk_root, config.cuda_tensor_root)))
elif i_subst == 8:
config.substitutions.append(("%clang_args", clang_arguments % config.cuda_tensor_root))
elif i_subst == 7:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_sdk_root, config.cuda_dnn_root, config.cuda_cub_root)))
elif i_subst == 6:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_dnn_root, config.cuda_cub_root)))
elif i_subst == 5:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_sdk_root, config.cuda_cub_root)))
elif i_subst == 4:
config.substitutions.append(("%clang_args", clang_arguments % config.cuda_cub_root))
elif i_subst == 3:
config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_sdk_root, config.cuda_dnn_root)))
elif i_subst == 2:
config.substitutions.append(("%clang_args", clang_arguments % config.cuda_dnn_root))
elif i_subst == 1:
config.substitutions.append(("%clang_args", clang_arguments % config.cuda_sdk_root))
# Collect all active root paths in the exact order they are appended to clang_arguments
roots = [
root for root in [
config.cuda_sdk_root,
config.cuda_dnn_root,
config.cuda_cub_root,
config.cuda_tensor_root,
config.cuda_file_root,
] if root and root != "OFF"
]

if roots:
config.substitutions.append(("%clang_args", clang_arguments % tuple(roots)))

if config.llvm_version_major < 4:
hipify_arguments = "-I'%s'/include"
Expand Down
Loading