Skip to content

Commit 2c87571

Browse files
committed
[test][hwasan] Deflake release-shadow.c
kNumShadowPages=1024 helps to pass it consistenly (10k runs). But to be sure also changing success condition to 8 out of 10.
1 parent 3af586f commit 2c87571

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

compiler-rt/test/hwasan/TestCases/Linux/release-shadow.c

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
#include <sanitizer/hwasan_interface.h>
1616

1717
const unsigned char kTag = 42;
18-
const size_t kNumShadowPages = 256;
18+
const size_t kNumShadowPages = 1024;
1919
const size_t kNumPages = 16 * kNumShadowPages;
2020
const size_t kPageSize = 4096;
2121
const size_t kMapSize = kNumPages * kPageSize;
2222

2323
void sync_rss() {
2424
char *page = (char *)mmap(0, kPageSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
2525
// Linux kernel updates RSS counters after a set number of page faults.
26-
for (int i = 0; i < 10000; ++i) {
26+
for (int i = 0; i < 100; ++i) {
2727
page[0] = 42;
2828
madvise(page, kPageSize, MADV_DONTNEED);
2929
}
@@ -44,17 +44,18 @@ size_t current_rss() {
4444
return rss;
4545
}
4646

47-
void test_rss_difference(void *p) {
47+
int test_rss_difference(void *p) {
4848
__hwasan_tag_memory(p, kTag, kMapSize);
4949
size_t rss_before = current_rss();
5050
__hwasan_tag_memory(p, 0, kMapSize);
5151
size_t rss_after = current_rss();
5252
fprintf(stderr, "%zu -> %zu\n", rss_before, rss_after);
53-
assert(rss_before > rss_after);
53+
if (rss_before <= rss_after)
54+
return 0;
5455
size_t diff = rss_before - rss_after;
5556
fprintf(stderr, "diff %zu\n", diff);
5657
// Check that the difference is at least close to kNumShadowPages.
57-
assert(diff > kNumShadowPages / 2);
58+
return diff > kNumShadowPages / 2;
5859
}
5960

6061
int main() {
@@ -64,9 +65,14 @@ int main() {
6465
void *p = mmap(0, kMapSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
6566
fprintf(stderr, "p = %p\n", p);
6667

67-
test_rss_difference(p);
68-
test_rss_difference(p);
69-
test_rss_difference(p);
68+
size_t total_count = 10;
69+
size_t success_count = 0;
70+
for (size_t i = 0; i < total_count; ++i)
71+
success_count += test_rss_difference(p);
72+
73+
fprintf(stderr, "p = %p\n", p);
74+
fprintf(stderr, "passed %zu out of %zu\n", success_count, total_count);
75+
assert(success_count > total_count * 0.8);
7076

7177
return 0;
7278
}

0 commit comments

Comments
 (0)