[PATCH] D46598: Add support for LTO plugin option obj-path
Rumeet Dhindsa via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue May 8 14:37:29 PDT 2018
rdhindsa updated this revision to Diff 145791.
rdhindsa added a comment.
Removed the test which ensured that regular LTO file was written with index only option. It needs to have obj-path option to write that file.
Repository:
rLLD LLVM Linker
https://reviews.llvm.org/D46598
Files:
lld/ELF/Config.h
lld/ELF/Driver.cpp
lld/ELF/LTO.cpp
lld/test/ELF/lto/thinlto.ll
Index: lld/test/ELF/lto/thinlto.ll
===================================================================
--- lld/test/ELF/lto/thinlto.ll
+++ lld/test/ELF/lto/thinlto.ll
@@ -49,11 +49,6 @@
; RUN: not ls %t2.o.thinlto.bc
; RUN: not ls %t4.o.thinlto.bc
-; Ensure lld generates one regular LTO file via splitting for ThinLTO builds
-; RUN: rm -f %t.lto.o
-; RUN: ld.lld -save-temps --plugin-opt=thinlto-index-only -shared %t.o %t2.o -o %t
-; RUN: llvm-readobj -h %t.lto.o | FileCheck %s --check-prefix=FORMAT
-
; First force single-threaded mode
; RUN: rm -f %t.lto.o %t1.lto.o
; RUN: ld.lld -save-temps --thinlto-jobs=1 -shared %t.o %t2.o -o %t
@@ -71,6 +66,12 @@
; stable on the final output file itself.
; RUN: ld.lld -shared %t.o %t2.o -o %t2
+; Test to ensure that thinlto-index-only with obj-path creates the file.
+; RUN: rm -f %t5.o
+; RUN: ld.lld --plugin-opt=thinlto-index-only --plugin-opt=obj-path=%t5.o -shared %t.o %t2.o -o %t4
+; RUN: llvm-readobj -h %t5.o | FileCheck %s --check-prefix=FORMAT
+; RUN: llvm-nm %t5.o | count 0
+
; NM: T f
; NM1: T f
; NM1-NOT: U g
Index: lld/ELF/LTO.cpp
===================================================================
--- lld/ELF/LTO.cpp
+++ lld/ELF/LTO.cpp
@@ -279,8 +279,8 @@
openFile(Path + ".imports");
}
- if (Config->SaveTemps)
- saveBuffer(Buff[0], Config->OutputFile + ".lto.o");
+ if (!Config->LTOObjPath.empty())
+ saveBuffer(Buff[0], Config->LTOObjPath);
// ThinLTO with index only option is required to generate only the index
// files. After that, we exit from linker and ThinLTO backend runs in a
Index: lld/ELF/Driver.cpp
===================================================================
--- lld/ELF/Driver.cpp
+++ lld/ELF/Driver.cpp
@@ -796,6 +796,8 @@
Config->LTODebugPassManager = true;
} else if (S.startswith("sample-profile=")) {
Config->LTOSampleProfile = S.substr(15);
+ } else if (S.startswith("obj-path=")) {
+ Config->LTOObjPath = S.substr(9);
} else if (S == "thinlto-index-only") {
Config->ThinLTOIndexOnly = true;
} else if (S.startswith("thinlto-index-only=")) {
Index: lld/ELF/Config.h
===================================================================
--- lld/ELF/Config.h
+++ lld/ELF/Config.h
@@ -86,6 +86,7 @@
llvm::StringRef Init;
llvm::StringRef LTOAAPipeline;
llvm::StringRef LTONewPmPasses;
+ llvm::StringRef LTOObjPath;
llvm::StringRef LTOSampleProfile;
llvm::StringRef MapFile;
llvm::StringRef OutputFile;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D46598.145791.patch
Type: text/x-patch
Size: 2516 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180508/00862a96/attachment.bin>
More information about the llvm-commits
mailing list