Skip to content
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

Jump to bottom

[SYCL] Refactor and generate SYCL builtins #10198

Merged
merged 45 commits into from
Aug 10, 2023
Merged

[SYCL] Refactor and generate SYCL builtins #10198

Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
35a6b05
[SYCL] Refactor and generate SYCL builtins
steffenlarsen Jul 4, 2023
4d40006
Require python3
steffenlarsen Jul 5, 2023
cf35f79
Remove unnecessary gitignore
steffenlarsen Jul 5, 2023
6cf4637
Add deprecated long long vectors
steffenlarsen Jul 5, 2023
a1d2fb6
Deprecate raw pointer builtins
steffenlarsen Jul 5, 2023
1a196b2
Add vector size checks
steffenlarsen Jul 5, 2023
2823683
Switch to fully-templated vectors
steffenlarsen Jul 6, 2023
0d4fa27
Group builtins by name
steffenlarsen Jul 7, 2023
afe7f9b
Additional fixes
steffenlarsen Jul 7, 2023
7fb0f90
First batch of marray overloads
steffenlarsen Jul 7, 2023
1105d05
Geometric marray functions
steffenlarsen Jul 7, 2023
3969443
Replace remaining marray builtins
steffenlarsen Jul 11, 2023
29a3479
Merge remote-tracking branch 'intel/sycl' into steffen/gen_builtins
steffenlarsen Jul 11, 2023
f0c9133
Fix formatting
steffenlarsen Jul 11, 2023
a956464
Remove dead include
steffenlarsen Jul 11, 2023
dfe2d5d
Install new generated files
steffenlarsen Jul 11, 2023
bf0b896
Merge branch 'sycl' into steffen/gen_builtins
steffenlarsen Jul 11, 2023
7ad7303
Add common type requirements
steffenlarsen Jul 13, 2023
81b71ae
Add explicit scalar templating
steffenlarsen Jul 13, 2023
c95a750
Add swizzle support and tests
steffenlarsen Jul 13, 2023
5d23d31
Merge remote-tracking branch 'intel/sycl' into steffen/gen_builtins
steffenlarsen Jul 14, 2023
36d858b
Cleanup
steffenlarsen Jul 14, 2023
1f7a837
Make integer builtins templated on scalar
steffenlarsen Jul 14, 2023
b16ea01
Use +=
steffenlarsen Jul 14, 2023
e340b05
Fix builtins for MSVC
steffenlarsen Jul 14, 2023
f223033
Fix vec nan tests
steffenlarsen Jul 17, 2023
a55b9db
Merge remote-tracking branch 'intel/sycl' into steffen/gen_builtins
steffenlarsen Jul 17, 2023
10058b5
Fix unsigned long nan expected return type
steffenlarsen Jul 17, 2023
d436730
Merge remote-tracking branch 'intel/sycl' into steffen/gen_builtins
steffenlarsen Jul 18, 2023
5c9d956
Address comments
steffenlarsen Jul 20, 2023
b9b2d47
Merge remote-tracking branch 'intel/sycl' into steffen/gen_builtins
steffenlarsen Jul 20, 2023
c859c79
Re-add to-be-deprecated fundamental vec types
steffenlarsen Jul 21, 2023
f06e2f5
Small template adjustments
steffenlarsen Jul 21, 2023
611d117
Make multi_ptr arguments fully templated
steffenlarsen Jul 24, 2023
b87ba65
Fix formatting
steffenlarsen Jul 24, 2023
e4853bb
Merge remote-tracking branch 'intel/sycl' into steffen/gen_builtins
steffenlarsen Jul 24, 2023
2f52a0a
Merge remote-tracking branch 'intel/sycl' into steffen/gen_builtins
steffenlarsen Jul 25, 2023
e5dc11e
Prevent regenerating builtins unless generator changed
steffenlarsen Jul 25, 2023
b44e04b
Add comments to utilities
steffenlarsen Jul 25, 2023
faca427
Address comments
steffenlarsen Jul 27, 2023
d4fea37
Merge remote-tracking branch 'intel/sycl' into steffen/gen_builtins
steffenlarsen Aug 1, 2023
d69759c
Fix includes
steffenlarsen Aug 1, 2023
c3b6d28
Merge remote-tracking branch 'intel/sycl' into steffen/gen_builtins
steffenlarsen Aug 9, 2023
bbced83
Merge branch 'sycl' into steffen/gen_builtins
steffenlarsen Aug 9, 2023
d721ee6
Merge remote-tracking branch 'intel/sycl' into steffen/gen_builtins
steffenlarsen Aug 10, 2023
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: 23 additions & 0 deletions sycl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,31 @@ set(sycl_plugin_dir ${CMAKE_CURRENT_SOURCE_DIR}/plugins)
string(TIMESTAMP __SYCL_COMPILER_VERSION "%Y%m%d")
configure_file("source/version.hpp.in" "${SYCL_INCLUDE_BUILD_DIR}/sycl/version.hpp")
configure_file("source/feature_test.hpp.in" "${SYCL_INCLUDE_BUILD_DIR}/sycl/feature_test.hpp")

# Generate SYCL builtins
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious - why is it better to have this generator instead of just headers?

Copy link
Contributor Author

@steffenlarsen steffenlarsen Jul 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having a generator means we have to make less repeat boiler-plate code. A lot of the generated builtins use exactly the same structure with only minor changes, so fixing a general bug for all such definitions would be tedious.

Of course, it comes with some complexity, but I think there is value to the final maintenance simplicity.

find_package(Python3 REQUIRED)
add_custom_command(
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/source/builtins_generator.py ${SYCL_INCLUDE_BUILD_DIR}/sycl
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/source/builtins_generator.py
OUTPUT "${SYCL_INCLUDE_BUILD_DIR}/sycl/builtins_scalar_gen.hpp"
"${SYCL_INCLUDE_BUILD_DIR}/sycl/builtins_vector_gen.hpp"
"${SYCL_INCLUDE_BUILD_DIR}/sycl/builtins_marray_gen.hpp"
COMMENT "Generating SYCL builtin headers"
)

add_custom_target(sycl-builtins-header
DEPENDS "${SYCL_INCLUDE_BUILD_DIR}/sycl/builtins_scalar_gen.hpp"
"${SYCL_INCLUDE_BUILD_DIR}/sycl/builtins_vector_gen.hpp"
"${SYCL_INCLUDE_BUILD_DIR}/sycl/builtins_marray_gen.hpp"
)

# Install generated headers.
install(FILES
"${SYCL_INCLUDE_BUILD_DIR}/sycl/feature_test.hpp"
"${SYCL_INCLUDE_BUILD_DIR}/sycl/version.hpp"
"${SYCL_INCLUDE_BUILD_DIR}/sycl/builtins_scalar_gen.hpp"
"${SYCL_INCLUDE_BUILD_DIR}/sycl/builtins_vector_gen.hpp"
"${SYCL_INCLUDE_BUILD_DIR}/sycl/builtins_marray_gen.hpp"
DESTINATION "${SYCL_INCLUDE_DIR}/sycl"
COMPONENT sycl-headers)

Expand All @@ -205,6 +227,7 @@ add_custom_target(sycl-headers
DEPENDS ${OUT_HEADERS_IN_SYCL_DIR}
${OUT_HEADERS_IN_CL_DIR}
${OUT_HEADERS_IN_STD_DIR}
sycl-builtins-header
boost_mp11-headers)

add_custom_command(
Expand Down
Loading