[llvm] r265216 - Revert "ThinLTO: add module caching handling."
Mehdi Amini via llvm-commits
llvm-commits at lists.llvm.org
Fri Apr 1 22:08:18 PDT 2016
Author: mehdi_amini
Date: Sat Apr 2 00:08:18 2016
New Revision: 265216
URL: http://llvm.org/viewvc/llvm-project?rev=265216&view=rev
Log:
Revert "ThinLTO: add module caching handling."
This reverts commit r265214, unintentionally commited.
From: Mehdi Amini <mehdi.amini at apple.com>
Modified:
llvm/trunk/include/llvm/ADT/StringExtras.h
llvm/trunk/lib/LTO/ThinLTOCodeGenerator.cpp
Modified: llvm/trunk/include/llvm/ADT/StringExtras.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/StringExtras.h?rev=265216&r1=265215&r2=265216&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/StringExtras.h (original)
+++ llvm/trunk/include/llvm/ADT/StringExtras.h Sat Apr 2 00:08:18 2016
@@ -59,22 +59,6 @@ static inline std::string utohexstr(uint
return std::string(BufPtr, std::end(Buffer));
}
-// Convert buffer \p Input to its hexadecimal representation.
-// The returned string is double the size of \p Input.
-static inline std::string toHex(StringRef Input) {
- static const char *const LUT = "0123456789ABCDEF";
- size_t Length = Input.size();
-
- std::string Output;
- Output.reserve(2 * Length);
- for (size_t i = 0; i < Length; ++i) {
- const unsigned char c = Input[i];
- Output.push_back(LUT[c >> 4]);
- Output.push_back(LUT[c & 15]);
- }
- return Output;
-}
-
static inline std::string utostr(uint64_t X, bool isNeg = false) {
char Buffer[21];
char *BufPtr = std::end(Buffer);
Modified: llvm/trunk/lib/LTO/ThinLTOCodeGenerator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/LTO/ThinLTOCodeGenerator.cpp?rev=265216&r1=265215&r2=265216&view=diff
==============================================================================
--- llvm/trunk/lib/LTO/ThinLTOCodeGenerator.cpp (original)
+++ llvm/trunk/lib/LTO/ThinLTOCodeGenerator.cpp Sat Apr 2 00:08:18 2016
@@ -29,9 +29,6 @@
#include "llvm/Linker/Linker.h"
#include "llvm/MC/SubtargetFeature.h"
#include "llvm/Object/ModuleSummaryIndexObjectFile.h"
-#include "llvm/Support/CachePruning.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/SHA1.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/TargetRegistry.h"
#include "llvm/Support/ThreadPool.h"
@@ -289,72 +286,6 @@ std::unique_ptr<MemoryBuffer> codegenMod
return make_unique<ObjectMemoryBuffer>(std::move(OutputBuffer));
}
-/// Manage caching for a single Module.
-class ModuleCacheEntry {
- SmallString<128> EntryPath;
-
-public:
- // Create a cache entry. This compute a unique hash for the Module considering
- // the current list of export/import, and offer an interface to query to
- // access the content in the cache.
- ModuleCacheEntry(StringRef CachePath, const ModuleSummaryIndex &Index,
- StringRef ModuleID,
- const FunctionImporter::ImportMapTy &ImportList,
- const FunctionImporter::ExportSetTy &ExportList) {
- if (CachePath.empty())
- return;
-
- // Compute the unique hash for this entry
- // This is based on the module itself, the export list, and the hash for
- // every single module in the import list
-
- SHA1 Hasher;
- // Include the hash for the current module
- auto ModHash = Index.getModuleHash(ModuleID);
- Hasher.update(ArrayRef<uint8_t>((uint8_t *)&ModHash[0], sizeof(ModHash)));
- for (auto F : ExportList)
- // The export list can impact the internalization, be conservative here
- Hasher.update(ArrayRef<uint8_t>((uint8_t *)&F, sizeof(F)));
-
- // Include the hash for every module we import functions from
- for (auto &Entry : ImportList) {
- auto ModHash = Index.getModuleHash(Entry.first());
- Hasher.update(ArrayRef<uint8_t>((uint8_t *)&ModHash[0], sizeof(ModHash)));
- }
-
- sys::path::append(EntryPath, CachePath, toHex(Hasher.result()));
- }
-
- // Try loading the buffer for this cache entry.
- ErrorOr<std::unique_ptr<MemoryBuffer>> tryLoadingBuffer() {
- if (EntryPath.empty())
- return std::error_code();
- return MemoryBuffer::getFile(EntryPath);
- }
-
- // Cache the Produced object file
- void write(MemoryBufferRef OutputBuffer) {
- if (EntryPath.empty())
- return;
-
- // Write to a temporary to avoid race condition
- SmallString<128> TempFilename;
- int TempFD;
- std::error_code EC =
- sys::fs::createTemporaryFile("Thin", "tmp.o", TempFD, TempFilename);
- if (EC) {
- errs() << "Error: " << EC.message() << "\n";
- report_fatal_error("ThinLTO: Can't get a temporary file");
- }
- {
- raw_fd_ostream OS(TempFD, /* ShouldClose */ true);
- OS << OutputBuffer.getBuffer();
- }
- // Rename to final destination (hopefully race condition won't matter here)
- sys::fs::rename(TempFilename, EntryPath);
- }
-};
-
static std::unique_ptr<MemoryBuffer>
ProcessThinLTOModule(Module &TheModule, const ModuleSummaryIndex &Index,
StringMap<MemoryBufferRef> &ModuleMap, TargetMachine &TM,
@@ -597,21 +528,6 @@ void ThinLTOCodeGenerator::run() {
int count = 0;
for (auto &ModuleBuffer : Modules) {
Pool.async([&](int count) {
- // The module may be cached, this helps handling it.
- ModuleCacheEntry CacheEntry(
- CacheOptions.Path, *Index, ModuleBuffer.getBufferIdentifier(),
- ImportLists[ModuleBuffer.getBufferIdentifier()],
- ExportLists[ModuleBuffer.getBufferIdentifier()]);
-
- {
- auto ErrOrBuffer = CacheEntry.tryLoadingBuffer();
- if (ErrOrBuffer) {
- // Cache Hit!
- ProducedBinaries[count] = std::move(ErrOrBuffer.get());
- return;
- }
- }
-
LLVMContext Context;
Context.setDiscardValueNames(LTODiscardValueNames);
@@ -624,24 +540,14 @@ void ThinLTOCodeGenerator::run() {
}
auto &ImportList = ImportLists[TheModule->getModuleIdentifier()];
-
- auto OutputBuffer = ProcessThinLTOModule(
+ ProducedBinaries[count] = ProcessThinLTOModule(
*TheModule, *Index, ModuleMap, *TMBuilder.create(), ImportList,
CacheOptions, DisableCodeGen, SaveTempsDir, count);
-
- CacheEntry.write(*OutputBuffer);
- ProducedBinaries[count] = std::move(OutputBuffer);
}, count);
count++;
}
}
- CachePruning(CacheOptions.Path)
- .setPruningInterval(CacheOptions.PruningInterval)
- .setEntryExpiration(CacheOptions.Expiration)
- .setMaxSize(CacheOptions.MaxPercentageOfAvailableSpace)
- .prune();
-
// If statistics were requested, print them out now.
if (llvm::AreStatisticsEnabled())
llvm::PrintStatistics();
More information about the llvm-commits
mailing list