Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

i#6599: Relax WOW64 drmemtrace syscall invariant #6732

Merged
merged 3 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions clients/drcachesim/tools/invariant_checker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,9 @@ invariant_checker_t::parallel_shard_memref(void *shard_data, const memref_t &mem
}
#endif
shard->expect_syscall_marker_ = false;
// TODO i#5949,i#6599: On WOW64 the "syscall" call is delayed by raw2trace
// acros the 2nd timestamp+cpuid; we disable this check until that is solved.
#if !defined(WINDOWS) || defined(X64)
// We expect an immediately preceding timestamp + cpuid.
if (shard->trace_version_ >= TRACE_ENTRY_VERSION_FREQUENT_TIMESTAMPS) {
report_if_false(
Expand All @@ -432,6 +435,7 @@ invariant_checker_t::parallel_shard_memref(void *shard_data, const memref_t &mem
TRACE_MARKER_TYPE_TIMESTAMP,
"Syscall marker not preceded by timestamp + cpuid");
}
#endif
}
if (memref.marker.type == TRACE_TYPE_MARKER &&
memref.marker.marker_type == TRACE_MARKER_TYPE_MAYBE_BLOCKING_SYSCALL) {
Expand Down
4 changes: 0 additions & 4 deletions suite/runsuite_wrapper.pl
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,6 @@
'code_api,thread_private,disable_traces|common.decode-stress' => 1, # i#1807
'code_api,thread_private,tracedump_binary|common.decode-stress' => 1, # i#1807
'code_api|client.file_io' => 1, # i#5802
'code_api|tool.drcacheoff.windows-invar' => 1, # i#6599
'code_api|tool.drcacheoff.invariant_checker' => 1, # i#6599
'code_api|tool.drcacheoff.getretaddr_record_replace_retaddr' => 1, # i#6599
'code_api|tool.record_filter' => 1, # i#6599
);

%ignore_failures_64 = (
Expand Down
Loading