This is an archive of the discontinued LLVM Phabricator instance.

Differential D110148

tsan: account for mid app range in mem profile
ClosedPublic

Authored by dvyukov on Sep 21 2021, 4:14 AM.

Details

Reviewers
melver
vitalybuka
Commits
rG608ffc98c3b7: tsan: account for mid app range in mem profile
Summary

We account low and high ranges, but forgot abount the mid range.
Account mid range as well.

Diff Detail

Unit TestsFailed

TimeTest
50 msx64 debian > ORC-x86_64-linux.TestCases/Linux/x86-64::trivial-cxa-atexit.S
60 msx64 debian > ORC-x86_64-linux.TestCases/Linux/x86-64::trivial-static-initializer.S
60 msx64 debian > ORC-x86_64-linux.TestCases/Linux/x86-64::trivial-tls.S

Event Timeline

dvyukov requested review of this revision.Sep 21 2021, 4:14 AM
dvyukov created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptSep 21 2021, 4:14 AM
Herald added a subscriber: Restricted Project. · View Herald Transcript
dvyukov added a child revision: D110149: tsan: include MBlock/SyncObj stats into mem profile.Sep 21 2021, 4:14 AM
Harbormaster completed remote builds in B124852: Diff 373843.Sep 21 2021, 4:39 AM
melver accepted this revision.Sep 21 2021, 6:50 AM
This revision is now accepted and ready to land.Sep 21 2021, 6:50 AM
dvyukov updated this revision to Diff 374136.Sep 22 2021, 1:08 AM

rebased and addressed comments

This revision was landed with ongoing or failed builds.Sep 22 2021, 1:13 AM
Closed by commit rG608ffc98c3b7: tsan: account for mid app range in mem profile (authored by dvyukov). · Explain Why
This revision was automatically updated to reflect the committed changes.
dvyukov added a commit: rG608ffc98c3b7: tsan: account for mid app range in mem profile.
Harbormaster completed remote builds in B125059: Diff 374136.Sep 22 2021, 1:29 AM

Revision Contents

PathSize
compiler-rt/
lib/
tsan/
rtl/
6 lines

Diff 374136

compiler-rt/lib/tsan/rtl/tsan_platform_linux.cpp

Show First 20 Lines • Show All 101 Lines • ▼ Show 20 Lines
void FillProfileCallback(uptr p, uptr rss, bool file, void FillProfileCallback(uptr p, uptr rss, bool file,
uptr *mem, uptr stats_size) { uptr *mem, uptr stats_size) {
mem[MemTotal] += rss; mem[MemTotal] += rss;
if (p >= ShadowBeg() && p < ShadowEnd()) if (p >= ShadowBeg() && p < ShadowEnd())
mem[MemShadow] += rss; mem[MemShadow] += rss;
else if (p >= MetaShadowBeg() && p < MetaShadowEnd()) else if (p >= MetaShadowBeg() && p < MetaShadowEnd())
mem[MemMeta] += rss; mem[MemMeta] += rss;
else if (p >= LoAppMemBeg() && p < LoAppMemEnd()) else if ((p >= LoAppMemBeg() && p < LoAppMemEnd()) ||
mem[file ? MemFile : MemMmap] += rss; (p >= MidAppMemBeg() && p < MidAppMemEnd()) ||
else if (p >= HiAppMemBeg() && p < HiAppMemEnd()) (p >= HiAppMemBeg() && p < HiAppMemEnd()))
mem[file ? MemFile : MemMmap] += rss; mem[file ? MemFile : MemMmap] += rss;
else if (p >= HeapMemBeg() && p < HeapMemEnd()) else if (p >= HeapMemBeg() && p < HeapMemEnd())
mem[MemHeap] += rss; mem[MemHeap] += rss;
else if (p >= TraceMemBeg() && p < TraceMemEnd()) else if (p >= TraceMemBeg() && p < TraceMemEnd())
mem[MemTrace] += rss; mem[MemTrace] += rss;
else else
mem[MemOther] += rss; mem[MemOther] += rss;
} }
▲ Show 20 Lines • Show All 408 Lines • Show Last 20 Lines