Skip to content

[SYCL] Add support for multiple filtered outputs in sycl-post-link - #12727

Merged
AlexeySachkov merged 27 commits into
intel:syclfrom
jzc:sycl-post-link-filtering
Apr 8, 2024
Merged

AlexeySachkov merged 27 commits into
intel:syclfrom
jzc:sycl-post-link-filtering

Conversation

@jzc

@jzc jzc commented Feb 15, 2024 •

Copy link
Copy Markdown
Contributor

This PR adds the required changes to sycl-post-link support optional kernel features in AOT mode as described by the design doc in #12252. Additionally, it also updates the driver to invoke sycl-post-link with a device architecture when Intel GPU targets are passed in -fsycl-targets.

@jzc
jzc requested review from a team as code owners February 15, 2024 19:21
@jzc
jzc temporarily deployed to WindowsCILock February 15, 2024 19:30 — with GitHub Actions Inactive
@jzc
jzc temporarily deployed to WindowsCILock February 15, 2024 20:48 — with GitHub Actions Inactive
@maksimsab
maksimsab self-requested a review February 16, 2024 15:12

@maksimsab maksimsab left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

First comments before I get fully acquainted with the whole parent proposal.

const module_split::ModuleDesc &M,
std::map<StringRef, util::PropertyValue> &Requirements);
struct SYCLDeviceRequirements {
SYCLDeviceRequirements(const module_split::ModuleDesc &M);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nit. I would propose a separate function getSYCLDeviceRequirements or createSYCLDeviceRequirements instead of the sophisticated constructor.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@jzc
jzc requested a review from a team as a code owner March 12, 2024 04:35
@jzc
jzc temporarily deployed to WindowsCILock March 12, 2024 04:36 — with GitHub Actions Inactive
@jzc
jzc temporarily deployed to WindowsCILock March 12, 2024 05:13 — with GitHub Actions Inactive
@jzc
jzc requested a review from maksimsab March 12, 2024 15:09
@jzc
jzc temporarily deployed to WindowsCILock March 22, 2024 15:34 — with GitHub Actions Inactive
@jzc

jzc commented Mar 22, 2024

Copy link
Copy Markdown
Contributor Author

@intel/dpcpp-clang-driver-reviewers FYI, can this get a review?

@intel/dpcpp-esimd-reviewers Looks like I also need a review from you all, I think llvm/lib/SYCLLowerIR/CMakeLists.txt is the only file you own in this PR, though.

@sarnex sarnex left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

cmake lgtm

@sarnex
sarnex requested a review from a team March 22, 2024 15:40
@jzc
jzc temporarily deployed to WindowsCILock March 22, 2024 16:28 — with GitHub Actions Inactive
Comment thread clang/lib/Driver/ToolChains/Clang.cpp Resolved
std::map<StringRef, util::PropertyValue> Requirements;

Requirements["aspects"] =
std::vector<uint32_t>(Aspects.begin(), Aspects.end());

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

What if Aspects set is empty? Shouldn't we apply if (<property is set>) <fill Requirements> here as it's done for other properties?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I was preserving the behavior of the code before I refactored this part, which always attached the property. I believe the runtime can handle the property not being attach but I also might need to update some tests if I do.

// We don't need the "fixed_target" property if it's empty
if (std::string(MDName) == "sycl_fixed_targets" && Values.empty())
continue;
Requirements[MappedName] =
std::vector<uint32_t>(Values.begin(), Values.end());

Comment on lines +65 to +66
if (!Reqs.ReqdWorkGroupSize.has_value())
Reqs.ReqdWorkGroupSize = NewReqdWorkGroupSize;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think we need else branch here to validate consistency of multiple "reqd_work_group_size" requirements.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

If we do this, then this test fails:

; We expect to see only one module generated:
;
; CHECK-TABLE: Code
; CHECK-TABLE-NEXT: _0.ll
; CHECK-TABLE-EMPTY:

Since splitting was disabled, there will be multiple reqd_work_group_size attributes in a module, and then it'll run into an assert if we placed on there. I think the surrounding code that calls getSYCLDeviceRequirements would need to be updated to not compute device requirements when splitting is disabled if we were to add an assert here.

@AlexeySachkov AlexeySachkov left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I would like us to make further progress on this PR, and therefore approving it so it can be merged.

Subsequent feedback can be applied through follow-up commits

@AlexeySachkov

Copy link
Copy Markdown
Contributor

@jzc, could you please make a merge with sycl branch to re-trigger testing on the latest codebase?

@asudarsa asudarsa left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM. Thanks for adding this support. Should be quite useful when the driver is actually calling sycl-post-link for multiple targets.

@jzc
jzc temporarily deployed to WindowsCILock April 4, 2024 14:43 — with GitHub Actions Inactive
@jzc
jzc temporarily deployed to WindowsCILock April 4, 2024 15:36 — with GitHub Actions Inactive
@AlexeySachkov
AlexeySachkov dismissed maksimsab’s stale review April 8, 2024 05:41

All comments were addressed and review was re-requested a while ago. The patch is approved by another codeowner in the same area. Any further feedback can be applied post-commit, dismissing the review to make progress here

@AlexeySachkov
AlexeySachkov merged commit c821dc9 into intel:sycl Apr 8, 2024
AlexeySachkov pushed a commit that referenced this pull request May 29, 2024
The `sycl_aspects` metadata kept track of the aspect names and their enum values as defined by [sycl/include/sycl/info/aspects.def](https://github.com/intel/llvm/blob/sycl/sycl/include/sycl/info/aspects.def).
This metadata was populated by the frontend by looking for the declaration of the SYCL aspects enum.
The `CleanupSYCLMetadata` pass then deletes this metadata after device compilation.

https://github.com/intel/llvm/blob/f6e73e8953e848ad87259798e9c861e9d44e93b0/clang/lib/CodeGen/BackendUtil.cpp#L1156-L1158

However, some processing in `sycl-post-link` that will be added in #12727 needs the
`sycl_aspects` metadata (which at that point, the metadata is already deleted by
`CleanupSYCLMetadata`).
To fix this, in this PR, before cleaning up the metadata in `CleanupSYCLMetadataPass`,
we update `sycl_used_aspects` metadata to include the aspect name.
Note that the aspect name might not exist, e.g. in the case of the negative-valued
"internal" aspects, in which case the value is passed along as normal.

This branch was previously deployed

1 inactive deployment
WindowsCILock — 2e3d46d9 Deployed Apr 4, 2024 by jzc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants