Skip to content

Fix handling of hyphens in base target ID #265

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
merged 4 commits into from
Mar 14, 2025
Merged

Fix handling of hyphens in base target ID #265

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2174edf
Fix handling of hyphens in base target ID
lawruble13 Mar 13, 2025
c0c7eb3
Fixup and comment _rocm_sanitize_target_id
cgmb Mar 14, 2025
a90fa31
Handle empty target feature list
cgmb Mar 14, 2025
a3b96eb
Merge branch 'develop' into lwrubles/fix-generic-targets
lawruble13 Mar 14, 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
23 changes: 20 additions & 3 deletions share/rocmcmakebuildtools/cmake/ROCMCheckTargetIds.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,26 @@ function(_rocm_sanitize_target_id TARGET_ID VARIABLE)
# CMake defines a preprocessor macro with this value, so it must be a valid C identifier
# Handle + and - for xnack and sramecc so that e.g. xnack+ and xnack- doesn't get folded to
# the same string by MAKE_C_IDENTIFIER
string(REPLACE "_" "__" TARGET_ID "${TARGET_ID}")
string(REPLACE "+" "_on" TARGET_ID "${TARGET_ID}")
string(REPLACE "-" "_off" TARGET_ID "${TARGET_ID}")

# Target ID syntax:
# <target-id> ::== <processor> ( ":" <target-feature> ( "+" | "-" ) )*

# split target id by colon into a list of components
string(REPLACE ":" ";" _components "${TARGET_ID}")
list(GET _components 0 _processor)
list(REMOVE_AT _components 0)
# remove '-' from processor name
string(REPLACE "-" "_" _processor "${_processor}")
if(_components)
# remove '+' or '-' from target features
string(REPLACE "+" "_on" _components "${_components}")
string(REPLACE "-" "_off" _components "${_components}")
# join components with a colon
string(REPLACE ";" ":" TARGET_ID "${_processor}:${_components}")
else()
set(TARGET_ID "${_processor}")
endif()

string(MAKE_C_IDENTIFIER "${TARGET_ID}" TARGET_ID)
set(${VARIABLE} "${TARGET_ID}" PARENT_SCOPE)
endfunction()
Loading