[llvm] r191042 - Fix LTO handling of module-level assembly (PR14152).
Galina Kistanova
gkistanova at gmail.com
Fri Sep 20 11:32:47 PDT 2013
Hi Peter,
One of added tests llvm/trunk/test/tools/lto/cfi_endproc.ll always fails
on the builder:
http://lab.llvm.org:8011/builders/clang-X86_64-freebsd/builds/10381
Please have a look at it?
Thanks
Galina
On Thu, Sep 19, 2013 at 3:15 PM, Peter Collingbourne <peter at pcc.me.uk>wrote:
> Author: pcc
> Date: Thu Sep 19 17:15:52 2013
> New Revision: 191042
>
> URL: http://llvm.org/viewvc/llvm-project?rev=191042&view=rev
> Log:
> Fix LTO handling of module-level assembly (PR14152).
>
> Patch by Tom Roeder!
>
> Added:
> llvm/trunk/test/tools/lto/
> llvm/trunk/test/tools/lto/cfi_endproc.ll
> llvm/trunk/test/tools/lto/lit.local.cfg
> llvm/trunk/tools/llvm-lto/
> llvm/trunk/tools/llvm-lto/CMakeLists.txt
> llvm/trunk/tools/llvm-lto/Makefile
> llvm/trunk/tools/llvm-lto/llvm-lto.cpp
> Modified:
> llvm/trunk/test/CMakeLists.txt
> llvm/trunk/test/Makefile
> llvm/trunk/test/lit.cfg
> llvm/trunk/test/lit.site.cfg.in
> llvm/trunk/tools/CMakeLists.txt
> llvm/trunk/tools/Makefile
> llvm/trunk/tools/lto/LTOModule.cpp
>
> Modified: llvm/trunk/test/CMakeLists.txt
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CMakeLists.txt?rev=191042&r1=191041&r2=191042&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/CMakeLists.txt (original)
> +++ llvm/trunk/test/CMakeLists.txt Thu Sep 19 17:15:52 2013
> @@ -28,6 +28,7 @@ set(LLVM_TEST_DEPENDS
> llvm-extract
> llvm-dwarfdump
> llvm-link
> + llvm-lto
> llvm-mc
> llvm-mcmarkup
> llvm-nm
>
> Modified: llvm/trunk/test/Makefile
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Makefile?rev=191042&r1=191041&r2=191042&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/Makefile (original)
> +++ llvm/trunk/test/Makefile Thu Sep 19 17:15:52 2013
> @@ -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
>
> Modified: llvm/trunk/test/lit.cfg
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.cfg?rev=191042&r1=191041&r2=191042&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/lit.cfg (original)
> +++ llvm/trunk/test/lit.cfg Thu Sep 19 17:15:52 2013
> @@ -221,7 +221,9 @@ for pattern in [r"\bbugpoint\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",
>
> Modified: llvm/trunk/test/lit.site.cfg.in
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.site.cfg.in?rev=191042&r1=191041&r2=191042&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/lit.site.cfg.in (original)
> +++ llvm/trunk/test/lit.site.cfg.in Thu Sep 19 17:15:52 2013
> @@ -14,7 +14,6 @@ config.python_executable = "@PYTHON_EXEC
> 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@"
>
> Added: llvm/trunk/test/tools/lto/cfi_endproc.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/lto/cfi_endproc.ll?rev=191042&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/tools/lto/cfi_endproc.ll (added)
> +++ llvm/trunk/test/tools/lto/cfi_endproc.ll Thu Sep 19 17:15:52 2013
> @@ -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
>
> Added: llvm/trunk/test/tools/lto/lit.local.cfg
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/lto/lit.local.cfg?rev=191042&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/tools/lto/lit.local.cfg (added)
> +++ llvm/trunk/test/tools/lto/lit.local.cfg Thu Sep 19 17:15:52 2013
> @@ -0,0 +1,3 @@
> +targets = set(config.root.targets_to_build.split())
> +if not 'X86' in targets:
> + config.unsupported = True
>
> Modified: llvm/trunk/tools/CMakeLists.txt
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/CMakeLists.txt?rev=191042&r1=191041&r2=191042&view=diff
>
> ==============================================================================
> --- llvm/trunk/tools/CMakeLists.txt (original)
> +++ llvm/trunk/tools/CMakeLists.txt Thu Sep 19 17:15:52 2013
> @@ -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 )
>
> Modified: llvm/trunk/tools/Makefile
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=191042&r1=191041&r2=191042&view=diff
>
> ==============================================================================
> --- llvm/trunk/tools/Makefile (original)
> +++ llvm/trunk/tools/Makefile Thu Sep 19 17:15:52 2013
> @@ -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
>
> Added: llvm/trunk/tools/llvm-lto/CMakeLists.txt
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-lto/CMakeLists.txt?rev=191042&view=auto
>
> ==============================================================================
> --- llvm/trunk/tools/llvm-lto/CMakeLists.txt (added)
> +++ llvm/trunk/tools/llvm-lto/CMakeLists.txt Thu Sep 19 17:15:52 2013
> @@ -0,0 +1,7 @@
> +add_llvm_tool(llvm-lto
> + llvm-lto.cpp
> + )
> +
> +target_link_libraries(llvm-lto LTO LLVMSupport)
> +
> +add_dependencies(llvm-lto lto)
>
> Added: llvm/trunk/tools/llvm-lto/Makefile
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-lto/Makefile?rev=191042&view=auto
>
> ==============================================================================
> --- llvm/trunk/tools/llvm-lto/Makefile (added)
> +++ llvm/trunk/tools/llvm-lto/Makefile Thu Sep 19 17:15:52 2013
> @@ -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
>
> Added: llvm/trunk/tools/llvm-lto/llvm-lto.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-lto/llvm-lto.cpp?rev=191042&view=auto
>
> ==============================================================================
> --- llvm/trunk/tools/llvm-lto/llvm-lto.cpp (added)
> +++ llvm/trunk/tools/llvm-lto/llvm-lto.cpp Thu Sep 19 17:15:52 2013
> @@ -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;
> +}
>
> Modified: llvm/trunk/tools/lto/LTOModule.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/LTOModule.cpp?rev=191042&r1=191041&r2=191042&view=diff
>
> ==============================================================================
> --- llvm/trunk/tools/lto/LTOModule.cpp (original)
> +++ llvm/trunk/tools/lto/LTOModule.cpp Thu Sep 19 17:15:52 2013
> @@ -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;
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20130920/028c3fe3/attachment.html>
More information about the llvm-commits
mailing list