This is an archive of the discontinued LLVM Phabricator instance.

[XRay] Stable sort XRayRecord to remove non-deterministic ordering
ClosedPublic

Authored by mgrang on Nov 11 2017, 8:36 PM.

Reviewers

Commits

Summary

This fixes failure in tools/llvm-xray/X86/graph-zero-latency-calls.yaml
uncovered by D39245.

LGTM

This revision is now accepted and ready to land.Nov 14 2017, 5:18 AM

This revision was automatically updated to reflect the committed changes.

Path

Size

lib/

XRay/

2 lines

Show First 20 Lines • Show All 600 Lines • ▼ Show 20 Lines	if (Type == NAIVE_FORMAT && (Version == 1 \|\| Version == 2)) {
if (auto E = loadFDRLog(Data, T.FileHeader, T.Records))		if (auto E = loadFDRLog(Data, T.FileHeader, T.Records))
return std::move(E);		return std::move(E);
} else {		} else {
if (auto E = loadYAMLLog(Data, T.FileHeader, T.Records))		if (auto E = loadYAMLLog(Data, T.FileHeader, T.Records))
return std::move(E);		return std::move(E);
}		}

if (Sort)		if (Sort)
llvm::sort(T.Records.begin(), T.Records.end(),		std::stable_sort(T.Records.begin(), T.Records.end(),
[&](const XRayRecord &L, const XRayRecord &R) {		[&](const XRayRecord &L, const XRayRecord &R) {
return L.TSC < R.TSC;		return L.TSC < R.TSC;
});		});

return std::move(T);		return std::move(T);
}		}