2008-11-02 13:52:50 +08:00
|
|
|
//===- MergeFunctions.cpp - Merge identical functions ---------------------===//
|
|
|
|
//
|
|
|
|
// The LLVM Compiler Infrastructure
|
|
|
|
//
|
|
|
|
// This file is distributed under the University of Illinois Open Source
|
|
|
|
// License. See LICENSE.TXT for details.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
//
|
|
|
|
// This pass looks for equivalent functions that are mergable and folds them.
|
|
|
|
//
|
2014-06-22 08:57:09 +08:00
|
|
|
// Order relation is defined on set of functions. It was made through
|
|
|
|
// special function comparison procedure that returns
|
|
|
|
// 0 when functions are equal,
|
|
|
|
// -1 when Left function is less than right function, and
|
|
|
|
// 1 for opposite case. We need total-ordering, so we need to maintain
|
|
|
|
// four properties on the functions set:
|
|
|
|
// a <= a (reflexivity)
|
|
|
|
// if a <= b and b <= a then a = b (antisymmetry)
|
|
|
|
// if a <= b and b <= c then a <= c (transitivity).
|
|
|
|
// for all a and b: a <= b or b <= a (totality).
|
2008-11-02 13:52:50 +08:00
|
|
|
//
|
2014-06-22 08:57:09 +08:00
|
|
|
// Comparison iterates through each instruction in each basic block.
|
|
|
|
// Functions are kept on binary tree. For each new function F we perform
|
|
|
|
// lookup in binary tree.
|
|
|
|
// In practice it works the following way:
|
|
|
|
// -- We define Function* container class with custom "operator<" (FunctionPtr).
|
|
|
|
// -- "FunctionPtr" instances are stored in std::set collection, so every
|
|
|
|
// std::set::insert operation will give you result in log(N) time.
|
Accelerate MergeFunctions with hashing
This patch makes the Merge Functions pass faster by calculating and comparing
a hash value which captures the essential structure of a function before
performing a full function comparison.
The hash is calculated by hashing the function signature, then walking the basic
blocks of the function in the same order as the main comparison function. The
opcode of each instruction is hashed in sequence, which means that different
functions according to the existing total order cannot have the same hash, as
the comparison requires the opcodes of the two functions to be the same order.
The hash function is a static member of the FunctionComparator class because it
is tightly coupled to the exact comparison function used. For example, functions
which are equivalent modulo a single variant callsite might be merged by a more
aggressive MergeFunctions, and the hash function would need to be insensitive to
these differences in order to exploit this.
The hashing function uses a utility class which accumulates the values into an
internal state using a standard bit-mixing function. Note that this is a different interface
than a regular hashing routine, because the values to be hashed are scattered
amongst the properties of a llvm::Function, not linear in memory. This scheme is
fast because only one word of state needs to be kept, and the mixing function is
a few instructions.
The main runOnModule function first computes the hash of each function, and only
further processes functions which do not have a unique function hash. The hash
is also used to order the sorted function set. If the hashes differ, their
values are used to order the functions, otherwise the full comparison is done.
Both of these are helpful in speeding up MergeFunctions. Together they result in
speedups of 9% for mysqld (a mostly C application with little redundancy), 46%
for libxul in Firefox, and 117% for Chromium. (These are all LTO builds.) In all
three cases, the new speed of MergeFunctions is about half that of the module
verifier, making it relatively inexpensive even for large LTO builds with
hundreds of thousands of functions. The same functions are merged, so this
change is free performance.
Author: jrkoenig
Reviewers: nlewycky, dschuff, jfb
Subscribers: llvm-commits, aemerson
Differential revision: http://reviews.llvm.org/D11923
llvm-svn: 245140
2015-08-15 09:18:18 +08:00
|
|
|
//
|
|
|
|
// As an optimization, a hash of the function structure is calculated first, and
|
|
|
|
// two functions are only compared if they have the same hash. This hash is
|
|
|
|
// cheap to compute, and has the property that if function F == G according to
|
|
|
|
// the comparison function, then hash(F) == hash(G). This consistency property
|
|
|
|
// is critical to ensuring all possible merging opportunities are exploited.
|
|
|
|
// Collisions in the hash affect the speed of the pass but not the correctness
|
|
|
|
// or determinism of the resulting transformation.
|
2008-11-02 13:52:50 +08:00
|
|
|
//
|
2010-05-13 13:48:45 +08:00
|
|
|
// When a match is found the functions are folded. If both functions are
|
|
|
|
// overridable, we move the functionality into a new internal function and
|
|
|
|
// leave two overridable thunks to it.
|
2008-11-02 13:52:50 +08:00
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
//
|
|
|
|
// Future work:
|
|
|
|
//
|
|
|
|
// * virtual functions.
|
|
|
|
//
|
|
|
|
// Many functions have their address taken by the virtual function table for
|
|
|
|
// the object they belong to. However, as long as it's only used for a lookup
|
2010-08-08 13:04:23 +08:00
|
|
|
// and call, this is irrelevant, and we'd like to fold such functions.
|
2008-11-02 13:52:50 +08:00
|
|
|
//
|
2010-08-08 13:04:23 +08:00
|
|
|
// * be smarter about bitcasts.
|
2010-05-13 13:48:45 +08:00
|
|
|
//
|
|
|
|
// In order to fold functions, we will sometimes add either bitcast instructions
|
|
|
|
// or bitcast constant expressions. Unfortunately, this can confound further
|
|
|
|
// analysis since the two functions differ where one has a bitcast and the
|
2010-08-08 13:04:23 +08:00
|
|
|
// other doesn't. We should learn to look through bitcasts.
|
2010-05-13 13:48:45 +08:00
|
|
|
//
|
2014-06-22 08:57:09 +08:00
|
|
|
// * Compare complex types with pointer types inside.
|
|
|
|
// * Compare cross-reference cases.
|
|
|
|
// * Compare complex expressions.
|
|
|
|
//
|
|
|
|
// All the three issues above could be described as ability to prove that
|
|
|
|
// fA == fB == fC == fE == fF == fG in example below:
|
|
|
|
//
|
|
|
|
// void fA() {
|
|
|
|
// fB();
|
|
|
|
// }
|
|
|
|
// void fB() {
|
|
|
|
// fA();
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// void fE() {
|
|
|
|
// fF();
|
|
|
|
// }
|
|
|
|
// void fF() {
|
|
|
|
// fG();
|
|
|
|
// }
|
|
|
|
// void fG() {
|
|
|
|
// fE();
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// Simplest cross-reference case (fA <--> fB) was implemented in previous
|
|
|
|
// versions of MergeFunctions, though it presented only in two function pairs
|
|
|
|
// in test-suite (that counts >50k functions)
|
|
|
|
// Though possibility to detect complex cross-referencing (e.g.: A->B->C->D->A)
|
|
|
|
// could cover much more cases.
|
|
|
|
//
|
2008-11-02 13:52:50 +08:00
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#include "llvm/Transforms/IPO.h"
|
2012-12-04 00:50:05 +08:00
|
|
|
#include "llvm/ADT/DenseSet.h"
|
|
|
|
#include "llvm/ADT/FoldingSet.h"
|
|
|
|
#include "llvm/ADT/STLExtras.h"
|
|
|
|
#include "llvm/ADT/SmallSet.h"
|
|
|
|
#include "llvm/ADT/Statistic.h"
|
Accelerate MergeFunctions with hashing
This patch makes the Merge Functions pass faster by calculating and comparing
a hash value which captures the essential structure of a function before
performing a full function comparison.
The hash is calculated by hashing the function signature, then walking the basic
blocks of the function in the same order as the main comparison function. The
opcode of each instruction is hashed in sequence, which means that different
functions according to the existing total order cannot have the same hash, as
the comparison requires the opcodes of the two functions to be the same order.
The hash function is a static member of the FunctionComparator class because it
is tightly coupled to the exact comparison function used. For example, functions
which are equivalent modulo a single variant callsite might be merged by a more
aggressive MergeFunctions, and the hash function would need to be insensitive to
these differences in order to exploit this.
The hashing function uses a utility class which accumulates the values into an
internal state using a standard bit-mixing function. Note that this is a different interface
than a regular hashing routine, because the values to be hashed are scattered
amongst the properties of a llvm::Function, not linear in memory. This scheme is
fast because only one word of state needs to be kept, and the mixing function is
a few instructions.
The main runOnModule function first computes the hash of each function, and only
further processes functions which do not have a unique function hash. The hash
is also used to order the sorted function set. If the hashes differ, their
values are used to order the functions, otherwise the full comparison is done.
Both of these are helpful in speeding up MergeFunctions. Together they result in
speedups of 9% for mysqld (a mostly C application with little redundancy), 46%
for libxul in Firefox, and 117% for Chromium. (These are all LTO builds.) In all
three cases, the new speed of MergeFunctions is about half that of the module
verifier, making it relatively inexpensive even for large LTO builds with
hundreds of thousands of functions. The same functions are merged, so this
change is free performance.
Author: jrkoenig
Reviewers: nlewycky, dschuff, jfb
Subscribers: llvm-commits, aemerson
Differential revision: http://reviews.llvm.org/D11923
llvm-svn: 245140
2015-08-15 09:18:18 +08:00
|
|
|
#include "llvm/ADT/Hashing.h"
|
2014-03-04 19:01:28 +08:00
|
|
|
#include "llvm/IR/CallSite.h"
|
2013-01-02 19:36:10 +08:00
|
|
|
#include "llvm/IR/Constants.h"
|
|
|
|
#include "llvm/IR/DataLayout.h"
|
|
|
|
#include "llvm/IR/IRBuilder.h"
|
|
|
|
#include "llvm/IR/InlineAsm.h"
|
|
|
|
#include "llvm/IR/Instructions.h"
|
|
|
|
#include "llvm/IR/LLVMContext.h"
|
|
|
|
#include "llvm/IR/Module.h"
|
|
|
|
#include "llvm/IR/Operator.h"
|
2014-03-04 19:17:44 +08:00
|
|
|
#include "llvm/IR/ValueHandle.h"
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
#include "llvm/IR/ValueMap.h"
|
2008-11-02 13:52:50 +08:00
|
|
|
#include "llvm/Pass.h"
|
2014-06-22 02:58:11 +08:00
|
|
|
#include "llvm/Support/CommandLine.h"
|
2008-11-02 13:52:50 +08:00
|
|
|
#include "llvm/Support/Debug.h"
|
2009-07-12 04:10:48 +08:00
|
|
|
#include "llvm/Support/ErrorHandling.h"
|
2009-07-25 08:23:56 +08:00
|
|
|
#include "llvm/Support/raw_ostream.h"
|
2010-08-31 16:29:37 +08:00
|
|
|
#include <vector>
|
2015-10-07 07:24:35 +08:00
|
|
|
|
2008-11-02 13:52:50 +08:00
|
|
|
using namespace llvm;
|
|
|
|
|
2014-04-22 10:55:47 +08:00
|
|
|
#define DEBUG_TYPE "mergefunc"
|
|
|
|
|
2008-11-02 13:52:50 +08:00
|
|
|
STATISTIC(NumFunctionsMerged, "Number of functions merged");
|
2010-09-07 09:42:10 +08:00
|
|
|
STATISTIC(NumThunksWritten, "Number of thunks generated");
|
2011-01-25 16:56:50 +08:00
|
|
|
STATISTIC(NumAliasesWritten, "Number of aliases generated");
|
2010-09-07 09:42:10 +08:00
|
|
|
STATISTIC(NumDoubleWeak, "Number of new functions created");
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2014-06-22 02:58:11 +08:00
|
|
|
static cl::opt<unsigned> NumFunctionsForSanityCheck(
|
|
|
|
"mergefunc-sanity",
|
|
|
|
cl::desc("How many functions in module could be used for "
|
|
|
|
"MergeFunctions pass sanity check. "
|
|
|
|
"'0' disables this check. Works only with '-debug' key."),
|
|
|
|
cl::init(0), cl::Hidden);
|
|
|
|
|
2010-09-05 17:00:32 +08:00
|
|
|
namespace {
|
|
|
|
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
/// GlobalNumberState assigns an integer to each global value in the program,
|
|
|
|
/// which is used by the comparison routine to order references to globals. This
|
|
|
|
/// state must be preserved throughout the pass, because Functions and other
|
|
|
|
/// globals need to maintain their relative order. Globals are assigned a number
|
|
|
|
/// when they are first visited. This order is deterministic, and so the
|
|
|
|
/// assigned numbers are as well. When two functions are merged, neither number
|
|
|
|
/// is updated. If the symbols are weak, this would be incorrect. If they are
|
|
|
|
/// strong, then one will be replaced at all references to the other, and so
|
|
|
|
/// direct callsites will now see one or the other symbol, and no update is
|
|
|
|
/// necessary. Note that if we were guaranteed unique names, we could just
|
|
|
|
/// compare those, but this would not work for stripped bitcodes or for those
|
|
|
|
/// few symbols without a name.
|
|
|
|
class GlobalNumberState {
|
|
|
|
struct Config : ValueMapConfig<GlobalValue*> {
|
|
|
|
enum { FollowRAUW = false };
|
|
|
|
};
|
|
|
|
// Each GlobalValue is mapped to an identifier. The Config ensures when RAUW
|
|
|
|
// occurs, the mapping does not change. Tracking changes is unnecessary, and
|
|
|
|
// also problematic for weak symbols (which may be overwritten).
|
|
|
|
typedef ValueMap<GlobalValue *, uint64_t, Config> ValueNumberMap;
|
|
|
|
ValueNumberMap GlobalNumbers;
|
|
|
|
// The next unused serial number to assign to a global.
|
|
|
|
uint64_t NextNumber;
|
|
|
|
public:
|
|
|
|
GlobalNumberState() : GlobalNumbers(), NextNumber(0) {}
|
|
|
|
uint64_t getNumber(GlobalValue* Global) {
|
|
|
|
ValueNumberMap::iterator MapIter;
|
|
|
|
bool Inserted;
|
|
|
|
std::tie(MapIter, Inserted) = GlobalNumbers.insert({Global, NextNumber});
|
|
|
|
if (Inserted)
|
|
|
|
NextNumber++;
|
|
|
|
return MapIter->second;
|
|
|
|
}
|
2015-10-06 01:26:36 +08:00
|
|
|
void clear() {
|
|
|
|
GlobalNumbers.clear();
|
|
|
|
}
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
};
|
|
|
|
|
2010-08-08 13:04:23 +08:00
|
|
|
/// FunctionComparator - Compares two functions to determine whether or not
|
2012-10-09 00:38:25 +08:00
|
|
|
/// they will generate machine code with the same behaviour. DataLayout is
|
2010-08-08 13:04:23 +08:00
|
|
|
/// used if available. The comparator always fails conservatively (erring on the
|
|
|
|
/// side of claiming that two functions are different).
|
2010-08-02 13:23:03 +08:00
|
|
|
class FunctionComparator {
|
|
|
|
public:
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
FunctionComparator(const Function *F1, const Function *F2,
|
|
|
|
GlobalNumberState* GN)
|
|
|
|
: FnL(F1), FnR(F2), GlobalNumbers(GN) {}
|
2010-08-02 13:23:03 +08:00
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
/// Test whether the two functions have equivalent behaviour.
|
2014-06-22 01:55:51 +08:00
|
|
|
int compare();
|
Accelerate MergeFunctions with hashing
This patch makes the Merge Functions pass faster by calculating and comparing
a hash value which captures the essential structure of a function before
performing a full function comparison.
The hash is calculated by hashing the function signature, then walking the basic
blocks of the function in the same order as the main comparison function. The
opcode of each instruction is hashed in sequence, which means that different
functions according to the existing total order cannot have the same hash, as
the comparison requires the opcodes of the two functions to be the same order.
The hash function is a static member of the FunctionComparator class because it
is tightly coupled to the exact comparison function used. For example, functions
which are equivalent modulo a single variant callsite might be merged by a more
aggressive MergeFunctions, and the hash function would need to be insensitive to
these differences in order to exploit this.
The hashing function uses a utility class which accumulates the values into an
internal state using a standard bit-mixing function. Note that this is a different interface
than a regular hashing routine, because the values to be hashed are scattered
amongst the properties of a llvm::Function, not linear in memory. This scheme is
fast because only one word of state needs to be kept, and the mixing function is
a few instructions.
The main runOnModule function first computes the hash of each function, and only
further processes functions which do not have a unique function hash. The hash
is also used to order the sorted function set. If the hashes differ, their
values are used to order the functions, otherwise the full comparison is done.
Both of these are helpful in speeding up MergeFunctions. Together they result in
speedups of 9% for mysqld (a mostly C application with little redundancy), 46%
for libxul in Firefox, and 117% for Chromium. (These are all LTO builds.) In all
three cases, the new speed of MergeFunctions is about half that of the module
verifier, making it relatively inexpensive even for large LTO builds with
hundreds of thousands of functions. The same functions are merged, so this
change is free performance.
Author: jrkoenig
Reviewers: nlewycky, dschuff, jfb
Subscribers: llvm-commits, aemerson
Differential revision: http://reviews.llvm.org/D11923
llvm-svn: 245140
2015-08-15 09:18:18 +08:00
|
|
|
/// Hash a function. Equivalent functions will have the same hash, and unequal
|
|
|
|
/// functions will have different hashes with high probability.
|
|
|
|
typedef uint64_t FunctionHash;
|
|
|
|
static FunctionHash functionHash(Function &);
|
2010-08-02 13:23:03 +08:00
|
|
|
|
|
|
|
private:
|
2011-01-28 16:43:14 +08:00
|
|
|
/// Test whether two basic blocks have equivalent behaviour.
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
int cmpBasicBlocks(const BasicBlock *BBL, const BasicBlock *BBR);
|
2010-08-02 13:23:03 +08:00
|
|
|
|
2014-05-07 17:05:10 +08:00
|
|
|
/// Constants comparison.
|
|
|
|
/// Its analog to lexicographical comparison between hypothetical numbers
|
|
|
|
/// of next format:
|
|
|
|
/// <bitcastability-trait><raw-bit-contents>
|
|
|
|
///
|
|
|
|
/// 1. Bitcastability.
|
|
|
|
/// Check whether L's type could be losslessly bitcasted to R's type.
|
|
|
|
/// On this stage method, in case when lossless bitcast is not possible
|
|
|
|
/// method returns -1 or 1, thus also defining which type is greater in
|
|
|
|
/// context of bitcastability.
|
|
|
|
/// Stage 0: If types are equal in terms of cmpTypes, then we can go straight
|
|
|
|
/// to the contents comparison.
|
|
|
|
/// If types differ, remember types comparison result and check
|
|
|
|
/// whether we still can bitcast types.
|
|
|
|
/// Stage 1: Types that satisfies isFirstClassType conditions are always
|
|
|
|
/// greater then others.
|
|
|
|
/// Stage 2: Vector is greater then non-vector.
|
|
|
|
/// If both types are vectors, then vector with greater bitwidth is
|
|
|
|
/// greater.
|
|
|
|
/// If both types are vectors with the same bitwidth, then types
|
|
|
|
/// are bitcastable, and we can skip other stages, and go to contents
|
|
|
|
/// comparison.
|
|
|
|
/// Stage 3: Pointer types are greater than non-pointers. If both types are
|
|
|
|
/// pointers of the same address space - go to contents comparison.
|
|
|
|
/// Different address spaces: pointer with greater address space is
|
|
|
|
/// greater.
|
|
|
|
/// Stage 4: Types are neither vectors, nor pointers. And they differ.
|
|
|
|
/// We don't know how to bitcast them. So, we better don't do it,
|
|
|
|
/// and return types comparison result (so it determines the
|
|
|
|
/// relationship among constants we don't know how to bitcast).
|
|
|
|
///
|
|
|
|
/// Just for clearance, let's see how the set of constants could look
|
|
|
|
/// on single dimension axis:
|
|
|
|
///
|
|
|
|
/// [NFCT], [FCT, "others"], [FCT, pointers], [FCT, vectors]
|
|
|
|
/// Where: NFCT - Not a FirstClassType
|
|
|
|
/// FCT - FirstClassTyp:
|
|
|
|
///
|
|
|
|
/// 2. Compare raw contents.
|
|
|
|
/// It ignores types on this stage and only compares bits from L and R.
|
|
|
|
/// Returns 0, if L and R has equivalent contents.
|
|
|
|
/// -1 or 1 if values are different.
|
|
|
|
/// Pretty trivial:
|
|
|
|
/// 2.1. If contents are numbers, compare numbers.
|
|
|
|
/// Ints with greater bitwidth are greater. Ints with same bitwidths
|
|
|
|
/// compared by their contents.
|
|
|
|
/// 2.2. "And so on". Just to avoid discrepancies with comments
|
|
|
|
/// perhaps it would be better to read the implementation itself.
|
|
|
|
/// 3. And again about overall picture. Let's look back at how the ordered set
|
|
|
|
/// of constants will look like:
|
|
|
|
/// [NFCT], [FCT, "others"], [FCT, pointers], [FCT, vectors]
|
|
|
|
///
|
|
|
|
/// Now look, what could be inside [FCT, "others"], for example:
|
|
|
|
/// [FCT, "others"] =
|
|
|
|
/// [
|
|
|
|
/// [double 0.1], [double 1.23],
|
|
|
|
/// [i32 1], [i32 2],
|
|
|
|
/// { double 1.0 }, ; StructTyID, NumElements = 1
|
|
|
|
/// { i32 1 }, ; StructTyID, NumElements = 1
|
|
|
|
/// { double 1, i32 1 }, ; StructTyID, NumElements = 2
|
|
|
|
/// { i32 1, double 1 } ; StructTyID, NumElements = 2
|
|
|
|
/// ]
|
|
|
|
///
|
|
|
|
/// Let's explain the order. Float numbers will be less than integers, just
|
|
|
|
/// because of cmpType terms: FloatTyID < IntegerTyID.
|
|
|
|
/// Floats (with same fltSemantics) are sorted according to their value.
|
|
|
|
/// Then you can see integers, and they are, like a floats,
|
|
|
|
/// could be easy sorted among each others.
|
|
|
|
/// The structures. Structures are grouped at the tail, again because of their
|
|
|
|
/// TypeID: StructTyID > IntegerTyID > FloatTyID.
|
|
|
|
/// Structures with greater number of elements are greater. Structures with
|
|
|
|
/// greater elements going first are greater.
|
|
|
|
/// The same logic with vectors, arrays and other possible complex types.
|
|
|
|
///
|
|
|
|
/// Bitcastable constants.
|
|
|
|
/// Let's assume, that some constant, belongs to some group of
|
|
|
|
/// "so-called-equal" values with different types, and at the same time
|
|
|
|
/// belongs to another group of constants with equal types
|
|
|
|
/// and "really" equal values.
|
|
|
|
///
|
|
|
|
/// Now, prove that this is impossible:
|
|
|
|
///
|
|
|
|
/// If constant A with type TyA is bitcastable to B with type TyB, then:
|
|
|
|
/// 1. All constants with equal types to TyA, are bitcastable to B. Since
|
|
|
|
/// those should be vectors (if TyA is vector), pointers
|
|
|
|
/// (if TyA is pointer), or else (if TyA equal to TyB), those types should
|
|
|
|
/// be equal to TyB.
|
|
|
|
/// 2. All constants with non-equal, but bitcastable types to TyA, are
|
|
|
|
/// bitcastable to B.
|
|
|
|
/// Once again, just because we allow it to vectors and pointers only.
|
|
|
|
/// This statement could be expanded as below:
|
|
|
|
/// 2.1. All vectors with equal bitwidth to vector A, has equal bitwidth to
|
|
|
|
/// vector B, and thus bitcastable to B as well.
|
|
|
|
/// 2.2. All pointers of the same address space, no matter what they point to,
|
|
|
|
/// bitcastable. So if C is pointer, it could be bitcasted to A and to B.
|
|
|
|
/// So any constant equal or bitcastable to A is equal or bitcastable to B.
|
|
|
|
/// QED.
|
|
|
|
///
|
|
|
|
/// In another words, for pointers and vectors, we ignore top-level type and
|
|
|
|
/// look at their particular properties (bit-width for vectors, and
|
|
|
|
/// address space for pointers).
|
|
|
|
/// If these properties are equal - compare their contents.
|
|
|
|
int cmpConstants(const Constant *L, const Constant *R);
|
|
|
|
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
/// Compares two global values by number. Uses the GlobalNumbersState to
|
|
|
|
/// identify the same gobals across function calls.
|
|
|
|
int cmpGlobalValues(GlobalValue *L, GlobalValue *R);
|
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
/// Assign or look up previously assigned numbers for the two values, and
|
|
|
|
/// return whether the numbers are equal. Numbers are assigned in the order
|
|
|
|
/// visited.
|
2014-05-07 19:11:39 +08:00
|
|
|
/// Comparison order:
|
|
|
|
/// Stage 0: Value that is function itself is always greater then others.
|
|
|
|
/// If left and right values are references to their functions, then
|
|
|
|
/// they are equal.
|
|
|
|
/// Stage 1: Constants are greater than non-constants.
|
|
|
|
/// If both left and right are constants, then the result of
|
|
|
|
/// cmpConstants is used as cmpValues result.
|
|
|
|
/// Stage 2: InlineAsm instances are greater than others. If both left and
|
|
|
|
/// right are InlineAsm instances, InlineAsm* pointers casted to
|
|
|
|
/// integers and compared as numbers.
|
|
|
|
/// Stage 3: For all other cases we compare order we meet these values in
|
|
|
|
/// their functions. If right value was met first during scanning,
|
|
|
|
/// then left value is greater.
|
|
|
|
/// In another words, we compare serial numbers, for more details
|
|
|
|
/// see comments for sn_mapL and sn_mapR.
|
|
|
|
int cmpValues(const Value *L, const Value *R);
|
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
/// Compare two Instructions for equivalence, similar to
|
|
|
|
/// Instruction::isSameOperationAs but with modifications to the type
|
2010-08-08 13:04:23 +08:00
|
|
|
/// comparison.
|
2014-05-16 19:02:22 +08:00
|
|
|
/// Stages are listed in "most significant stage first" order:
|
|
|
|
/// On each stage below, we do comparison between some left and right
|
|
|
|
/// operation parts. If parts are non-equal, we assign parts comparison
|
|
|
|
/// result to the operation comparison result and exit from method.
|
|
|
|
/// Otherwise we proceed to the next stage.
|
|
|
|
/// Stages:
|
|
|
|
/// 1. Operations opcodes. Compared as numbers.
|
|
|
|
/// 2. Number of operands.
|
|
|
|
/// 3. Operation types. Compared with cmpType method.
|
|
|
|
/// 4. Compare operation subclass optional data as stream of bytes:
|
|
|
|
/// just convert it to integers and call cmpNumbers.
|
|
|
|
/// 5. Compare in operation operand types with cmpType in
|
|
|
|
/// most significant operand first order.
|
|
|
|
/// 6. Last stage. Check operations for some specific attributes.
|
|
|
|
/// For example, for Load it would be:
|
|
|
|
/// 6.1.Load: volatile (as boolean flag)
|
|
|
|
/// 6.2.Load: alignment (as integer numbers)
|
|
|
|
/// 6.3.Load: synch-scope (as integer numbers)
|
2014-06-21 03:11:56 +08:00
|
|
|
/// 6.4.Load: range metadata (as integer numbers)
|
2014-05-16 19:02:22 +08:00
|
|
|
/// On this stage its better to see the code, since its not more than 10-15
|
|
|
|
/// strings for particular instruction, and could change sometimes.
|
2014-07-31 15:16:59 +08:00
|
|
|
int cmpOperations(const Instruction *L, const Instruction *R) const;
|
2014-05-16 19:02:22 +08:00
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
/// Compare two GEPs for equivalent pointer arithmetic.
|
2014-05-16 19:55:02 +08:00
|
|
|
/// Parts to be compared for each comparison stage,
|
|
|
|
/// most significant stage first:
|
|
|
|
/// 1. Address space. As numbers.
|
2015-03-10 10:37:25 +08:00
|
|
|
/// 2. Constant offset, (using GEPOperator::accumulateConstantOffset method).
|
2014-05-16 19:55:02 +08:00
|
|
|
/// 3. Pointer operand type (using cmpType method).
|
|
|
|
/// 4. Number of operands.
|
|
|
|
/// 5. Compare operands, using cmpValues method.
|
2014-08-25 16:12:45 +08:00
|
|
|
int cmpGEPs(const GEPOperator *GEPL, const GEPOperator *GEPR);
|
|
|
|
int cmpGEPs(const GetElementPtrInst *GEPL, const GetElementPtrInst *GEPR) {
|
|
|
|
return cmpGEPs(cast<GEPOperator>(GEPL), cast<GEPOperator>(GEPR));
|
2014-05-16 19:55:02 +08:00
|
|
|
}
|
|
|
|
|
2014-03-13 19:54:50 +08:00
|
|
|
/// cmpType - compares two types,
|
|
|
|
/// defines total ordering among the types set.
|
|
|
|
///
|
|
|
|
/// Return values:
|
|
|
|
/// 0 if types are equal,
|
|
|
|
/// -1 if Left is less than Right,
|
|
|
|
/// +1 if Left is greater than Right.
|
|
|
|
///
|
|
|
|
/// Description:
|
|
|
|
/// Comparison is broken onto stages. Like in lexicographical comparison
|
|
|
|
/// stage coming first has higher priority.
|
|
|
|
/// On each explanation stage keep in mind total ordering properties.
|
|
|
|
///
|
2014-03-14 16:17:19 +08:00
|
|
|
/// 0. Before comparison we coerce pointer types of 0 address space to
|
|
|
|
/// integer.
|
2014-03-13 19:54:50 +08:00
|
|
|
/// We also don't bother with same type at left and right, so
|
|
|
|
/// just return 0 in this case.
|
|
|
|
///
|
|
|
|
/// 1. If types are of different kind (different type IDs).
|
|
|
|
/// Return result of type IDs comparison, treating them as numbers.
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
/// 2. If types are integers, check that they have the same width. If they
|
|
|
|
/// are vectors, check that they have the same count and subtype.
|
|
|
|
/// 3. Types have the same ID, so check whether they are one of:
|
2014-03-13 19:54:50 +08:00
|
|
|
/// * Void
|
|
|
|
/// * Float
|
|
|
|
/// * Double
|
|
|
|
/// * X86_FP80
|
|
|
|
/// * FP128
|
|
|
|
/// * PPC_FP128
|
|
|
|
/// * Label
|
|
|
|
/// * Metadata
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
/// We can treat these types as equal whenever their IDs are same.
|
2014-03-13 19:54:50 +08:00
|
|
|
/// 4. If Left and Right are pointers, return result of address space
|
|
|
|
/// comparison (numbers comparison). We can treat pointer types of same
|
|
|
|
/// address space as equal.
|
|
|
|
/// 5. If types are complex.
|
|
|
|
/// Then both Left and Right are to be expanded and their element types will
|
|
|
|
/// be checked with the same way. If we get Res != 0 on some stage, return it.
|
|
|
|
/// Otherwise return 0.
|
|
|
|
/// 6. For all other cases put llvm_unreachable.
|
2014-08-25 16:16:39 +08:00
|
|
|
int cmpTypes(Type *TyL, Type *TyR) const;
|
2014-03-13 19:54:50 +08:00
|
|
|
|
|
|
|
int cmpNumbers(uint64_t L, uint64_t R) const;
|
2014-08-25 16:19:50 +08:00
|
|
|
int cmpAPInts(const APInt &L, const APInt &R) const;
|
2014-08-25 16:22:46 +08:00
|
|
|
int cmpAPFloats(const APFloat &L, const APFloat &R) const;
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
int cmpInlineAsm(const InlineAsm *L, const InlineAsm *R) const;
|
|
|
|
int cmpMem(StringRef L, StringRef R) const;
|
2014-05-16 16:55:34 +08:00
|
|
|
int cmpAttrs(const AttributeSet L, const AttributeSet R) const;
|
Remove Merge Functions pointer comparisons
Summary:
This patch removes two remaining places where pointer value comparisons
are used to order functions: comparing range annotation metadata, and comparing
block address constants. (These are both rare cases, and so no actual
non-determinism was observed from either case).
The fix for range metadata is simple: the annotation always consists of a pair
of integers, so we just order by those integers.
The fix for block addresses is more subtle. Two constants are the same if they
are the same basic block in the same function, or if they refer to corresponding
basic blocks in each respective function. Note that in the first case, merging
is trivially correct. In the second, the correctness of merging relies on the
fact that the the values of block addresses cannot be compared. This change is
actually an enhancement, as these functions could not previously be merged (see
merge-block-address.ll).
There is still a problem with cross function block addresses, in that constants
pointing to a basic block in a merged function is not updated.
This also more robustly compares floating point constants by all fields of their
semantics, and fixes a dyn_cast/cast mixup.
Author: jrkoenig
Reviewers: dschuff, nlewycky, jfb
Subscribers llvm-commits
Differential revision: http://reviews.llvm.org/D12376
llvm-svn: 246305
2015-08-29 00:49:09 +08:00
|
|
|
int cmpRangeMetadata(const MDNode* L, const MDNode* R) const;
|
2014-05-07 17:05:10 +08:00
|
|
|
|
2010-08-02 13:23:03 +08:00
|
|
|
// The two functions undergoing comparison.
|
2014-06-22 01:55:51 +08:00
|
|
|
const Function *FnL, *FnR;
|
2010-08-02 13:23:03 +08:00
|
|
|
|
2014-05-07 19:11:39 +08:00
|
|
|
/// Assign serial numbers to values from left function, and values from
|
|
|
|
/// right function.
|
|
|
|
/// Explanation:
|
|
|
|
/// Being comparing functions we need to compare values we meet at left and
|
|
|
|
/// right sides.
|
|
|
|
/// Its easy to sort things out for external values. It just should be
|
|
|
|
/// the same value at left and right.
|
|
|
|
/// But for local values (those were introduced inside function body)
|
|
|
|
/// we have to ensure they were introduced at exactly the same place,
|
|
|
|
/// and plays the same role.
|
|
|
|
/// Let's assign serial number to each value when we meet it first time.
|
|
|
|
/// Values that were met at same place will be with same serial numbers.
|
|
|
|
/// In this case it would be good to explain few points about values assigned
|
|
|
|
/// to BBs and other ways of implementation (see below).
|
|
|
|
///
|
|
|
|
/// 1. Safety of BB reordering.
|
|
|
|
/// It's safe to change the order of BasicBlocks in function.
|
|
|
|
/// Relationship with other functions and serial numbering will not be
|
|
|
|
/// changed in this case.
|
|
|
|
/// As follows from FunctionComparator::compare(), we do CFG walk: we start
|
|
|
|
/// from the entry, and then take each terminator. So it doesn't matter how in
|
|
|
|
/// fact BBs are ordered in function. And since cmpValues are called during
|
|
|
|
/// this walk, the numbering depends only on how BBs located inside the CFG.
|
|
|
|
/// So the answer is - yes. We will get the same numbering.
|
|
|
|
///
|
|
|
|
/// 2. Impossibility to use dominance properties of values.
|
|
|
|
/// If we compare two instruction operands: first is usage of local
|
|
|
|
/// variable AL from function FL, and second is usage of local variable AR
|
|
|
|
/// from FR, we could compare their origins and check whether they are
|
|
|
|
/// defined at the same place.
|
|
|
|
/// But, we are still not able to compare operands of PHI nodes, since those
|
|
|
|
/// could be operands from further BBs we didn't scan yet.
|
|
|
|
/// So it's impossible to use dominance properties in general.
|
|
|
|
DenseMap<const Value*, int> sn_mapL, sn_mapR;
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
|
|
|
|
// The global state we will use
|
|
|
|
GlobalNumberState* GlobalNumbers;
|
2010-08-02 13:23:03 +08:00
|
|
|
};
|
2011-01-28 15:36:21 +08:00
|
|
|
|
2014-09-10 18:08:25 +08:00
|
|
|
class FunctionNode {
|
2015-06-09 08:03:29 +08:00
|
|
|
mutable AssertingVH<Function> F;
|
Accelerate MergeFunctions with hashing
This patch makes the Merge Functions pass faster by calculating and comparing
a hash value which captures the essential structure of a function before
performing a full function comparison.
The hash is calculated by hashing the function signature, then walking the basic
blocks of the function in the same order as the main comparison function. The
opcode of each instruction is hashed in sequence, which means that different
functions according to the existing total order cannot have the same hash, as
the comparison requires the opcodes of the two functions to be the same order.
The hash function is a static member of the FunctionComparator class because it
is tightly coupled to the exact comparison function used. For example, functions
which are equivalent modulo a single variant callsite might be merged by a more
aggressive MergeFunctions, and the hash function would need to be insensitive to
these differences in order to exploit this.
The hashing function uses a utility class which accumulates the values into an
internal state using a standard bit-mixing function. Note that this is a different interface
than a regular hashing routine, because the values to be hashed are scattered
amongst the properties of a llvm::Function, not linear in memory. This scheme is
fast because only one word of state needs to be kept, and the mixing function is
a few instructions.
The main runOnModule function first computes the hash of each function, and only
further processes functions which do not have a unique function hash. The hash
is also used to order the sorted function set. If the hashes differ, their
values are used to order the functions, otherwise the full comparison is done.
Both of these are helpful in speeding up MergeFunctions. Together they result in
speedups of 9% for mysqld (a mostly C application with little redundancy), 46%
for libxul in Firefox, and 117% for Chromium. (These are all LTO builds.) In all
three cases, the new speed of MergeFunctions is about half that of the module
verifier, making it relatively inexpensive even for large LTO builds with
hundreds of thousands of functions. The same functions are merged, so this
change is free performance.
Author: jrkoenig
Reviewers: nlewycky, dschuff, jfb
Subscribers: llvm-commits, aemerson
Differential revision: http://reviews.llvm.org/D11923
llvm-svn: 245140
2015-08-15 09:18:18 +08:00
|
|
|
FunctionComparator::FunctionHash Hash;
|
2014-06-22 04:54:36 +08:00
|
|
|
public:
|
Accelerate MergeFunctions with hashing
This patch makes the Merge Functions pass faster by calculating and comparing
a hash value which captures the essential structure of a function before
performing a full function comparison.
The hash is calculated by hashing the function signature, then walking the basic
blocks of the function in the same order as the main comparison function. The
opcode of each instruction is hashed in sequence, which means that different
functions according to the existing total order cannot have the same hash, as
the comparison requires the opcodes of the two functions to be the same order.
The hash function is a static member of the FunctionComparator class because it
is tightly coupled to the exact comparison function used. For example, functions
which are equivalent modulo a single variant callsite might be merged by a more
aggressive MergeFunctions, and the hash function would need to be insensitive to
these differences in order to exploit this.
The hashing function uses a utility class which accumulates the values into an
internal state using a standard bit-mixing function. Note that this is a different interface
than a regular hashing routine, because the values to be hashed are scattered
amongst the properties of a llvm::Function, not linear in memory. This scheme is
fast because only one word of state needs to be kept, and the mixing function is
a few instructions.
The main runOnModule function first computes the hash of each function, and only
further processes functions which do not have a unique function hash. The hash
is also used to order the sorted function set. If the hashes differ, their
values are used to order the functions, otherwise the full comparison is done.
Both of these are helpful in speeding up MergeFunctions. Together they result in
speedups of 9% for mysqld (a mostly C application with little redundancy), 46%
for libxul in Firefox, and 117% for Chromium. (These are all LTO builds.) In all
three cases, the new speed of MergeFunctions is about half that of the module
verifier, making it relatively inexpensive even for large LTO builds with
hundreds of thousands of functions. The same functions are merged, so this
change is free performance.
Author: jrkoenig
Reviewers: nlewycky, dschuff, jfb
Subscribers: llvm-commits, aemerson
Differential revision: http://reviews.llvm.org/D11923
llvm-svn: 245140
2015-08-15 09:18:18 +08:00
|
|
|
// Note the hash is recalculated potentially multiple times, but it is cheap.
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
FunctionNode(Function *F)
|
|
|
|
: F(F), Hash(FunctionComparator::functionHash(*F)) {}
|
2014-06-22 04:54:36 +08:00
|
|
|
Function *getFunc() const { return F; }
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
FunctionComparator::FunctionHash getHash() const { return Hash; }
|
2015-06-09 08:03:29 +08:00
|
|
|
|
|
|
|
/// Replace the reference to the function F by the function G, assuming their
|
|
|
|
/// implementations are equal.
|
|
|
|
void replaceBy(Function *G) const {
|
|
|
|
F = G;
|
|
|
|
}
|
|
|
|
|
2015-10-07 07:24:35 +08:00
|
|
|
void release() { F = nullptr; }
|
2014-06-22 04:54:36 +08:00
|
|
|
};
|
2015-10-07 07:24:35 +08:00
|
|
|
} // end anonymous namespace
|
2010-08-02 13:23:03 +08:00
|
|
|
|
2014-03-13 19:54:50 +08:00
|
|
|
int FunctionComparator::cmpNumbers(uint64_t L, uint64_t R) const {
|
|
|
|
if (L < R) return -1;
|
|
|
|
if (L > R) return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-08-25 16:19:50 +08:00
|
|
|
int FunctionComparator::cmpAPInts(const APInt &L, const APInt &R) const {
|
2014-05-07 17:05:10 +08:00
|
|
|
if (int Res = cmpNumbers(L.getBitWidth(), R.getBitWidth()))
|
|
|
|
return Res;
|
|
|
|
if (L.ugt(R)) return 1;
|
|
|
|
if (R.ugt(L)) return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-08-25 16:22:46 +08:00
|
|
|
int FunctionComparator::cmpAPFloats(const APFloat &L, const APFloat &R) const {
|
Remove Merge Functions pointer comparisons
Summary:
This patch removes two remaining places where pointer value comparisons
are used to order functions: comparing range annotation metadata, and comparing
block address constants. (These are both rare cases, and so no actual
non-determinism was observed from either case).
The fix for range metadata is simple: the annotation always consists of a pair
of integers, so we just order by those integers.
The fix for block addresses is more subtle. Two constants are the same if they
are the same basic block in the same function, or if they refer to corresponding
basic blocks in each respective function. Note that in the first case, merging
is trivially correct. In the second, the correctness of merging relies on the
fact that the the values of block addresses cannot be compared. This change is
actually an enhancement, as these functions could not previously be merged (see
merge-block-address.ll).
There is still a problem with cross function block addresses, in that constants
pointing to a basic block in a merged function is not updated.
This also more robustly compares floating point constants by all fields of their
semantics, and fixes a dyn_cast/cast mixup.
Author: jrkoenig
Reviewers: dschuff, nlewycky, jfb
Subscribers llvm-commits
Differential revision: http://reviews.llvm.org/D12376
llvm-svn: 246305
2015-08-29 00:49:09 +08:00
|
|
|
// Floats are ordered first by semantics (i.e. float, double, half, etc.),
|
|
|
|
// then by value interpreted as a bitstring (aka APInt).
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
const fltSemantics &SL = L.getSemantics(), &SR = R.getSemantics();
|
|
|
|
if (int Res = cmpNumbers(APFloat::semanticsPrecision(SL),
|
|
|
|
APFloat::semanticsPrecision(SR)))
|
2014-05-07 17:05:10 +08:00
|
|
|
return Res;
|
Remove Merge Functions pointer comparisons
Summary:
This patch removes two remaining places where pointer value comparisons
are used to order functions: comparing range annotation metadata, and comparing
block address constants. (These are both rare cases, and so no actual
non-determinism was observed from either case).
The fix for range metadata is simple: the annotation always consists of a pair
of integers, so we just order by those integers.
The fix for block addresses is more subtle. Two constants are the same if they
are the same basic block in the same function, or if they refer to corresponding
basic blocks in each respective function. Note that in the first case, merging
is trivially correct. In the second, the correctness of merging relies on the
fact that the the values of block addresses cannot be compared. This change is
actually an enhancement, as these functions could not previously be merged (see
merge-block-address.ll).
There is still a problem with cross function block addresses, in that constants
pointing to a basic block in a merged function is not updated.
This also more robustly compares floating point constants by all fields of their
semantics, and fixes a dyn_cast/cast mixup.
Author: jrkoenig
Reviewers: dschuff, nlewycky, jfb
Subscribers llvm-commits
Differential revision: http://reviews.llvm.org/D12376
llvm-svn: 246305
2015-08-29 00:49:09 +08:00
|
|
|
if (int Res = cmpNumbers(APFloat::semanticsMaxExponent(SL),
|
|
|
|
APFloat::semanticsMaxExponent(SR)))
|
|
|
|
return Res;
|
|
|
|
if (int Res = cmpNumbers(APFloat::semanticsMinExponent(SL),
|
|
|
|
APFloat::semanticsMinExponent(SR)))
|
|
|
|
return Res;
|
|
|
|
if (int Res = cmpNumbers(APFloat::semanticsSizeInBits(SL),
|
|
|
|
APFloat::semanticsSizeInBits(SR)))
|
|
|
|
return Res;
|
2014-08-25 16:19:50 +08:00
|
|
|
return cmpAPInts(L.bitcastToAPInt(), R.bitcastToAPInt());
|
2014-05-07 17:05:10 +08:00
|
|
|
}
|
|
|
|
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
int FunctionComparator::cmpMem(StringRef L, StringRef R) const {
|
2014-05-16 16:55:34 +08:00
|
|
|
// Prevent heavy comparison, compare sizes first.
|
|
|
|
if (int Res = cmpNumbers(L.size(), R.size()))
|
|
|
|
return Res;
|
|
|
|
|
|
|
|
// Compare strings lexicographically only when it is necessary: only when
|
|
|
|
// strings are equal in size.
|
|
|
|
return L.compare(R);
|
|
|
|
}
|
|
|
|
|
|
|
|
int FunctionComparator::cmpAttrs(const AttributeSet L,
|
|
|
|
const AttributeSet R) const {
|
|
|
|
if (int Res = cmpNumbers(L.getNumSlots(), R.getNumSlots()))
|
|
|
|
return Res;
|
|
|
|
|
|
|
|
for (unsigned i = 0, e = L.getNumSlots(); i != e; ++i) {
|
|
|
|
AttributeSet::iterator LI = L.begin(i), LE = L.end(i), RI = R.begin(i),
|
|
|
|
RE = R.end(i);
|
|
|
|
for (; LI != LE && RI != RE; ++LI, ++RI) {
|
|
|
|
Attribute LA = *LI;
|
|
|
|
Attribute RA = *RI;
|
|
|
|
if (LA < RA)
|
|
|
|
return -1;
|
|
|
|
if (RA < LA)
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (LI != LE)
|
|
|
|
return 1;
|
|
|
|
if (RI != RE)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2015-10-07 07:24:35 +08:00
|
|
|
|
Remove Merge Functions pointer comparisons
Summary:
This patch removes two remaining places where pointer value comparisons
are used to order functions: comparing range annotation metadata, and comparing
block address constants. (These are both rare cases, and so no actual
non-determinism was observed from either case).
The fix for range metadata is simple: the annotation always consists of a pair
of integers, so we just order by those integers.
The fix for block addresses is more subtle. Two constants are the same if they
are the same basic block in the same function, or if they refer to corresponding
basic blocks in each respective function. Note that in the first case, merging
is trivially correct. In the second, the correctness of merging relies on the
fact that the the values of block addresses cannot be compared. This change is
actually an enhancement, as these functions could not previously be merged (see
merge-block-address.ll).
There is still a problem with cross function block addresses, in that constants
pointing to a basic block in a merged function is not updated.
This also more robustly compares floating point constants by all fields of their
semantics, and fixes a dyn_cast/cast mixup.
Author: jrkoenig
Reviewers: dschuff, nlewycky, jfb
Subscribers llvm-commits
Differential revision: http://reviews.llvm.org/D12376
llvm-svn: 246305
2015-08-29 00:49:09 +08:00
|
|
|
int FunctionComparator::cmpRangeMetadata(const MDNode* L,
|
|
|
|
const MDNode* R) const {
|
|
|
|
if (L == R)
|
|
|
|
return 0;
|
|
|
|
if (!L)
|
|
|
|
return -1;
|
|
|
|
if (!R)
|
|
|
|
return 1;
|
|
|
|
// Range metadata is a sequence of numbers. Make sure they are the same
|
|
|
|
// sequence.
|
|
|
|
// TODO: Note that as this is metadata, it is possible to drop and/or merge
|
|
|
|
// this data when considering functions to merge. Thus this comparison would
|
|
|
|
// return 0 (i.e. equivalent), but merging would become more complicated
|
|
|
|
// because the ranges would need to be unioned. It is not likely that
|
|
|
|
// functions differ ONLY in this metadata if they are actually the same
|
|
|
|
// function semantically.
|
|
|
|
if (int Res = cmpNumbers(L->getNumOperands(), R->getNumOperands()))
|
|
|
|
return Res;
|
|
|
|
for (size_t I = 0; I < L->getNumOperands(); ++I) {
|
|
|
|
ConstantInt* LLow = mdconst::extract<ConstantInt>(L->getOperand(I));
|
|
|
|
ConstantInt* RLow = mdconst::extract<ConstantInt>(R->getOperand(I));
|
|
|
|
if (int Res = cmpAPInts(LLow->getValue(), RLow->getValue()))
|
|
|
|
return Res;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2014-05-16 16:55:34 +08:00
|
|
|
|
2014-05-07 17:05:10 +08:00
|
|
|
/// Constants comparison:
|
|
|
|
/// 1. Check whether type of L constant could be losslessly bitcasted to R
|
|
|
|
/// type.
|
|
|
|
/// 2. Compare constant contents.
|
|
|
|
/// For more details see declaration comments.
|
|
|
|
int FunctionComparator::cmpConstants(const Constant *L, const Constant *R) {
|
|
|
|
|
|
|
|
Type *TyL = L->getType();
|
|
|
|
Type *TyR = R->getType();
|
|
|
|
|
|
|
|
// Check whether types are bitcastable. This part is just re-factored
|
|
|
|
// Type::canLosslesslyBitCastTo method, but instead of returning true/false,
|
|
|
|
// we also pack into result which type is "less" for us.
|
2014-08-25 16:16:39 +08:00
|
|
|
int TypesRes = cmpTypes(TyL, TyR);
|
2014-05-07 17:05:10 +08:00
|
|
|
if (TypesRes != 0) {
|
|
|
|
// Types are different, but check whether we can bitcast them.
|
|
|
|
if (!TyL->isFirstClassType()) {
|
|
|
|
if (TyR->isFirstClassType())
|
|
|
|
return -1;
|
|
|
|
// Neither TyL nor TyR are values of first class type. Return the result
|
|
|
|
// of comparing the types
|
|
|
|
return TypesRes;
|
|
|
|
}
|
|
|
|
if (!TyR->isFirstClassType()) {
|
|
|
|
if (TyL->isFirstClassType())
|
|
|
|
return 1;
|
|
|
|
return TypesRes;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Vector -> Vector conversions are always lossless if the two vector types
|
|
|
|
// have the same size, otherwise not.
|
|
|
|
unsigned TyLWidth = 0;
|
|
|
|
unsigned TyRWidth = 0;
|
|
|
|
|
2015-08-02 06:20:21 +08:00
|
|
|
if (auto *VecTyL = dyn_cast<VectorType>(TyL))
|
2014-05-07 17:05:10 +08:00
|
|
|
TyLWidth = VecTyL->getBitWidth();
|
2015-08-02 06:20:21 +08:00
|
|
|
if (auto *VecTyR = dyn_cast<VectorType>(TyR))
|
2014-05-07 17:05:10 +08:00
|
|
|
TyRWidth = VecTyR->getBitWidth();
|
|
|
|
|
|
|
|
if (TyLWidth != TyRWidth)
|
|
|
|
return cmpNumbers(TyLWidth, TyRWidth);
|
|
|
|
|
|
|
|
// Zero bit-width means neither TyL nor TyR are vectors.
|
|
|
|
if (!TyLWidth) {
|
|
|
|
PointerType *PTyL = dyn_cast<PointerType>(TyL);
|
|
|
|
PointerType *PTyR = dyn_cast<PointerType>(TyR);
|
|
|
|
if (PTyL && PTyR) {
|
|
|
|
unsigned AddrSpaceL = PTyL->getAddressSpace();
|
|
|
|
unsigned AddrSpaceR = PTyR->getAddressSpace();
|
|
|
|
if (int Res = cmpNumbers(AddrSpaceL, AddrSpaceR))
|
|
|
|
return Res;
|
|
|
|
}
|
|
|
|
if (PTyL)
|
|
|
|
return 1;
|
|
|
|
if (PTyR)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
// TyL and TyR aren't vectors, nor pointers. We don't know how to
|
|
|
|
// bitcast them.
|
|
|
|
return TypesRes;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// OK, types are bitcastable, now check constant contents.
|
|
|
|
|
|
|
|
if (L->isNullValue() && R->isNullValue())
|
|
|
|
return TypesRes;
|
|
|
|
if (L->isNullValue() && !R->isNullValue())
|
|
|
|
return 1;
|
|
|
|
if (!L->isNullValue() && R->isNullValue())
|
|
|
|
return -1;
|
|
|
|
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
auto GlobalValueL = const_cast<GlobalValue*>(dyn_cast<GlobalValue>(L));
|
|
|
|
auto GlobalValueR = const_cast<GlobalValue*>(dyn_cast<GlobalValue>(R));
|
|
|
|
if (GlobalValueL && GlobalValueR) {
|
|
|
|
return cmpGlobalValues(GlobalValueL, GlobalValueR);
|
|
|
|
}
|
|
|
|
|
2014-05-07 17:05:10 +08:00
|
|
|
if (int Res = cmpNumbers(L->getValueID(), R->getValueID()))
|
|
|
|
return Res;
|
|
|
|
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
if (const auto *SeqL = dyn_cast<ConstantDataSequential>(L)) {
|
Remove Merge Functions pointer comparisons
Summary:
This patch removes two remaining places where pointer value comparisons
are used to order functions: comparing range annotation metadata, and comparing
block address constants. (These are both rare cases, and so no actual
non-determinism was observed from either case).
The fix for range metadata is simple: the annotation always consists of a pair
of integers, so we just order by those integers.
The fix for block addresses is more subtle. Two constants are the same if they
are the same basic block in the same function, or if they refer to corresponding
basic blocks in each respective function. Note that in the first case, merging
is trivially correct. In the second, the correctness of merging relies on the
fact that the the values of block addresses cannot be compared. This change is
actually an enhancement, as these functions could not previously be merged (see
merge-block-address.ll).
There is still a problem with cross function block addresses, in that constants
pointing to a basic block in a merged function is not updated.
This also more robustly compares floating point constants by all fields of their
semantics, and fixes a dyn_cast/cast mixup.
Author: jrkoenig
Reviewers: dschuff, nlewycky, jfb
Subscribers llvm-commits
Differential revision: http://reviews.llvm.org/D12376
llvm-svn: 246305
2015-08-29 00:49:09 +08:00
|
|
|
const auto *SeqR = cast<ConstantDataSequential>(R);
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
// This handles ConstantDataArray and ConstantDataVector. Note that we
|
|
|
|
// compare the two raw data arrays, which might differ depending on the host
|
|
|
|
// endianness. This isn't a problem though, because the endiness of a module
|
|
|
|
// will affect the order of the constants, but this order is the same
|
|
|
|
// for a given input module and host platform.
|
|
|
|
return cmpMem(SeqL->getRawDataValues(), SeqR->getRawDataValues());
|
|
|
|
}
|
|
|
|
|
2014-05-07 17:05:10 +08:00
|
|
|
switch (L->getValueID()) {
|
|
|
|
case Value::UndefValueVal: return TypesRes;
|
|
|
|
case Value::ConstantIntVal: {
|
|
|
|
const APInt &LInt = cast<ConstantInt>(L)->getValue();
|
|
|
|
const APInt &RInt = cast<ConstantInt>(R)->getValue();
|
2014-08-25 16:19:50 +08:00
|
|
|
return cmpAPInts(LInt, RInt);
|
2014-05-07 17:05:10 +08:00
|
|
|
}
|
|
|
|
case Value::ConstantFPVal: {
|
|
|
|
const APFloat &LAPF = cast<ConstantFP>(L)->getValueAPF();
|
|
|
|
const APFloat &RAPF = cast<ConstantFP>(R)->getValueAPF();
|
2014-08-25 16:22:46 +08:00
|
|
|
return cmpAPFloats(LAPF, RAPF);
|
2014-05-07 17:05:10 +08:00
|
|
|
}
|
|
|
|
case Value::ConstantArrayVal: {
|
|
|
|
const ConstantArray *LA = cast<ConstantArray>(L);
|
|
|
|
const ConstantArray *RA = cast<ConstantArray>(R);
|
|
|
|
uint64_t NumElementsL = cast<ArrayType>(TyL)->getNumElements();
|
|
|
|
uint64_t NumElementsR = cast<ArrayType>(TyR)->getNumElements();
|
|
|
|
if (int Res = cmpNumbers(NumElementsL, NumElementsR))
|
|
|
|
return Res;
|
|
|
|
for (uint64_t i = 0; i < NumElementsL; ++i) {
|
|
|
|
if (int Res = cmpConstants(cast<Constant>(LA->getOperand(i)),
|
|
|
|
cast<Constant>(RA->getOperand(i))))
|
|
|
|
return Res;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
case Value::ConstantStructVal: {
|
|
|
|
const ConstantStruct *LS = cast<ConstantStruct>(L);
|
|
|
|
const ConstantStruct *RS = cast<ConstantStruct>(R);
|
|
|
|
unsigned NumElementsL = cast<StructType>(TyL)->getNumElements();
|
|
|
|
unsigned NumElementsR = cast<StructType>(TyR)->getNumElements();
|
|
|
|
if (int Res = cmpNumbers(NumElementsL, NumElementsR))
|
|
|
|
return Res;
|
|
|
|
for (unsigned i = 0; i != NumElementsL; ++i) {
|
|
|
|
if (int Res = cmpConstants(cast<Constant>(LS->getOperand(i)),
|
|
|
|
cast<Constant>(RS->getOperand(i))))
|
|
|
|
return Res;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
case Value::ConstantVectorVal: {
|
|
|
|
const ConstantVector *LV = cast<ConstantVector>(L);
|
|
|
|
const ConstantVector *RV = cast<ConstantVector>(R);
|
|
|
|
unsigned NumElementsL = cast<VectorType>(TyL)->getNumElements();
|
|
|
|
unsigned NumElementsR = cast<VectorType>(TyR)->getNumElements();
|
|
|
|
if (int Res = cmpNumbers(NumElementsL, NumElementsR))
|
|
|
|
return Res;
|
|
|
|
for (uint64_t i = 0; i < NumElementsL; ++i) {
|
|
|
|
if (int Res = cmpConstants(cast<Constant>(LV->getOperand(i)),
|
|
|
|
cast<Constant>(RV->getOperand(i))))
|
|
|
|
return Res;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
case Value::ConstantExprVal: {
|
|
|
|
const ConstantExpr *LE = cast<ConstantExpr>(L);
|
|
|
|
const ConstantExpr *RE = cast<ConstantExpr>(R);
|
|
|
|
unsigned NumOperandsL = LE->getNumOperands();
|
|
|
|
unsigned NumOperandsR = RE->getNumOperands();
|
|
|
|
if (int Res = cmpNumbers(NumOperandsL, NumOperandsR))
|
|
|
|
return Res;
|
|
|
|
for (unsigned i = 0; i < NumOperandsL; ++i) {
|
|
|
|
if (int Res = cmpConstants(cast<Constant>(LE->getOperand(i)),
|
|
|
|
cast<Constant>(RE->getOperand(i))))
|
|
|
|
return Res;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
case Value::BlockAddressVal: {
|
Remove Merge Functions pointer comparisons
Summary:
This patch removes two remaining places where pointer value comparisons
are used to order functions: comparing range annotation metadata, and comparing
block address constants. (These are both rare cases, and so no actual
non-determinism was observed from either case).
The fix for range metadata is simple: the annotation always consists of a pair
of integers, so we just order by those integers.
The fix for block addresses is more subtle. Two constants are the same if they
are the same basic block in the same function, or if they refer to corresponding
basic blocks in each respective function. Note that in the first case, merging
is trivially correct. In the second, the correctness of merging relies on the
fact that the the values of block addresses cannot be compared. This change is
actually an enhancement, as these functions could not previously be merged (see
merge-block-address.ll).
There is still a problem with cross function block addresses, in that constants
pointing to a basic block in a merged function is not updated.
This also more robustly compares floating point constants by all fields of their
semantics, and fixes a dyn_cast/cast mixup.
Author: jrkoenig
Reviewers: dschuff, nlewycky, jfb
Subscribers llvm-commits
Differential revision: http://reviews.llvm.org/D12376
llvm-svn: 246305
2015-08-29 00:49:09 +08:00
|
|
|
const BlockAddress *LBA = cast<BlockAddress>(L);
|
|
|
|
const BlockAddress *RBA = cast<BlockAddress>(R);
|
|
|
|
if (int Res = cmpValues(LBA->getFunction(), RBA->getFunction()))
|
|
|
|
return Res;
|
|
|
|
if (LBA->getFunction() == RBA->getFunction()) {
|
|
|
|
// They are BBs in the same function. Order by which comes first in the
|
|
|
|
// BB order of the function. This order is deterministic.
|
|
|
|
Function* F = LBA->getFunction();
|
|
|
|
BasicBlock *LBB = LBA->getBasicBlock();
|
|
|
|
BasicBlock *RBB = RBA->getBasicBlock();
|
|
|
|
if (LBB == RBB)
|
|
|
|
return 0;
|
|
|
|
for(BasicBlock &BB : F->getBasicBlockList()) {
|
|
|
|
if (&BB == LBB) {
|
|
|
|
assert(&BB != RBB);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (&BB == RBB)
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
llvm_unreachable("Basic Block Address does not point to a basic block in "
|
|
|
|
"its function.");
|
|
|
|
return -1;
|
|
|
|
} else {
|
|
|
|
// cmpValues said the functions are the same. So because they aren't
|
|
|
|
// literally the same pointer, they must respectively be the left and
|
|
|
|
// right functions.
|
|
|
|
assert(LBA->getFunction() == FnL && RBA->getFunction() == FnR);
|
|
|
|
// cmpValues will tell us if these are equivalent BasicBlocks, in the
|
|
|
|
// context of their respective functions.
|
|
|
|
return cmpValues(LBA->getBasicBlock(), RBA->getBasicBlock());
|
|
|
|
}
|
2014-05-07 17:05:10 +08:00
|
|
|
}
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
default: // Unknown constant, abort.
|
|
|
|
DEBUG(dbgs() << "Looking at valueID " << L->getValueID() << "\n");
|
|
|
|
llvm_unreachable("Constant ValueID not recognized.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int FunctionComparator::cmpGlobalValues(GlobalValue *L, GlobalValue* R) {
|
|
|
|
return cmpNumbers(GlobalNumbers->getNumber(L), GlobalNumbers->getNumber(R));
|
2014-05-07 17:05:10 +08:00
|
|
|
}
|
|
|
|
|
2014-03-13 19:54:50 +08:00
|
|
|
/// cmpType - compares two types,
|
|
|
|
/// defines total ordering among the types set.
|
|
|
|
/// See method declaration comments for more details.
|
2014-08-25 16:16:39 +08:00
|
|
|
int FunctionComparator::cmpTypes(Type *TyL, Type *TyR) const {
|
2014-03-14 16:48:52 +08:00
|
|
|
PointerType *PTyL = dyn_cast<PointerType>(TyL);
|
|
|
|
PointerType *PTyR = dyn_cast<PointerType>(TyR);
|
2013-11-27 00:11:03 +08:00
|
|
|
|
2015-03-10 10:37:25 +08:00
|
|
|
const DataLayout &DL = FnL->getParent()->getDataLayout();
|
|
|
|
if (PTyL && PTyL->getAddressSpace() == 0)
|
|
|
|
TyL = DL.getIntPtrType(TyL);
|
|
|
|
if (PTyR && PTyR->getAddressSpace() == 0)
|
|
|
|
TyR = DL.getIntPtrType(TyR);
|
2013-11-27 00:11:03 +08:00
|
|
|
|
2014-03-13 19:54:50 +08:00
|
|
|
if (TyL == TyR)
|
|
|
|
return 0;
|
2013-11-10 09:44:37 +08:00
|
|
|
|
2014-03-13 19:54:50 +08:00
|
|
|
if (int Res = cmpNumbers(TyL->getTypeID(), TyR->getTypeID()))
|
|
|
|
return Res;
|
2009-06-12 16:04:51 +08:00
|
|
|
|
2014-03-13 19:54:50 +08:00
|
|
|
switch (TyL->getTypeID()) {
|
2010-05-13 13:48:45 +08:00
|
|
|
default:
|
|
|
|
llvm_unreachable("Unknown type!");
|
2010-07-07 15:48:00 +08:00
|
|
|
// Fall through in Release mode.
|
2010-05-13 13:48:45 +08:00
|
|
|
case Type::IntegerTyID:
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
return cmpNumbers(cast<IntegerType>(TyL)->getBitWidth(),
|
|
|
|
cast<IntegerType>(TyR)->getBitWidth());
|
|
|
|
case Type::VectorTyID: {
|
|
|
|
VectorType *VTyL = cast<VectorType>(TyL), *VTyR = cast<VectorType>(TyR);
|
|
|
|
if (int Res = cmpNumbers(VTyL->getNumElements(), VTyR->getNumElements()))
|
|
|
|
return Res;
|
|
|
|
return cmpTypes(VTyL->getElementType(), VTyR->getElementType());
|
|
|
|
}
|
|
|
|
// TyL == TyR would have returned true earlier, because types are uniqued.
|
2009-06-12 16:04:51 +08:00
|
|
|
case Type::VoidTyID:
|
|
|
|
case Type::FloatTyID:
|
|
|
|
case Type::DoubleTyID:
|
|
|
|
case Type::X86_FP80TyID:
|
|
|
|
case Type::FP128TyID:
|
|
|
|
case Type::PPC_FP128TyID:
|
|
|
|
case Type::LabelTyID:
|
|
|
|
case Type::MetadataTyID:
|
2015-08-14 13:09:07 +08:00
|
|
|
case Type::TokenTyID:
|
2014-03-13 19:54:50 +08:00
|
|
|
return 0;
|
2009-06-12 16:04:51 +08:00
|
|
|
|
|
|
|
case Type::PointerTyID: {
|
2014-03-14 16:48:52 +08:00
|
|
|
assert(PTyL && PTyR && "Both types must be pointers here.");
|
|
|
|
return cmpNumbers(PTyL->getAddressSpace(), PTyR->getAddressSpace());
|
2009-06-12 16:04:51 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
case Type::StructTyID: {
|
2014-03-14 16:48:52 +08:00
|
|
|
StructType *STyL = cast<StructType>(TyL);
|
|
|
|
StructType *STyR = cast<StructType>(TyR);
|
|
|
|
if (STyL->getNumElements() != STyR->getNumElements())
|
|
|
|
return cmpNumbers(STyL->getNumElements(), STyR->getNumElements());
|
2009-06-12 16:04:51 +08:00
|
|
|
|
2014-03-14 16:48:52 +08:00
|
|
|
if (STyL->isPacked() != STyR->isPacked())
|
|
|
|
return cmpNumbers(STyL->isPacked(), STyR->isPacked());
|
2009-06-12 16:04:51 +08:00
|
|
|
|
2014-03-14 16:48:52 +08:00
|
|
|
for (unsigned i = 0, e = STyL->getNumElements(); i != e; ++i) {
|
2014-08-25 16:16:39 +08:00
|
|
|
if (int Res = cmpTypes(STyL->getElementType(i), STyR->getElementType(i)))
|
2014-03-13 19:54:50 +08:00
|
|
|
return Res;
|
2009-06-12 16:04:51 +08:00
|
|
|
}
|
2014-03-13 19:54:50 +08:00
|
|
|
return 0;
|
2009-06-12 16:04:51 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
case Type::FunctionTyID: {
|
2014-03-14 16:48:52 +08:00
|
|
|
FunctionType *FTyL = cast<FunctionType>(TyL);
|
|
|
|
FunctionType *FTyR = cast<FunctionType>(TyR);
|
|
|
|
if (FTyL->getNumParams() != FTyR->getNumParams())
|
|
|
|
return cmpNumbers(FTyL->getNumParams(), FTyR->getNumParams());
|
2014-03-13 19:54:50 +08:00
|
|
|
|
2014-03-14 16:48:52 +08:00
|
|
|
if (FTyL->isVarArg() != FTyR->isVarArg())
|
|
|
|
return cmpNumbers(FTyL->isVarArg(), FTyR->isVarArg());
|
2009-06-12 16:04:51 +08:00
|
|
|
|
2014-08-25 16:16:39 +08:00
|
|
|
if (int Res = cmpTypes(FTyL->getReturnType(), FTyR->getReturnType()))
|
2014-03-13 19:54:50 +08:00
|
|
|
return Res;
|
2009-06-12 16:04:51 +08:00
|
|
|
|
2014-03-14 16:48:52 +08:00
|
|
|
for (unsigned i = 0, e = FTyL->getNumParams(); i != e; ++i) {
|
2014-08-25 16:16:39 +08:00
|
|
|
if (int Res = cmpTypes(FTyL->getParamType(i), FTyR->getParamType(i)))
|
2014-03-13 19:54:50 +08:00
|
|
|
return Res;
|
2009-06-12 16:04:51 +08:00
|
|
|
}
|
2014-03-13 19:54:50 +08:00
|
|
|
return 0;
|
2009-06-12 16:04:51 +08:00
|
|
|
}
|
|
|
|
|
2010-07-16 14:31:12 +08:00
|
|
|
case Type::ArrayTyID: {
|
2014-03-14 16:48:52 +08:00
|
|
|
ArrayType *ATyL = cast<ArrayType>(TyL);
|
|
|
|
ArrayType *ATyR = cast<ArrayType>(TyR);
|
|
|
|
if (ATyL->getNumElements() != ATyR->getNumElements())
|
|
|
|
return cmpNumbers(ATyL->getNumElements(), ATyR->getNumElements());
|
2014-08-25 16:16:39 +08:00
|
|
|
return cmpTypes(ATyL->getElementType(), ATyR->getElementType());
|
2009-06-12 16:04:51 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
// Determine whether the two operations are the same except that pointer-to-A
|
|
|
|
// and pointer-to-B are equivalent. This should be kept in sync with
|
|
|
|
// Instruction::isSameOperationAs.
|
2014-05-16 19:02:22 +08:00
|
|
|
// Read method declaration comments for more details.
|
2014-07-31 15:16:59 +08:00
|
|
|
int FunctionComparator::cmpOperations(const Instruction *L,
|
|
|
|
const Instruction *R) const {
|
2011-02-06 13:04:00 +08:00
|
|
|
// Differences from Instruction::isSameOperationAs:
|
|
|
|
// * replace type comparison with calls to isEquivalentType.
|
|
|
|
// * we test for I->hasSameSubclassOptionalData (nuw/nsw/tail) at the top
|
|
|
|
// * because of the above, we don't test for the tail bit on calls later on
|
2014-05-16 19:02:22 +08:00
|
|
|
if (int Res = cmpNumbers(L->getOpcode(), R->getOpcode()))
|
|
|
|
return Res;
|
|
|
|
|
|
|
|
if (int Res = cmpNumbers(L->getNumOperands(), R->getNumOperands()))
|
|
|
|
return Res;
|
|
|
|
|
2014-08-25 16:16:39 +08:00
|
|
|
if (int Res = cmpTypes(L->getType(), R->getType()))
|
2014-05-16 19:02:22 +08:00
|
|
|
return Res;
|
|
|
|
|
|
|
|
if (int Res = cmpNumbers(L->getRawSubclassOptionalData(),
|
|
|
|
R->getRawSubclassOptionalData()))
|
|
|
|
return Res;
|
2009-06-12 16:04:51 +08:00
|
|
|
|
2015-05-13 05:42:22 +08:00
|
|
|
if (const AllocaInst *AI = dyn_cast<AllocaInst>(L)) {
|
|
|
|
if (int Res = cmpTypes(AI->getAllocatedType(),
|
|
|
|
cast<AllocaInst>(R)->getAllocatedType()))
|
|
|
|
return Res;
|
|
|
|
if (int Res =
|
|
|
|
cmpNumbers(AI->getAlignment(), cast<AllocaInst>(R)->getAlignment()))
|
|
|
|
return Res;
|
|
|
|
}
|
|
|
|
|
2009-06-12 16:04:51 +08:00
|
|
|
// We have two instructions of identical opcode and #operands. Check to see
|
|
|
|
// if all operands are the same type
|
2014-05-16 19:02:22 +08:00
|
|
|
for (unsigned i = 0, e = L->getNumOperands(); i != e; ++i) {
|
|
|
|
if (int Res =
|
2014-08-25 16:16:39 +08:00
|
|
|
cmpTypes(L->getOperand(i)->getType(), R->getOperand(i)->getType()))
|
2014-05-16 19:02:22 +08:00
|
|
|
return Res;
|
|
|
|
}
|
2009-06-12 16:04:51 +08:00
|
|
|
|
|
|
|
// Check special state that is a part of some instructions.
|
2014-05-16 19:02:22 +08:00
|
|
|
if (const LoadInst *LI = dyn_cast<LoadInst>(L)) {
|
|
|
|
if (int Res = cmpNumbers(LI->isVolatile(), cast<LoadInst>(R)->isVolatile()))
|
|
|
|
return Res;
|
|
|
|
if (int Res =
|
|
|
|
cmpNumbers(LI->getAlignment(), cast<LoadInst>(R)->getAlignment()))
|
|
|
|
return Res;
|
|
|
|
if (int Res =
|
|
|
|
cmpNumbers(LI->getOrdering(), cast<LoadInst>(R)->getOrdering()))
|
|
|
|
return Res;
|
2014-06-21 03:11:56 +08:00
|
|
|
if (int Res =
|
|
|
|
cmpNumbers(LI->getSynchScope(), cast<LoadInst>(R)->getSynchScope()))
|
|
|
|
return Res;
|
Remove Merge Functions pointer comparisons
Summary:
This patch removes two remaining places where pointer value comparisons
are used to order functions: comparing range annotation metadata, and comparing
block address constants. (These are both rare cases, and so no actual
non-determinism was observed from either case).
The fix for range metadata is simple: the annotation always consists of a pair
of integers, so we just order by those integers.
The fix for block addresses is more subtle. Two constants are the same if they
are the same basic block in the same function, or if they refer to corresponding
basic blocks in each respective function. Note that in the first case, merging
is trivially correct. In the second, the correctness of merging relies on the
fact that the the values of block addresses cannot be compared. This change is
actually an enhancement, as these functions could not previously be merged (see
merge-block-address.ll).
There is still a problem with cross function block addresses, in that constants
pointing to a basic block in a merged function is not updated.
This also more robustly compares floating point constants by all fields of their
semantics, and fixes a dyn_cast/cast mixup.
Author: jrkoenig
Reviewers: dschuff, nlewycky, jfb
Subscribers llvm-commits
Differential revision: http://reviews.llvm.org/D12376
llvm-svn: 246305
2015-08-29 00:49:09 +08:00
|
|
|
return cmpRangeMetadata(LI->getMetadata(LLVMContext::MD_range),
|
|
|
|
cast<LoadInst>(R)->getMetadata(LLVMContext::MD_range));
|
2014-05-16 19:02:22 +08:00
|
|
|
}
|
|
|
|
if (const StoreInst *SI = dyn_cast<StoreInst>(L)) {
|
|
|
|
if (int Res =
|
|
|
|
cmpNumbers(SI->isVolatile(), cast<StoreInst>(R)->isVolatile()))
|
|
|
|
return Res;
|
|
|
|
if (int Res =
|
|
|
|
cmpNumbers(SI->getAlignment(), cast<StoreInst>(R)->getAlignment()))
|
|
|
|
return Res;
|
|
|
|
if (int Res =
|
|
|
|
cmpNumbers(SI->getOrdering(), cast<StoreInst>(R)->getOrdering()))
|
|
|
|
return Res;
|
|
|
|
return cmpNumbers(SI->getSynchScope(), cast<StoreInst>(R)->getSynchScope());
|
|
|
|
}
|
|
|
|
if (const CmpInst *CI = dyn_cast<CmpInst>(L))
|
|
|
|
return cmpNumbers(CI->getPredicate(), cast<CmpInst>(R)->getPredicate());
|
|
|
|
if (const CallInst *CI = dyn_cast<CallInst>(L)) {
|
|
|
|
if (int Res = cmpNumbers(CI->getCallingConv(),
|
|
|
|
cast<CallInst>(R)->getCallingConv()))
|
|
|
|
return Res;
|
2014-07-15 18:46:51 +08:00
|
|
|
if (int Res =
|
|
|
|
cmpAttrs(CI->getAttributes(), cast<CallInst>(R)->getAttributes()))
|
|
|
|
return Res;
|
Remove Merge Functions pointer comparisons
Summary:
This patch removes two remaining places where pointer value comparisons
are used to order functions: comparing range annotation metadata, and comparing
block address constants. (These are both rare cases, and so no actual
non-determinism was observed from either case).
The fix for range metadata is simple: the annotation always consists of a pair
of integers, so we just order by those integers.
The fix for block addresses is more subtle. Two constants are the same if they
are the same basic block in the same function, or if they refer to corresponding
basic blocks in each respective function. Note that in the first case, merging
is trivially correct. In the second, the correctness of merging relies on the
fact that the the values of block addresses cannot be compared. This change is
actually an enhancement, as these functions could not previously be merged (see
merge-block-address.ll).
There is still a problem with cross function block addresses, in that constants
pointing to a basic block in a merged function is not updated.
This also more robustly compares floating point constants by all fields of their
semantics, and fixes a dyn_cast/cast mixup.
Author: jrkoenig
Reviewers: dschuff, nlewycky, jfb
Subscribers llvm-commits
Differential revision: http://reviews.llvm.org/D12376
llvm-svn: 246305
2015-08-29 00:49:09 +08:00
|
|
|
return cmpRangeMetadata(
|
|
|
|
CI->getMetadata(LLVMContext::MD_range),
|
|
|
|
cast<CallInst>(R)->getMetadata(LLVMContext::MD_range));
|
2014-05-16 19:02:22 +08:00
|
|
|
}
|
|
|
|
if (const InvokeInst *CI = dyn_cast<InvokeInst>(L)) {
|
|
|
|
if (int Res = cmpNumbers(CI->getCallingConv(),
|
|
|
|
cast<InvokeInst>(R)->getCallingConv()))
|
|
|
|
return Res;
|
2014-07-15 18:46:51 +08:00
|
|
|
if (int Res =
|
|
|
|
cmpAttrs(CI->getAttributes(), cast<InvokeInst>(R)->getAttributes()))
|
|
|
|
return Res;
|
Remove Merge Functions pointer comparisons
Summary:
This patch removes two remaining places where pointer value comparisons
are used to order functions: comparing range annotation metadata, and comparing
block address constants. (These are both rare cases, and so no actual
non-determinism was observed from either case).
The fix for range metadata is simple: the annotation always consists of a pair
of integers, so we just order by those integers.
The fix for block addresses is more subtle. Two constants are the same if they
are the same basic block in the same function, or if they refer to corresponding
basic blocks in each respective function. Note that in the first case, merging
is trivially correct. In the second, the correctness of merging relies on the
fact that the the values of block addresses cannot be compared. This change is
actually an enhancement, as these functions could not previously be merged (see
merge-block-address.ll).
There is still a problem with cross function block addresses, in that constants
pointing to a basic block in a merged function is not updated.
This also more robustly compares floating point constants by all fields of their
semantics, and fixes a dyn_cast/cast mixup.
Author: jrkoenig
Reviewers: dschuff, nlewycky, jfb
Subscribers llvm-commits
Differential revision: http://reviews.llvm.org/D12376
llvm-svn: 246305
2015-08-29 00:49:09 +08:00
|
|
|
return cmpRangeMetadata(
|
|
|
|
CI->getMetadata(LLVMContext::MD_range),
|
|
|
|
cast<InvokeInst>(R)->getMetadata(LLVMContext::MD_range));
|
2014-05-16 19:02:22 +08:00
|
|
|
}
|
|
|
|
if (const InsertValueInst *IVI = dyn_cast<InsertValueInst>(L)) {
|
|
|
|
ArrayRef<unsigned> LIndices = IVI->getIndices();
|
|
|
|
ArrayRef<unsigned> RIndices = cast<InsertValueInst>(R)->getIndices();
|
|
|
|
if (int Res = cmpNumbers(LIndices.size(), RIndices.size()))
|
|
|
|
return Res;
|
|
|
|
for (size_t i = 0, e = LIndices.size(); i != e; ++i) {
|
|
|
|
if (int Res = cmpNumbers(LIndices[i], RIndices[i]))
|
|
|
|
return Res;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (const ExtractValueInst *EVI = dyn_cast<ExtractValueInst>(L)) {
|
|
|
|
ArrayRef<unsigned> LIndices = EVI->getIndices();
|
|
|
|
ArrayRef<unsigned> RIndices = cast<ExtractValueInst>(R)->getIndices();
|
|
|
|
if (int Res = cmpNumbers(LIndices.size(), RIndices.size()))
|
|
|
|
return Res;
|
|
|
|
for (size_t i = 0, e = LIndices.size(); i != e; ++i) {
|
|
|
|
if (int Res = cmpNumbers(LIndices[i], RIndices[i]))
|
|
|
|
return Res;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (const FenceInst *FI = dyn_cast<FenceInst>(L)) {
|
|
|
|
if (int Res =
|
|
|
|
cmpNumbers(FI->getOrdering(), cast<FenceInst>(R)->getOrdering()))
|
|
|
|
return Res;
|
|
|
|
return cmpNumbers(FI->getSynchScope(), cast<FenceInst>(R)->getSynchScope());
|
|
|
|
}
|
|
|
|
|
|
|
|
if (const AtomicCmpXchgInst *CXI = dyn_cast<AtomicCmpXchgInst>(L)) {
|
|
|
|
if (int Res = cmpNumbers(CXI->isVolatile(),
|
|
|
|
cast<AtomicCmpXchgInst>(R)->isVolatile()))
|
|
|
|
return Res;
|
IR: add "cmpxchg weak" variant to support permitted failure.
This commit adds a weak variant of the cmpxchg operation, as described
in C++11. A cmpxchg instruction with this modifier is permitted to
fail to store, even if the comparison indicated it should.
As a result, cmpxchg instructions must return a flag indicating
success in addition to their original iN value loaded. Thus, for
uniformity *all* cmpxchg instructions now return "{ iN, i1 }". The
second flag is 1 when the store succeeded.
At the DAG level, a new ATOMIC_CMP_SWAP_WITH_SUCCESS node has been
added as the natural representation for the new cmpxchg instructions.
It is a strong cmpxchg.
By default this gets Expanded to the existing ATOMIC_CMP_SWAP during
Legalization, so existing backends should see no change in behaviour.
If they wish to deal with the enhanced node instead, they can call
setOperationAction on it. Beware: as a node with 2 results, it cannot
be selected from TableGen.
Currently, no use is made of the extra information provided in this
patch. Test updates are almost entirely adapting the input IR to the
new scheme.
Summary for out of tree users:
------------------------------
+ Legacy Bitcode files are upgraded during read.
+ Legacy assembly IR files will be invalid.
+ Front-ends must adapt to different type for "cmpxchg".
+ Backends should be unaffected by default.
llvm-svn: 210903
2014-06-13 22:24:07 +08:00
|
|
|
if (int Res = cmpNumbers(CXI->isWeak(),
|
|
|
|
cast<AtomicCmpXchgInst>(R)->isWeak()))
|
|
|
|
return Res;
|
2014-05-16 19:02:22 +08:00
|
|
|
if (int Res = cmpNumbers(CXI->getSuccessOrdering(),
|
|
|
|
cast<AtomicCmpXchgInst>(R)->getSuccessOrdering()))
|
|
|
|
return Res;
|
|
|
|
if (int Res = cmpNumbers(CXI->getFailureOrdering(),
|
|
|
|
cast<AtomicCmpXchgInst>(R)->getFailureOrdering()))
|
|
|
|
return Res;
|
|
|
|
return cmpNumbers(CXI->getSynchScope(),
|
|
|
|
cast<AtomicCmpXchgInst>(R)->getSynchScope());
|
|
|
|
}
|
|
|
|
if (const AtomicRMWInst *RMWI = dyn_cast<AtomicRMWInst>(L)) {
|
|
|
|
if (int Res = cmpNumbers(RMWI->getOperation(),
|
|
|
|
cast<AtomicRMWInst>(R)->getOperation()))
|
|
|
|
return Res;
|
|
|
|
if (int Res = cmpNumbers(RMWI->isVolatile(),
|
|
|
|
cast<AtomicRMWInst>(R)->isVolatile()))
|
|
|
|
return Res;
|
|
|
|
if (int Res = cmpNumbers(RMWI->getOrdering(),
|
|
|
|
cast<AtomicRMWInst>(R)->getOrdering()))
|
|
|
|
return Res;
|
|
|
|
return cmpNumbers(RMWI->getSynchScope(),
|
|
|
|
cast<AtomicRMWInst>(R)->getSynchScope());
|
|
|
|
}
|
|
|
|
return 0;
|
2008-11-02 13:52:50 +08:00
|
|
|
}
|
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
// Determine whether two GEP operations perform the same underlying arithmetic.
|
2014-05-16 19:55:02 +08:00
|
|
|
// Read method declaration comments for more details.
|
2014-08-25 16:12:45 +08:00
|
|
|
int FunctionComparator::cmpGEPs(const GEPOperator *GEPL,
|
2014-05-16 19:55:02 +08:00
|
|
|
const GEPOperator *GEPR) {
|
|
|
|
|
|
|
|
unsigned int ASL = GEPL->getPointerAddressSpace();
|
|
|
|
unsigned int ASR = GEPR->getPointerAddressSpace();
|
|
|
|
|
|
|
|
if (int Res = cmpNumbers(ASL, ASR))
|
|
|
|
return Res;
|
2013-11-10 09:44:37 +08:00
|
|
|
|
2014-05-16 19:55:02 +08:00
|
|
|
// When we have target data, we can reduce the GEP down to the value in bytes
|
|
|
|
// added to the address.
|
2015-03-10 10:37:25 +08:00
|
|
|
const DataLayout &DL = FnL->getParent()->getDataLayout();
|
|
|
|
unsigned BitWidth = DL.getPointerSizeInBits(ASL);
|
|
|
|
APInt OffsetL(BitWidth, 0), OffsetR(BitWidth, 0);
|
|
|
|
if (GEPL->accumulateConstantOffset(DL, OffsetL) &&
|
|
|
|
GEPR->accumulateConstantOffset(DL, OffsetR))
|
|
|
|
return cmpAPInts(OffsetL, OffsetR);
|
2015-09-14 23:37:48 +08:00
|
|
|
if (int Res = cmpTypes(GEPL->getSourceElementType(),
|
|
|
|
GEPR->getSourceElementType()))
|
2014-05-16 19:55:02 +08:00
|
|
|
return Res;
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2014-05-16 19:55:02 +08:00
|
|
|
if (int Res = cmpNumbers(GEPL->getNumOperands(), GEPR->getNumOperands()))
|
|
|
|
return Res;
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2014-05-16 19:55:02 +08:00
|
|
|
for (unsigned i = 0, e = GEPL->getNumOperands(); i != e; ++i) {
|
|
|
|
if (int Res = cmpValues(GEPL->getOperand(i), GEPR->getOperand(i)))
|
|
|
|
return Res;
|
2008-11-02 13:52:50 +08:00
|
|
|
}
|
|
|
|
|
2014-05-16 19:55:02 +08:00
|
|
|
return 0;
|
2008-11-02 13:52:50 +08:00
|
|
|
}
|
|
|
|
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
int FunctionComparator::cmpInlineAsm(const InlineAsm *L,
|
|
|
|
const InlineAsm *R) const {
|
|
|
|
// InlineAsm's are uniqued. If they are the same pointer, obviously they are
|
|
|
|
// the same, otherwise compare the fields.
|
|
|
|
if (L == R)
|
|
|
|
return 0;
|
|
|
|
if (int Res = cmpTypes(L->getFunctionType(), R->getFunctionType()))
|
|
|
|
return Res;
|
|
|
|
if (int Res = cmpMem(L->getAsmString(), R->getAsmString()))
|
|
|
|
return Res;
|
|
|
|
if (int Res = cmpMem(L->getConstraintString(), R->getConstraintString()))
|
|
|
|
return Res;
|
|
|
|
if (int Res = cmpNumbers(L->hasSideEffects(), R->hasSideEffects()))
|
|
|
|
return Res;
|
|
|
|
if (int Res = cmpNumbers(L->isAlignStack(), R->isAlignStack()))
|
|
|
|
return Res;
|
|
|
|
if (int Res = cmpNumbers(L->getDialect(), R->getDialect()))
|
|
|
|
return Res;
|
|
|
|
llvm_unreachable("InlineAsm blocks were not uniqued.");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-05-07 19:11:39 +08:00
|
|
|
/// Compare two values used by the two functions under pair-wise comparison. If
|
|
|
|
/// this is the first time the values are seen, they're added to the mapping so
|
|
|
|
/// that we will detect mismatches on next use.
|
|
|
|
/// See comments in declaration for more details.
|
|
|
|
int FunctionComparator::cmpValues(const Value *L, const Value *R) {
|
|
|
|
// Catch self-reference case.
|
2014-06-22 01:55:51 +08:00
|
|
|
if (L == FnL) {
|
|
|
|
if (R == FnR)
|
2014-05-07 19:11:39 +08:00
|
|
|
return 0;
|
|
|
|
return -1;
|
|
|
|
}
|
2014-06-22 01:55:51 +08:00
|
|
|
if (R == FnR) {
|
|
|
|
if (L == FnL)
|
2014-05-07 19:11:39 +08:00
|
|
|
return 0;
|
|
|
|
return 1;
|
2011-01-27 16:38:19 +08:00
|
|
|
}
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2014-05-07 19:11:39 +08:00
|
|
|
const Constant *ConstL = dyn_cast<Constant>(L);
|
|
|
|
const Constant *ConstR = dyn_cast<Constant>(R);
|
|
|
|
if (ConstL && ConstR) {
|
|
|
|
if (L == R)
|
|
|
|
return 0;
|
|
|
|
return cmpConstants(ConstL, ConstR);
|
|
|
|
}
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2014-05-07 19:11:39 +08:00
|
|
|
if (ConstL)
|
|
|
|
return 1;
|
|
|
|
if (ConstR)
|
|
|
|
return -1;
|
2010-05-13 13:48:45 +08:00
|
|
|
|
2014-05-07 19:11:39 +08:00
|
|
|
const InlineAsm *InlineAsmL = dyn_cast<InlineAsm>(L);
|
|
|
|
const InlineAsm *InlineAsmR = dyn_cast<InlineAsm>(R);
|
2010-05-13 13:48:45 +08:00
|
|
|
|
2014-05-07 19:11:39 +08:00
|
|
|
if (InlineAsmL && InlineAsmR)
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
return cmpInlineAsm(InlineAsmL, InlineAsmR);
|
2014-05-07 19:11:39 +08:00
|
|
|
if (InlineAsmL)
|
|
|
|
return 1;
|
|
|
|
if (InlineAsmR)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
auto LeftSN = sn_mapL.insert(std::make_pair(L, sn_mapL.size())),
|
|
|
|
RightSN = sn_mapR.insert(std::make_pair(R, sn_mapR.size()));
|
|
|
|
|
|
|
|
return cmpNumbers(LeftSN.first->second, RightSN.first->second);
|
|
|
|
}
|
2011-01-28 16:43:14 +08:00
|
|
|
// Test whether two basic blocks have equivalent behaviour.
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
int FunctionComparator::cmpBasicBlocks(const BasicBlock *BBL,
|
|
|
|
const BasicBlock *BBR) {
|
2014-06-22 01:55:51 +08:00
|
|
|
BasicBlock::const_iterator InstL = BBL->begin(), InstLE = BBL->end();
|
|
|
|
BasicBlock::const_iterator InstR = BBR->begin(), InstRE = BBR->end();
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2010-05-13 13:48:45 +08:00
|
|
|
do {
|
2015-10-14 01:51:03 +08:00
|
|
|
if (int Res = cmpValues(&*InstL, &*InstR))
|
2014-06-22 01:55:51 +08:00
|
|
|
return Res;
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
const GetElementPtrInst *GEPL = dyn_cast<GetElementPtrInst>(InstL);
|
|
|
|
const GetElementPtrInst *GEPR = dyn_cast<GetElementPtrInst>(InstR);
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
if (GEPL && !GEPR)
|
|
|
|
return 1;
|
|
|
|
if (GEPR && !GEPL)
|
|
|
|
return -1;
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
if (GEPL && GEPR) {
|
|
|
|
if (int Res =
|
|
|
|
cmpValues(GEPL->getPointerOperand(), GEPR->getPointerOperand()))
|
|
|
|
return Res;
|
2014-08-25 16:12:45 +08:00
|
|
|
if (int Res = cmpGEPs(GEPL, GEPR))
|
2014-06-22 01:55:51 +08:00
|
|
|
return Res;
|
2010-05-13 13:48:45 +08:00
|
|
|
} else {
|
2015-10-14 01:51:03 +08:00
|
|
|
if (int Res = cmpOperations(&*InstL, &*InstR))
|
2014-06-22 01:55:51 +08:00
|
|
|
return Res;
|
|
|
|
assert(InstL->getNumOperands() == InstR->getNumOperands());
|
2010-05-13 13:48:45 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
for (unsigned i = 0, e = InstL->getNumOperands(); i != e; ++i) {
|
|
|
|
Value *OpL = InstL->getOperand(i);
|
|
|
|
Value *OpR = InstR->getOperand(i);
|
|
|
|
if (int Res = cmpValues(OpL, OpR))
|
|
|
|
return Res;
|
2015-08-26 11:02:58 +08:00
|
|
|
// cmpValues should ensure this is true.
|
|
|
|
assert(cmpTypes(OpL->getType(), OpR->getType()) == 0);
|
2008-11-02 13:52:50 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
++InstL, ++InstR;
|
|
|
|
} while (InstL != InstLE && InstR != InstRE);
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
if (InstL != InstLE && InstR == InstRE)
|
|
|
|
return 1;
|
|
|
|
if (InstL == InstLE && InstR != InstRE)
|
|
|
|
return -1;
|
|
|
|
return 0;
|
2008-11-02 13:52:50 +08:00
|
|
|
}
|
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
// Test whether the two functions have equivalent behaviour.
|
2014-06-22 01:55:51 +08:00
|
|
|
int FunctionComparator::compare() {
|
2014-05-07 19:11:39 +08:00
|
|
|
sn_mapL.clear();
|
|
|
|
sn_mapR.clear();
|
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
if (int Res = cmpAttrs(FnL->getAttributes(), FnR->getAttributes()))
|
|
|
|
return Res;
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
if (int Res = cmpNumbers(FnL->hasGC(), FnR->hasGC()))
|
|
|
|
return Res;
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
if (FnL->hasGC()) {
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
if (int Res = cmpMem(FnL->getGC(), FnR->getGC()))
|
2014-06-22 01:55:51 +08:00
|
|
|
return Res;
|
|
|
|
}
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
if (int Res = cmpNumbers(FnL->hasSection(), FnR->hasSection()))
|
|
|
|
return Res;
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
if (FnL->hasSection()) {
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
if (int Res = cmpMem(FnL->getSection(), FnR->getSection()))
|
2014-06-22 01:55:51 +08:00
|
|
|
return Res;
|
|
|
|
}
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
if (int Res = cmpNumbers(FnL->isVarArg(), FnR->isVarArg()))
|
|
|
|
return Res;
|
2009-06-12 16:04:51 +08:00
|
|
|
|
2008-11-02 13:52:50 +08:00
|
|
|
// TODO: if it's internal and only used in direct calls, we could handle this
|
|
|
|
// case too.
|
2014-06-22 01:55:51 +08:00
|
|
|
if (int Res = cmpNumbers(FnL->getCallingConv(), FnR->getCallingConv()))
|
|
|
|
return Res;
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2014-08-25 16:16:39 +08:00
|
|
|
if (int Res = cmpTypes(FnL->getFunctionType(), FnR->getFunctionType()))
|
2014-06-22 01:55:51 +08:00
|
|
|
return Res;
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
assert(FnL->arg_size() == FnR->arg_size() &&
|
2010-09-07 09:42:10 +08:00
|
|
|
"Identically typed functions have different numbers of args!");
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2010-05-13 13:48:45 +08:00
|
|
|
// Visit the arguments so that they get enumerated in the order they're
|
|
|
|
// passed in.
|
2014-06-22 01:55:51 +08:00
|
|
|
for (Function::const_arg_iterator ArgLI = FnL->arg_begin(),
|
|
|
|
ArgRI = FnR->arg_begin(),
|
|
|
|
ArgLE = FnL->arg_end();
|
|
|
|
ArgLI != ArgLE; ++ArgLI, ++ArgRI) {
|
2015-10-14 01:51:03 +08:00
|
|
|
if (cmpValues(&*ArgLI, &*ArgRI) != 0)
|
2010-09-07 09:42:10 +08:00
|
|
|
llvm_unreachable("Arguments repeat!");
|
2010-05-13 13:48:45 +08:00
|
|
|
}
|
2008-11-02 13:52:50 +08:00
|
|
|
|
2010-08-08 13:04:23 +08:00
|
|
|
// We do a CFG-ordered walk since the actual ordering of the blocks in the
|
|
|
|
// linked list is immaterial. Our walk starts at the entry block for both
|
2010-08-02 13:23:03 +08:00
|
|
|
// functions, then takes each block from each terminator in order. As an
|
|
|
|
// artifact, this also means that unreachable blocks are ignored.
|
2014-06-22 01:55:51 +08:00
|
|
|
SmallVector<const BasicBlock *, 8> FnLBBs, FnRBBs;
|
2010-08-02 13:23:03 +08:00
|
|
|
SmallSet<const BasicBlock *, 128> VisitedBBs; // in terms of F1.
|
2010-08-06 15:21:30 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
FnLBBs.push_back(&FnL->getEntryBlock());
|
|
|
|
FnRBBs.push_back(&FnR->getEntryBlock());
|
2010-08-06 15:21:30 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
VisitedBBs.insert(FnLBBs[0]);
|
|
|
|
while (!FnLBBs.empty()) {
|
|
|
|
const BasicBlock *BBL = FnLBBs.pop_back_val();
|
|
|
|
const BasicBlock *BBR = FnRBBs.pop_back_val();
|
2010-08-06 15:21:30 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
if (int Res = cmpValues(BBL, BBR))
|
|
|
|
return Res;
|
|
|
|
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
if (int Res = cmpBasicBlocks(BBL, BBR))
|
2014-06-22 01:55:51 +08:00
|
|
|
return Res;
|
2010-08-06 15:21:30 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
const TerminatorInst *TermL = BBL->getTerminator();
|
|
|
|
const TerminatorInst *TermR = BBR->getTerminator();
|
2010-08-06 15:21:30 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
assert(TermL->getNumSuccessors() == TermR->getNumSuccessors());
|
|
|
|
for (unsigned i = 0, e = TermL->getNumSuccessors(); i != e; ++i) {
|
2014-11-19 15:49:26 +08:00
|
|
|
if (!VisitedBBs.insert(TermL->getSuccessor(i)).second)
|
2010-05-13 14:45:13 +08:00
|
|
|
continue;
|
2010-08-06 15:21:30 +08:00
|
|
|
|
2014-06-22 01:55:51 +08:00
|
|
|
FnLBBs.push_back(TermL->getSuccessor(i));
|
|
|
|
FnRBBs.push_back(TermR->getSuccessor(i));
|
2010-05-13 13:48:45 +08:00
|
|
|
}
|
2008-11-02 13:52:50 +08:00
|
|
|
}
|
2014-06-22 01:55:51 +08:00
|
|
|
return 0;
|
2008-11-02 13:52:50 +08:00
|
|
|
}
|
|
|
|
|
Accelerate MergeFunctions with hashing
This patch makes the Merge Functions pass faster by calculating and comparing
a hash value which captures the essential structure of a function before
performing a full function comparison.
The hash is calculated by hashing the function signature, then walking the basic
blocks of the function in the same order as the main comparison function. The
opcode of each instruction is hashed in sequence, which means that different
functions according to the existing total order cannot have the same hash, as
the comparison requires the opcodes of the two functions to be the same order.
The hash function is a static member of the FunctionComparator class because it
is tightly coupled to the exact comparison function used. For example, functions
which are equivalent modulo a single variant callsite might be merged by a more
aggressive MergeFunctions, and the hash function would need to be insensitive to
these differences in order to exploit this.
The hashing function uses a utility class which accumulates the values into an
internal state using a standard bit-mixing function. Note that this is a different interface
than a regular hashing routine, because the values to be hashed are scattered
amongst the properties of a llvm::Function, not linear in memory. This scheme is
fast because only one word of state needs to be kept, and the mixing function is
a few instructions.
The main runOnModule function first computes the hash of each function, and only
further processes functions which do not have a unique function hash. The hash
is also used to order the sorted function set. If the hashes differ, their
values are used to order the functions, otherwise the full comparison is done.
Both of these are helpful in speeding up MergeFunctions. Together they result in
speedups of 9% for mysqld (a mostly C application with little redundancy), 46%
for libxul in Firefox, and 117% for Chromium. (These are all LTO builds.) In all
three cases, the new speed of MergeFunctions is about half that of the module
verifier, making it relatively inexpensive even for large LTO builds with
hundreds of thousands of functions. The same functions are merged, so this
change is free performance.
Author: jrkoenig
Reviewers: nlewycky, dschuff, jfb
Subscribers: llvm-commits, aemerson
Differential revision: http://reviews.llvm.org/D11923
llvm-svn: 245140
2015-08-15 09:18:18 +08:00
|
|
|
// Accumulate the hash of a sequence of 64-bit integers. This is similar to a
|
|
|
|
// hash of a sequence of 64bit ints, but the entire input does not need to be
|
|
|
|
// available at once. This interface is necessary for functionHash because it
|
|
|
|
// needs to accumulate the hash as the structure of the function is traversed
|
|
|
|
// without saving these values to an intermediate buffer. This form of hashing
|
|
|
|
// is not often needed, as usually the object to hash is just read from a
|
|
|
|
// buffer.
|
|
|
|
class HashAccumulator64 {
|
|
|
|
uint64_t Hash;
|
|
|
|
public:
|
|
|
|
// Initialize to random constant, so the state isn't zero.
|
|
|
|
HashAccumulator64() { Hash = 0x6acaa36bef8325c5ULL; }
|
|
|
|
void add(uint64_t V) {
|
|
|
|
Hash = llvm::hashing::detail::hash_16_bytes(Hash, V);
|
|
|
|
}
|
|
|
|
// No finishing is required, because the entire hash value is used.
|
|
|
|
uint64_t getHash() { return Hash; }
|
|
|
|
};
|
|
|
|
|
|
|
|
// A function hash is calculated by considering only the number of arguments and
|
|
|
|
// whether a function is varargs, the order of basic blocks (given by the
|
|
|
|
// successors of each basic block in depth first order), and the order of
|
|
|
|
// opcodes of each instruction within each of these basic blocks. This mirrors
|
|
|
|
// the strategy compare() uses to compare functions by walking the BBs in depth
|
|
|
|
// first order and comparing each instruction in sequence. Because this hash
|
|
|
|
// does not look at the operands, it is insensitive to things such as the
|
|
|
|
// target of calls and the constants used in the function, which makes it useful
|
|
|
|
// when possibly merging functions which are the same modulo constants and call
|
|
|
|
// targets.
|
|
|
|
FunctionComparator::FunctionHash FunctionComparator::functionHash(Function &F) {
|
|
|
|
HashAccumulator64 H;
|
|
|
|
H.add(F.isVarArg());
|
|
|
|
H.add(F.arg_size());
|
|
|
|
|
|
|
|
SmallVector<const BasicBlock *, 8> BBs;
|
|
|
|
SmallSet<const BasicBlock *, 16> VisitedBBs;
|
|
|
|
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
// Walk the blocks in the same order as FunctionComparator::cmpBasicBlocks(),
|
Accelerate MergeFunctions with hashing
This patch makes the Merge Functions pass faster by calculating and comparing
a hash value which captures the essential structure of a function before
performing a full function comparison.
The hash is calculated by hashing the function signature, then walking the basic
blocks of the function in the same order as the main comparison function. The
opcode of each instruction is hashed in sequence, which means that different
functions according to the existing total order cannot have the same hash, as
the comparison requires the opcodes of the two functions to be the same order.
The hash function is a static member of the FunctionComparator class because it
is tightly coupled to the exact comparison function used. For example, functions
which are equivalent modulo a single variant callsite might be merged by a more
aggressive MergeFunctions, and the hash function would need to be insensitive to
these differences in order to exploit this.
The hashing function uses a utility class which accumulates the values into an
internal state using a standard bit-mixing function. Note that this is a different interface
than a regular hashing routine, because the values to be hashed are scattered
amongst the properties of a llvm::Function, not linear in memory. This scheme is
fast because only one word of state needs to be kept, and the mixing function is
a few instructions.
The main runOnModule function first computes the hash of each function, and only
further processes functions which do not have a unique function hash. The hash
is also used to order the sorted function set. If the hashes differ, their
values are used to order the functions, otherwise the full comparison is done.
Both of these are helpful in speeding up MergeFunctions. Together they result in
speedups of 9% for mysqld (a mostly C application with little redundancy), 46%
for libxul in Firefox, and 117% for Chromium. (These are all LTO builds.) In all
three cases, the new speed of MergeFunctions is about half that of the module
verifier, making it relatively inexpensive even for large LTO builds with
hundreds of thousands of functions. The same functions are merged, so this
change is free performance.
Author: jrkoenig
Reviewers: nlewycky, dschuff, jfb
Subscribers: llvm-commits, aemerson
Differential revision: http://reviews.llvm.org/D11923
llvm-svn: 245140
2015-08-15 09:18:18 +08:00
|
|
|
// accumulating the hash of the function "structure." (BB and opcode sequence)
|
|
|
|
BBs.push_back(&F.getEntryBlock());
|
|
|
|
VisitedBBs.insert(BBs[0]);
|
|
|
|
while (!BBs.empty()) {
|
|
|
|
const BasicBlock *BB = BBs.pop_back_val();
|
|
|
|
// This random value acts as a block header, as otherwise the partition of
|
|
|
|
// opcodes into BBs wouldn't affect the hash, only the order of the opcodes
|
|
|
|
H.add(45798);
|
|
|
|
for (auto &Inst : *BB) {
|
|
|
|
H.add(Inst.getOpcode());
|
|
|
|
}
|
|
|
|
const TerminatorInst *Term = BB->getTerminator();
|
|
|
|
for (unsigned i = 0, e = Term->getNumSuccessors(); i != e; ++i) {
|
|
|
|
if (!VisitedBBs.insert(Term->getSuccessor(i)).second)
|
|
|
|
continue;
|
|
|
|
BBs.push_back(Term->getSuccessor(i));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return H.getHash();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-01-28 15:36:21 +08:00
|
|
|
namespace {
|
|
|
|
|
|
|
|
/// MergeFunctions finds functions which will generate identical machine code,
|
|
|
|
/// by considering all pointer types to be equivalent. Once identified,
|
|
|
|
/// MergeFunctions will fold them by replacing a call to one to a call to a
|
|
|
|
/// bitcast of the other.
|
|
|
|
///
|
|
|
|
class MergeFunctions : public ModulePass {
|
|
|
|
public:
|
|
|
|
static char ID;
|
|
|
|
MergeFunctions()
|
2015-09-03 07:55:23 +08:00
|
|
|
: ModulePass(ID), FnTree(FunctionNodeCmp(&GlobalNumbers)), FNodesInTree(),
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
HasGlobalAliases(false) {
|
2011-01-28 15:36:21 +08:00
|
|
|
initializeMergeFunctionsPass(*PassRegistry::getPassRegistry());
|
|
|
|
}
|
|
|
|
|
2014-03-05 17:10:37 +08:00
|
|
|
bool runOnModule(Module &M) override;
|
2011-01-28 15:36:21 +08:00
|
|
|
|
|
|
|
private:
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
// The function comparison operator is provided here so that FunctionNodes do
|
|
|
|
// not need to become larger with another pointer.
|
|
|
|
class FunctionNodeCmp {
|
|
|
|
GlobalNumberState* GlobalNumbers;
|
|
|
|
public:
|
|
|
|
FunctionNodeCmp(GlobalNumberState* GN) : GlobalNumbers(GN) {}
|
|
|
|
bool operator()(const FunctionNode &LHS, const FunctionNode &RHS) const {
|
|
|
|
// Order first by hashes, then full function comparison.
|
|
|
|
if (LHS.getHash() != RHS.getHash())
|
|
|
|
return LHS.getHash() < RHS.getHash();
|
|
|
|
FunctionComparator FCmp(LHS.getFunc(), RHS.getFunc(), GlobalNumbers);
|
|
|
|
return FCmp.compare() == -1;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
typedef std::set<FunctionNode, FunctionNodeCmp> FnTreeType;
|
|
|
|
|
|
|
|
GlobalNumberState GlobalNumbers;
|
2011-01-28 15:36:21 +08:00
|
|
|
|
|
|
|
/// A work queue of functions that may have been modified and should be
|
|
|
|
/// analyzed again.
|
|
|
|
std::vector<WeakVH> Deferred;
|
|
|
|
|
2014-06-22 02:58:11 +08:00
|
|
|
/// Checks the rules of order relation introduced among functions set.
|
|
|
|
/// Returns true, if sanity check has been passed, and false if failed.
|
|
|
|
bool doSanityCheck(std::vector<WeakVH> &Worklist);
|
|
|
|
|
2014-06-22 04:54:36 +08:00
|
|
|
/// Insert a ComparableFunction into the FnTree, or merge it away if it's
|
2011-01-28 15:36:21 +08:00
|
|
|
/// equal to one that's already present.
|
2014-06-22 04:54:36 +08:00
|
|
|
bool insert(Function *NewFunction);
|
2011-01-28 15:36:21 +08:00
|
|
|
|
2014-06-22 04:54:36 +08:00
|
|
|
/// Remove a Function from the FnTree and queue it up for a second sweep of
|
2011-01-28 15:36:21 +08:00
|
|
|
/// analysis.
|
2011-01-28 16:43:14 +08:00
|
|
|
void remove(Function *F);
|
2011-01-28 15:36:21 +08:00
|
|
|
|
2014-06-22 04:54:36 +08:00
|
|
|
/// Find the functions that use this Value and remove them from FnTree and
|
2011-01-28 15:36:21 +08:00
|
|
|
/// queue the functions.
|
2011-01-28 16:43:14 +08:00
|
|
|
void removeUsers(Value *V);
|
2011-01-28 15:36:21 +08:00
|
|
|
|
|
|
|
/// Replace all direct calls of Old with calls of New. Will bitcast New if
|
|
|
|
/// necessary to make types match.
|
|
|
|
void replaceDirectCallers(Function *Old, Function *New);
|
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
/// Merge two equivalent functions. Upon completion, G may be deleted, or may
|
|
|
|
/// be converted into a thunk. In either case, it should never be visited
|
|
|
|
/// again.
|
|
|
|
void mergeTwoFunctions(Function *F, Function *G);
|
2011-01-28 15:36:21 +08:00
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
/// Replace G with a thunk or an alias to F. Deletes G.
|
|
|
|
void writeThunkOrAlias(Function *F, Function *G);
|
2011-01-28 15:36:21 +08:00
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
/// Replace G with a simple tail call to bitcast(F). Also replace direct uses
|
|
|
|
/// of G with bitcast(F). Deletes G.
|
|
|
|
void writeThunk(Function *F, Function *G);
|
2011-01-28 15:36:21 +08:00
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
/// Replace G with an alias to F. Deletes G.
|
|
|
|
void writeAlias(Function *F, Function *G);
|
2011-01-28 15:36:21 +08:00
|
|
|
|
2015-06-09 08:03:29 +08:00
|
|
|
/// Replace function F with function G in the function tree.
|
2015-09-03 07:55:23 +08:00
|
|
|
void replaceFunctionInTree(const FunctionNode &FN, Function *G);
|
2015-06-09 08:03:29 +08:00
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
/// The set of all distinct functions. Use the insert() and remove() methods
|
2015-09-03 07:55:23 +08:00
|
|
|
/// to modify it. The map allows efficient lookup and deferring of Functions.
|
2014-06-22 04:54:36 +08:00
|
|
|
FnTreeType FnTree;
|
2015-09-03 07:55:23 +08:00
|
|
|
// Map functions to the iterators of the FunctionNode which contains them
|
|
|
|
// in the FnTree. This must be updated carefully whenever the FnTree is
|
|
|
|
// modified, i.e. in insert(), remove(), and replaceFunctionInTree(), to avoid
|
|
|
|
// dangling iterators into FnTree. The invariant that preserves this is that
|
|
|
|
// there is exactly one mapping F -> FN for each FunctionNode FN in FnTree.
|
|
|
|
ValueMap<Function*, FnTreeType::iterator> FNodesInTree;
|
2011-01-28 15:36:21 +08:00
|
|
|
|
|
|
|
/// Whether or not the target supports global aliases.
|
|
|
|
bool HasGlobalAliases;
|
|
|
|
};
|
|
|
|
|
2015-10-07 07:24:35 +08:00
|
|
|
} // end anonymous namespace
|
2011-01-28 15:36:21 +08:00
|
|
|
|
|
|
|
char MergeFunctions::ID = 0;
|
|
|
|
INITIALIZE_PASS(MergeFunctions, "mergefunc", "Merge Functions", false, false)
|
|
|
|
|
|
|
|
ModulePass *llvm::createMergeFunctionsPass() {
|
|
|
|
return new MergeFunctions();
|
|
|
|
}
|
|
|
|
|
2014-06-22 02:58:11 +08:00
|
|
|
bool MergeFunctions::doSanityCheck(std::vector<WeakVH> &Worklist) {
|
|
|
|
if (const unsigned Max = NumFunctionsForSanityCheck) {
|
|
|
|
unsigned TripleNumber = 0;
|
|
|
|
bool Valid = true;
|
|
|
|
|
|
|
|
dbgs() << "MERGEFUNC-SANITY: Started for first " << Max << " functions.\n";
|
|
|
|
|
|
|
|
unsigned i = 0;
|
|
|
|
for (std::vector<WeakVH>::iterator I = Worklist.begin(), E = Worklist.end();
|
|
|
|
I != E && i < Max; ++I, ++i) {
|
|
|
|
unsigned j = i;
|
|
|
|
for (std::vector<WeakVH>::iterator J = I; J != E && j < Max; ++J, ++j) {
|
|
|
|
Function *F1 = cast<Function>(*I);
|
|
|
|
Function *F2 = cast<Function>(*J);
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
int Res1 = FunctionComparator(F1, F2, &GlobalNumbers).compare();
|
|
|
|
int Res2 = FunctionComparator(F2, F1, &GlobalNumbers).compare();
|
2014-06-22 02:58:11 +08:00
|
|
|
|
|
|
|
// If F1 <= F2, then F2 >= F1, otherwise report failure.
|
|
|
|
if (Res1 != -Res2) {
|
|
|
|
dbgs() << "MERGEFUNC-SANITY: Non-symmetric; triple: " << TripleNumber
|
|
|
|
<< "\n";
|
|
|
|
F1->dump();
|
|
|
|
F2->dump();
|
|
|
|
Valid = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (Res1 == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
unsigned k = j;
|
|
|
|
for (std::vector<WeakVH>::iterator K = J; K != E && k < Max;
|
|
|
|
++k, ++K, ++TripleNumber) {
|
|
|
|
if (K == J)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
Function *F3 = cast<Function>(*K);
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
int Res3 = FunctionComparator(F1, F3, &GlobalNumbers).compare();
|
|
|
|
int Res4 = FunctionComparator(F2, F3, &GlobalNumbers).compare();
|
2014-06-22 02:58:11 +08:00
|
|
|
|
|
|
|
bool Transitive = true;
|
|
|
|
|
|
|
|
if (Res1 != 0 && Res1 == Res4) {
|
2014-06-22 03:07:51 +08:00
|
|
|
// F1 > F2, F2 > F3 => F1 > F3
|
2014-06-22 02:58:11 +08:00
|
|
|
Transitive = Res3 == Res1;
|
2014-06-22 03:07:51 +08:00
|
|
|
} else if (Res3 != 0 && Res3 == -Res4) {
|
|
|
|
// F1 > F3, F3 > F2 => F1 > F2
|
2014-06-22 02:58:11 +08:00
|
|
|
Transitive = Res3 == Res1;
|
2014-06-22 03:07:51 +08:00
|
|
|
} else if (Res4 != 0 && -Res3 == Res4) {
|
|
|
|
// F2 > F3, F3 > F1 => F2 > F1
|
2014-06-22 02:58:11 +08:00
|
|
|
Transitive = Res4 == -Res1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!Transitive) {
|
|
|
|
dbgs() << "MERGEFUNC-SANITY: Non-transitive; triple: "
|
|
|
|
<< TripleNumber << "\n";
|
|
|
|
dbgs() << "Res1, Res3, Res4: " << Res1 << ", " << Res3 << ", "
|
|
|
|
<< Res4 << "\n";
|
|
|
|
F1->dump();
|
|
|
|
F2->dump();
|
|
|
|
F3->dump();
|
|
|
|
Valid = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
dbgs() << "MERGEFUNC-SANITY: " << (Valid ? "Passed." : "Failed.") << "\n";
|
|
|
|
return Valid;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2011-01-28 15:36:21 +08:00
|
|
|
bool MergeFunctions::runOnModule(Module &M) {
|
|
|
|
bool Changed = false;
|
|
|
|
|
Accelerate MergeFunctions with hashing
This patch makes the Merge Functions pass faster by calculating and comparing
a hash value which captures the essential structure of a function before
performing a full function comparison.
The hash is calculated by hashing the function signature, then walking the basic
blocks of the function in the same order as the main comparison function. The
opcode of each instruction is hashed in sequence, which means that different
functions according to the existing total order cannot have the same hash, as
the comparison requires the opcodes of the two functions to be the same order.
The hash function is a static member of the FunctionComparator class because it
is tightly coupled to the exact comparison function used. For example, functions
which are equivalent modulo a single variant callsite might be merged by a more
aggressive MergeFunctions, and the hash function would need to be insensitive to
these differences in order to exploit this.
The hashing function uses a utility class which accumulates the values into an
internal state using a standard bit-mixing function. Note that this is a different interface
than a regular hashing routine, because the values to be hashed are scattered
amongst the properties of a llvm::Function, not linear in memory. This scheme is
fast because only one word of state needs to be kept, and the mixing function is
a few instructions.
The main runOnModule function first computes the hash of each function, and only
further processes functions which do not have a unique function hash. The hash
is also used to order the sorted function set. If the hashes differ, their
values are used to order the functions, otherwise the full comparison is done.
Both of these are helpful in speeding up MergeFunctions. Together they result in
speedups of 9% for mysqld (a mostly C application with little redundancy), 46%
for libxul in Firefox, and 117% for Chromium. (These are all LTO builds.) In all
three cases, the new speed of MergeFunctions is about half that of the module
verifier, making it relatively inexpensive even for large LTO builds with
hundreds of thousands of functions. The same functions are merged, so this
change is free performance.
Author: jrkoenig
Reviewers: nlewycky, dschuff, jfb
Subscribers: llvm-commits, aemerson
Differential revision: http://reviews.llvm.org/D11923
llvm-svn: 245140
2015-08-15 09:18:18 +08:00
|
|
|
// All functions in the module, ordered by hash. Functions with a unique
|
|
|
|
// hash value are easily eliminated.
|
|
|
|
std::vector<std::pair<FunctionComparator::FunctionHash, Function *>>
|
|
|
|
HashedFuncs;
|
|
|
|
for (Function &Func : M) {
|
|
|
|
if (!Func.isDeclaration() && !Func.hasAvailableExternallyLinkage()) {
|
|
|
|
HashedFuncs.push_back({FunctionComparator::functionHash(Func), &Func});
|
|
|
|
}
|
2011-01-28 15:36:21 +08:00
|
|
|
}
|
|
|
|
|
2015-08-16 10:41:23 +08:00
|
|
|
std::stable_sort(
|
|
|
|
HashedFuncs.begin(), HashedFuncs.end(),
|
|
|
|
[](const std::pair<FunctionComparator::FunctionHash, Function *> &a,
|
|
|
|
const std::pair<FunctionComparator::FunctionHash, Function *> &b) {
|
|
|
|
return a.first < b.first;
|
|
|
|
});
|
Accelerate MergeFunctions with hashing
This patch makes the Merge Functions pass faster by calculating and comparing
a hash value which captures the essential structure of a function before
performing a full function comparison.
The hash is calculated by hashing the function signature, then walking the basic
blocks of the function in the same order as the main comparison function. The
opcode of each instruction is hashed in sequence, which means that different
functions according to the existing total order cannot have the same hash, as
the comparison requires the opcodes of the two functions to be the same order.
The hash function is a static member of the FunctionComparator class because it
is tightly coupled to the exact comparison function used. For example, functions
which are equivalent modulo a single variant callsite might be merged by a more
aggressive MergeFunctions, and the hash function would need to be insensitive to
these differences in order to exploit this.
The hashing function uses a utility class which accumulates the values into an
internal state using a standard bit-mixing function. Note that this is a different interface
than a regular hashing routine, because the values to be hashed are scattered
amongst the properties of a llvm::Function, not linear in memory. This scheme is
fast because only one word of state needs to be kept, and the mixing function is
a few instructions.
The main runOnModule function first computes the hash of each function, and only
further processes functions which do not have a unique function hash. The hash
is also used to order the sorted function set. If the hashes differ, their
values are used to order the functions, otherwise the full comparison is done.
Both of these are helpful in speeding up MergeFunctions. Together they result in
speedups of 9% for mysqld (a mostly C application with little redundancy), 46%
for libxul in Firefox, and 117% for Chromium. (These are all LTO builds.) In all
three cases, the new speed of MergeFunctions is about half that of the module
verifier, making it relatively inexpensive even for large LTO builds with
hundreds of thousands of functions. The same functions are merged, so this
change is free performance.
Author: jrkoenig
Reviewers: nlewycky, dschuff, jfb
Subscribers: llvm-commits, aemerson
Differential revision: http://reviews.llvm.org/D11923
llvm-svn: 245140
2015-08-15 09:18:18 +08:00
|
|
|
|
|
|
|
auto S = HashedFuncs.begin();
|
|
|
|
for (auto I = HashedFuncs.begin(), IE = HashedFuncs.end(); I != IE; ++I) {
|
|
|
|
// If the hash value matches the previous value or the next one, we must
|
|
|
|
// consider merging it. Otherwise it is dropped and never considered again.
|
|
|
|
if ((I != S && std::prev(I)->first == I->first) ||
|
|
|
|
(std::next(I) != IE && std::next(I)->first == I->first) ) {
|
|
|
|
Deferred.push_back(WeakVH(I->second));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-01-28 15:36:21 +08:00
|
|
|
do {
|
|
|
|
std::vector<WeakVH> Worklist;
|
|
|
|
Deferred.swap(Worklist);
|
|
|
|
|
2014-06-22 02:58:11 +08:00
|
|
|
DEBUG(doSanityCheck(Worklist));
|
|
|
|
|
2011-01-28 15:36:21 +08:00
|
|
|
DEBUG(dbgs() << "size of module: " << M.size() << '\n');
|
|
|
|
DEBUG(dbgs() << "size of worklist: " << Worklist.size() << '\n');
|
|
|
|
|
|
|
|
// Insert only strong functions and merge them. Strong function merging
|
|
|
|
// always deletes one of them.
|
|
|
|
for (std::vector<WeakVH>::iterator I = Worklist.begin(),
|
|
|
|
E = Worklist.end(); I != E; ++I) {
|
|
|
|
if (!*I) continue;
|
|
|
|
Function *F = cast<Function>(*I);
|
|
|
|
if (!F->isDeclaration() && !F->hasAvailableExternallyLinkage() &&
|
|
|
|
!F->mayBeOverridden()) {
|
2014-06-22 04:54:36 +08:00
|
|
|
Changed |= insert(F);
|
2011-01-28 15:36:21 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Insert only weak functions and merge them. By doing these second we
|
|
|
|
// create thunks to the strong function when possible. When two weak
|
|
|
|
// functions are identical, we create a new strong function with two weak
|
|
|
|
// weak thunks to it which are identical but not mergable.
|
|
|
|
for (std::vector<WeakVH>::iterator I = Worklist.begin(),
|
|
|
|
E = Worklist.end(); I != E; ++I) {
|
|
|
|
if (!*I) continue;
|
|
|
|
Function *F = cast<Function>(*I);
|
|
|
|
if (!F->isDeclaration() && !F->hasAvailableExternallyLinkage() &&
|
|
|
|
F->mayBeOverridden()) {
|
2014-06-22 04:54:36 +08:00
|
|
|
Changed |= insert(F);
|
2011-01-28 15:36:21 +08:00
|
|
|
}
|
|
|
|
}
|
2014-06-22 04:54:36 +08:00
|
|
|
DEBUG(dbgs() << "size of FnTree: " << FnTree.size() << '\n');
|
2011-01-28 15:36:21 +08:00
|
|
|
} while (!Deferred.empty());
|
|
|
|
|
2014-06-22 04:54:36 +08:00
|
|
|
FnTree.clear();
|
2015-10-06 01:26:36 +08:00
|
|
|
GlobalNumbers.clear();
|
2011-01-28 15:36:21 +08:00
|
|
|
|
|
|
|
return Changed;
|
|
|
|
}
|
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
// Replace direct callers of Old with New.
|
2011-01-25 16:56:50 +08:00
|
|
|
void MergeFunctions::replaceDirectCallers(Function *Old, Function *New) {
|
|
|
|
Constant *BitcastNew = ConstantExpr::getBitCast(New, Old->getType());
|
2014-03-09 11:16:01 +08:00
|
|
|
for (auto UI = Old->use_begin(), UE = Old->use_end(); UI != UE;) {
|
|
|
|
Use *U = &*UI;
|
2011-01-25 16:56:50 +08:00
|
|
|
++UI;
|
2014-03-09 11:16:01 +08:00
|
|
|
CallSite CS(U->getUser());
|
|
|
|
if (CS && CS.isCallee(U)) {
|
2015-07-22 01:07:07 +08:00
|
|
|
// Transfer the called function's attributes to the call site. Due to the
|
2015-09-11 02:08:35 +08:00
|
|
|
// bitcast we will 'lose' ABI changing attributes because the 'called
|
2015-07-22 01:07:07 +08:00
|
|
|
// function' is no longer a Function* but the bitcast. Code that looks up
|
|
|
|
// the attributes from the called function will fail.
|
2015-09-11 02:08:35 +08:00
|
|
|
|
|
|
|
// FIXME: This is not actually true, at least not anymore. The callsite
|
|
|
|
// will always have the same ABI affecting attributes as the callee,
|
|
|
|
// because otherwise the original input has UB. Note that Old and New
|
|
|
|
// always have matching ABI, so no attributes need to be changed.
|
|
|
|
// Transferring other attributes may help other optimizations, but that
|
|
|
|
// should be done uniformly and not in this ad-hoc way.
|
2015-07-22 01:07:07 +08:00
|
|
|
auto &Context = New->getContext();
|
|
|
|
auto NewFuncAttrs = New->getAttributes();
|
|
|
|
auto CallSiteAttrs = CS.getAttributes();
|
|
|
|
|
|
|
|
CallSiteAttrs = CallSiteAttrs.addAttributes(
|
|
|
|
Context, AttributeSet::ReturnIndex, NewFuncAttrs.getRetAttributes());
|
|
|
|
|
|
|
|
for (unsigned argIdx = 0; argIdx < CS.arg_size(); argIdx++) {
|
|
|
|
AttributeSet Attrs = NewFuncAttrs.getParamAttributes(argIdx);
|
|
|
|
if (Attrs.getNumSlots())
|
|
|
|
CallSiteAttrs = CallSiteAttrs.addAttributes(Context, argIdx, Attrs);
|
|
|
|
}
|
|
|
|
|
|
|
|
CS.setAttributes(CallSiteAttrs);
|
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
remove(CS.getInstruction()->getParent()->getParent());
|
2014-03-09 11:16:01 +08:00
|
|
|
U->set(BitcastNew);
|
2011-01-25 16:56:50 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
// Replace G with an alias to F if possible, or else a thunk to F. Deletes G.
|
|
|
|
void MergeFunctions::writeThunkOrAlias(Function *F, Function *G) {
|
2011-01-25 16:56:50 +08:00
|
|
|
if (HasGlobalAliases && G->hasUnnamedAddr()) {
|
|
|
|
if (G->hasExternalLinkage() || G->hasLocalLinkage() ||
|
|
|
|
G->hasWeakLinkage()) {
|
2011-01-28 16:43:14 +08:00
|
|
|
writeAlias(F, G);
|
2011-01-25 16:56:50 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
writeThunk(F, G);
|
2011-01-25 16:56:50 +08:00
|
|
|
}
|
|
|
|
|
2013-09-17 17:36:11 +08:00
|
|
|
// Helper for writeThunk,
|
|
|
|
// Selects proper bitcast operation,
|
2014-01-25 01:20:08 +08:00
|
|
|
// but a bit simpler then CastInst::getCastOpcode.
|
2014-05-01 01:53:04 +08:00
|
|
|
static Value *createCast(IRBuilder<false> &Builder, Value *V, Type *DestTy) {
|
2013-09-17 17:36:11 +08:00
|
|
|
Type *SrcTy = V->getType();
|
2014-05-01 01:53:04 +08:00
|
|
|
if (SrcTy->isStructTy()) {
|
|
|
|
assert(DestTy->isStructTy());
|
|
|
|
assert(SrcTy->getStructNumElements() == DestTy->getStructNumElements());
|
|
|
|
Value *Result = UndefValue::get(DestTy);
|
|
|
|
for (unsigned int I = 0, E = SrcTy->getStructNumElements(); I < E; ++I) {
|
|
|
|
Value *Element = createCast(
|
2014-08-27 13:25:25 +08:00
|
|
|
Builder, Builder.CreateExtractValue(V, makeArrayRef(I)),
|
2014-05-01 01:53:04 +08:00
|
|
|
DestTy->getStructElementType(I));
|
|
|
|
|
|
|
|
Result =
|
2014-08-27 13:25:25 +08:00
|
|
|
Builder.CreateInsertValue(Result, Element, makeArrayRef(I));
|
2014-05-01 01:53:04 +08:00
|
|
|
}
|
|
|
|
return Result;
|
|
|
|
}
|
|
|
|
assert(!DestTy->isStructTy());
|
2013-09-17 17:36:11 +08:00
|
|
|
if (SrcTy->isIntegerTy() && DestTy->isPointerTy())
|
|
|
|
return Builder.CreateIntToPtr(V, DestTy);
|
|
|
|
else if (SrcTy->isPointerTy() && DestTy->isIntegerTy())
|
|
|
|
return Builder.CreatePtrToInt(V, DestTy);
|
|
|
|
else
|
|
|
|
return Builder.CreateBitCast(V, DestTy);
|
|
|
|
}
|
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
// Replace G with a simple tail call to bitcast(F). Also replace direct uses
|
|
|
|
// of G with bitcast(F). Deletes G.
|
|
|
|
void MergeFunctions::writeThunk(Function *F, Function *G) {
|
2010-05-13 13:48:45 +08:00
|
|
|
if (!G->mayBeOverridden()) {
|
|
|
|
// Redirect direct callers of G to F.
|
2011-01-25 16:56:50 +08:00
|
|
|
replaceDirectCallers(G, F);
|
2010-05-13 13:48:45 +08:00
|
|
|
}
|
|
|
|
|
2010-09-07 09:42:10 +08:00
|
|
|
// If G was internal then we may have replaced all uses of G with F. If so,
|
2010-08-06 15:21:30 +08:00
|
|
|
// stop here and delete G. There's no need for a thunk.
|
|
|
|
if (G->hasLocalLinkage() && G->use_empty()) {
|
|
|
|
G->eraseFromParent();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-06-12 23:56:56 +08:00
|
|
|
Function *NewG = Function::Create(G->getFunctionType(), G->getLinkage(), "",
|
|
|
|
G->getParent());
|
2009-08-14 05:58:54 +08:00
|
|
|
BasicBlock *BB = BasicBlock::Create(F->getContext(), "", NewG);
|
2010-08-08 13:04:23 +08:00
|
|
|
IRBuilder<false> Builder(BB);
|
2009-06-12 16:04:51 +08:00
|
|
|
|
2010-05-13 13:48:45 +08:00
|
|
|
SmallVector<Value *, 16> Args;
|
2009-06-12 16:04:51 +08:00
|
|
|
unsigned i = 0;
|
2011-07-18 12:54:35 +08:00
|
|
|
FunctionType *FFTy = F->getFunctionType();
|
2015-10-14 01:51:03 +08:00
|
|
|
for (Argument & AI : NewG->args()) {
|
|
|
|
Args.push_back(createCast(Builder, &AI, FFTy->getParamType(i)));
|
2009-06-12 16:04:51 +08:00
|
|
|
++i;
|
2008-11-02 13:52:50 +08:00
|
|
|
}
|
|
|
|
|
2011-07-15 16:37:34 +08:00
|
|
|
CallInst *CI = Builder.CreateCall(F, Args);
|
2009-06-12 16:04:51 +08:00
|
|
|
CI->setTailCall();
|
2009-06-13 00:04:00 +08:00
|
|
|
CI->setCallingConv(F->getCallingConv());
|
2015-09-11 02:08:35 +08:00
|
|
|
CI->setAttributes(F->getAttributes());
|
2010-01-05 21:12:22 +08:00
|
|
|
if (NewG->getReturnType()->isVoidTy()) {
|
2010-08-08 13:04:23 +08:00
|
|
|
Builder.CreateRetVoid();
|
2009-06-12 16:04:51 +08:00
|
|
|
} else {
|
2013-09-17 17:36:11 +08:00
|
|
|
Builder.CreateRet(createCast(Builder, CI, NewG->getReturnType()));
|
2008-11-03 00:46:26 +08:00
|
|
|
}
|
|
|
|
|
2009-06-12 16:04:51 +08:00
|
|
|
NewG->copyAttributesFrom(G);
|
|
|
|
NewG->takeName(G);
|
2011-01-28 16:43:14 +08:00
|
|
|
removeUsers(G);
|
2009-06-12 16:04:51 +08:00
|
|
|
G->replaceAllUsesWith(NewG);
|
|
|
|
G->eraseFromParent();
|
2010-09-07 09:42:10 +08:00
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
DEBUG(dbgs() << "writeThunk: " << NewG->getName() << '\n');
|
2010-09-07 09:42:10 +08:00
|
|
|
++NumThunksWritten;
|
2008-11-02 13:52:50 +08:00
|
|
|
}
|
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
// Replace G with an alias to F and delete G.
|
|
|
|
void MergeFunctions::writeAlias(Function *F, Function *G) {
|
2015-09-15 04:29:26 +08:00
|
|
|
auto *GA = GlobalAlias::create(G->getLinkage(), "", F);
|
2011-01-25 16:56:50 +08:00
|
|
|
F->setAlignment(std::max(F->getAlignment(), G->getAlignment()));
|
|
|
|
GA->takeName(G);
|
|
|
|
GA->setVisibility(G->getVisibility());
|
2011-01-28 16:43:14 +08:00
|
|
|
removeUsers(G);
|
2011-01-25 16:56:50 +08:00
|
|
|
G->replaceAllUsesWith(GA);
|
|
|
|
G->eraseFromParent();
|
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
DEBUG(dbgs() << "writeAlias: " << GA->getName() << '\n');
|
2011-01-25 16:56:50 +08:00
|
|
|
++NumAliasesWritten;
|
|
|
|
}
|
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
// Merge two equivalent functions. Upon completion, Function G is deleted.
|
|
|
|
void MergeFunctions::mergeTwoFunctions(Function *F, Function *G) {
|
2010-09-07 09:42:10 +08:00
|
|
|
if (F->mayBeOverridden()) {
|
|
|
|
assert(G->mayBeOverridden());
|
2009-06-12 23:56:56 +08:00
|
|
|
|
2015-06-10 02:19:17 +08:00
|
|
|
// Make them both thunks to the same internal function.
|
|
|
|
Function *H = Function::Create(F->getFunctionType(), F->getLinkage(), "",
|
|
|
|
F->getParent());
|
|
|
|
H->copyAttributesFrom(F);
|
|
|
|
H->takeName(F);
|
|
|
|
removeUsers(F);
|
|
|
|
F->replaceAllUsesWith(H);
|
2009-06-12 23:56:56 +08:00
|
|
|
|
2015-06-10 02:19:17 +08:00
|
|
|
unsigned MaxAlignment = std::max(G->getAlignment(), H->getAlignment());
|
2010-08-10 05:03:28 +08:00
|
|
|
|
2015-06-10 02:19:17 +08:00
|
|
|
if (HasGlobalAliases) {
|
2011-01-28 16:43:14 +08:00
|
|
|
writeAlias(F, G);
|
|
|
|
writeAlias(F, H);
|
2011-01-25 16:56:50 +08:00
|
|
|
} else {
|
2015-06-10 02:19:17 +08:00
|
|
|
writeThunk(F, G);
|
|
|
|
writeThunk(F, H);
|
2011-01-25 16:56:50 +08:00
|
|
|
}
|
2010-09-07 09:42:10 +08:00
|
|
|
|
2015-06-10 02:19:17 +08:00
|
|
|
F->setAlignment(MaxAlignment);
|
|
|
|
F->setLinkage(GlobalValue::PrivateLinkage);
|
2010-09-07 09:42:10 +08:00
|
|
|
++NumDoubleWeak;
|
2010-08-06 15:21:30 +08:00
|
|
|
} else {
|
2011-01-28 16:43:14 +08:00
|
|
|
writeThunkOrAlias(F, G);
|
2008-11-02 13:52:50 +08:00
|
|
|
}
|
|
|
|
|
2009-06-12 16:04:51 +08:00
|
|
|
++NumFunctionsMerged;
|
2008-11-02 13:52:50 +08:00
|
|
|
}
|
|
|
|
|
2015-09-03 07:55:23 +08:00
|
|
|
/// Replace function F by function G.
|
|
|
|
void MergeFunctions::replaceFunctionInTree(const FunctionNode &FN,
|
2015-06-09 08:03:29 +08:00
|
|
|
Function *G) {
|
2015-09-03 07:55:23 +08:00
|
|
|
Function *F = FN.getFunc();
|
Improve the determinism of MergeFunctions
Summary:
Merge functions previously relied on unsigned comparisons of pointer values to
order functions. This caused observable non-determinism in the compiler for
large bitcode programs. Basically, opt -mergefuncs program.bc | md5sum produces
different hashes when run repeatedly on the same machine. Differing output was
observed on three large bitcodes, but it was less frequent on the smallest file.
It is possible that this only manifests on the large inputs, hence remaining
undetected until now.
This patch fixes this by removing (almost, see below) all places where
comparisons between pointers are used to order functions. Most of these changes
are local, but the comparison of global values requires assigning an identifier
to each local in the order it is visited. This is very similar to the way the
comparison function identifies Value*'s defined within a function. Because the
order of visiting the functions and their subparts is deterministic, the
identifiers assigned to the globals will be as well, and the order of functions
will be deterministic.
With these changes, there is no more observed non-determinism. There is also
only minor slowdowns (negligible to 4%) compared to the baseline, which is
likely a result of the fact that global comparisons involve hash lookups and not
just pointer comparisons.
The one caveat so far is that programs containing BlockAddress constants can
still be non-deterministic. It is not clear what the right solution is here. In
particular, even if the global numbers are used to order by function, we still
need a way to order the BasicBlock*'s. Unfortunately, we cannot just bail out
and fail to order the functions or consider them equal, because we require a
total order over functions. Note that programs with BlockAddress constants are
relatively rare, so the impact of leaving this in is minor as long as this pass
is opt-in.
Author: jrkoenig
Reviewers: nlewycky, jfb, dschuff
Subscribers: jevinskie, llvm-commits, chapuni
Differential revision: http://reviews.llvm.org/D12168
llvm-svn: 245762
2015-08-22 07:27:24 +08:00
|
|
|
assert(FunctionComparator(F, G, &GlobalNumbers).compare() == 0 &&
|
|
|
|
"The two functions must be equal");
|
2015-09-03 07:55:23 +08:00
|
|
|
|
|
|
|
auto I = FNodesInTree.find(F);
|
|
|
|
assert(I != FNodesInTree.end() && "F should be in FNodesInTree");
|
|
|
|
assert(FNodesInTree.count(G) == 0 && "FNodesInTree should not contain G");
|
|
|
|
|
|
|
|
FnTreeType::iterator IterToFNInFnTree = I->second;
|
|
|
|
assert(&(*IterToFNInFnTree) == &FN && "F should map to FN in FNodesInTree.");
|
|
|
|
// Remove F -> FN and insert G -> FN
|
|
|
|
FNodesInTree.erase(I);
|
|
|
|
FNodesInTree.insert({G, IterToFNInFnTree});
|
|
|
|
// Replace F with G in FN, which is stored inside the FnTree.
|
|
|
|
FN.replaceBy(G);
|
2015-06-09 08:03:29 +08:00
|
|
|
}
|
|
|
|
|
2014-06-22 04:54:36 +08:00
|
|
|
// Insert a ComparableFunction into the FnTree, or merge it away if equal to one
|
2011-01-28 16:43:14 +08:00
|
|
|
// that was already inserted.
|
2014-06-22 04:54:36 +08:00
|
|
|
bool MergeFunctions::insert(Function *NewFunction) {
|
|
|
|
std::pair<FnTreeType::iterator, bool> Result =
|
2015-03-10 10:37:25 +08:00
|
|
|
FnTree.insert(FunctionNode(NewFunction));
|
2014-06-22 04:54:36 +08:00
|
|
|
|
2011-02-09 14:32:02 +08:00
|
|
|
if (Result.second) {
|
2015-09-03 07:55:23 +08:00
|
|
|
assert(FNodesInTree.count(NewFunction) == 0);
|
|
|
|
FNodesInTree.insert({NewFunction, Result.first});
|
2014-06-22 04:54:36 +08:00
|
|
|
DEBUG(dbgs() << "Inserting as unique: " << NewFunction->getName() << '\n');
|
2010-09-05 16:22:49 +08:00
|
|
|
return false;
|
2011-02-09 14:32:02 +08:00
|
|
|
}
|
2010-08-31 13:53:05 +08:00
|
|
|
|
2014-09-10 18:08:25 +08:00
|
|
|
const FunctionNode &OldF = *Result.first;
|
2010-09-05 16:22:49 +08:00
|
|
|
|
2013-10-02 02:05:30 +08:00
|
|
|
// Don't merge tiny functions, since it can just end up making the function
|
|
|
|
// larger.
|
|
|
|
// FIXME: Should still merge them if they are unnamed_addr and produce an
|
|
|
|
// alias.
|
2014-06-22 04:54:36 +08:00
|
|
|
if (NewFunction->size() == 1) {
|
|
|
|
if (NewFunction->front().size() <= 2) {
|
|
|
|
DEBUG(dbgs() << NewFunction->getName()
|
|
|
|
<< " is to small to bother merging\n");
|
2013-10-02 02:05:30 +08:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-09 08:03:29 +08:00
|
|
|
// Impose a total order (by name) on the replacement of functions. This is
|
|
|
|
// important when operating on more than one module independently to prevent
|
|
|
|
// cycles of thunks calling each other when the modules are linked together.
|
|
|
|
//
|
|
|
|
// When one function is weak and the other is strong there is an order imposed
|
|
|
|
// already. We process strong functions before weak functions.
|
|
|
|
if ((OldF.getFunc()->mayBeOverridden() && NewFunction->mayBeOverridden()) ||
|
|
|
|
(!OldF.getFunc()->mayBeOverridden() && !NewFunction->mayBeOverridden()))
|
|
|
|
if (OldF.getFunc()->getName() > NewFunction->getName()) {
|
|
|
|
// Swap the two functions.
|
|
|
|
Function *F = OldF.getFunc();
|
2015-09-03 07:55:23 +08:00
|
|
|
replaceFunctionInTree(*Result.first, NewFunction);
|
2015-06-09 08:03:29 +08:00
|
|
|
NewFunction = F;
|
|
|
|
assert(OldF.getFunc() != F && "Must have swapped the functions.");
|
|
|
|
}
|
|
|
|
|
2010-09-05 16:22:49 +08:00
|
|
|
// Never thunk a strong function to a weak function.
|
2014-06-22 04:54:36 +08:00
|
|
|
assert(!OldF.getFunc()->mayBeOverridden() || NewFunction->mayBeOverridden());
|
2010-09-05 16:22:49 +08:00
|
|
|
|
2014-06-22 04:54:36 +08:00
|
|
|
DEBUG(dbgs() << " " << OldF.getFunc()->getName()
|
|
|
|
<< " == " << NewFunction->getName() << '\n');
|
2010-09-05 16:22:49 +08:00
|
|
|
|
2014-06-22 04:54:36 +08:00
|
|
|
Function *DeleteF = NewFunction;
|
2011-01-28 16:43:14 +08:00
|
|
|
mergeTwoFunctions(OldF.getFunc(), DeleteF);
|
2010-09-05 16:22:49 +08:00
|
|
|
return true;
|
2010-08-08 13:04:23 +08:00
|
|
|
}
|
2009-06-12 16:04:51 +08:00
|
|
|
|
2014-06-22 04:54:36 +08:00
|
|
|
// Remove a function from FnTree. If it was already in FnTree, add
|
|
|
|
// it to Deferred so that we'll look at it in the next round.
|
2011-01-28 16:43:14 +08:00
|
|
|
void MergeFunctions::remove(Function *F) {
|
2015-09-03 07:55:23 +08:00
|
|
|
auto I = FNodesInTree.find(F);
|
|
|
|
if (I != FNodesInTree.end()) {
|
|
|
|
DEBUG(dbgs() << "Deferred " << F->getName()<< ".\n");
|
|
|
|
FnTree.erase(I->second);
|
|
|
|
// I->second has been invalidated, remove it from the FNodesInTree map to
|
|
|
|
// preserve the invariant.
|
|
|
|
FNodesInTree.erase(I);
|
2015-05-30 03:43:39 +08:00
|
|
|
Deferred.emplace_back(F);
|
2010-08-31 13:53:05 +08:00
|
|
|
}
|
2011-01-02 10:46:33 +08:00
|
|
|
}
|
2010-09-05 16:22:49 +08:00
|
|
|
|
2011-01-28 16:43:14 +08:00
|
|
|
// For each instruction used by the value, remove() the function that contains
|
|
|
|
// the instruction. This should happen right before a call to RAUW.
|
|
|
|
void MergeFunctions::removeUsers(Value *V) {
|
2011-01-03 03:16:44 +08:00
|
|
|
std::vector<Value *> Worklist;
|
|
|
|
Worklist.push_back(V);
|
2015-07-16 05:51:33 +08:00
|
|
|
SmallSet<Value*, 8> Visited;
|
|
|
|
Visited.insert(V);
|
2011-01-03 03:16:44 +08:00
|
|
|
while (!Worklist.empty()) {
|
|
|
|
Value *V = Worklist.back();
|
|
|
|
Worklist.pop_back();
|
|
|
|
|
2014-03-09 11:16:01 +08:00
|
|
|
for (User *U : V->users()) {
|
|
|
|
if (Instruction *I = dyn_cast<Instruction>(U)) {
|
2011-01-28 16:43:14 +08:00
|
|
|
remove(I->getParent()->getParent());
|
2014-03-09 11:16:01 +08:00
|
|
|
} else if (isa<GlobalValue>(U)) {
|
2011-01-15 18:16:23 +08:00
|
|
|
// do nothing
|
2014-03-09 11:16:01 +08:00
|
|
|
} else if (Constant *C = dyn_cast<Constant>(U)) {
|
2015-07-16 05:51:33 +08:00
|
|
|
for (User *UU : C->users()) {
|
|
|
|
if (!Visited.insert(UU).second)
|
|
|
|
Worklist.push_back(UU);
|
|
|
|
}
|
2011-01-03 03:16:44 +08:00
|
|
|
}
|
2010-09-05 16:22:49 +08:00
|
|
|
}
|
2010-08-31 13:53:05 +08:00
|
|
|
}
|
2010-09-05 16:22:49 +08:00
|
|
|
}
|