Add debug options to clang-linker-wrapper #101008
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -581,8 +581,16 @@ Expected<StringRef> clang(ArrayRef<StringRef> InputFiles, const ArgList &Args) { | |
| if (SaveTemps) | ||
| CmdArgs.push_back("-save-temps"); | ||
|
|
||
| if (linkerSupportsLTO(Args)) { | ||
| if (SaveTemps) | ||
| CmdArgs.push_back("-Wl,--save-temps"); | ||
| if (Args.hasArg(OPT_lto_debug_pass_manager)) | ||
| CmdArgs.push_back("-Wl,--lto-debug-pass-manager"); | ||
| for (const opt::Arg *Arg : Args.filtered(OPT_offload_opt_eq_minus)) { | ||
| CmdArgs.push_back( | ||
| Args.MakeArgString("-Wl,--mllvm=" + StringRef(Arg->getValue()))); | ||
|
Comment on lines
+589
to
+591
There was a problem hiding this comment. This should already be handled elsewhere. There was a problem hiding this comment. I'll remove the commit that added this. I think I wrote it before 97c62b8f75 was merged. |
||
| } | ||
| } | ||
|
|
||
| if (Args.hasArg(OPT_embed_bitcode)) | ||
| CmdArgs.push_back("-Wl,--lto-emit-llvm"); | ||
|
|
@@ -767,6 +775,8 @@ std::unique_ptr<lto::LTO> createLTO( | |
| // TODO: Handle remark files | ||
| Conf.HasWholeProgramVisibility = Args.hasArg(OPT_whole_program); | ||
|
|
||
| Conf.DebugPassManager = Args.hasArg(OPT_lto_debug_pass_manager); | ||
|
|
||
| return std::make_unique<lto::LTO>(std::move(Conf), Backend); | ||
| } | ||
|
|
||
|
|
@@ -781,6 +791,8 @@ bool isValidCIdentifier(StringRef S) { | |
| Error linkBitcodeFiles(SmallVectorImpl<OffloadFile> &InputFiles, | ||
| SmallVectorImpl<StringRef> &OutputFiles, | ||
| const ArgList &Args) { | ||
| if (Verbose) | ||
| llvm::errs() << "Linking bitcode files\n"; | ||
|
Comment on lines
+794
to
+795
There was a problem hiding this comment. Verbose mode just wants to print information from the tools generally. I think if we want tracing we already have the time-trace scope. There was a problem hiding this comment. Time-trace seems to be focused more on profiling than just tracing. It writes json to a file. There was a problem hiding this comment. That sounds more like debugging than verbose output, we could add something for it but in general I don't think it adds too much, since this path isn't really used anymore. |
||
| llvm::TimeTraceScope TimeScope("Link bitcode files"); | ||
| const llvm::Triple Triple(Args.getLastArgValue(OPT_triple_EQ)); | ||
| StringRef Arch = Args.getLastArgValue(OPT_arch_EQ); | ||
|
|
@@ -1017,6 +1029,8 @@ Expected<StringRef> writeOffloadFile(const OffloadFile &File) { | |
| // Compile the module to an object file using the appropriate target machine for | ||
| // the host triple. | ||
| Expected<StringRef> compileModule(Module &M, OffloadKind Kind) { | ||
| if (Verbose) | ||
| llvm::errs() << "Compiling module\n"; | ||
| llvm::TimeTraceScope TimeScope("Compile module"); | ||
| std::string Msg; | ||
| const Target *T = TargetRegistry::lookupTarget(M.getTargetTriple(), Msg); | ||
|
|
@@ -1197,7 +1211,8 @@ bundleLinkedOutput(ArrayRef<OffloadingImage> Images, const ArgList &Args, | |
| } | ||
| } | ||
|
|
||
| /// Returns a new ArgList containing arguments used for the device linking | ||
| /// phase. | ||
| DerivedArgList getLinkerArgs(ArrayRef<OffloadFile> Input, | ||
| const InputArgList &Args) { | ||
| DerivedArgList DAL = DerivedArgList(DerivedArgList(Args)); | ||
|
|
@@ -1309,7 +1324,7 @@ Expected<SmallVector<StringRef>> linkAndWrapDeviceFiles( | |
| // First link and remove all the input files containing bitcode if | ||
| // the target linker does not support it natively. | ||
| SmallVector<StringRef> InputFiles; | ||
| if (!linkerSupportsLTO(LinkerArgs) || Args.hasArg(OPT_lto_in_process)) | ||
| if (Error Err = linkBitcodeFiles(Input, InputFiles, LinkerArgs)) | ||
| return Err; | ||
|
|
||
|
|
||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
--save-tempsthing is kind of special, I'm thining for stuff like this it's better suited for-Xoffload-linker --lto-debug-pass-manageronce I merge #101032.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Verified that
--device-linker=--lto-debug-pass-managerworks.I am going to close this PR since most of the functionality is redundant or now available by other means.