diff options
| -rw-r--r-- | test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | test/Makefile | 11 | ||||
| -rw-r--r-- | test/lit.cfg | 4 | ||||
| -rw-r--r-- | test/lit.site.cfg.in | 1 | ||||
| -rw-r--r-- | test/tools/lto/cfi_endproc.ll | 20 | ||||
| -rw-r--r-- | test/tools/lto/lit.local.cfg | 3 | ||||
| -rw-r--r-- | tools/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/Makefile | 7 | ||||
| -rw-r--r-- | tools/llvm-lto/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tools/llvm-lto/Makefile | 22 | ||||
| -rw-r--r-- | tools/llvm-lto/llvm-lto.cpp | 103 | ||||
| -rw-r--r-- | tools/lto/LTOModule.cpp | 3 |
12 files changed, 167 insertions, 17 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 392f5f218e..4effaf727c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -28,6 +28,7 @@ set(LLVM_TEST_DEPENDS llvm-extract llvm-dwarfdump llvm-link + llvm-lto llvm-mc llvm-mcmarkup llvm-nm diff --git a/test/Makefile b/test/Makefile index 33c8a0c1dc..fc85f24e7e 100644 --- a/test/Makefile +++ b/test/Makefile @@ -116,16 +116,6 @@ else ENABLE_ASSERTIONS=1 endif -# Derive whether or not LTO is enabled by checking the extra options. -LTO_IS_ENABLED := 0 -ifneq ($(findstring -flto,$(CompileCommonOpts)),) -LTO_IS_ENABLED := 1 -else -ifneq ($(findstring -O4,$(CompileCommonOpts)),) -LTO_IS_ENABLED := 1 -endif -endif - lit.site.cfg: FORCE @echo "Making LLVM 'lit.site.cfg' file..." @$(ECHOPATH) s=@LLVM_HOST_TRIPLE@=$(HOST_TRIPLE)=g > lit.tmp @@ -139,7 +129,6 @@ lit.site.cfg: FORCE @$(ECHOPATH) s=@OCAMLOPT@=$(OCAMLOPT) -cc $(subst *,'\\\"',*$(subst =,"\\=",$(CXX_FOR_OCAMLOPT))*) -I $(LibDir)/ocaml=g >> lit.tmp @$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> lit.tmp @$(ECHOPATH) s=@ENABLE_ASSERTIONS@=$(ENABLE_ASSERTIONS)=g >> lit.tmp - @$(ECHOPATH) s=@LTO_IS_ENABLED@=$(LTO_IS_ENABLED)=g >> lit.tmp @$(ECHOPATH) s=@TARGETS_TO_BUILD@=$(TARGETS_TO_BUILD)=g >> lit.tmp @$(ECHOPATH) s=@LLVM_BINDINGS@=$(BINDINGS_TO_BUILD)=g >> lit.tmp @$(ECHOPATH) s=@HOST_OS@=$(HOST_OS)=g >> lit.tmp diff --git a/test/lit.cfg b/test/lit.cfg index 9e4e0b0229..ea9303d197 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -221,7 +221,9 @@ for pattern in [r"\bbugpoint\b(?!-)", r"(?<!/|-)\bclang\b(?!-)", r"\bllvm-size\b", # Match llvmc but not -llvmc NOHYPHEN + r"\bllvmc\b", - r"\blto\b", + r"\bllvm-lto\b", + # Match lto but not -lto + NOHYPHEN + r"\blto\b", # Don't match '.opt', '-opt', # '^opt' or '/opt'. r"\bmacho-dump\b", r"(?<!\.|-|\^|/)\bopt\b", diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index 6ebdddf5f8..72fd9c9ff7 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -14,7 +14,6 @@ config.python_executable = "@PYTHON_EXECUTABLE@" config.ocamlopt_executable = "@OCAMLOPT@" config.enable_shared = @ENABLE_SHARED@ config.enable_assertions = @ENABLE_ASSERTIONS@ -config.lto_is_enabled = "@LTO_IS_ENABLED@" config.targets_to_build = "@TARGETS_TO_BUILD@" config.llvm_bindings = "@LLVM_BINDINGS@" config.host_os = "@HOST_OS@" diff --git a/test/tools/lto/cfi_endproc.ll b/test/tools/lto/cfi_endproc.ll new file mode 100644 index 0000000000..0a47b0225e --- /dev/null +++ b/test/tools/lto/cfi_endproc.ll @@ -0,0 +1,20 @@ +; RUN: llvm-as < %s >%t1 +; RUN: llvm-lto -o %t2 %t1 + +target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +module asm ".text" +module asm ".align 16, 0x90" +module asm ".type PR14512, @function" +module asm "PR14512:.cfi_startproc" +module asm "ret" +module asm ".cfi_endproc" + +declare void @PR14512() + +define i32 @main(i32 %argc, i8** %argv) { + call void @PR14512() + ret i32 0 +} +; XFAIL: win32 diff --git a/test/tools/lto/lit.local.cfg b/test/tools/lto/lit.local.cfg new file mode 100644 index 0000000000..6df0e03ee6 --- /dev/null +++ b/test/tools/lto/lit.local.cfg @@ -0,0 +1,3 @@ +targets = set(config.root.targets_to_build.split()) +if not 'X86' in targets: + config.unsupported = True diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 1f15fc0b64..468d396b59 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -45,8 +45,10 @@ add_llvm_tool_subdirectory(yaml2obj) if( NOT WIN32 ) add_llvm_tool_subdirectory(lto) + add_llvm_tool_subdirectory(llvm-lto) else() ignore_llvm_tool_subdirectory(lto) + ignore_llvm_tool_subdirectory(llvm-lto) endif() if( LLVM_ENABLE_PIC ) diff --git a/tools/Makefile b/tools/Makefile index b7375c9970..d3d4593a50 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -54,11 +54,10 @@ endif ifndef ONLY_TOOLS ifeq ($(ENABLE_PIC),1) # gold only builds if binutils is around. It requires "lto" to build before - # it so it is added to DIRS. + # it so it is added to DIRS. llvm-lto also requires lto + DIRS += lto llvm-lto ifdef BINUTILS_INCDIR - DIRS += lto gold - else - PARALLEL_DIRS += lto + DIRS += gold endif PARALLEL_DIRS += bugpoint-passes diff --git a/tools/llvm-lto/CMakeLists.txt b/tools/llvm-lto/CMakeLists.txt new file mode 100644 index 0000000000..b253b69c1b --- /dev/null +++ b/tools/llvm-lto/CMakeLists.txt @@ -0,0 +1,7 @@ +add_llvm_tool(llvm-lto + llvm-lto.cpp + ) + +target_link_libraries(llvm-lto LTO LLVMSupport) + +add_dependencies(llvm-lto lto) diff --git a/tools/llvm-lto/Makefile b/tools/llvm-lto/Makefile new file mode 100644 index 0000000000..1b1a1f8b38 --- /dev/null +++ b/tools/llvm-lto/Makefile @@ -0,0 +1,22 @@ +##===- tools/llvm-lto/Makefile -----------------------------*- Makefile -*-===## +# +# The LLVM Compiler Infrastructure +# +# This file is distributed under the University of Illinois Open Source +# License. See LICENSE.TXT for details. +# +##===----------------------------------------------------------------------===## + +LEVEL := ../.. +TOOLNAME := llvm-lto +LINK_COMPONENTS := support + +# This tool has no plugins, optimize startup time. +TOOL_NO_EXPORTS := 1 + +NO_INSTALL := 1 + +include $(LEVEL)/Makefile.common + +LDFLAGS += -L$(LibDir) +LIBS += -lLTO diff --git a/tools/llvm-lto/llvm-lto.cpp b/tools/llvm-lto/llvm-lto.cpp new file mode 100644 index 0000000000..f25037c37a --- /dev/null +++ b/tools/llvm-lto/llvm-lto.cpp @@ -0,0 +1,103 @@ +//===-- llvm-lto: a simple command-line program to link modules with LTO --===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This program takes in a list of bitcode files, links them, performs link-time +// optimization, and outputs an object file. +// +//===----------------------------------------------------------------------===// + +#include "llvm-c/lto.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/ManagedStatic.h" +#include "llvm/Support/PrettyStackTrace.h" +#include "llvm/Support/Signals.h" +#include "llvm/Support/raw_ostream.h" + +using namespace llvm; + +static cl::list<std::string> InputFilenames(cl::Positional, cl::OneOrMore, + cl::desc("<input bitcode files>")); + +static cl::opt<std::string> OutputFilename("o", + cl::desc("Override output filename"), + cl::init(""), + cl::value_desc("filename")); + +int main(int argc, char **argv) { + // Print a stack trace if we signal out. + sys::PrintStackTraceOnErrorSignal(); + PrettyStackTraceProgram X(argc, argv); + + llvm_shutdown_obj Y; // Call llvm_shutdown() on exit. + cl::ParseCommandLineOptions(argc, argv, "llvm LTO linker\n"); + + unsigned BaseArg = 0; + std::string ErrorMessage; + + lto_code_gen_t code_gen = lto_codegen_create(); + if (code_gen == NULL) + errs() << argv[0] << ": error creating a code generation module: " + << lto_get_error_message() << "\n"; + + lto_codegen_set_pic_model(code_gen, LTO_CODEGEN_PIC_MODEL_DYNAMIC); + lto_codegen_set_debug_model(code_gen, LTO_DEBUG_MODEL_DWARF); + + for (unsigned i = BaseArg; i < InputFilenames.size(); ++i) { + lto_module_t BitcodeModule = lto_module_create(InputFilenames[i].c_str()); + if (BitcodeModule == NULL) { + errs() << argv[0] << ": error loading file '" << InputFilenames[i] + << "': " << lto_get_error_message() << "\n"; + return 1; + } + + if (lto_codegen_add_module(code_gen, BitcodeModule)) { + errs() << argv[0] << ": error adding file '" << InputFilenames[i] + << "': " << lto_get_error_message() << "\n"; + lto_module_dispose(BitcodeModule); + return 1; + } + + lto_module_dispose(BitcodeModule); + } + + if (!OutputFilename.empty()) { + size_t len = 0; + const void *Code = lto_codegen_compile(code_gen, &len); + if (Code == NULL) { + errs() << argv[0] + << ": error compiling the code: " << lto_get_error_message() + << "\n"; + return 1; + } + + std::string ErrorInfo; + raw_fd_ostream FileStream(OutputFilename.c_str(), ErrorInfo); + if (!ErrorInfo.empty()) { + errs() << argv[0] << ": error opening the file '" << OutputFilename + << "': " << ErrorInfo << "\n"; + return 1; + } + + FileStream.write(reinterpret_cast<const char *>(Code), len); + } else { + const char *OutputName = NULL; + if (lto_codegen_compile_to_file(code_gen, &OutputName)) { + errs() << argv[0] + << ": error compiling the code: " << lto_get_error_message() + << "\n"; + return 1; + } + + outs() << "Wrote native object file '" << OutputName << "'\n"; + } + + lto_codegen_dispose(code_gen); + + return 0; +} diff --git a/tools/lto/LTOModule.cpp b/tools/lto/LTOModule.cpp index 1a9d8f5c4e..87e3573de9 100644 --- a/tools/lto/LTOModule.cpp +++ b/tools/lto/LTOModule.cpp @@ -792,6 +792,9 @@ namespace { const MCSymbol *Label, unsigned PointerSize) {} virtual void FinishImpl() {} + virtual void EmitCFIEndProcImpl(MCDwarfFrameInfo &Frame) { + RecordProcEnd(Frame); + } static bool classof(const MCStreamer *S) { return S->getKind() == SK_RecordStreamer; |