Skip to content

Commit

Permalink
TransformUtils: Introduce module splitter.
Browse files Browse the repository at this point in the history
The module splitter splits a module into linkable partitions. It will
be used to implement parallel LTO code generation.

This initial version of the splitter does not attempt to deal with the
somewhat subtle symbol visibility issues around module splitting. These
will be dealt with in a future change.

Differential Revision: http://reviews.llvm.org/D12132

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@245662 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
pcc committed Aug 21, 2015
1 parent 81fc7b2 commit c1e784c
Show file tree
Hide file tree
Showing 19 changed files with 413 additions and 1 deletion.
9 changes: 9 additions & 0 deletions include/llvm/Transforms/Utils/Cloning.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "llvm/IR/ValueHandle.h"
#include "llvm/IR/ValueMap.h"
#include "llvm/Transforms/Utils/ValueMapper.h"
#include <functional>

namespace llvm {

Expand Down Expand Up @@ -52,6 +53,14 @@ class DominatorTree;
Module *CloneModule(const Module *M);
Module *CloneModule(const Module *M, ValueToValueMapTy &VMap);

/// Return a copy of the specified module. The ShouldCloneDefinition function
/// controls whether a specific GlobalValue's definition is cloned. If the
/// function returns false, the module copy will contain an external reference
/// in place of the global definition.
Module *
CloneModule(const Module *M, ValueToValueMapTy &VMap,
std::function<bool(const GlobalValue *)> ShouldCloneDefinition);

/// ClonedCodeInfo - This struct can be used to capture information about code
/// being cloned, while it is being cloned.
struct ClonedCodeInfo {
Expand Down
43 changes: 43 additions & 0 deletions include/llvm/Transforms/Utils/SplitModule.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
//===- SplitModule.h - Split a module into partitions -----------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
// This file defines the function llvm::SplitModule, which splits a module
// into multiple linkable partitions. It can be used to implement parallel code
// generation for link-time optimization.
//
//===----------------------------------------------------------------------===//

#ifndef LLVM_TRANSFORMS_UTILS_SPLITMODULE_H
#define LLVM_TRANSFORMS_UTILS_SPLITMODULE_H

#include <functional>
#include <memory>

namespace llvm {

class Module;
class StringRef;

/// Splits the module M into N linkable partitions. The function ModuleCallback
/// is called N times passing each individual partition as the MPart argument.
///
/// FIXME: This function does not deal with the somewhat subtle symbol
/// visibility issues around module splitting, including (but not limited to):
///
/// - Internal symbols should not collide with symbols defined outside the
/// module.
/// - Internal symbols defined in module-level inline asm should be visible to
/// each partition.
void SplitModule(
std::unique_ptr<Module> M, unsigned N,
std::function<void(std::unique_ptr<Module> MPart)> ModuleCallback);

} // End llvm namespace

#endif
1 change: 1 addition & 0 deletions lib/Transforms/Utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ add_llvm_library(LLVMTransformUtils
SimplifyIndVar.cpp
SimplifyInstructions.cpp
SimplifyLibCalls.cpp
SplitModule.cpp
SymbolRewriter.cpp
UnifyFunctionExitNodes.cpp
Utils.cpp
Expand Down
39 changes: 39 additions & 0 deletions lib/Transforms/Utils/CloneModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ Module *llvm::CloneModule(const Module *M) {
}

Module *llvm::CloneModule(const Module *M, ValueToValueMapTy &VMap) {
return CloneModule(M, VMap, [](const GlobalValue *GV) { return true; });
}

Module *llvm::CloneModule(
const Module *M, ValueToValueMapTy &VMap,
std::function<bool(const GlobalValue *)> ShouldCloneDefinition) {
// First off, we need to create the new module.
Module *New = new Module(M->getModuleIdentifier(), M->getContext());
New->setDataLayout(M->getDataLayout());
Expand Down Expand Up @@ -68,6 +74,26 @@ Module *llvm::CloneModule(const Module *M, ValueToValueMapTy &VMap) {
// Loop over the aliases in the module
for (Module::const_alias_iterator I = M->alias_begin(), E = M->alias_end();
I != E; ++I) {
if (!ShouldCloneDefinition(I)) {
// An alias cannot act as an external reference, so we need to create
// either a function or a global variable depending on the value type.
// FIXME: Once pointee types are gone we can probably pick one or the
// other.
GlobalValue *GV;
if (I->getValueType()->isFunctionTy())
GV = Function::Create(cast<FunctionType>(I->getValueType()),
GlobalValue::ExternalLinkage, I->getName(), New);
else
GV = new GlobalVariable(
*New, I->getValueType(), false, GlobalValue::ExternalLinkage,
(Constant *)nullptr, I->getName(), (GlobalVariable *)nullptr,
I->getThreadLocalMode(), I->getType()->getAddressSpace());
VMap[I] = GV;
// We do not copy attributes (mainly because copying between different
// kinds of globals is forbidden), but this is generally not required for
// correctness.
continue;
}
auto *PTy = cast<PointerType>(I->getType());
auto *GA = GlobalAlias::create(PTy, I->getLinkage(), I->getName(), New);
GA->copyAttributesFrom(I);
Expand All @@ -81,6 +107,11 @@ Module *llvm::CloneModule(const Module *M, ValueToValueMapTy &VMap) {
for (Module::const_global_iterator I = M->global_begin(), E = M->global_end();
I != E; ++I) {
GlobalVariable *GV = cast<GlobalVariable>(VMap[I]);
if (!ShouldCloneDefinition(I)) {
// Skip after setting the correct linkage for an external reference.
GV->setLinkage(GlobalValue::ExternalLinkage);
continue;
}
if (I->hasInitializer())
GV->setInitializer(MapValue(I->getInitializer(), VMap));
}
Expand All @@ -89,6 +120,11 @@ Module *llvm::CloneModule(const Module *M, ValueToValueMapTy &VMap) {
//
for (Module::const_iterator I = M->begin(), E = M->end(); I != E; ++I) {
Function *F = cast<Function>(VMap[I]);
if (!ShouldCloneDefinition(I)) {
// Skip after setting the correct linkage for an external reference.
F->setLinkage(GlobalValue::ExternalLinkage);
continue;
}
if (!I->isDeclaration()) {
Function::arg_iterator DestI = F->arg_begin();
for (Function::const_arg_iterator J = I->arg_begin(); J != I->arg_end();
Expand All @@ -109,6 +145,9 @@ Module *llvm::CloneModule(const Module *M, ValueToValueMapTy &VMap) {
// And aliases
for (Module::const_alias_iterator I = M->alias_begin(), E = M->alias_end();
I != E; ++I) {
// We already dealt with undefined aliases above.
if (!ShouldCloneDefinition(I))
continue;
GlobalAlias *GA = cast<GlobalAlias>(VMap[I]);
if (const Constant *C = I->getAliasee())
GA->setAliasee(MapValue(C, VMap));
Expand Down
85 changes: 85 additions & 0 deletions lib/Transforms/Utils/SplitModule.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
//===- SplitModule.cpp - Split a module into partitions -------------------===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
// This file defines the function llvm::SplitModule, which splits a module
// into multiple linkable partitions. It can be used to implement parallel code
// generation for link-time optimization.
//
//===----------------------------------------------------------------------===//

#include "llvm/Transforms/Utils/SplitModule.h"
#include "llvm/ADT/Hashing.h"
#include "llvm/IR/Function.h"
#include "llvm/IR/GlobalAlias.h"
#include "llvm/IR/GlobalObject.h"
#include "llvm/IR/GlobalValue.h"
#include "llvm/IR/Module.h"
#include "llvm/Support/MD5.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Transforms/Utils/Cloning.h"

using namespace llvm;

static void externalize(GlobalValue *GV) {
if (GV->hasLocalLinkage()) {
GV->setLinkage(GlobalValue::ExternalLinkage);
GV->setVisibility(GlobalValue::HiddenVisibility);
}

// Unnamed entities must be named consistently between modules. setName will
// give a distinct name to each such entity.
if (!GV->hasName())
GV->setName("__llvmsplit_unnamed");
}

// Returns whether GV should be in partition (0-based) I of N.
static bool isInPartition(const GlobalValue *GV, unsigned I, unsigned N) {
if (auto GA = dyn_cast<GlobalAlias>(GV))
if (const GlobalObject *Base = GA->getBaseObject())
GV = Base;

StringRef Name;
if (const Comdat *C = GV->getComdat())
Name = C->getName();
else
Name = GV->getName();

// Partition by MD5 hash. We only need a few bits for evenness as the number
// of partitions will generally be in the 1-2 figure range; the low 16 bits
// are enough.
MD5 H;
MD5::MD5Result R;
H.update(Name);
H.final(R);
return (R[0] | (R[1] << 8)) % N == I;
}

void llvm::SplitModule(
std::unique_ptr<Module> M, unsigned N,
std::function<void(std::unique_ptr<Module> MPart)> ModuleCallback) {
for (Function &F : *M)
externalize(&F);
for (GlobalVariable &GV : M->globals())
externalize(&GV);
for (GlobalAlias &GA : M->aliases())
externalize(&GA);

// FIXME: We should be able to reuse M as the last partition instead of
// cloning it.
for (unsigned I = 0; I != N; ++I) {
ValueToValueMapTy VMap;
std::unique_ptr<Module> MPart(
CloneModule(M.get(), VMap, [=](const GlobalValue *GV) {
return isInPartition(GV, I, N);
}));
if (I != 0)
MPart->setModuleInlineAsm("");
ModuleCallback(std::move(MPart));
}
}
1 change: 1 addition & 0 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ set(LLVM_TEST_DEPENDS
llvm-readobj
llvm-rtdyld
llvm-size
llvm-split
llvm-symbolizer
llvm-tblgen
macho-dump
Expand Down
1 change: 1 addition & 0 deletions test/lit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ for pattern in [r"\bbugpoint\b(?!-)",
r"\bllvm-readobj\b",
r"\bllvm-rtdyld\b",
r"\bllvm-size\b",
r"\bllvm-split\b",
r"\bllvm-tblgen\b",
r"\bllvm-c-test\b",
r"\bmacho-dump\b",
Expand Down
19 changes: 19 additions & 0 deletions test/tools/llvm-split/alias.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
; RUN: llvm-split -o %t %s
; RUN: llvm-dis -o - %t0 | FileCheck --check-prefix=CHECK0 %s
; RUN: llvm-dis -o - %t1 | FileCheck --check-prefix=CHECK1 %s

; CHECK0-DAG: @afoo = alias [2 x i8*]* @foo
; CHECK1-DAG: @afoo = external global [2 x i8*]
@afoo = alias [2 x i8*]* @foo

; CHECK0-DAG: declare void @abar()
; CHECK1-DAG: @abar = alias void ()* @bar
@abar = alias void ()* @bar

@foo = global [2 x i8*] [i8* bitcast (void ()* @bar to i8*), i8* bitcast (void ()* @abar to i8*)]

define void @bar() {
store [2 x i8*] zeroinitializer, [2 x i8*]* @foo
store [2 x i8*] zeroinitializer, [2 x i8*]* @afoo
ret void
}
19 changes: 19 additions & 0 deletions test/tools/llvm-split/comdat.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
; RUN: llvm-split -o %t %s
; RUN: llvm-dis -o - %t0 | FileCheck --check-prefix=CHECK0 %s
; RUN: llvm-dis -o - %t1 | FileCheck --check-prefix=CHECK1 %s

$foo = comdat any

; CHECK0: define void @foo()
; CHECK1: declare void @foo()
define void @foo() comdat {
call void @bar()
ret void
}

; CHECK0: define void @bar()
; CHECK1: declare void @bar()
define void @bar() comdat($foo) {
call void @foo()
ret void
}
17 changes: 17 additions & 0 deletions test/tools/llvm-split/function.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
; RUN: llvm-split -o %t %s
; RUN: llvm-dis -o - %t0 | FileCheck --check-prefix=CHECK0 %s
; RUN: llvm-dis -o - %t1 | FileCheck --check-prefix=CHECK1 %s

; CHECK0: define void @foo()
; CHECK1: declare void @foo()
define void @foo() {
call void @bar()
ret void
}

; CHECK0: declare void @bar()
; CHECK1: define void @bar()
define void @bar() {
call void @foo()
ret void
}
11 changes: 11 additions & 0 deletions test/tools/llvm-split/global.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
; RUN: llvm-split -o %t %s
; RUN: llvm-dis -o - %t0 | FileCheck --check-prefix=CHECK0 %s
; RUN: llvm-dis -o - %t1 | FileCheck --check-prefix=CHECK1 %s

; CHECK0: @foo = global i8* bitcast
; CHECK1: @foo = external global i8*
@foo = global i8* bitcast (i8** @bar to i8*)

; CHECK0: @bar = external global i8*
; CHECK1: @bar = global i8* bitcast
@bar = global i8* bitcast (i8** @foo to i8*)
17 changes: 17 additions & 0 deletions test/tools/llvm-split/internal.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
; RUN: llvm-split -o %t %s
; RUN: llvm-dis -o - %t0 | FileCheck --check-prefix=CHECK0 %s
; RUN: llvm-dis -o - %t1 | FileCheck --check-prefix=CHECK1 %s

; CHECK0: define hidden void @foo()
; CHECK1: declare hidden void @foo()
define internal void @foo() {
call void @bar()
ret void
}

; CHECK0: declare void @bar()
; CHECK1: define void @bar()
define void @bar() {
call void @foo()
ret void
}
31 changes: 31 additions & 0 deletions test/tools/llvm-split/unnamed.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
; RUN: llvm-split -o %t %s
; RUN: llvm-dis -o - %t0 | FileCheck --check-prefix=CHECK0 %s
; RUN: llvm-dis -o - %t1 | FileCheck --check-prefix=CHECK1 %s

; CHECK0: declare hidden void @__llvmsplit_unnamed()
; CHECK1: define hidden void @__llvmsplit_unnamed()
define internal void @0() {
; CHECK1: call void @foo()
call void @foo()
ret void
}

; CHECK0: declare hidden void @__llvmsplit_unnamed1()
; CHECK1: define hidden void @__llvmsplit_unnamed1()
define internal void @1() {
; CHECK1: call void @foo()
; CHECK1: call void @foo()
call void @foo()
call void @foo()
ret void
}

; CHECK0: define void @foo()
; CHECK1: declare void @foo()
define void @foo() {
; CHECK0: call void @__llvmsplit_unnamed1()
; CHECK0: call void @__llvmsplit_unnamed()
call void @1()
call void @0()
ret void
}
1 change: 1 addition & 0 deletions tools/LLVMBuild.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ subdirectories =
llvm-profdata
llvm-rtdyld
llvm-size
llvm-split
macho-dump
opt
verify-uselistorder
Expand Down
3 changes: 2 additions & 1 deletion tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ PARALLEL_DIRS := opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link \
macho-dump llvm-objdump llvm-readobj llvm-rtdyld \
llvm-dwarfdump llvm-cov llvm-size llvm-stress llvm-mcmarkup \
llvm-profdata llvm-symbolizer obj2yaml yaml2obj llvm-c-test \
llvm-cxxdump verify-uselistorder dsymutil llvm-pdbdump
llvm-cxxdump verify-uselistorder dsymutil llvm-pdbdump \
llvm-split

# If Intel JIT Events support is configured, build an extra tool to test it.
ifeq ($(USE_INTEL_JITEVENTS), 1)
Expand Down
Loading

0 comments on commit c1e784c

Please sign in to comment.