[SYCL] Allow native OpenCL and L0 executable binaries in persistent cache #6256
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…cache These changes expand the persistent device code cache to allow executable binaries produced by IGC for both OpenCL and L0 to be cached. Signed-off-by: Larsen, Steffen <[email protected]>
aelovikov-intel
changed the title
sycl/source/detail/pi.cpp
Outdated
| RT::PiDeviceBinaryType getBinaryImageFormat(const unsigned char *ImgData, | ||
| size_t ImgSize) { | ||
| struct { | ||
| RT::PiDeviceBinaryType Fmt; | ||
| const uint32_t Magic; | ||
| } Fmts[] = {{PI_DEVICE_BINARY_TYPE_SPIRV, 0x07230203}, | ||
| {PI_DEVICE_BINARY_TYPE_LLVMIR_BITCODE, 0xDEC04342}}; | ||
| {PI_DEVICE_BINARY_TYPE_LLVMIR_BITCODE, 0xDEC04342}, | ||
| {PI_DEVICE_BINARY_TYPE_NATIVE, 0x43544E49}}; // INTC native |
There was a problem hiding this comment.
Suggested change
| {PI_DEVICE_BINARY_TYPE_NATIVE, 0x43544E49}}; // INTC native | |
| {PI_DEVICE_BINARY_TYPE_NATIVE, 0x43544E49}}; // 'I', 'N', 'T', 'C' ; Intel native |
There was a problem hiding this comment.
Maybe it would need an extra clang-format on top of the suggestion...
There was a problem hiding this comment.
I moved it above the definition as otherwise the formatting was awful.
sycl/source/detail/pi.cpp
Outdated
| for (const auto &Fmt : Fmts) { | ||
| if (Hdr == Fmt.Magic) | ||
| return Fmt.Fmt; | ||
| } | ||
|
|
||
| // ELF files we need to be parsed separately. The header type ends at 18 |
There was a problem hiding this comment.
Something strange with the first sentence.
And possibly the 2nd better be written as "... ends after 18 bytes", but that one is up to you.
There was a problem hiding this comment.
You're right, that was not a very well constructed sentence. Better now?
sycl/source/detail/pi.cpp
Outdated
| // ELF files we need to be parsed separately. The header type ends at 18 | ||
| // bytes. | ||
| if (Hdr == 0x464c457F && ImgSize >= 18) { | ||
| detail::remove_const_t<decltype(ELFFmts[0].Magic)> HdrType = |
There was a problem hiding this comment.
I'm not sure how this type is better than auto...
There was a problem hiding this comment.
Very good question. I just went with the same structure as the outer case, but it has been changed to uint16_t as the return type of getELFHeaderType is explicit anyway.
sycl/source/detail/pi.cpp
Outdated
| {PI_DEVICE_BINARY_TYPE_LLVMIR_BITCODE, 0xDEC04342}, | ||
| {PI_DEVICE_BINARY_TYPE_NATIVE, 0x43544E49}}; // INTC native | ||
|
|
||
| struct { |
There was a problem hiding this comment.
Can we move this to line 722 please?
There was a problem hiding this comment.
Sure. It has been moved. It could potentially also be moved into the following check, though I further indentation may make it harder to read.
Signed-off-by: Larsen, Steffen <[email protected]>
aelovikov-intel
approved these changes
Jun 6, 2022
steffenlarsen
added a commit
to steffenlarsen/llvm
that referenced
this pull request
Jun 7, 2022
intel#6256 changed the binary format used by the PersistentDeviceCodeCache tests to be a parameter, however the tests would be setting the format after the image had been initialized, which causes the image to think it is still the old format after changing the binary format of the PI image to the format read from the GTest parameter. With these changes the format will be set immediately from the parameter rather than deferring it to during setup. Additionally it fixes the SetUp and TearDown overrides. Signed-off-by: Larsen, Steffen <[email protected]>
pvchupin
pushed a commit
that referenced
this pull request
Jun 7, 2022
#6256 changed the binary format used by the PersistentDeviceCodeCache tests to be a parameter, however the tests would be setting the format after the image had been initialized, which causes the image to think it is still the old format after changing the binary format of the PI image to the format read from the GTest parameter. With these changes the format will be set immediately from the parameter rather than deferring it to during setup. Additionally it fixes the SetUp and TearDown overrides. Signed-off-by: Larsen, Steffen <[email protected]>
steffenlarsen
added a commit
to steffenlarsen/llvm
that referenced
this pull request
Jun 15, 2022
Following the changes in intel#6256 this commit allows executable device binaries with ZEBIN format to be cached persistently. Signed-off-by: Larsen, Steffen <[email protected]>
pvchupin
pushed a commit
that referenced
this pull request
Jun 15, 2022
Following the changes in #6256 this commit allows executable device binaries with ZEBIN format to be cached persistently. Signed-off-by: Larsen, Steffen <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These changes expand the persistent device code cache to allow executable binaries produced by IGC for both OpenCL and L0 to be cached.