[SYCL] Switch to using integration footer by default #3777

dm-vodopyanov · 2021-05-18T15:49:09Z

Added spec_constant_integration.hpp header file, which is included from
integration footer.
Added get_spec_constant_symbolic_ID_wrapper which in combination
with spec_constant_integration.hpp allows us to avoid exploiting a UB
related to instantiating a template before we have seen all its
specializations.

Replaced -fsycl-use-footer compiler flag with -fno-sycl-use-footer
flag with the opposite semantics.

…e header This patch moves functions which use `__builtin_unique_stable_name` to a separate header which should only be included to integration footer. This was made to get rid of UB when the compiler sees defenition of the template specialization before seeing a declaration.

bader · 2021-05-18T16:31:59Z

This patch moves functions which use __builtin_unique_stable_name to a
separate header which should only be included to integration footer.

This description is not accurate KernelInfoData method still uses __builtin_unique_stable_name:

llvm/sycl/include/CL/sycl/detail/kernel_desc.hpp

Line 102 in 22f9009

static constexpr auto n = __builtin_unique_stable_name(T);

romanovvlad · 2021-05-19T04:49:53Z

This patch moves functions which use __builtin_unique_stable_name to a
separate header which should only be included to integration footer.

This description is not accurate KernelInfoData method still uses __builtin_unique_stable_name:

llvm/sycl/include/CL/sycl/detail/kernel_desc.hpp

Line 102 in 22f9009

static constexpr auto n = __builtin_unique_stable_name(T);

Right, it is not directly related to __builtin_unique_stable_name, we rather need to guarantee that calls of get_spec_constant_symbolic_ID appear after specializations of this functions which defined in the integration footer.

…_stable_name-to-separate-header

clang/lib/Sema/SemaSYCL.cpp

…bled by default for any app

erichkeane · 2021-06-01T17:37:33Z

I don't think we should be putting the last patch into the repo, we are about a week and a half away from getting the actual implementation, and this will delay it.

clang/test/Driver/sycl-preprocess.cpp

…e_name-to-separate-header

erichkeane

Just 2 CFE test nits.

clang/test/CodeGenSYCL/anonymous_integration_footer.cpp

clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp

…din_unique_stable_name-to-separate-header

Added a wrapper, which is defined in integration footer only after we define all specializations for `get_spec_constant_symbolic_ID`. By using it we ensure that we do not try to instantiate `get_spec_constant_symbolic_ID` until after we made all required specializations.

…eparate-header' of github.com:dm-vodopyanov/llvm into private/dvodopya/move-__buildin_unique_stable_name-to-separate-header

…din_unique_stable_name-to-separate-header

The primary function/wrapper which is used by DPC++ RT is left as-is, i.e. `get_spec_constant_symbolic_ID`. The internal function and its specialziations which are generated by the compiler renamed to `get_spec_constant_symbolic_ID_impl`.

romanovvlad

LGTM

AlexeySachkov · 2021-06-28T12:31:08Z

@AGindinson, @mdtoguchi, could you please take a look at the driver part? Basically, we have enabled integration footer by default and turned existing -fsycl-use-footer into -fno-sycl-use-footer and adjusted tests. However, I'm not exactly sure that we have enough coverage for this new option.

@AaronBallman, @elizabethandrews, @premanandrao, could you please take a look at FE part? The changes are quite simple: we have added a few more includes to emitted integration footer + did renaming get_spec_constant_symbolic_ID -> get_spec_constant_symbolic_ID_impl

elizabethandrews

FE changes LGTM. Thanks!

clang/test/Driver/sycl-int-footer.cpp

…din_unique_stable_name-to-separate-header

…eparate-header' of github.com:dm-vodopyanov/llvm into private/dvodopya/move-__buildin_unique_stable_name-to-separate-header

elizabethandrews

FE changes LGTM

romanovvlad

LGTM

* upstream/sycl: (649 commits) [SYCL][Driver][NFC] Update integration footer test for 32-bit host (intel#4039) [SYCL][L0] Initialize descriptor .stype and .pNext (intel#4032) [SYCL] Add sycl::kernel::get_kernel_bundle method (intel#3855) [SYCL] Add support for device UUID as a SYCL extension. (intel#3696) [SYCL][Matrix] Add spec document for the matrix extension interface and its first implementation for AMX (intel#3551) Fix debug build mangler test after PR#3992 (8f38045). (intel#4033) [Driver][SYCL] Restrict user -include file in final integration footer step (intel#4036) [SYCL] [Tests] Do not copy device binary image mocks (intel#4023) [SYCL][Doc] Update docs to reflect new compiler features (intel#4030) [SYCL][CUDA] cl_khr_fp16 extension connected to cuda PI. (intel#4029) [SYCL][NFC] Refactor RT unit tests (intel#4021) [SYCL] Switch to using integration footer by default (intel#3777) [SYCL][CUDA] Add the Use Default Stream property (intel#4004) Uplift GPU RT version for Linux to 21.24.20098 (intel#4003) [SYCL][CUDA] atomic_ref.fetch_add used for fp64 reduction if device.has(atomic64) (intel#3950) [Driver][SYCL] Differentiate host dependency link from regular host link (intel#4002) [SYCL][ESIMD] Support device half type in intrinsics. (intel#4024) [SYCL] Allow fpga_reg only for PODs and Trivially-copyable structs (intel#3643) [SYCL][FPGA] Restore legacy debug info version for the hardware (intel#3991) [SYCL][PI][L0] Force reset of memcpy command-list. (intel#4001) ...

dm-vodopyanov requested a review from a team as a code owner May 18, 2021 15:49

dm-vodopyanov requested a review from romanovvlad May 18, 2021 15:49

dm-vodopyanov added 2 commits May 18, 2021 18:50

Add missing EOL

dd66b44

Remove extra endif

22f9009

bader changed the title ~~[SYCL] Move __buildin_unique_stable_name dependent funcs to a separate header~~ [SYCL] Move __builtin_unique_stable_name dependent funcs to a separate header May 18, 2021

dm-vodopyanov changed the title ~~[SYCL] Move __builtin_unique_stable_name dependent funcs to a separate header~~ [SYCL] Move get_spec_constant_symbolic_ID to a separate header May 19, 2021

dm-vodopyanov added 3 commits May 20, 2021 20:03

Merge branch 'intel:sycl' into private/dvodopya/move-__buildin_unique…

3db201f

…_stable_name-to-separate-header

Merge branch 'intel:sycl' into private/dvodopya/move-__buildin_unique…

68187a5

…_stable_name-to-separate-header

Add -fsycl-use-footer to tests and include missing header to int footer

1bd1e94

dm-vodopyanov requested review from AaronBallman, elizabethandrews and premanandrao as code owners May 31, 2021 13:13

AlexeySachkov reviewed Jun 1, 2021

View reviewed changes

clang/lib/Sema/SemaSYCL.cpp Outdated Show resolved Hide resolved

elizabethandrews requested a review from erichkeane June 1, 2021 15:23

Enable __builtin_unique_stable_name in FE; Make -fsycl-use-footer ena…

1bd83e0

…bled by default for any app

dm-vodopyanov requested review from AGindinson and mdtoguchi as code owners June 1, 2021 17:33

mdtoguchi reviewed Jun 1, 2021

View reviewed changes

clang/test/Driver/sycl-preprocess.cpp Show resolved Hide resolved

dm-vodopyanov added 5 commits June 9, 2021 16:16

Merge branch 'sycl' into private/dvodopya/move-__buildin_unique_stabl…

0c9e8e2

…e_name-to-separate-header

Fix some test failures

0d3e000

Merge branch 'sycl' into private/dvodopya/move-__buildin_unique_stabl…

224eb1a

…e_name-to-separate-header

Update PR to use new builtin

ed1686d

Fix SYCL :: basic_tests/SYCL-2020*** tests

feb54c4

erichkeane reviewed Jun 15, 2021

View reviewed changes

clang/test/CodeGenSYCL/anonymous_integration_footer.cpp Outdated Show resolved Hide resolved

clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp Outdated Show resolved Hide resolved

AlexeySachkov added 2 commits June 16, 2021 16:17

Fix check-clang

e56ee41

Merge remote-tracking branch 'sycl' into private/dvodopya/move-__buil…

30ce3d0

…din_unique_stable_name-to-separate-header

AlexeySachkov added 2 commits June 25, 2021 16:22

Merge branch 'private/dvodopya/move-__buildin_unique_stable_name-to-s…

3ef8887

…eparate-header' of github.com:dm-vodopyanov/llvm into private/dvodopya/move-__buildin_unique_stable_name-to-separate-header

AlexeySachkov dismissed stale reviews from mdtoguchi and AaronBallman via 3ef8887 June 25, 2021 13:27

Merge remote-tracking branch 'sycl' into private/dvodopya/move-__buil…

77e7988

…din_unique_stable_name-to-separate-header

AlexeySachkov removed the request for review from kbobrovs June 25, 2021 13:31

AlexeySachkov changed the title ~~[SYCL] Move get_spec_constant_symbolic_ID to a separate header~~ [SYCL] Switch to using integration footer by default Jun 25, 2021

AlexeySachkov added 4 commits June 28, 2021 10:10

Adjust sycl-offload-amdgcn.cpp test

68c1f1a

Merge remote-tracking branch 'sycl' into private/dvodopya/move-__buil…

30de609

…din_unique_stable_name-to-separate-header

Add a test for -fno-sycl-use-footer

37be540

Rename get_spec_constant_symbolic_ID

48e59c9

The primary function/wrapper which is used by DPC++ RT is left as-is, i.e. `get_spec_constant_symbolic_ID`. The internal function and its specialziations which are generated by the compiler renamed to `get_spec_constant_symbolic_ID_impl`.

romanovvlad reviewed Jun 28, 2021

View reviewed changes

Fix comment and clang-format

b73a756

elizabethandrews previously approved these changes Jun 28, 2021

View reviewed changes

mdtoguchi reviewed Jun 28, 2021

View reviewed changes

clang/test/Driver/sycl-int-footer.cpp Show resolved Hide resolved

AlexeySachkov added 3 commits June 29, 2021 12:38

Merge remote-tracking branch 'sycl' into private/dvodopya/move-__buil…

d5765f4

…din_unique_stable_name-to-separate-header

Add test for compiler phases w/ and w/o integration footer

8e58b19

Merge branch 'private/dvodopya/move-__buildin_unique_stable_name-to-s…

d5e10a2

…eparate-header' of github.com:dm-vodopyanov/llvm into private/dvodopya/move-__buildin_unique_stable_name-to-separate-header

AlexeySachkov dismissed elizabethandrews’s stale review via d5e10a2 June 29, 2021 11:17

An attempt to make sycl-int-footer.cpp OS-independent

9476403

AlexeySachkov requested review from mdtoguchi and elizabethandrews June 30, 2021 07:01

mdtoguchi approved these changes Jun 30, 2021

View reviewed changes

elizabethandrews approved these changes Jun 30, 2021

View reviewed changes

romanovvlad approved these changes Jun 30, 2021

View reviewed changes

romanovvlad merged commit 4a6d21f into intel:sycl Jun 30, 2021

dm-vodopyanov deleted the private/dvodopya/move-__buildin_unique_stable_name-to-separate-header branch February 10, 2022 14:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[SYCL] Switch to using integration footer by default #3777

[SYCL] Switch to using integration footer by default #3777

dm-vodopyanov commented May 18, 2021 •

edited by AlexeySachkov

Loading

bader commented May 18, 2021

romanovvlad commented May 19, 2021

erichkeane commented Jun 1, 2021

erichkeane left a comment

romanovvlad left a comment

AlexeySachkov commented Jun 28, 2021

elizabethandrews left a comment

elizabethandrews left a comment

romanovvlad left a comment

[SYCL] Switch to using integration footer by default #3777

[SYCL] Switch to using integration footer by default #3777

Conversation

dm-vodopyanov commented May 18, 2021 • edited by AlexeySachkov Loading

bader commented May 18, 2021

romanovvlad commented May 19, 2021

erichkeane commented Jun 1, 2021

erichkeane left a comment

Choose a reason for hiding this comment

romanovvlad left a comment

Choose a reason for hiding this comment

AlexeySachkov commented Jun 28, 2021

elizabethandrews left a comment

Choose a reason for hiding this comment

elizabethandrews left a comment

Choose a reason for hiding this comment

romanovvlad left a comment

Choose a reason for hiding this comment

dm-vodopyanov commented May 18, 2021 •

edited by AlexeySachkov

Loading