[NewOffloadModel] Remove compiler backend option and linker option to be passed as argument for ClangLinkerWrapper #20691
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5232,7 +5232,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, | |
| (JA.isHostOffloading(C.getActiveOffloadKinds()) && | ||
| Args.hasFlag(options::OPT_offload_new_driver, | ||
| options::OPT_no_offload_new_driver, | ||
| C.isOffloadingHostKind(Action::OFK_Cuda))) || | ||
| (JA.isHostOffloading(Action::OFK_SYCL) && | ||
| C.getDriver().GetUseNewOffloadDriverForSYCLOffload(C, Args)); | ||
|
|
||
| bool IsRDCMode = | ||
| Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, IsSYCL); | ||
|
|
@@ -11245,14 +11247,16 @@ void LinkerWrapper::ConstructJob(Compilation &C, const JobAction &JA, | |
| if (Kind == Action::OFK_OpenMP && !Args.hasArg(OPT_no_offloadlib) && | ||
| (TC->getTriple().isAMDGPU() || TC->getTriple().isNVPTX())) | ||
| LinkerArgs.emplace_back("-lompdevice"); | ||
| // Forward all of these to the appropriate toolchain. | ||
| if (!C.hasOffloadToolChain<Action::OFK_SYCL>()) { | ||
|
Contributor
There was a problem hiding this comment. Is it possible to avoid this SYCL-specific customization? What happens if we keep this for SYCL as well?
Contributor
There was a problem hiding this comment. Where does |
||
| for (StringRef Arg : CompilerArgs) | ||
| CmdArgs.push_back(Args.MakeArgString( | ||
| "--device-compiler=" + TC->getTripleString() + "=" + Arg)); | ||
| for (StringRef Arg : LinkerArgs) | ||
| CmdArgs.push_back(Args.MakeArgString( | ||
| "--device-linker=" + TC->getTripleString() + "=" + Arg)); | ||
| } | ||
|
|
||
| // Forward the LTO mode relying on the Driver's parsing. | ||
| if (C.getDriver().getOffloadLTOMode() == LTOK_Full) | ||
|
|
@@ -11458,57 +11462,27 @@ void LinkerWrapper::ConstructJob(Compilation &C, const JobAction &JA, | |
| CmdArgs.push_back( | ||
| Args.MakeArgString("-sycl-allow-device-image-dependencies")); | ||
|
|
||
| // For AOT, pass along backend target args via --device-compiler options | ||
| // to the clang-linker-wrapper. | ||
| const toolchains::SYCLToolChain &SYCLTC = | ||
| static_cast<const toolchains::SYCLToolChain &>(getToolChain()); | ||
| for (auto &ToolChainMember : | ||
| llvm::make_range(ToolChainRange.first, ToolChainRange.second)) { | ||
| const ToolChain *TC = ToolChainMember.second; | ||
| ArgStringList BuildArgs; | ||
| SYCLTC.TranslateBackendTargetArgs(TC->getTriple(), Args, BuildArgs); | ||
| SmallString<128> BackendOptString; | ||
| if (TC->getTriple().getSubArch() == llvm::Triple::SPIRSubArch_gen || (TC->getTriple().getSubArch() == llvm::Triple::SPIRSubArch_x86_64)) { | ||
| for (const auto &A : BuildArgs) | ||
| appendOption(BackendOptString, A); | ||
| CmdArgs.push_back(Args.MakeArgString( | ||
| "--device-compiler=" + TC->getTripleString() + "=" + BackendOptString)); | ||
| } | ||
| } | ||
|
|
||
| // Add option to enable creating of the .syclbin file. | ||
| const ArgList &Args = | ||
| C.getArgsForToolChain(nullptr, StringRef(), Action::OFK_SYCL); | ||
| if (Arg *A = Args.getLastArg(options::OPT_fsyclbin_EQ)) | ||
| CmdArgs.push_back( | ||
| Args.MakeArgString("--syclbin=" + StringRef{A->getValue()})); | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -141,27 +141,14 @@ | |
| // MULT_TARG_PHASES: 15: backend, {14}, assembler, (host-sycl) | ||
| // MULT_TARG_PHASES: 16: assembler, {15}, object, (host-sycl) | ||
|
|
||
|
Contributor
There was a problem hiding this comment. Per my understanding, we still need to pass
Contributor
Author
There was a problem hiding this comment. Thanks for pointing this out! I think for backend option and linker option that are passed at compile time, they are stored in the Only the Therefore, for this test and the one got deleted below,
Contributor
There was a problem hiding this comment. Yes, I understand how it works with your implementation. And I challenge that. Despite we extracted and put options to SYCLImage on compile stage, we still want to pass these options to link stage as well. |
||
| /// Test option passing behavior for clang-offload-wrapper options for AOT | ||
| // RUN: %clangxx --target=x86_64-unknown-linux-gnu -fsycl --offload-new-driver \ | ||
| // RUN: -fsycl-targets=spir64_gen,spir64_x86_64 \ | ||
| // RUN: -Xsycl-target-backend=spir64_gen -backend-gen-opt \ | ||
| // RUN: -Xsycl-target-backend=spir64_x86_64 -backend-cpu-opt \ | ||
| // RUN: -### %s 2>&1 \ | ||
| // RUN: | FileCheck -check-prefix WRAPPER_OPTIONS_BACKEND_AOT %s | ||
| // WRAPPER_OPTIONS_BACKEND_AOT: clang-linker-wrapper{{.*}} "--host-triple=x86_64-unknown-linux-gnu" {{.*}} "--device-compiler=spir64_gen-unknown-unknown=-backend-gen-opt" "--device-compiler=spir64_x86_64-unknown-unknown=-backend-cpu-opt" | ||
|
|
||
| /// Verify arch settings for nvptx and amdgcn targets | ||
| // RUN: %clangxx -fsycl -### -fsycl-targets=amdgcn-amd-amdhsa -fno-sycl-libspirv \ | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -716,7 +716,7 @@ getTripleBasedSYCLPostLinkOpts(const ArgList &Args, | |
| /// code and will be parsed to generate options required to be passed into the | ||
| /// sycl-post-link tool. | ||
| static Expected<std::vector<module_split::SplitModule>> | ||
| runSYCLPostLinkTool(ArrayRef<StringRef> InputFiles, const ArgList &Args, bool HasGPUTool) { | ||
| Expected<std::string> SYCLPostLinkPath = | ||
| findProgram("sycl-post-link", {getMainExecutable("sycl-post-link")}); | ||
| if (!SYCLPostLinkPath) | ||
|
|
@@ -731,14 +731,13 @@ runSYCLPostLinkTool(ArrayRef<StringRef> InputFiles, const ArgList &Args) { | |
|
|
||
| // Enable the driver to invoke sycl-post-link with the device architecture | ||
| // when Intel GPU targets are passed in -fsycl-targets. | ||
| // HasGPUTool is checked to ensure the device architecture is not | ||
| // passed through -Xsycl-target-backend=spir64_gen "-device <arch>" format | ||
| const llvm::Triple Triple(Args.getLastArgValue(OPT_triple_EQ)); | ||
| StringRef Arch = Args.getLastArgValue(OPT_arch_EQ); | ||
|
|
||
| if (Triple.getSubArch() == llvm::Triple::SPIRSubArch_gen && !Arch.empty() && | ||
| !HasGPUTool && Arch != "*") | ||
| OutputPathWithArch = "intel_gpu_" + Arch.str() + "," + OutputPathWithArch; | ||
| else if (Triple.getSubArch() == llvm::Triple::SPIRSubArch_x86_64) | ||
| OutputPathWithArch = "spir64_x86_64," + OutputPathWithArch; | ||
|
|
@@ -982,10 +981,6 @@ static void addSYCLBackendOptions(const ArgList &Args, | |
| CmdArgs.push_back(Args.MakeArgString(JoinedOptions)); | ||
| } | ||
| } | ||
|
Contributor
There was a problem hiding this comment. Args parameter is not used anymore in this function and can be removed.
Contributor
There was a problem hiding this comment. Or maybe we need to handle
Contributor
Author
There was a problem hiding this comment. Thanks for the suggestion! The reason I didn't move the handling of Therefore, to avoid processing
Contributor
There was a problem hiding this comment. ok, now I see that order of options did not change. So, I guess, just remove the |
||
| return; | ||
|
Contributor
There was a problem hiding this comment. this return is also unnecessary, right? |
||
| } | ||
|
|
||
|
|
@@ -2222,6 +2217,15 @@ linkAndWrapDeviceFiles(ArrayRef<SmallVector<OffloadFile>> LinkerInputFiles, | |
| extractSYCLCompileLinkOptions(Input); | ||
| if (!CompileLinkOptionsOrErr) | ||
| return CompileLinkOptionsOrErr.takeError(); | ||
|
|
||
| // Append any additional backend compiler options specified at link time. | ||
| const llvm::Triple Triple(LinkerArgs.getLastArgValue(OPT_triple_EQ)); | ||
YuriPlyakhin marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| for (StringRef Arg : LinkerArgs.getAllArgValues(OPT_device_compiler_args_EQ)) { | ||
| auto [ArgTriple, ArgValue] = Arg.split('='); | ||
| if (ArgTriple == Triple.getTriple() && !ArgValue.empty()) { | ||
| CompileLinkOptionsOrErr->first += Twine(" ", ArgValue).str(); | ||
| } | ||
| } | ||
|
|
||
| SmallVector<StringRef> InputFiles; | ||
| // Write device inputs to an output file for the linker. | ||
|
|
@@ -2238,16 +2242,19 @@ linkAndWrapDeviceFiles(ArrayRef<SmallVector<OffloadFile>> LinkerInputFiles, | |
| return TmpOutputOrErr.takeError(); | ||
| SmallVector<StringRef> InputFilesSYCL; | ||
| InputFilesSYCL.emplace_back(*TmpOutputOrErr); | ||
|
|
||
| SmallVector<StringRef, 16> Args; | ||
| StringRef(CompileLinkOptionsOrErr->first).split(Args, ' '); | ||
| bool HasGPUTool = std::find(Args.begin(), Args.end(), "-device") != Args.end(); | ||
YixingZhang007 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| auto SplitModulesOrErr = | ||
| UseSYCLPostLinkTool | ||
| ? sycl::runSYCLPostLinkTool(InputFilesSYCL, LinkerArgs, HasGPUTool) | ||
| : sycl::runSYCLSplitLibrary(InputFilesSYCL, LinkerArgs, | ||
| *SYCLModuleSplitMode); | ||
| if (!SplitModulesOrErr) | ||
| return SplitModulesOrErr.takeError(); | ||
|
|
||
| auto &SplitModules = *SplitModulesOrErr; | ||
| bool IsJIT = Triple.isSPIROrSPIRV() && | ||
| Triple.getSubArch() == llvm::Triple::NoSubArch; | ||
| if ((Triple.isNVPTX() || Triple.isAMDGCN()) && | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.