<div dir="ltr">Hi Peter,<br><br>One of added tests llvm/trunk/test/tools/lto/cfi_endproc.ll always fails on the builder:<br><a href="http://lab.llvm.org:8011/builders/clang-X86_64-freebsd/builds/10381">http://lab.llvm.org:8011/builders/clang-X86_64-freebsd/builds/10381</a><br>
Please have a look at it?<br><br>Thanks<br><br>Galina<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Sep 19, 2013 at 3:15 PM, Peter Collingbourne <span dir="ltr"><<a href="mailto:peter@pcc.me.uk" target="_blank">peter@pcc.me.uk</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: pcc<br>
Date: Thu Sep 19 17:15:52 2013<br>
New Revision: 191042<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=191042&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=191042&view=rev</a><br>
Log:<br>
Fix LTO handling of module-level assembly (PR14152).<br>
<br>
Patch by Tom Roeder!<br>
<br>
Added:<br>
llvm/trunk/test/tools/lto/<br>
llvm/trunk/test/tools/lto/cfi_endproc.ll<br>
llvm/trunk/test/tools/lto/lit.local.cfg<br>
llvm/trunk/tools/llvm-lto/<br>
llvm/trunk/tools/llvm-lto/CMakeLists.txt<br>
llvm/trunk/tools/llvm-lto/Makefile<br>
llvm/trunk/tools/llvm-lto/llvm-lto.cpp<br>
Modified:<br>
llvm/trunk/test/CMakeLists.txt<br>
llvm/trunk/test/Makefile<br>
llvm/trunk/test/lit.cfg<br>
llvm/trunk/test/<a href="http://lit.site.cfg.in" target="_blank">lit.site.cfg.in</a><br>
llvm/trunk/tools/CMakeLists.txt<br>
llvm/trunk/tools/Makefile<br>
llvm/trunk/tools/lto/LTOModule.cpp<br>
<br>
Modified: llvm/trunk/test/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CMakeLists.txt?rev=191042&r1=191041&r2=191042&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CMakeLists.txt?rev=191042&r1=191041&r2=191042&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CMakeLists.txt (original)<br>
+++ llvm/trunk/test/CMakeLists.txt Thu Sep 19 17:15:52 2013<br>
@@ -28,6 +28,7 @@ set(LLVM_TEST_DEPENDS<br>
llvm-extract<br>
llvm-dwarfdump<br>
llvm-link<br>
+ llvm-lto<br>
llvm-mc<br>
llvm-mcmarkup<br>
llvm-nm<br>
<br>
Modified: llvm/trunk/test/Makefile<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Makefile?rev=191042&r1=191041&r2=191042&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Makefile?rev=191042&r1=191041&r2=191042&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Makefile (original)<br>
+++ llvm/trunk/test/Makefile Thu Sep 19 17:15:52 2013<br>
@@ -116,16 +116,6 @@ else<br>
ENABLE_ASSERTIONS=1<br>
endif<br>
<br>
-# Derive whether or not LTO is enabled by checking the extra options.<br>
-LTO_IS_ENABLED := 0<br>
-ifneq ($(findstring -flto,$(CompileCommonOpts)),)<br>
-LTO_IS_ENABLED := 1<br>
-else<br>
-ifneq ($(findstring -O4,$(CompileCommonOpts)),)<br>
-LTO_IS_ENABLED := 1<br>
-endif<br>
-endif<br>
-<br>
lit.site.cfg: FORCE<br>
@echo "Making LLVM 'lit.site.cfg' file..."<br>
@$(ECHOPATH) s=@LLVM_HOST_TRIPLE@=$(HOST_TRIPLE)=g > lit.tmp<br>
@@ -139,7 +129,6 @@ lit.site.cfg: FORCE<br>
@$(ECHOPATH) s=@OCAMLOPT@=$(OCAMLOPT) -cc $(subst *,'\\\"',*$(subst =,"\\=",$(CXX_FOR_OCAMLOPT))*) -I $(LibDir)/ocaml=g >> lit.tmp<br>
@$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> lit.tmp<br>
@$(ECHOPATH) s=@ENABLE_ASSERTIONS@=$(ENABLE_ASSERTIONS)=g >> lit.tmp<br>
- @$(ECHOPATH) s=@LTO_IS_ENABLED@=$(LTO_IS_ENABLED)=g >> lit.tmp<br>
@$(ECHOPATH) s=@TARGETS_TO_BUILD@=$(TARGETS_TO_BUILD)=g >> lit.tmp<br>
@$(ECHOPATH) s=@LLVM_BINDINGS@=$(BINDINGS_TO_BUILD)=g >> lit.tmp<br>
@$(ECHOPATH) s=@HOST_OS@=$(HOST_OS)=g >> lit.tmp<br>
<br>
Modified: llvm/trunk/test/lit.cfg<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.cfg?rev=191042&r1=191041&r2=191042&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.cfg?rev=191042&r1=191041&r2=191042&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/lit.cfg (original)<br>
+++ llvm/trunk/test/lit.cfg Thu Sep 19 17:15:52 2013<br>
@@ -221,7 +221,9 @@ for pattern in [r"\bbugpoint\b(?!-)",<br>
r"\bllvm-size\b",<br>
# Match llvmc but not -llvmc<br>
NOHYPHEN + r"\bllvmc\b",<br>
- r"\blto\b",<br>
+ r"\bllvm-lto\b",<br>
+ # Match lto but not -lto<br>
+ NOHYPHEN + r"\blto\b",<br>
# Don't match '.opt', '-opt',<br>
# '^opt' or '/opt'.<br>
r"\bmacho-dump\b", r"(?<!\.|-|\^|/)\bopt\b",<br>
<br>
Modified: llvm/trunk/test/<a href="http://lit.site.cfg.in" target="_blank">lit.site.cfg.in</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.site.cfg.in?rev=191042&r1=191041&r2=191042&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.site.cfg.in?rev=191042&r1=191041&r2=191042&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/<a href="http://lit.site.cfg.in" target="_blank">lit.site.cfg.in</a> (original)<br>
+++ llvm/trunk/test/<a href="http://lit.site.cfg.in" target="_blank">lit.site.cfg.in</a> Thu Sep 19 17:15:52 2013<br>
@@ -14,7 +14,6 @@ config.python_executable = "@PYTHON_EXEC<br>
config.ocamlopt_executable = "@OCAMLOPT@"<br>
config.enable_shared = @ENABLE_SHARED@<br>
config.enable_assertions = @ENABLE_ASSERTIONS@<br>
-config.lto_is_enabled = "@LTO_IS_ENABLED@"<br>
config.targets_to_build = "@TARGETS_TO_BUILD@"<br>
config.llvm_bindings = "@LLVM_BINDINGS@"<br>
config.host_os = "@HOST_OS@"<br>
<br>
Added: llvm/trunk/test/tools/lto/cfi_endproc.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/lto/cfi_endproc.ll?rev=191042&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/lto/cfi_endproc.ll?rev=191042&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/lto/cfi_endproc.ll (added)<br>
+++ llvm/trunk/test/tools/lto/cfi_endproc.ll Thu Sep 19 17:15:52 2013<br>
@@ -0,0 +1,20 @@<br>
+; RUN: llvm-as < %s >%t1<br>
+; RUN: llvm-lto -o %t2 %t1<br>
+<br>
+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"<br>
+target triple = "x86_64-unknown-linux-gnu"<br>
+<br>
+module asm ".text"<br>
+module asm ".align 16, 0x90"<br>
+module asm ".type PR14512, @function"<br>
+module asm "PR14512:.cfi_startproc"<br>
+module asm "ret"<br>
+module asm ".cfi_endproc"<br>
+<br>
+declare void @PR14512()<br>
+<br>
+define i32 @main(i32 %argc, i8** %argv) {<br>
+ call void @PR14512()<br>
+ ret i32 0<br>
+}<br>
+; XFAIL: win32<br>
<br>
Added: llvm/trunk/test/tools/lto/lit.local.cfg<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/lto/lit.local.cfg?rev=191042&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/lto/lit.local.cfg?rev=191042&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/lto/lit.local.cfg (added)<br>
+++ llvm/trunk/test/tools/lto/lit.local.cfg Thu Sep 19 17:15:52 2013<br>
@@ -0,0 +1,3 @@<br>
+targets = set(config.root.targets_to_build.split())<br>
+if not 'X86' in targets:<br>
+ config.unsupported = True<br>
<br>
Modified: llvm/trunk/tools/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/CMakeLists.txt?rev=191042&r1=191041&r2=191042&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/CMakeLists.txt?rev=191042&r1=191041&r2=191042&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/CMakeLists.txt (original)<br>
+++ llvm/trunk/tools/CMakeLists.txt Thu Sep 19 17:15:52 2013<br>
@@ -45,8 +45,10 @@ add_llvm_tool_subdirectory(yaml2obj)<br>
<br>
if( NOT WIN32 )<br>
add_llvm_tool_subdirectory(lto)<br>
+ add_llvm_tool_subdirectory(llvm-lto)<br>
else()<br>
ignore_llvm_tool_subdirectory(lto)<br>
+ ignore_llvm_tool_subdirectory(llvm-lto)<br>
endif()<br>
<br>
if( LLVM_ENABLE_PIC )<br>
<br>
Modified: llvm/trunk/tools/Makefile<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=191042&r1=191041&r2=191042&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=191042&r1=191041&r2=191042&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/Makefile (original)<br>
+++ llvm/trunk/tools/Makefile Thu Sep 19 17:15:52 2013<br>
@@ -54,11 +54,10 @@ endif<br>
ifndef ONLY_TOOLS<br>
ifeq ($(ENABLE_PIC),1)<br>
# gold only builds if binutils is around. It requires "lto" to build before<br>
- # it so it is added to DIRS.<br>
+ # it so it is added to DIRS. llvm-lto also requires lto<br>
+ DIRS += lto llvm-lto<br>
ifdef BINUTILS_INCDIR<br>
- DIRS += lto gold<br>
- else<br>
- PARALLEL_DIRS += lto<br>
+ DIRS += gold<br>
endif<br>
<br>
PARALLEL_DIRS += bugpoint-passes<br>
<br>
Added: llvm/trunk/tools/llvm-lto/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-lto/CMakeLists.txt?rev=191042&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-lto/CMakeLists.txt?rev=191042&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-lto/CMakeLists.txt (added)<br>
+++ llvm/trunk/tools/llvm-lto/CMakeLists.txt Thu Sep 19 17:15:52 2013<br>
@@ -0,0 +1,7 @@<br>
+add_llvm_tool(llvm-lto<br>
+ llvm-lto.cpp<br>
+ )<br>
+<br>
+target_link_libraries(llvm-lto LTO LLVMSupport)<br>
+<br>
+add_dependencies(llvm-lto lto)<br>
<br>
Added: llvm/trunk/tools/llvm-lto/Makefile<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-lto/Makefile?rev=191042&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-lto/Makefile?rev=191042&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-lto/Makefile (added)<br>
+++ llvm/trunk/tools/llvm-lto/Makefile Thu Sep 19 17:15:52 2013<br>
@@ -0,0 +1,22 @@<br>
+##===- tools/llvm-lto/Makefile -----------------------------*- Makefile -*-===##<br>
+#<br>
+# The LLVM Compiler Infrastructure<br>
+#<br>
+# This file is distributed under the University of Illinois Open Source<br>
+# License. See LICENSE.TXT for details.<br>
+#<br>
+##===----------------------------------------------------------------------===##<br>
+<br>
+LEVEL := ../..<br>
+TOOLNAME := llvm-lto<br>
+LINK_COMPONENTS := support<br>
+<br>
+# This tool has no plugins, optimize startup time.<br>
+TOOL_NO_EXPORTS := 1<br>
+<br>
+NO_INSTALL := 1<br>
+<br>
+include $(LEVEL)/Makefile.common<br>
+<br>
+LDFLAGS += -L$(LibDir)<br>
+LIBS += -lLTO<br>
<br>
Added: llvm/trunk/tools/llvm-lto/llvm-lto.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-lto/llvm-lto.cpp?rev=191042&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-lto/llvm-lto.cpp?rev=191042&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-lto/llvm-lto.cpp (added)<br>
+++ llvm/trunk/tools/llvm-lto/llvm-lto.cpp Thu Sep 19 17:15:52 2013<br>
@@ -0,0 +1,103 @@<br>
+//===-- llvm-lto: a simple command-line program to link modules with LTO --===//<br>
+//<br>
+// The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+//<br>
+// This program takes in a list of bitcode files, links them, performs link-time<br>
+// optimization, and outputs an object file.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#include "llvm-c/lto.h"<br>
+#include "llvm/Support/CommandLine.h"<br>
+#include "llvm/Support/ManagedStatic.h"<br>
+#include "llvm/Support/PrettyStackTrace.h"<br>
+#include "llvm/Support/Signals.h"<br>
+#include "llvm/Support/raw_ostream.h"<br>
+<br>
+using namespace llvm;<br>
+<br>
+static cl::list<std::string> InputFilenames(cl::Positional, cl::OneOrMore,<br>
+ cl::desc("<input bitcode files>"));<br>
+<br>
+static cl::opt<std::string> OutputFilename("o",<br>
+ cl::desc("Override output filename"),<br>
+ cl::init(""),<br>
+ cl::value_desc("filename"));<br>
+<br>
+int main(int argc, char **argv) {<br>
+ // Print a stack trace if we signal out.<br>
+ sys::PrintStackTraceOnErrorSignal();<br>
+ PrettyStackTraceProgram X(argc, argv);<br>
+<br>
+ llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.<br>
+ cl::ParseCommandLineOptions(argc, argv, "llvm LTO linker\n");<br>
+<br>
+ unsigned BaseArg = 0;<br>
+ std::string ErrorMessage;<br>
+<br>
+ lto_code_gen_t code_gen = lto_codegen_create();<br>
+ if (code_gen == NULL)<br>
+ errs() << argv[0] << ": error creating a code generation module: "<br>
+ << lto_get_error_message() << "\n";<br>
+<br>
+ lto_codegen_set_pic_model(code_gen, LTO_CODEGEN_PIC_MODEL_DYNAMIC);<br>
+ lto_codegen_set_debug_model(code_gen, LTO_DEBUG_MODEL_DWARF);<br>
+<br>
+ for (unsigned i = BaseArg; i < InputFilenames.size(); ++i) {<br>
+ lto_module_t BitcodeModule = lto_module_create(InputFilenames[i].c_str());<br>
+ if (BitcodeModule == NULL) {<br>
+ errs() << argv[0] << ": error loading file '" << InputFilenames[i]<br>
+ << "': " << lto_get_error_message() << "\n";<br>
+ return 1;<br>
+ }<br>
+<br>
+ if (lto_codegen_add_module(code_gen, BitcodeModule)) {<br>
+ errs() << argv[0] << ": error adding file '" << InputFilenames[i]<br>
+ << "': " << lto_get_error_message() << "\n";<br>
+ lto_module_dispose(BitcodeModule);<br>
+ return 1;<br>
+ }<br>
+<br>
+ lto_module_dispose(BitcodeModule);<br>
+ }<br>
+<br>
+ if (!OutputFilename.empty()) {<br>
+ size_t len = 0;<br>
+ const void *Code = lto_codegen_compile(code_gen, &len);<br>
+ if (Code == NULL) {<br>
+ errs() << argv[0]<br>
+ << ": error compiling the code: " << lto_get_error_message()<br>
+ << "\n";<br>
+ return 1;<br>
+ }<br>
+<br>
+ std::string ErrorInfo;<br>
+ raw_fd_ostream FileStream(OutputFilename.c_str(), ErrorInfo);<br>
+ if (!ErrorInfo.empty()) {<br>
+ errs() << argv[0] << ": error opening the file '" << OutputFilename<br>
+ << "': " << ErrorInfo << "\n";<br>
+ return 1;<br>
+ }<br>
+<br>
+ FileStream.write(reinterpret_cast<const char *>(Code), len);<br>
+ } else {<br>
+ const char *OutputName = NULL;<br>
+ if (lto_codegen_compile_to_file(code_gen, &OutputName)) {<br>
+ errs() << argv[0]<br>
+ << ": error compiling the code: " << lto_get_error_message()<br>
+ << "\n";<br>
+ return 1;<br>
+ }<br>
+<br>
+ outs() << "Wrote native object file '" << OutputName << "'\n";<br>
+ }<br>
+<br>
+ lto_codegen_dispose(code_gen);<br>
+<br>
+ return 0;<br>
+}<br>
<br>
Modified: llvm/trunk/tools/lto/LTOModule.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/LTOModule.cpp?rev=191042&r1=191041&r2=191042&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/LTOModule.cpp?rev=191042&r1=191041&r2=191042&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/lto/LTOModule.cpp (original)<br>
+++ llvm/trunk/tools/lto/LTOModule.cpp Thu Sep 19 17:15:52 2013<br>
@@ -792,6 +792,9 @@ namespace {<br>
const MCSymbol *Label,<br>
unsigned PointerSize) {}<br>
virtual void FinishImpl() {}<br>
+ virtual void EmitCFIEndProcImpl(MCDwarfFrameInfo &Frame) {<br>
+ RecordProcEnd(Frame);<br>
+ }<br>
<br>
static bool classof(const MCStreamer *S) {<br>
return S->getKind() == SK_RecordStreamer;<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>