[compiler-rt] d047368 - [MemProf] Loosen matching of profile data to avoid bot flakes

[Teresa Johnson via llvm-commits]

Author: Teresa Johnson
Date: 2021-09-30T21:22:40-07:00
New Revision: d047368149dc3084774db618051346c045a2f645

URL: https://github.com/llvm/llvm-project/commit/d047368149dc3084774db618051346c045a2f645
DIFF: https://github.com/llvm/llvm-project/commit/d047368149dc3084774db618051346c045a2f645.diff

LOG: [MemProf] Loosen matching of profile data to avoid bot flakes

Allow for the allocations to have migrated cpus, assuming they wouldn't
is causing some bot flakiness, e.g.:
https://lab.llvm.org/buildbot/#/builders/37/builds/7197

Added: 
    

Modified: 
    compiler-rt/test/memprof/TestCases/test_malloc_load_store.c
    compiler-rt/test/memprof/TestCases/test_new_load_store.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/memprof/TestCases/test_malloc_load_store.c b/compiler-rt/test/memprof/TestCases/test_malloc_load_store.c
index 697c2b7eec47f..7c44e5a94dbeb 100644
--- a/compiler-rt/test/memprof/TestCases/test_malloc_load_store.c
+++ b/compiler-rt/test/memprof/TestCases/test_malloc_load_store.c
@@ -15,7 +15,7 @@
 // CHECK:  Memory allocation stack id = [[STACKID:[0-9]+]]{{[[:space:]].*}}alloc_count 1, size (ave/min/max) 40.00 / 40 / 40
 // CHECK-NEXT:  access_count (ave/min/max): 20.00 / 20 / 20
 // CHECK-NEXT:  lifetime (ave/min/max): [[AVELIFETIME:[0-9]+]].00 / [[AVELIFETIME]] / [[AVELIFETIME]]
-// CHECK-NEXT:  num migrated: 0, num lifetime overlaps: 0, num same alloc cpu: 0, num same dealloc_cpu: 0
+// CHECK-NEXT:  num migrated: {{[0-1]}}, num lifetime overlaps: 0, num same alloc cpu: 0, num same dealloc_cpu: 0
 // CHECK: Stack for id [[STACKID]]:
 // CHECK-NEXT: #0 {{.*}} in {{.*}}malloc
 // CHECK-NEXT: #1 {{.*}} in main {{.*}}:[[@LINE+6]]

diff  --git a/compiler-rt/test/memprof/TestCases/test_new_load_store.cpp b/compiler-rt/test/memprof/TestCases/test_new_load_store.cpp
index 9ef3313348dbc..c9f97b280e3b4 100644
--- a/compiler-rt/test/memprof/TestCases/test_new_load_store.cpp
+++ b/compiler-rt/test/memprof/TestCases/test_new_load_store.cpp
@@ -19,7 +19,7 @@
 // CHECK:  Memory allocation stack id = [[STACKID:[0-9]+]]{{[[:space:]].*}}alloc_count 1, size (ave/min/max) 40.00 / 40 / 40
 // CHECK-NEXT:  access_count (ave/min/max): 20.00 / 20 / 20
 // CHECK-NEXT:  lifetime (ave/min/max): [[AVELIFETIME:[0-9]+]].00 / [[AVELIFETIME]] / [[AVELIFETIME]]
-// CHECK-NEXT:  num migrated: 0, num lifetime overlaps: 0, num same alloc cpu: 0, num same dealloc_cpu: 0
+// CHECK-NEXT:  num migrated: {{[0-1]}}, num lifetime overlaps: 0, num same alloc cpu: 0, num same dealloc_cpu: 0
 // CHECK: Stack for id [[STACKID]]:
 // CHECK-NEXT: #0 {{.*}} in operator new
 // CHECK-NEXT: #1 {{.*}} in main {{.*}}:[[@LINE+6]]