RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-02-26 21:56:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert r342233.

Browse Source 
This caused LLD test failures, which I've been unable to reproduce.

Reverting to allow for further investigation next week.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@342244 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
James Henderson 2018-09-14 16:48:47 +00:00
parent 6764b4552f
commit 7eee232c9a
6 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/llvm-c/lto.h
View File

@ -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
@ -827,16 +827,6 @@ extern void thinlto_codegen_set_cache_entry_expiration(thinlto_code_gen_t cg,
extern void thinlto_codegen_set_cache_size_bytes(thinlto_code_gen_t cg,
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.

2
include/llvm/LTO/legacy/ThinLTOCodeGenerator.h
View File

@ -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;
}

13
test/ThinLTO/X86/cache.ll
View File

@ -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

2
tools/llvm-lto/llvm-lto.cpp
View File

@ -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."));

7
tools/lto/lto.cpp
View File

@ -591,13 +591,6 @@ void thinlto_codegen_set_cache_size_bytes(
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);

1
tools/lto/lto.exports
View File

@ -58,7 +58,6 @@ thinlto_codegen_set_cache_pruning_interval
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