diff options
author | Mehdi Amini <mehdi.amini@apple.com> | 2016-05-16 08:50:23 +0000 |
---|---|---|
committer | Mehdi Amini <mehdi.amini@apple.com> | 2016-05-16 08:50:23 +0000 |
commit | 564c49a9389dd0260fa2424e894ff5f9b82bfab4 (patch) | |
tree | d2892163f63033f8b772b139a200daffa72e3bd3 /llvm/lib/Bitcode/Writer/BitcodeWriter.cpp | |
parent | 187043f61eccbe5f9940906fb42477149e7616aa (diff) | |
download | llvm-564c49a9389dd0260fa2424e894ff5f9b82bfab4.zip llvm-564c49a9389dd0260fa2424e894ff5f9b82bfab4.tar.gz llvm-564c49a9389dd0260fa2424e894ff5f9b82bfab4.tar.bz2 |
ThinLTO: fix non-determinism in bitcode writing
Calls are initialized from a DenseMap. We can sort them using the
value id to recover some determinism during serialization.
From: Mehdi Amini <mehdi.amini@apple.com>
llvm-svn: 269634
Diffstat (limited to 'llvm/lib/Bitcode/Writer/BitcodeWriter.cpp')
-rw-r--r-- | llvm/lib/Bitcode/Writer/BitcodeWriter.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp index 1bd2e6f..fff15e9 100644 --- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -3177,8 +3177,14 @@ void ModuleBitcodeWriter::writePerModuleFunctionSummaryRecord( NameVals.insert(NameVals.end(), Refs.begin(), Refs.end()); + std::vector<FunctionSummary::EdgeTy> Calls = FS->calls(); + std::sort(Calls.begin(), Calls.end(), + [this](FunctionSummary::EdgeTy &L, FunctionSummary::EdgeTy &R) { + return VE.getValueID(L.first.getValue()) < + VE.getValueID(R.first.getValue()); + }); bool HasProfileData = F.getEntryCount().hasValue(); - for (auto &ECI : FS->calls()) { + for (auto &ECI : Calls) { NameVals.push_back(VE.getValueID(ECI.first.getValue())); assert(ECI.second.CallsiteCount > 0 && "Expected at least one callsite"); NameVals.push_back(ECI.second.CallsiteCount); |