Skip to content

Commit

Permalink
Revert some clang changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
abhinav92003 committed Apr 10, 2024
1 parent 34ffa88 commit 6c1f2c8
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions clients/drcachesim/tools/invariant_checker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -777,8 +777,8 @@ invariant_checker_t::parallel_shard_memref(void *shard_data, const memref_t &mem
// variable is not cached as it can dynamically vary based on data values.
cur_instr_info.memref = memref;
if (knob_verbose_ >= 3) {
std::cerr << "::" << memref.data.pid << ":" << memref.data.tid
<< ":: " << " @" << (void *)memref.instr.addr
std::cerr << "::" << memref.data.pid << ":" << memref.data.tid << ":: "
<< " @" << (void *)memref.instr.addr
<< ((memref.instr.type == TRACE_TYPE_INSTR_NO_FETCH)
? " non-fetched"
: "")
Expand Down Expand Up @@ -890,8 +890,8 @@ invariant_checker_t::parallel_shard_memref(void *shard_data, const memref_t &mem
// Clear window transitions on instrs.
shard->window_transition_ = false;
} else if (knob_verbose_ >= 3) {
std::cerr << "::" << memref.data.pid << ":" << memref.data.tid
<< ":: " << " type " << memref.instr.type << "\n";
std::cerr << "::" << memref.data.pid << ":" << memref.data.tid << ":: "
<< " type " << memref.instr.type << "\n";
}

if (memref.marker.type == TRACE_TYPE_MARKER &&
Expand Down Expand Up @@ -919,8 +919,8 @@ invariant_checker_t::parallel_shard_memref(void *shard_data, const memref_t &mem
// Reset this since we just saw a timestamp marker.
shard->instr_count_since_last_timestamp_ = 0;
if (knob_verbose_ >= 3) {
std::cerr << "::" << memref.data.pid << ":" << memref.data.tid
<< ":: " << " timestamp " << memref.marker.marker_value << "\n";
std::cerr << "::" << memref.data.pid << ":" << memref.data.tid << ":: "
<< " timestamp " << memref.marker.marker_value << "\n";
}
}
if (memref.marker.type == TRACE_TYPE_MARKER &&
Expand All @@ -941,10 +941,9 @@ invariant_checker_t::parallel_shard_memref(void *shard_data, const memref_t &mem
(memref.marker.marker_type == TRACE_MARKER_TYPE_KERNEL_EVENT ||
memref.marker.marker_type == TRACE_MARKER_TYPE_KERNEL_XFER)) {
if (knob_verbose_ >= 3) {
std::cerr << "::" << memref.data.pid << ":" << memref.data.tid
<< ":: " << "marker type " << memref.marker.marker_type
<< " value 0x" << std::hex << memref.marker.marker_value << std::dec
<< "\n";
std::cerr << "::" << memref.data.pid << ":" << memref.data.tid << ":: "
<< "marker type " << memref.marker.marker_type << " value 0x"
<< std::hex << memref.marker.marker_value << std::dec << "\n";
}
// Zero is pushed as a sentinel. This push matches the return used by post
// signal handler to run the restorer code. It is assumed that all signal
Expand Down

0 comments on commit 6c1f2c8

Please sign in to comment.