i#7050: Remove preempted and faulting instruction from the drmemtraces.

clients/drcachesim/tests/offline-burst_aarch64_sys.templatex

@@ -13,7 +13,7 @@ Total counts:
      .* total data loads
      .* total data stores
            1 total icache flushes
-           4 total dcache flushes
+           3 total dcache flushes
            1 total threads
      .* total timestamp \+ cpuid markers
 .*
@@ -25,6 +25,6 @@ Thread .* counts:
      .* data loads
      .* data stores
            1 icache flushes
-           4 dcache flushes
+           3 dcache flushes
      .* timestamp \+ cpuid markers
 .*

clients/drcachesim/tests/offline-legacy-int-offs.templatex

@@ -3,12 +3,12 @@ ERROR: failed to initialize analyzer: Directory setup failed: Failed sanity chec
 #elif defined(X86) && defined(X64)
 Basic counts tool results:
 Total counts:
-      109205 total \(fetched\) instructions
-        6768 total unique \(fetched\) instructions
+      109201 total \(fetched\) instructions
+        6765 total unique \(fetched\) instructions
           93 total non-fetched instructions
           11 total prefetches
-       23974 total data loads
-        5544 total data stores
+       23972 total data loads
+        5543 total data stores
            0 total icache flushes
            0 total dcache flushes
            3 total threads
@@ -25,14 +25,14 @@ Total counts:
            0 total system call number markers
            0 total blocking system call markers
           12 total other markers
-        8429 total encodings
+        8426 total encodings
 Thread 552306 counts:
-      101049 \(fetched\) instructions
-        6393 unique \(fetched\) instructions
+      101045 \(fetched\) instructions
+        6390 unique \(fetched\) instructions
           93 non-fetched instructions
           11 prefetches
-       21712 data loads
-        4442 data stores
+       21710 data loads
+        4441 data stores
            0 icache flushes
            0 dcache flushes
          110 timestamp \+ cpuid markers
@@ -48,7 +48,7 @@ Thread 552306 counts:
            0 system call number markers
            0 blocking system call markers
            4 other markers
-        6393 encodings
+        6390 encodings
 Thread 552323 counts:
         4674 \(fetched\) instructions
         1028 unique \(fetched\) instructions

clients/drcachesim/tests/raw2trace_unit_tests.cpp

@@ -436,9 +436,10 @@ test_branch_delays(void *drcontext)
         check_entry(entries, idx, TRACE_TYPE_MARKER, TRACE_MARKER_TYPE_FILETYPE) &&
         check_entry(entries, idx, TRACE_TYPE_THREAD, -1) &&
         check_entry(entries, idx, TRACE_TYPE_PID, -1) &&
-        check_entry(entries, idx, TRACE_TYPE_MARKER, TRACE_MARKER_TYPE_CACHE_LINE_SIZE) &&
         check_entry(entries, idx, TRACE_TYPE_MARKER,
-                    TRACE_MARKER_TYPE_CHUNK_INSTR_COUNT) &&
+                    TRACE_MARKER_TYPE_CACHE_LINE_SIZE) && // 5 type: 28 size: 10 val: 64
+        check_entry(entries, idx, TRACE_TYPE_MARKER,
+                    TRACE_MARKER_TYPE_CHUNK_INSTR_COUNT) && // 10000000
         check_entry(entries, idx, TRACE_TYPE_MARKER, TRACE_MARKER_TYPE_TIMESTAMP) &&
         check_entry(entries, idx, TRACE_TYPE_MARKER, TRACE_MARKER_TYPE_CPU_ID) &&
         // Both branches should be delayed until after the timestamp+cpu markers:
@@ -3156,6 +3157,124 @@ test_ifiltered(void *drcontext)
 #endif
 }
 
+/* Tests asynchronous signal handling (i#7050). */
+bool
+test_asynchronous_signal(void *drcontext)
+{
+    bool res = true;
+    {
+        std::cerr << "\n===============\nTesting instr removal by async signal\n";
+        instrlist_t *ilist = instrlist_create(drcontext);
+        // raw2trace doesn't like offsets of 0 so we shift with a nop.
+        instr_t *nop = XINST_CREATE_nop(drcontext);
+        instr_t *move =
+            XINST_CREATE_move(drcontext, opnd_create_reg(REG1), opnd_create_reg(REG2));
+        instr_t *move2 =
+            XINST_CREATE_move(drcontext, opnd_create_reg(REG2), opnd_create_reg(REG1));
+        instrlist_append(ilist, nop);
+        instrlist_append(ilist, move);
+        instrlist_append(ilist, move2);
+        size_t offs_nop = 0;
+        size_t offs_move1 = offs_nop + instr_length(drcontext, nop);
+
+        std::vector<offline_entry_t> raw;
+        raw.push_back(make_header());
+        raw.push_back(make_tid());
+        raw.push_back(make_pid());
+        raw.push_back(make_line_size());
+        raw.push_back(make_timestamp());
+        raw.push_back(make_core());
+        raw.push_back(make_block(offs_move1, 1));
+        raw.push_back(make_marker(TRACE_MARKER_TYPE_KERNEL_EVENT, offs_move1));
+        raw.push_back(make_exit());
+
+        std::vector<uint64_t> stats;
+        std::vector<trace_entry_t> entries;
+        if (!run_raw2trace(drcontext, raw, ilist, entries, &stats))
+            return false;
+        int idx = 0;
+        res = check_entry(entries, idx, TRACE_TYPE_HEADER, -1) &&
+            check_entry(entries, idx, TRACE_TYPE_MARKER, TRACE_MARKER_TYPE_VERSION) &&
+            check_entry(entries, idx, TRACE_TYPE_MARKER, TRACE_MARKER_TYPE_FILETYPE) &&
+            check_entry(entries, idx, TRACE_TYPE_THREAD, -1) &&
+            check_entry(entries, idx, TRACE_TYPE_PID, -1) &&
+            check_entry(entries, idx, TRACE_TYPE_MARKER,
+                        TRACE_MARKER_TYPE_CACHE_LINE_SIZE) &&
+            check_entry(entries, idx, TRACE_TYPE_MARKER,
+                        TRACE_MARKER_TYPE_CHUNK_INSTR_COUNT) &&
+            check_entry(entries, idx, TRACE_TYPE_MARKER, TRACE_MARKER_TYPE_TIMESTAMP) &&
+            check_entry(entries, idx, TRACE_TYPE_MARKER, TRACE_MARKER_TYPE_CPU_ID) &&
+            // The move instruction is removed because of the asynchronous signal.
+            check_entry(entries, idx, TRACE_TYPE_MARKER, TRACE_MARKER_TYPE_KERNEL_EVENT,
+                        offs_move1) &&
+            check_entry(entries, idx, TRACE_TYPE_THREAD_EXIT, -1) &&
+            check_entry(entries, idx, TRACE_TYPE_FOOTER, -1);
+    }
+    {
+        std::cerr
+            << "\n===============\nTesting instr and memref removal by async signal\n";
+        instrlist_t *ilist = instrlist_create(drcontext);
+        // raw2trace doesn't like offsets of 0 so we shift with a nop.
+        instr_t *nop = XINST_CREATE_nop(drcontext);
+        instr_t *move =
+            XINST_CREATE_move(drcontext, opnd_create_reg(REG1), opnd_create_reg(REG2));
+        instr_t *store = XINST_CREATE_store(drcontext, OPND_CREATE_MEMPTR(REG2, 0),
+                                            opnd_create_reg(REG1));
+        instr_t *move2 =
+            XINST_CREATE_move(drcontext, opnd_create_reg(REG2), opnd_create_reg(REG1));
+        instrlist_append(ilist, nop);
+        instrlist_append(ilist, move);
+        instrlist_append(ilist, store);
+        instrlist_append(ilist, move2);
+        size_t offs_nop = 0;
+        size_t offs_move1 = offs_nop + instr_length(drcontext, nop);
+        size_t offs_store = offs_move1 + instr_length(drcontext, move);
+        size_t offs_move2 = offs_store + instr_length(drcontext, store);
+
+        std::vector<offline_entry_t> raw;
+        raw.push_back(make_header());
+        raw.push_back(make_tid());
+        raw.push_back(make_pid());
+        raw.push_back(make_line_size());
+        raw.push_back(make_timestamp());
+        raw.push_back(make_core());
+        raw.push_back(make_block(offs_move1, 2));
+        raw.push_back(make_memref(42));
+        raw.push_back(make_marker(TRACE_MARKER_TYPE_KERNEL_EVENT, offs_store));
+        raw.push_back(make_block(offs_move2, 1));
+        raw.push_back(make_exit());
+
+        std::vector<uint64_t> stats;
+        std::vector<trace_entry_t> entries;
+        if (!run_raw2trace(drcontext, raw, ilist, entries, &stats))
+            return false;
+        int idx = 0;
+        res &=
+            (check_entry(entries, idx, TRACE_TYPE_HEADER, -1) &&
+             check_entry(entries, idx, TRACE_TYPE_MARKER, TRACE_MARKER_TYPE_VERSION) &&
+             check_entry(entries, idx, TRACE_TYPE_MARKER, TRACE_MARKER_TYPE_FILETYPE) &&
+             check_entry(entries, idx, TRACE_TYPE_THREAD, -1) &&
+             check_entry(entries, idx, TRACE_TYPE_PID, -1) &&
+             check_entry(entries, idx, TRACE_TYPE_MARKER,
+                         TRACE_MARKER_TYPE_CACHE_LINE_SIZE) &&
+             check_entry(entries, idx, TRACE_TYPE_MARKER,
+                         TRACE_MARKER_TYPE_CHUNK_INSTR_COUNT) &&
+             check_entry(entries, idx, TRACE_TYPE_MARKER, TRACE_MARKER_TYPE_TIMESTAMP) &&
+             check_entry(entries, idx, TRACE_TYPE_MARKER, TRACE_MARKER_TYPE_CPU_ID) &&
+             // The move instruction.
+             check_entry(entries, idx, TRACE_TYPE_ENCODING, -1) &&
+             check_entry(entries, idx, TRACE_TYPE_INSTR, -1, offs_move1) &&
+             // The store instruction and the memref are removed.
+             check_entry(entries, idx, TRACE_TYPE_MARKER, TRACE_MARKER_TYPE_KERNEL_EVENT,
+                         offs_store) &&
+             check_entry(entries, idx, TRACE_TYPE_ENCODING, -1) &&
+             check_entry(entries, idx, TRACE_TYPE_INSTR, -1, offs_move2) &&
+             check_entry(entries, idx, TRACE_TYPE_THREAD_EXIT, -1) &&
+             check_entry(entries, idx, TRACE_TYPE_FOOTER, -1));
+    }
+    return res;
+}
+
 int
 test_main(int argc, const char *argv[])
 {
@@ -3177,7 +3296,8 @@ test_main(int argc, const char *argv[])
         !test_xfer_modoffs(drcontext) || !test_xfer_absolute(drcontext) ||
         !test_branch_decoration(drcontext) ||
         !test_stats_timestamp_instr_count(drcontext) ||
-        !test_is_maybe_blocking_syscall(drcontext) || !test_ifiltered(drcontext))
+        !test_is_maybe_blocking_syscall(drcontext) || !test_ifiltered(drcontext) ||
+        !test_asynchronous_signal(drcontext))
         return 1;
     return 0;
 }

clients/drcachesim/tests/signal_invariants.c

@@ -190,8 +190,10 @@ GLOBAL_LABEL(FUNCNAME:)
 #define FUNCNAME test_signal_midbb
         DECLARE_FUNC(FUNCNAME)
 GLOBAL_LABEL(FUNCNAME:)
-        /* prefetcht2's address is the instr count until a signal */
-        prefetcht2 [3]
+        /* prefetcht2's address is the instr count until a signal not counting
+         * the preempted instr.
+         */
+        prefetcht2 [2]
         nop
         nop
         ud2
@@ -205,8 +207,10 @@ GLOBAL_LABEL(FUNCNAME:)
 #define FUNCNAME test_signal_startbb
         DECLARE_FUNC(FUNCNAME)
 GLOBAL_LABEL(FUNCNAME:)
-        /* prefetcht2's address is the instr count until a signal */
-        prefetcht2 [2]
+        /* prefetcht2's address is the instr count until a signal not counting
+         * the preempted instr.
+         */
+        prefetcht2 [1]
         jmp      new_bb
     new_bb:
         ud2
@@ -221,10 +225,14 @@ GLOBAL_LABEL(FUNCNAME:)
          * XXX i#3958: Today the 2nd movs memref is incorrectly included *before*
          * the fault.
          */
-        /* prefetcht2's address is the instr count until a signal */
-        prefetcht2 [5]
-        /* prefetcht1's address is the memref count until a signal */
-        prefetcht1 [3]
+        /* prefetcht2's address is the instr count until a signal not counting
+         * the preempted instr.
+         */
+        prefetcht2 [4]
+        /* prefetcht1's address is the memref count until a signal not counting
+         * the preempted memref.
+         */
+        prefetcht1 [1]
         mov      REG_XSI, HEX(42)
         mov      REG_XDI, REG_XSP
         push     REG_XAX