[llvm] r288201 - Add llvm-modextract tool.
Peter Collingbourne via llvm-commits
llvm-commits at lists.llvm.org
Tue Nov 29 13:54:34 PST 2016
Author: pcc
Date: Tue Nov 29 15:54:33 2016
New Revision: 288201
URL: http://llvm.org/viewvc/llvm-project?rev=288201&view=rev
Log:
Add llvm-modextract tool.
This program is for testing features that rely on multi-module bitcode files.
It takes a multi-module bitcode file, extracts one of the modules and writes
it to the output file.
Differential Revision: https://reviews.llvm.org/D26778
Added:
llvm/trunk/test/tools/llvm-modextract/
llvm/trunk/test/tools/llvm-modextract/single.ll
llvm/trunk/tools/llvm-modextract/
llvm/trunk/tools/llvm-modextract/CMakeLists.txt
llvm/trunk/tools/llvm-modextract/LLVMBuild.txt
llvm/trunk/tools/llvm-modextract/llvm-modextract.cpp
Modified:
llvm/trunk/include/llvm/Bitcode/BitcodeReader.h
llvm/trunk/test/CMakeLists.txt
llvm/trunk/test/lit.cfg
llvm/trunk/tools/LLVMBuild.txt
Modified: llvm/trunk/include/llvm/Bitcode/BitcodeReader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/BitcodeReader.h?rev=288201&r1=288200&r2=288201&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Bitcode/BitcodeReader.h (original)
+++ llvm/trunk/include/llvm/Bitcode/BitcodeReader.h Tue Nov 29 15:54:33 2016
@@ -66,7 +66,9 @@ namespace llvm {
bool ShouldLazyLoadMetadata);
public:
- ArrayRef<uint8_t> getBuffer() const { return Buffer; }
+ StringRef getBuffer() const {
+ return StringRef((const char *)Buffer.begin(), Buffer.size());
+ }
/// Read the bitcode module and prepare for lazy deserialization of function
/// bodies. If ShouldLazyLoadMetadata is true, lazily load metadata as well.
Modified: llvm/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CMakeLists.txt?rev=288201&r1=288200&r2=288201&view=diff
==============================================================================
--- llvm/trunk/test/CMakeLists.txt (original)
+++ llvm/trunk/test/CMakeLists.txt Tue Nov 29 15:54:33 2016
@@ -48,6 +48,7 @@ set(LLVM_TEST_DEPENDS
llvm-lto2
llvm-mc
llvm-mcmarkup
+ llvm-modextract
llvm-nm
llvm-objdump
llvm-opt-report
Modified: llvm/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.cfg?rev=288201&r1=288200&r2=288201&view=diff
==============================================================================
--- llvm/trunk/test/lit.cfg (original)
+++ llvm/trunk/test/lit.cfg Tue Nov 29 15:54:33 2016
@@ -298,6 +298,7 @@ for pattern in [r"\bbugpoint\b(?!-)",
r"\bllvm-lto2\b",
r"\bllvm-mc\b",
r"\bllvm-mcmarkup\b",
+ r"\bllvm-modextract\b",
r"\bllvm-nm\b",
r"\bllvm-objdump\b",
r"\bllvm-pdbdump\b",
Added: llvm/trunk/test/tools/llvm-modextract/single.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-modextract/single.ll?rev=288201&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-modextract/single.ll (added)
+++ llvm/trunk/test/tools/llvm-modextract/single.ll Tue Nov 29 15:54:33 2016
@@ -0,0 +1,12 @@
+; RUN: llvm-as -o %t %s
+; RUN: llvm-modextract -n 0 -o - %t | llvm-dis | FileCheck %s
+; RUN: not llvm-modextract -n 1 -o - %t 2>&1 | FileCheck --check-prefix=ERROR %s
+; RUN: llvm-modextract -b -n 0 -o - %t | llvm-dis | FileCheck %s
+; RUN: not llvm-modextract -b -n 1 -o - %t 2>&1 | FileCheck --check-prefix=ERROR %s
+
+; CHECK: define void @f()
+; ERROR: llvm-modextract: error: module index out of range; bitcode file contains 1 module(s)
+
+define void @f() {
+ ret void
+}
Modified: llvm/trunk/tools/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/LLVMBuild.txt?rev=288201&r1=288200&r2=288201&view=diff
==============================================================================
--- llvm/trunk/tools/LLVMBuild.txt (original)
+++ llvm/trunk/tools/LLVMBuild.txt Tue Nov 29 15:54:33 2016
@@ -36,6 +36,7 @@ subdirectories =
llvm-lto
llvm-mc
llvm-mcmarkup
+ llvm-modextract
llvm-nm
llvm-objdump
llvm-pdbdump
Added: llvm/trunk/tools/llvm-modextract/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-modextract/CMakeLists.txt?rev=288201&view=auto
==============================================================================
--- llvm/trunk/tools/llvm-modextract/CMakeLists.txt (added)
+++ llvm/trunk/tools/llvm-modextract/CMakeLists.txt Tue Nov 29 15:54:33 2016
@@ -0,0 +1,10 @@
+set(LLVM_LINK_COMPONENTS
+ IRReader
+ BitWriter
+ Core
+ Support
+ )
+
+add_llvm_tool(llvm-modextract
+ llvm-modextract.cpp
+ )
Added: llvm/trunk/tools/llvm-modextract/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-modextract/LLVMBuild.txt?rev=288201&view=auto
==============================================================================
--- llvm/trunk/tools/llvm-modextract/LLVMBuild.txt (added)
+++ llvm/trunk/tools/llvm-modextract/LLVMBuild.txt Tue Nov 29 15:54:33 2016
@@ -0,0 +1,22 @@
+;===- ./tools/llvm-modextract/LLVMBuild.txt --------------------*- Conf -*--===;
+;
+; The LLVM Compiler Infrastructure
+;
+; This file is distributed under the University of Illinois Open Source
+; License. See LICENSE.TXT for details.
+;
+;===------------------------------------------------------------------------===;
+;
+; This is an LLVMBuild description file for the components in this subdirectory.
+;
+; For more information on the LLVMBuild system, please see:
+;
+; http://llvm.org/docs/LLVMBuild.html
+;
+;===------------------------------------------------------------------------===;
+
+[component_0]
+type = Tool
+name = llvm-modextract
+parent = Tools
+required_libraries = BitReader BitWriter
Added: llvm/trunk/tools/llvm-modextract/llvm-modextract.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-modextract/llvm-modextract.cpp?rev=288201&view=auto
==============================================================================
--- llvm/trunk/tools/llvm-modextract/llvm-modextract.cpp (added)
+++ llvm/trunk/tools/llvm-modextract/llvm-modextract.cpp Tue Nov 29 15:54:33 2016
@@ -0,0 +1,72 @@
+//===-- llvm-modextract.cpp - LLVM module extractor utility ---------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This program is for testing features that rely on multi-module bitcode files.
+// It takes a multi-module bitcode file, extracts one of the modules and writes
+// it to the output file.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Bitcode/BitcodeReader.h"
+#include "llvm/Bitcode/BitcodeWriter.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Error.h"
+#include "llvm/Support/FileSystem.h"
+#include "llvm/Support/ToolOutputFile.h"
+
+using namespace llvm;
+
+static cl::opt<bool>
+ BinaryExtract("b", cl::desc("Whether to perform binary extraction"));
+
+static cl::opt<std::string> OutputFilename("o", cl::Required,
+ cl::desc("Output filename"),
+ cl::value_desc("filename"));
+
+static cl::opt<std::string>
+ InputFilename(cl::Positional, cl::desc("<input bitcode>"), cl::init("-"));
+
+static cl::opt<unsigned> ModuleIndex("n", cl::Required,
+ cl::desc("Index of module to extract"),
+ cl::value_desc("index"));
+
+int main(int argc, char **argv) {
+ cl::ParseCommandLineOptions(argc, argv, "Module extractor");
+
+ ExitOnError ExitOnErr("llvm-modextract: error: ");
+
+ std::unique_ptr<MemoryBuffer> MB =
+ ExitOnErr(errorOrToExpected(MemoryBuffer::getFileOrSTDIN(InputFilename)));
+ std::vector<BitcodeModule> Ms = ExitOnErr(getBitcodeModuleList(*MB));
+
+ LLVMContext Context;
+ if (ModuleIndex >= Ms.size()) {
+ errs() << "llvm-modextract: error: module index out of range; bitcode file "
+ "contains "
+ << Ms.size() << " module(s)\n";
+ return 1;
+ }
+
+ std::error_code EC;
+ std::unique_ptr<tool_output_file> Out(
+ new tool_output_file(OutputFilename, EC, sys::fs::F_None));
+ ExitOnErr(errorCodeToError(EC));
+
+ if (BinaryExtract) {
+ SmallVector<char, 0> Header;
+ BitcodeWriter Writer(Header);
+ Out->os() << Header << Ms[ModuleIndex].getBuffer();
+ return 0;
+ }
+
+ std::unique_ptr<Module> M = ExitOnErr(Ms[ModuleIndex].parseModule(Context));
+ WriteBitcodeToFile(M.get(), Out->os());
+
+ return 0;
+}
More information about the llvm-commits
mailing list