[llvm] r342244 - Revert r342233.
James Henderson via llvm-commits
llvm-commits at lists.llvm.org
Fri Sep 14 09:48:47 PDT 2018
Author: jhenderson
Date: Fri Sep 14 09:48:47 2018
New Revision: 342244
URL: http://llvm.org/viewvc/llvm-project?rev=342244&view=rev
Log:
Revert r342233.
This caused LLD test failures, which I've been unable to reproduce.
Reverting to allow for further investigation next week.
Modified:
llvm/trunk/include/llvm-c/lto.h
llvm/trunk/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h
llvm/trunk/test/ThinLTO/X86/cache.ll
llvm/trunk/tools/llvm-lto/llvm-lto.cpp
llvm/trunk/tools/lto/lto.cpp
llvm/trunk/tools/lto/lto.exports
Modified: llvm/trunk/include/llvm-c/lto.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/lto.h?rev=342244&r1=342243&r2=342244&view=diff
==============================================================================
--- llvm/trunk/include/llvm-c/lto.h (original)
+++ llvm/trunk/include/llvm-c/lto.h Fri Sep 14 09:48:47 2018
@@ -44,7 +44,7 @@ typedef bool lto_bool_t;
* @{
*/
-#define LTO_API_VERSION 23
+#define LTO_API_VERSION 22
/**
* \since prior to LTO_API_VERSION=3
@@ -828,16 +828,6 @@ extern void thinlto_codegen_set_cache_si
unsigned max_size_bytes);
/**
- * Same as thinlto_codegen_set_cache_size_bytes, except the maximum size is in
- * megabytes (2^20 bytes).
- *
- * \since LTO_API_VERSION=23
- */
-extern void
-thinlto_codegen_set_cache_size_megabytes(thinlto_code_gen_t cg,
- unsigned max_size_megabytes);
-
-/**
* Sets the maximum number of files in the cache directory. An unspecified
* default value will be applied. A value of 0 will be ignored.
*
Modified: llvm/trunk/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h?rev=342244&r1=342243&r2=342244&view=diff
==============================================================================
--- llvm/trunk/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h (original)
+++ llvm/trunk/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h Fri Sep 14 09:48:47 2018
@@ -187,7 +187,7 @@ public:
/// Cache policy: the maximum size for the cache directory in bytes. A value
/// over the amount of available space on the disk will be reduced to the
/// amount of available space. A value of 0 will be ignored.
- void setCacheMaxSizeBytes(uint64_t MaxSizeBytes) {
+ void setCacheMaxSizeBytes(unsigned MaxSizeBytes) {
if (MaxSizeBytes)
CacheOptions.Policy.MaxSizeBytes = MaxSizeBytes;
}
Modified: llvm/trunk/test/ThinLTO/X86/cache.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ThinLTO/X86/cache.ll?rev=342244&r1=342243&r2=342244&view=diff
==============================================================================
--- llvm/trunk/test/ThinLTO/X86/cache.ll (original)
+++ llvm/trunk/test/ThinLTO/X86/cache.ll Fri Sep 14 09:48:47 2018
@@ -121,19 +121,6 @@
; RUN: not ls %t.cache/llvmcache-foo-100k
; RUN: not ls %t.cache/llvmcache-foo-77k
-; Verify that specifying a max size > 4GB for the cache directory does not
-; prematurely prune, due to an integer overflow.
-; RUN: rm -Rf %t.cache && mkdir %t.cache
-; RUN: %python -c "with open(r'%t.cache/llvmcache-foo-10', 'w') as file: file.truncate(10)"
-; RUN: llvm-lto -thinlto-action=run -exported-symbol=globalfunc %t2.bc %t.bc -thinlto-cache-dir %t.cache --thinlto-cache-max-size-bytes 4294967297
-; RUN: ls %t.cache/llvmcache-foo-10
-
-; Verify that negative numbers aren't accepted for the
-; --thinlto-cache-max-size-bytes switch
-; RUN: rm -Rf %t.cache && mkdir %t.cache
-; RUN: not llvm-lto %t.bc --thinlto-cache-max-size-bytes -1 2>&1 | FileCheck %s
-; CHECK: -thinlto-cache-max-size-bytes option: '-1' value invalid
-
; Verify that specifying max number of files in the cache directory prunes
; it to this amount, removing the oldest files first.
; RUN: rm -Rf %t.cache && mkdir %t.cache
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=342244&r1=342243&r2=342244&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-lto/llvm-lto.cpp (original)
+++ llvm/trunk/tools/llvm-lto/llvm-lto.cpp Fri Sep 14 09:48:47 2018
@@ -158,7 +158,7 @@ static cl::opt<int>
ThinLTOCachePruningInterval("thinlto-cache-pruning-interval",
cl::init(1200), cl::desc("Set ThinLTO cache pruning interval."));
-static cl::opt<unsigned long long>
+static cl::opt<int>
ThinLTOCacheMaxSizeBytes("thinlto-cache-max-size-bytes",
cl::desc("Set ThinLTO cache pruning directory maximum size in bytes."));
Modified: llvm/trunk/tools/lto/lto.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/lto.cpp?rev=342244&r1=342243&r2=342244&view=diff
==============================================================================
--- llvm/trunk/tools/lto/lto.cpp (original)
+++ llvm/trunk/tools/lto/lto.cpp Fri Sep 14 09:48:47 2018
@@ -591,13 +591,6 @@ void thinlto_codegen_set_cache_size_byte
return unwrap(cg)->setCacheMaxSizeBytes(MaxSizeBytes);
}
-void thinlto_codegen_set_cache_size_megabytes(
- thinlto_code_gen_t cg, unsigned MaxSizeMegabytes) {
- uint64_t MaxSizeBytes = MaxSizeMegabytes;
- MaxSizeBytes *= 1024 * 1024;
- return unwrap(cg)->setCacheMaxSizeBytes(MaxSizeBytes);
-}
-
void thinlto_codegen_set_cache_size_files(
thinlto_code_gen_t cg, unsigned MaxSizeFiles) {
return unwrap(cg)->setCacheMaxSizeFiles(MaxSizeFiles);
Modified: llvm/trunk/tools/lto/lto.exports
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/lto.exports?rev=342244&r1=342243&r2=342244&view=diff
==============================================================================
--- llvm/trunk/tools/lto/lto.exports (original)
+++ llvm/trunk/tools/lto/lto.exports Fri Sep 14 09:48:47 2018
@@ -58,7 +58,6 @@ thinlto_codegen_set_cache_pruning_interv
thinlto_codegen_set_cache_entry_expiration
thinlto_codegen_set_final_cache_size_relative_to_available_space
thinlto_codegen_set_cache_size_bytes
-thinlto_codegen_set_cache_size_megabytes
thinlto_codegen_set_cache_size_files
thinlto_codegen_set_savetemps_dir
thinlto_codegen_set_cpu
More information about the llvm-commits
mailing list