This is an archive of the discontinued LLVM Phabricator instance.

Differential D147660

[PS4][clang] Pass -flto-jobs argument to orbis-ld
ClosedPublic

Authored by ormris on Apr 5 2023, 2:23 PM.

Details

Reviewers
ychen
probinson
Commits
rG393a1c3b4fcd: [PS4][clang] Pass -flto-jobs argument to orbis-ld
Summary

Pass -flto-jobs to orbis-ld correctly.

Diff Detail

Event Timeline

ormris created this revision.Apr 5 2023, 2:23 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 5 2023, 2:23 PM
Herald added subscribers: steven_wu, hiraditya, inglorion. · View Herald Transcript
ormris requested review of this revision.Apr 5 2023, 2:23 PM
Herald added a subscriber: MaskRay. · View Herald TranscriptApr 5 2023, 2:23 PM
Harbormaster completed remote builds in B223879: Diff 511206.Apr 5 2023, 9:24 PM
probinson added inline comments.Apr 6 2023, 7:17 AM
clang/lib/Driver/ToolChains/PS4CPU.cpp
188

The test shows that we were already adding this to the command line. Are we now adding it twice?

ormris updated this revision to Diff 511748.Apr 7 2023, 11:33 AM

Remove previous fix

clang/lib/Driver/ToolChains/PS4CPU.cpp
188

Fixed

Harbormaster completed remote builds in B224259: Diff 511748.Apr 7 2023, 12:09 PM
probinson accepted this revision.Apr 11 2023, 6:01 AM

LGTM

This revision is now accepted and ready to land.Apr 11 2023, 6:01 AM
This revision was landed with ongoing or failed builds.Apr 11 2023, 10:33 AM
Closed by commit rG393a1c3b4fcd: [PS4][clang] Pass -flto-jobs argument to orbis-ld (authored by ormris). · Explain Why
This revision was automatically updated to reflect the committed changes.
ormris added a commit: rG393a1c3b4fcd: [PS4][clang] Pass -flto-jobs argument to orbis-ld.
Herald added a project: Restricted Project. · View Herald TranscriptApr 11 2023, 10:33 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
ormris added a comment.Apr 11 2023, 10:34 AM

Thanks!

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
14 lines
test/
Driver/
5 lines

Diff 512511

clang/lib/Driver/ToolChains/PS4CPU.cpp

Show First 20 Lines • Show All 174 Lines • ▼ Show 20 Lines if (UseLTO) {
// This tells LTO to perform JustMyCode instrumentation. // This tells LTO to perform JustMyCode instrumentation.
if (UseJMC) if (UseJMC)
AddCodeGenFlag("-enable-jmc-instrument"); AddCodeGenFlag("-enable-jmc-instrument");
if (Arg *A = Args.getLastArg(options::OPT_fcrash_diagnostics_dir)) if (Arg *A = Args.getLastArg(options::OPT_fcrash_diagnostics_dir))
AddCodeGenFlag(Twine("-crash-diagnostics-dir=") + A->getValue()); AddCodeGenFlag(Twine("-crash-diagnostics-dir=") + A->getValue());
StringRef Parallelism = getLTOParallelism(Args, D);
if (!Parallelism.empty()) {
if (IsPS4)
AddCodeGenFlag(Twine("-threads=") + Parallelism);
else
CmdArgs.push_back(Args.MakeArgString(Twine("-plugin-opt=jobs=") + Parallelism));
probinsonUnsubmitted
Not Done
ReplyInline Actions

The test shows that we were already adding this to the command line. Are we now adding it twice?

probinson: The test shows that we were already adding this to the command line. Are we now adding it twice?
ormrisAuthorUnsubmitted
Done
ReplyInline Actions

Fixed

ormris: Fixed
}
if (IsPS4) { if (IsPS4) {
const char *Prefix = nullptr; const char *Prefix = nullptr;
if (D.getLTOMode() == LTOK_Thin) if (D.getLTOMode() == LTOK_Thin)
Prefix = "-lto-thin-debug-options="; Prefix = "-lto-thin-debug-options=";
else if (D.getLTOMode() == LTOK_Full) else if (D.getLTOMode() == LTOK_Full)
Prefix = "-lto-debug-options="; Prefix = "-lto-debug-options=";
else else
llvm_unreachable("new LTO mode?"); llvm_unreachable("new LTO mode?");
CmdArgs.push_back(Args.MakeArgString(Twine(Prefix) + PS4LTOArgs)); CmdArgs.push_back(Args.MakeArgString(Twine(Prefix) + PS4LTOArgs));
} }
} }
if (IsPS5 && UseLTO) {
StringRef Parallelism = getLTOParallelism(Args, D);
if (!Parallelism.empty())
CmdArgs.push_back(Args.MakeArgString("-plugin-opt=jobs=" + Parallelism));
}
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs))
TC.addSanitizerArgs(Args, CmdArgs, "-l", ""); TC.addSanitizerArgs(Args, CmdArgs, "-l", "");
Args.AddAllArgs(CmdArgs, options::OPT_L); Args.AddAllArgs(CmdArgs, options::OPT_L);
Args.AddAllArgs(CmdArgs, options::OPT_T_Group); Args.AddAllArgs(CmdArgs, options::OPT_T_Group);
Args.AddAllArgs(CmdArgs, options::OPT_e); Args.AddAllArgs(CmdArgs, options::OPT_e);
Args.AddAllArgs(CmdArgs, options::OPT_s); Args.AddAllArgs(CmdArgs, options::OPT_s);
Args.AddAllArgs(CmdArgs, options::OPT_t); Args.AddAllArgs(CmdArgs, options::OPT_t);
▲ Show 20 Lines • Show All 198 Lines • Show Last 20 Lines

clang/test/Driver/lto-jobs.c

// Confirm that -flto-jobs=N is passed to linker // Confirm that -flto-jobs=N is passed to linker
// RUN: %clang -target x86_64-unknown-linux -### %s -flto=thin -flto-jobs=5 2> %t // RUN: %clang -target x86_64-unknown-linux -### %s -flto=thin -flto-jobs=5 2> %t
// RUN: FileCheck -check-prefix=CHECK-LINK-THIN-JOBS-ACTION < %t %s // RUN: FileCheck -check-prefix=CHECK-LINK-THIN-JOBS-ACTION < %t %s
// //
// RUN: %clang -target x86_64-sie-ps5 -### %s -flto=thin -flto-jobs=5 2> %t // RUN: %clang -target x86_64-sie-ps5 -### %s -flto=thin -flto-jobs=5 2> %t
// RUN: FileCheck -check-prefix=CHECK-LINK-THIN-JOBS-ACTION < %t %s // RUN: FileCheck -check-prefix=CHECK-LINK-THIN-JOBS-ACTION < %t %s
// //
// CHECK-LINK-THIN-JOBS-ACTION: "-plugin-opt=jobs=5" // CHECK-LINK-THIN-JOBS-ACTION: "-plugin-opt=jobs=5"
//
// RUN: %clang -target x86_64-scei-ps4 -### %s -flto=thin -flto-jobs=5 2> %t
// RUN: FileCheck -check-prefix=CHECK-PS4-LINK-THIN-JOBS-ACTION < %t %s
//
// CHECK-PS4-LINK-THIN-JOBS-ACTION: "-lto-thin-debug-options= -generate-arange-section -threads=5"
// RUN: %clang -target x86_64-apple-darwin13.3.0 -### %s -flto=thin -flto-jobs=5 2> %t // RUN: %clang -target x86_64-apple-darwin13.3.0 -### %s -flto=thin -flto-jobs=5 2> %t
// RUN: FileCheck -check-prefix=CHECK-LINK-THIN-JOBS2-ACTION < %t %s // RUN: FileCheck -check-prefix=CHECK-LINK-THIN-JOBS2-ACTION < %t %s
// //
// CHECK-LINK-THIN-JOBS2-ACTION: "-mllvm" "-threads={{[0-9]+}}" // CHECK-LINK-THIN-JOBS2-ACTION: "-mllvm" "-threads={{[0-9]+}}"