[PATCH] D54039: Reland "Change the timestamp of llvmcache-foo file to meet the thinLTO prune policy"

[Fangrui Song via Phabricator via llvm-commits]

MaskRay created this revision.
MaskRay added reviewers: ruiu, craig.topper, smaslov, Jianping, espindola, LuoYuanke, tejohnson.
Herald added subscribers: aheejin, krytarowski, sbc100.

It is difficult to touch a file with a relative mtime across different OSes as POSIX touch -d is rigid and POSIX date is inedequate to print timestamp of a relative date (OpenBSD uses `date -r ...`, FreeBSD uses `date -v-2M` while GNU accepts `-d '-2 min'`

Just use python os.utime()

Original description:

  The case may randomly fail if we test it with command "
   while llvm-lit tools/lld/test/ELF/lto/cache.ll; do true; done". It is because the llvmcache-foo file is younger than llvmcache-349F039B8EB076D412007D82778442BED3148C4E and llvmcache-A8107945C65C2B2BBEE8E61AA604C311D60D58D6. But due to timestamp precision reason their timestamp is the same. Given the same timestamp, the file prune policy is to remove bigger size file first, so mostly foo file is removed for its bigger size. And the files size is under threshold after deleting foo file. That's what test case expect.
  
  However sometimes, the precision is enough to measure that timestamp of llvmcache-349F039B8EB076D412007D82778442BED3148C4E and llvmcache-A8107945C65C2B2BBEE8E61AA604C311D60D58D6 are smaller than foo, so llvmcache-349F039B8EB076D412007D82778442BED3148C4E and llvmcache-A8107945C65C2B2BBEE8E61AA604C311D60D58D6 are deleted first. Since the files size is still above the file size threshold after deleting the 2 files, the foo file is also deleted. And then the test case fails, because it expect only one file should be deleted instead of 3.
  
  The fix is to change the timestamp of llvmcache-foo file to meet the thinLTO prune policy.
  The same fix is applied to llvm code at https://reviews.llvm.org/D52452.
  
  Patch by Luo Yuanke.


Repository:
  rLLD LLVM Linker

https://reviews.llvm.org/D54039

Files:
  test/ELF/lto/cache.ll
  test/wasm/lto/cache.ll


Index: test/wasm/lto/cache.ll
===================================================================
--- test/wasm/lto/cache.ll
+++ test/wasm/lto/cache.ll
@@ -17,6 +17,10 @@
 ; RUN: wasm-ld --thinlto-cache-dir=%t.cache --thinlto-cache-policy cache_size_bytes=128k:prune_interval=0s -o %t.wasm %t2.o %t.o
 ; RUN: ls %t.cache | count 5
 
+; Increase the age of llvmcache-foo, which will give it the oldest time stamp
+; so that it is processed and removed first.
+; RUN: %python -c 'import os,sys,time; t=time.time()-120; os.utime(sys.argv[1],(t,t))' %t.cache/llvmcache-foo
+
 ; This should remove it.
 ; RUN: wasm-ld --thinlto-cache-dir=%t.cache --thinlto-cache-policy cache_size_bytes=32k:prune_interval=0s -o %t.wasm %t2.o %t.o
 ; RUN: ls %t.cache | count 4
Index: test/ELF/lto/cache.ll
===================================================================
--- test/ELF/lto/cache.ll
+++ test/ELF/lto/cache.ll
@@ -19,6 +19,10 @@
 ; RUN: ld.lld --thinlto-cache-dir=%t.cache --thinlto-cache-policy cache_size_bytes=128k:prune_interval=0s -o %t3 %t2.o %t.o
 ; RUN: ls %t.cache | count 5
 
+; Increase the age of llvmcache-foo, which will give it the oldest time stamp
+; so that it is processed and removed first.
+; RUN: %python -c 'import os,sys,time; t=time.time()-120; os.utime(sys.argv[1],(t,t))' %t.cache/llvmcache-foo
+
 ; This should remove it.
 ; RUN: ld.lld --thinlto-cache-dir=%t.cache --thinlto-cache-policy cache_size_bytes=32k:prune_interval=0s -o %t3 %t2.o %t.o
 ; RUN: ls %t.cache | count 4


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D54039.172391.patch
Type: text/x-patch
Size: 1499 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181102/c0357a3f/attachment.bin>