Skip to content

[SYCL][libclc] Remangler fixes #7723

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
steffenlarsen merged 18 commits into from
Dec 9, 2022
Merged

[SYCL][libclc] Remangler fixes #7723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
77a6a05
[LIBCLC] Generate FunctionDecl to remangle substituted entries
Oct 5, 2022
d9d39a8
Fix buffer initialization
Nov 15, 2022
d39ddf2
Update libclc/utils/libclc-remangler/LibclcRemangler.cpp
jchlanda Nov 18, 2022
e1648e1
Update libclc/utils/libclc-remangler/LibclcRemangler.cpp
jchlanda Nov 18, 2022
721647c
Remove dummy namespace
Nov 18, 2022
f734786
Whitespace fix
Nov 18, 2022
4e70850
Fix dependencies
Nov 18, 2022
d24f464
Add `_BitInt` clause
Nov 18, 2022
ccbe60e
Update libclc/utils/libclc-remangler/LibclcRemangler.cpp
jchlanda Nov 18, 2022
fb2951c
Update libclc/utils/libclc-remangler/LibclcRemangler.cpp
jchlanda Nov 18, 2022
85d8635
Update signature of createKernelDecl
Nov 21, 2022
cf6b512
Update AreQTsEqual
Nov 21, 2022
aa4a1bb
Use max_align_t for InitialBuffer alignment
Nov 22, 2022
09f6ec4
Update libclc/utils/libclc-remangler/LibclcRemangler.cpp
jchlanda Nov 24, 2022
49500fe
Update libclc/utils/libclc-remangler/LibclcRemangler.cpp
jchlanda Nov 24, 2022
5d77bac
Fix signature for NamespaceDecl::Create
Dec 5, 2022
e0f3a52
Link against clangSerialization
Dec 9, 2022
b88627f
Force itanium mangling
Dec 9, 2022
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
10 changes: 7 additions & 3 deletions libclc/cmake/modules/AddLibclc.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ macro(add_libclc_builtin_set arch_suffix)

# Generate remangled variants if requested
if( LIBCLC_GENERATE_REMANGLED_VARIANTS )
set(dummy_in "${CMAKE_BINARY_DIR}/lib/clc/libclc_dummy_in.cc")
add_custom_command( OUTPUT ${dummy_in}
COMMAND ${CMAKE_COMMAND} -E touch ${dummy_in} )
set(long_widths l32 l64)
set(char_signedness signed unsigned)
if( ${obj_suffix} STREQUAL "libspirv-nvptx64--nvidiacl.bc")
Expand All @@ -128,10 +131,11 @@ macro(add_libclc_builtin_set arch_suffix)
-o "${builtins_remangle_path}"
--long-width=${long_width}
--char-signedness=${signedness}
"$<TARGET_PROPERTY:prepare-${obj_suffix},TARGET_FILE>"
DEPENDS "${builtins_obj_path}" "prepare-${obj_suffix}" libclc-remangler )
--input-ir="$<TARGET_PROPERTY:prepare-${obj_suffix},TARGET_FILE>"
${dummy_in}
DEPENDS "${builtins_obj_path}" "prepare-${obj_suffix}" libclc-remangler ${dummy_in})
add_custom_target( "remangled-${long_width}-${signedness}_char.${obj_suffix_mangled}" ALL
DEPENDS "${builtins_remangle_path}" )
DEPENDS "${builtins_remangle_path}" "${dummy_in}")
set_target_properties("remangled-${long_width}-${signedness}_char.${obj_suffix_mangled}"
PROPERTIES TARGET_FILE "${builtins_remangle_path}")

Expand Down
24 changes: 24 additions & 0 deletions libclc/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,27 @@ foreach( t ${LIBCLC_TARGET_TO_TEST} )

endforeach( d )
endforeach( t )

if(LIBCLC_GENERATE_REMANGLED_VARIANTS)
# Run remangler in test mode if generating remangled variants and make sure
# it depends on check-libclc target.
# Both `long_widths` and `char_signedness` are set in AddLibclc.cmake and can
# be used here.
foreach(long_width ${long_widths})
foreach(signedness ${char_signedness})
# In `-t` (TestRun) the remangler does not perform any substitutions, it
# needs to make sure that the remangled name matches the original mangled
# one.
set (test_target_name "test-remangled-${long_width}-${signedness}_char")
add_custom_target(${test_target_name}
COMMAND libclc-remangler
--long-width=${long_width}
--char-signedness=${signedness}
--input-ir="$<TARGET_PROPERTY:prepare-${obj_suffix},TARGET_FILE>"
${dummy_in} -t -o -
DEPENDS "${builtins_obj_path}" "prepare-${obj_suffix}" "${dummy_in}" libclc-remangler)

add_dependencies(check-libclc ${test_target_name})
endforeach()
endforeach()
endif()
10 changes: 9 additions & 1 deletion libclc/utils/libclc-remangler/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,12 @@ target_include_directories(libclc-remangler PRIVATE
${CMAKE_SOURCE_DIR}/../clang/include
${CMAKE_BINARY_DIR}/tools/clang/include)

clang_target_link_libraries(libclc-remangler PRIVATE clangBasic)
clang_target_link_libraries(libclc-remangler
PRIVATE
clangAST
clangBasic
clangFrontend
clangTooling
clangSerialization
LLVMOption
)
Loading