[NewOffloadModel] Fix argument parsing in Clang Linker Wrapper #20470
+78
−16
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
… new offloading model
YixingZhang007
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
YixingZhang007
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
YixingZhang007
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
YixingZhang007
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
| /// Otherwise return 'false'. | ||
| bool Driver::GetUseNewOffloadDriverForSYCLOffload(Compilation &C, | ||
| const ArgList &Args) const { | ||
| // Check only if enabled with -fsycl |
There was a problem hiding this comment.
Suggested change
| // Check only if enabled with -fsycl | |
| // Check only if enabled with -fsycl. |
| /// Utility function to parse all devices passed via -fsycl-targets. | ||
| /// Return 'true' for JIT, AOT Intel CPU/GPUs and NVidia/AMD targets. | ||
| /// Otherwise return 'false'. | ||
| bool Driver::GetUseNewOffloadDriverForSYCLOffload(Compilation &C, |
There was a problem hiding this comment.
I think the name doesn't describe very well what the function is doing, or at least doesn't align very well with the description in the comment above. I would expect something including the words Get and Devices at least.
| if (!BeforeOptions.empty()){ | ||
| SmallVector<StringRef, 8> BeforeArgs; | ||
| BeforeOptions.split(BeforeArgs, " ", /*MaxSplit=*/-1, /*KeepEmpty=*/false); | ||
| for (auto string : BeforeArgs) { |
There was a problem hiding this comment.
This is most likely introducing a copy for each arg. Can we try const auto & instead?
| CmdArgs.push_back(Args.MakeArgString(Replace)); | ||
| SmallVector<StringRef, 8> AfterArgs; | ||
| AfterOptions.split(AfterArgs, " ", /*MaxSplit=*/-1, /*KeepEmpty=*/false); | ||
| std::string JoinedOptions = llvm::join(AfterArgs, " "); |
There was a problem hiding this comment.
Does this pass all tests? It was similar to this before and I had to add the , because it was causing trouble with ocloc. I added a specific test for that, so if it is passing, then I'm good.
| // RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_dg2_g10,intel_gpu_dg2_g11,intel_gpu_dg2_g12,intel_gpu_pvc,intel_gpu_mtl_h,intel_gpu_mtl_u -fsycl-fp64-conv-emu %O0 %s -o %t.out | ||
| // RUN: %{run} %t.out | ||
|
|
||
| // RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_dg2_g10,intel_gpu_dg2_g11,intel_gpu_dg2_g12,intel_gpu_pvc,intel_gpu_mtl_h,intel_gpu_mtl_u -fsycl-fp64-conv-emu --offload-new-driver %O0 %s -o %t.out |
There was a problem hiding this comment.
Could we also try with -g? The code you're changing used to have issues with -g, so just to be on the safe side.
YixingZhang007
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
YixingZhang007
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
YixingZhang007
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
YixingZhang007
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
YixingZhang007
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
YixingZhang007
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
YixingZhang007
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This PR is still working in progress. Thanks for understanding :)