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.

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

[ClangLinkerWrapper] Reintroduce missing upstream commits that remove in-house LTO in clang-linker-wrapper #16952

Open
wants to merge 4 commits into
base: sycl
Choose a base branch
from

Conversation

asudarsa
Copy link
Contributor

@asudarsa asudarsa commented Feb 10, 2025

A couple of upstream commits were not merged due to merge conflicts.
This PR reintroduces the following upstream commits:

  1. ccd73ee
  2. 4a96081

Also, This PR restores missing changes from upstream commit aae059e1389bebe86ceb3aea159d95ca6d0823ea](f2f1a14)

Thanks

… to 'merge' conflicts.

This PR reintroduces the following upstream commits:
1. ccd73ee
2. 4a96081
@asudarsa asudarsa requested a review from a team as a code owner February 10, 2025 19:00
@bader
Copy link
Contributor

bader commented Feb 10, 2025

@AlexeySachkov, please, take a look. This seems to duplicate/conflict with #16926.

@asudarsa asudarsa requested a review from a team as a code owner February 10, 2025 21:56
@asudarsa
Copy link
Contributor Author

@AlexeySachkov, please, take a look. This seems to duplicate/conflict with #16926.

Hi @bader

I had an offline discussion with @AlexeySachkov and we decided to have a separate PR for bringing in missing upstream commits and do improvements in a separate PR.
@AlexeySachkov, may be we can close #16926 ?

Thanks

@@ -285,15 +282,17 @@ Expected<StringRef> createOutputFile(const Twine &Prefix, StringRef Extension) {
return TempFiles.back();
}

Expected<StringRef> writeOffloadFile(const OffloadFile &File) {
// TODO: Remove HasSYCLOffloadKind dependence when aligning with community code.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

When we start using clang-sycl-linker, we can remove dependence on HasSYCLOffloadKind here.

Thanks

@asudarsa
Copy link
Contributor Author

asudarsa commented Feb 10, 2025

Some changes that overlapped with changes in #16884 have been removed from this PR.

Thanks

Signed-off-by: Arvind Sudarsanam <[email protected]>
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.

3 participants