llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Edd Dawson (playstation-edd) <details> <summary>Changes</summary> The driver doesn't know if LTO will occur at link time. That's determined by the presence or absence of LLVM bitcode objects among those ingested by the linker. For this reason, LTO options for codegen etc must be passed to the linker unconditionally. If LTO does not occur, these options have no effect. Also simplify the way LTO options are supplied to the PS4 linker. `-lto-debug-options` and `-lto-thin-debug-options` are combined and routed to the same place. So, always use the former, regardless of full/thin LTO mode. SIE tracker: TOOLCHAIN-16575 --- Full diff: https://github.com/llvm/llvm-project/pull/100423.diff 5 Files Affected: - (modified) clang/lib/Driver/ToolChains/PS4CPU.cpp (+36-47) - (modified) clang/test/Driver/lto-jobs.c (+4-1) - (modified) clang/test/Driver/ps4-linker.c (+8-10) - (modified) clang/test/Driver/ps5-linker.c (+4-6) - (modified) clang/test/Driver/unified-lto.c (+22-1) ``````````diff diff --git a/clang/lib/Driver/ToolChains/PS4CPU.cpp b/clang/lib/Driver/ToolChains/PS4CPU.cpp index d6af9388e54a6..958fec5b96361 100644 --- a/clang/lib/Driver/ToolChains/PS4CPU.cpp +++ b/clang/lib/Driver/ToolChains/PS4CPU.cpp @@ -152,48 +152,38 @@ void tools::PS4cpu::Linker::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back(Output.getFilename()); } - const bool UseLTO = D.isUsingLTO(); const bool UseJMC = Args.hasFlag(options::OPT_fjmc, options::OPT_fno_jmc, false); + const bool UnifiedLTO = Args.hasFlag(options::OPT_funified_lto, + options::OPT_fno_unified_lto, true); + const char *LTOArgs = ""; - auto AddCodeGenFlag = [&](Twine Flag) { + auto AddLTOFlag = [&](Twine Flag) { LTOArgs = Args.MakeArgString(Twine(LTOArgs) + " " + Flag); }; - if (UseLTO) { - // This tells LTO to perform JustMyCode instrumentation. - if (UseJMC) - AddCodeGenFlag("-enable-jmc-instrument"); - - if (Arg *A = Args.getLastArg(options::OPT_fcrash_diagnostics_dir)) - AddCodeGenFlag(Twine("-crash-diagnostics-dir=") + A->getValue()); + // If the linker sees bitcode objects it will perform LTO. We can't tell + // whether or not that will be the case at this point. So, unconditionally + // pass LTO options to ensure proper codegen, metadata production, etc if + // LTO indeed occurs. + if (UnifiedLTO) + CmdArgs.push_back(D.getLTOMode() == LTOK_Thin ? "--lto=thin" + : "--lto=full"); + if (UseJMC) + AddLTOFlag("-enable-jmc-instrument"); - StringRef Parallelism = getLTOParallelism(Args, D); - if (!Parallelism.empty()) - AddCodeGenFlag(Twine("-threads=") + Parallelism); + if (Arg *A = Args.getLastArg(options::OPT_fcrash_diagnostics_dir)) + AddLTOFlag(Twine("-crash-diagnostics-dir=") + A->getValue()); - const char *Prefix = nullptr; - if (D.getLTOMode() == LTOK_Thin) - Prefix = "-lto-thin-debug-options="; - else if (D.getLTOMode() == LTOK_Full) - Prefix = "-lto-debug-options="; - else - llvm_unreachable("new LTO mode?"); + if (StringRef Threads = getLTOParallelism(Args, D); !Threads.empty()) + AddLTOFlag(Twine("-threads=") + Threads); - CmdArgs.push_back(Args.MakeArgString(Twine(Prefix) + LTOArgs)); - } + CmdArgs.push_back(Args.MakeArgString(Twine("-lto-debug-options=") + LTOArgs)); if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) TC.addSanitizerArgs(Args, CmdArgs, "-l", ""); - if (D.isUsingLTO() && Args.hasArg(options::OPT_funified_lto)) { - if (D.getLTOMode() == LTOK_Thin) - CmdArgs.push_back("--lto=thin"); - else if (D.getLTOMode() == LTOK_Full) - CmdArgs.push_back("--lto=full"); - } - Args.addAllArgs(CmdArgs, {options::OPT_L, options::OPT_T_Group, options::OPT_s, options::OPT_t}); @@ -259,37 +249,36 @@ void tools::PS5cpu::Linker::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back(Output.getFilename()); } - const bool UseLTO = D.isUsingLTO(); const bool UseJMC = Args.hasFlag(options::OPT_fjmc, options::OPT_fno_jmc, false); - auto AddCodeGenFlag = [&](Twine Flag) { + const bool UnifiedLTO = Args.hasFlag(options::OPT_funified_lto, + options::OPT_fno_unified_lto, true); + + auto AddLTOFlag = [&](Twine Flag) { CmdArgs.push_back(Args.MakeArgString(Twine("-plugin-opt=") + Flag)); }; - if (UseLTO) { - // This tells LTO to perform JustMyCode instrumentation. - if (UseJMC) - AddCodeGenFlag("-enable-jmc-instrument"); + // If the linker sees bitcode objects it will perform LTO. We can't tell + // whether or not that will be the case at this point. So unconditionally + // pass LTO options to ensure proper codegen, metadata production, etc if + // LTO indeed occurs. + if (UnifiedLTO) + CmdArgs.push_back(D.getLTOMode() == LTOK_Thin ? "--lto=thin" + : "--lto=full"); - if (Arg *A = Args.getLastArg(options::OPT_fcrash_diagnostics_dir)) - AddCodeGenFlag(Twine("-crash-diagnostics-dir=") + A->getValue()); + if (UseJMC) + AddLTOFlag("-enable-jmc-instrument"); - StringRef Parallelism = getLTOParallelism(Args, D); - if (!Parallelism.empty()) - CmdArgs.push_back(Args.MakeArgString(Twine("-plugin-opt=jobs=") + Parallelism)); - } + if (Arg *A = Args.getLastArg(options::OPT_fcrash_diagnostics_dir)) + AddLTOFlag(Twine("-crash-diagnostics-dir=") + A->getValue()); + + if (StringRef Jobs = getLTOParallelism(Args, D); !Jobs.empty()) + AddLTOFlag(Twine("jobs=") + Jobs); if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) TC.addSanitizerArgs(Args, CmdArgs, "-l", ""); - if (D.isUsingLTO() && Args.hasArg(options::OPT_funified_lto)) { - if (D.getLTOMode() == LTOK_Thin) - CmdArgs.push_back("--lto=thin"); - else if (D.getLTOMode() == LTOK_Full) - CmdArgs.push_back("--lto=full"); - } - Args.addAllArgs(CmdArgs, {options::OPT_L, options::OPT_T_Group, options::OPT_s, options::OPT_t}); diff --git a/clang/test/Driver/lto-jobs.c b/clang/test/Driver/lto-jobs.c index b4f109e4c502c..2c7ca02ea4779 100644 --- a/clang/test/Driver/lto-jobs.c +++ b/clang/test/Driver/lto-jobs.c @@ -6,12 +6,15 @@ // 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: %clang --target=x86_64-sie-ps5 -### %s -flto-jobs=5 2> %t +// RUN: FileCheck -check-prefix=CHECK-LINK-THIN-JOBS-ACTION < %t %s +// // 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= -threads=5" +// CHECK-PS4-LINK-THIN-JOBS-ACTION: "-lto-debug-options= -threads=5" // 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 diff --git a/clang/test/Driver/ps4-linker.c b/clang/test/Driver/ps4-linker.c index be989cdd7d5b1..449da3040e758 100644 --- a/clang/test/Driver/ps4-linker.c +++ b/clang/test/Driver/ps4-linker.c @@ -1,20 +1,18 @@ // Test the driver's control over the JustMyCode behavior with linker flags. -// RUN: %clang --target=x86_64-scei-ps4 -fjmc %s -### 2>&1 | FileCheck --check-prefixes=CHECK,CHECK-LIB %s -// RUN: %clang --target=x86_64-scei-ps4 -flto=thin -fjmc %s -### 2>&1 | FileCheck --check-prefixes=CHECK-THIN-LTO,CHECK-LIB %s -// RUN: %clang --target=x86_64-scei-ps4 -flto=full -fjmc %s -### 2>&1 | FileCheck --check-prefixes=CHECK-FULL-LTO,CHECK-LIB %s +// RUN: %clang --target=x86_64-scei-ps4 -fjmc %s -### 2>&1 | FileCheck --check-prefixes=CHECK-LTO,CHECK-LIB %s +// RUN: %clang --target=x86_64-scei-ps4 -flto=thin -fjmc %s -### 2>&1 | FileCheck --check-prefixes=CHECK-LTO,CHECK-LIB %s +// RUN: %clang --target=x86_64-scei-ps4 -flto=full -fjmc %s -### 2>&1 | FileCheck --check-prefixes=CHECK-LTO,CHECK-LIB %s -// CHECK-NOT: -enable-jmc-instrument -// CHECK-THIN-LTO: "-lto-thin-debug-options= -enable-jmc-instrument" -// CHECK-FULL-LTO: "-lto-debug-options= -enable-jmc-instrument" +// CHECK-LTO: "-lto-debug-options= -enable-jmc-instrument" // Check the default library name. // CHECK-LIB: "--whole-archive" "-lSceDbgJmc" "--no-whole-archive" // Test the driver's control over the -fcrash-diagnostics-dir behavior with linker flags. -// RUN: %clang --target=x86_64-scei-ps4 -flto=thin -fcrash-diagnostics-dir=mydumps %s -### 2>&1 | FileCheck --check-prefixes=CHECK-DIAG-THIN-LTO %s -// RUN: %clang --target=x86_64-scei-ps4 -flto=full -fcrash-diagnostics-dir=mydumps %s -### 2>&1 | FileCheck --check-prefixes=CHECK-DIAG-FULL-LTO %s +// RUN: %clang --target=x86_64-scei-ps4 -fcrash-diagnostics-dir=mydumps %s -### 2>&1 | FileCheck --check-prefixes=CHECK-DIAG-LTO %s +// RUN: %clang --target=x86_64-scei-ps4 -flto=thin -fcrash-diagnostics-dir=mydumps %s -### 2>&1 | FileCheck --check-prefixes=CHECK-DIAG-LTO %s +// RUN: %clang --target=x86_64-scei-ps4 -flto=full -fcrash-diagnostics-dir=mydumps %s -### 2>&1 | FileCheck --check-prefixes=CHECK-DIAG-LTO %s -// CHECK-DIAG-THIN-LTO: "-lto-thin-debug-options= -crash-diagnostics-dir=mydumps" -// CHECK-DIAG-FULL-LTO: "-lto-debug-options= -crash-diagnostics-dir=mydumps" +// CHECK-DIAG-LTO: "-lto-debug-options= -crash-diagnostics-dir=mydumps" diff --git a/clang/test/Driver/ps5-linker.c b/clang/test/Driver/ps5-linker.c index 9f1e3a273b2db..cf39d5bae97ac 100644 --- a/clang/test/Driver/ps5-linker.c +++ b/clang/test/Driver/ps5-linker.c @@ -1,10 +1,9 @@ // Test the driver's control over the JustMyCode behavior with linker flags. // RUN: %clang --target=x86_64-scei-ps5 -fjmc %s -### 2>&1 | FileCheck --check-prefixes=CHECK,CHECK-LIB %s -// RUN: %clang --target=x86_64-scei-ps5 -flto -fjmc %s -### 2>&1 | FileCheck --check-prefixes=CHECK-LTO,CHECK-LIB %s +// RUN: %clang --target=x86_64-scei-ps5 -flto -fjmc %s -### 2>&1 | FileCheck --check-prefixes=CHECK,CHECK-LIB %s -// CHECK-NOT: -plugin-opt=-enable-jmc-instrument -// CHECK-LTO: -plugin-opt=-enable-jmc-instrument +// CHECK: -plugin-opt=-enable-jmc-instrument // Check the default library name. // CHECK-LIB: "--whole-archive" "-lSceJmc_nosubmission" "--no-whole-archive" @@ -12,7 +11,6 @@ // Test the driver's control over the -fcrash-diagnostics-dir behavior with linker flags. // RUN: %clang --target=x86_64-scei-ps5 -fcrash-diagnostics-dir=mydumps %s -### 2>&1 | FileCheck --check-prefixes=CHECK-DIAG %s -// RUN: %clang --target=x86_64-scei-ps5 -flto -fcrash-diagnostics-dir=mydumps %s -### 2>&1 | FileCheck --check-prefixes=CHECK-DIAG-LTO %s +// RUN: %clang --target=x86_64-scei-ps5 -flto -fcrash-diagnostics-dir=mydumps %s -### 2>&1 | FileCheck --check-prefixes=CHECK-DIAG %s -// CHECK-DIAG-NOT: -plugin-opt=-crash-diagnostics-dir=mydumps -// CHECK-DIAG-LTO: -plugin-opt=-crash-diagnostics-dir=mydumps +// CHECK-DIAG: -plugin-opt=-crash-diagnostics-dir=mydumps diff --git a/clang/test/Driver/unified-lto.c b/clang/test/Driver/unified-lto.c index 3a6fe44f5b32d..490aaca59939d 100644 --- a/clang/test/Driver/unified-lto.c +++ b/clang/test/Driver/unified-lto.c @@ -7,6 +7,27 @@ // NOUNIT-NOT: "-flto-unit" // RUN: %clang --target=x86_64-sie-ps5 -### %s -funified-lto 2>&1 | FileCheck --check-prefix=NOUNILTO %s -// NOUNILTO: clang: warning: argument unused during compilation: '-funified-lto' // NOUNILTO: "-cc1" // NOUNILTO-NOT: "-funified-lto + +// On PlayStation -funified-lto is the default. `-flto(=...)` influences the +// `--lto=...` option passed to linker, unless `-fno-unified-lto` is supplied. +// PS4: +// RUN: %clang --target=x86_64-sie-ps4 -### %s 2>&1 | FileCheck --check-prefixes=LD,LTOFULL %s +// RUN: %clang --target=x86_64-sie-ps4 -### %s -flto 2>&1 | FileCheck --check-prefixes=LD,LTOFULL %s +// RUN: %clang --target=x86_64-sie-ps4 -### %s -flto=full 2>&1 | FileCheck --check-prefixes=LD,LTOFULL %s +// RUN: %clang --target=x86_64-sie-ps4 -### %s -flto=thin 2>&1 | FileCheck --check-prefixes=LD,LTOTHIN %s +// RUN: %clang --target=x86_64-sie-ps4 -### %s -fno-unified-lto -flto=full 2>&1 | FileCheck --check-prefixes=LD,NOLTO %s +// RUN: %clang --target=x86_64-sie-ps4 -### %s -fno-unified-lto -flto=thin 2>&1 | FileCheck --check-prefixes=LD,NOLTO %s +// PS5: +// RUN: %clang --target=x86_64-sie-ps5 -### %s 2>&1 | FileCheck --check-prefixes=LD,LTOFULL %s +// RUN: %clang --target=x86_64-sie-ps5 -### %s -flto 2>&1 | FileCheck --check-prefixes=LD,LTOFULL %s +// RUN: %clang --target=x86_64-sie-ps5 -### %s -flto=full 2>&1 | FileCheck --check-prefixes=LD,LTOFULL %s +// RUN: %clang --target=x86_64-sie-ps5 -### %s -flto=thin 2>&1 | FileCheck --check-prefixes=LD,LTOTHIN %s +// RUN: %clang --target=x86_64-sie-ps5 -### %s -fno-unified-lto -flto=full 2>&1 | FileCheck --check-prefixes=LD,NOLTO %s +// RUN: %clang --target=x86_64-sie-ps5 -### %s -fno-unified-lto -flto=thin 2>&1 | FileCheck --check-prefixes=LD,NOLTO %s + +// LD: {{.*ld}}" +// LTOFULL-SAME: "--lto=full" +// LTOTHIN-SAME: "--lto=thin" +// NOLTO-NOT: "--lto `````````` </details> https://github.com/llvm/llvm-project/pull/100423 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
