[llvm] r269543 - Revert "Add testing in llvm-lto for ThinLTO caching."

[Mehdi Amini via llvm-commits]

Author: mehdi_amini
Date: Sat May 14 00:07:44 2016
New Revision: 269543

URL: http://llvm.org/viewvc/llvm-project?rev=269543&view=rev
Log:
Revert "Add testing in llvm-lto for ThinLTO caching."

This reverts commit r269538 and r269542.
"rename()" is expected to fail across filesystems, will handle this.

From: Mehdi Amini <mehdi.amini at apple.com>

Removed:
    llvm/trunk/test/ThinLTO/X86/Inputs/cache.ll
    llvm/trunk/test/ThinLTO/X86/cache.ll
Modified:
    llvm/trunk/tools/llvm-lto/llvm-lto.cpp

Removed: llvm/trunk/test/ThinLTO/X86/Inputs/cache.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ThinLTO/X86/Inputs/cache.ll?rev=269542&view=auto
==============================================================================
--- llvm/trunk/test/ThinLTO/X86/Inputs/cache.ll (original)
+++ llvm/trunk/test/ThinLTO/X86/Inputs/cache.ll (removed)
@@ -1,11 +0,0 @@
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.11.0"
-
-
-define i32 @main() {
-entry:
-  call void (...) @globalfunc()
-  ret i32 0
-}
-
-declare void @globalfunc(...)

Removed: llvm/trunk/test/ThinLTO/X86/cache.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ThinLTO/X86/cache.ll?rev=269542&view=auto
==============================================================================
--- llvm/trunk/test/ThinLTO/X86/cache.ll (original)
+++ llvm/trunk/test/ThinLTO/X86/cache.ll (removed)
@@ -1,18 +0,0 @@
-; RUN: opt -module-summary %s -o %t.bc
-; RUN: opt -module-summary %p/Inputs/funcimport.ll -o %t2.bc
-
-; Verify that enabling caching is working
-; RUN: rm -Rf %t.cache && mkdir %t.cache
-; RUN: llvm-lto -thinlto-action=run -exported-symbol=globalfunc %t2.bc  %t.bc -thinlto-cache-dir %t.cache -debug-only=thinlto
-; RUN: ls %t.cache/
-; RUN: ls %t.cache/llvmcache.timestamp
-; RUN: ls %t.cache | count 3
-
-; REQUIRES: assert
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.11.0"
-
-define void @globalfunc() #0 {
-entry:
-  ret void
-}

Modified: llvm/trunk/tools/llvm-lto/llvm-lto.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-lto/llvm-lto.cpp?rev=269543&r1=269542&r2=269543&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-lto/llvm-lto.cpp (original)
+++ llvm/trunk/tools/llvm-lto/llvm-lto.cpp Sat May 14 00:07:44 2016
@@ -109,9 +109,6 @@ static cl::opt<std::string> ThinLTOModul
     cl::desc("For the module ID for the file to process, useful to "
              "match what is in the index."));
 
-static cl::opt<std::string>
-    ThinLTOCacheDir("thinlto-cache-dir", cl::desc("Enable ThinLTO caching."));
-
 static cl::opt<bool>
     SaveModuleFile("save-merged-module", cl::init(false),
                    cl::desc("Write merged LTO module to file before CodeGen"));
@@ -353,7 +350,6 @@ public:
   ThinLTOProcessing(const TargetOptions &Options) {
     ThinGenerator.setCodePICModel(RelocModel);
     ThinGenerator.setTargetOptions(Options);
-    ThinGenerator.setCacheDir(ThinLTOCacheDir);
 
     // Add all the exported symbols to the table of symbols to preserve.
     for (unsigned i = 0; i < ExportedSymbols.size(); ++i)