Move conditions for prefetching into the prefetch() function

DynamoRIO · Sep 27, 2024 · 7109abb · 7109abb
1 parent 8c71e1a
commit 7109abb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/clients/drcachesim/simulator/caching_device.cpp b/clients/drcachesim/simulator/caching_device.cpp
@@ -240,8 +240,8 @@ caching_device_t::request(const memref_t &memref_in)
 
         // Issue a hardware prefetch, if any, before we remember the last tag,
         // so we remember this line and not the prefetched line.
-        if (missed && !type_is_prefetch(memref.data.type) && prefetcher_ != nullptr)
-            prefetcher_->prefetch(this, memref);
+        if (prefetcher_ != nullptr)
+            prefetcher_->prefetch(this, memref, missed);
 
         if (tag + 1 <= final_tag) {
             addr_t next_addr = (tag + 1) << block_size_bits_;

diff --git a/clients/drcachesim/simulator/prefetcher.cpp b/clients/drcachesim/simulator/prefetcher.cpp
@@ -48,13 +48,15 @@ prefetcher_t::prefetcher_t(int block_size)
 }
 
 void
-prefetcher_t::prefetch(caching_device_t *cache, const memref_t &memref_in)
+prefetcher_t::prefetch(caching_device_t *cache, const memref_t &memref_in, const bool missed)
 {
     // We implement a simple next-line prefetcher.
-    memref_t memref = memref_in;
-    memref.data.addr += block_size_;
-    memref.data.type = TRACE_TYPE_HARDWARE_PREFETCH;
-    cache->request(memref);
+    if (missed && !type_is_prefetch(memref_in.data.type)) {
+      memref_t memref = memref_in;
+      memref.data.addr += block_size_;
+      memref.data.type = TRACE_TYPE_HARDWARE_PREFETCH;
+      cache->request(memref);
+    }
 }
 } // namespace drmemtrace
 } // namespace dynamorio
diff --git a/clients/drcachesim/simulator/prefetcher.h b/clients/drcachesim/simulator/prefetcher.h
@@ -51,7 +51,7 @@ class prefetcher_t {
     {
     }
     virtual void
-    prefetch(caching_device_t *cache, const memref_t &memref);
+    prefetch(caching_device_t *cache, const memref_t &memref, bool missed);
 
 protected:
     int block_size_;

diff --git a/clients/drcachesim/tests/drcachesim_unit_tests.cpp b/clients/drcachesim/tests/drcachesim_unit_tests.cpp
@@ -327,15 +327,17 @@ class next2line_prefetcher_factory_t : public prefetcher_factory_t {
         {
         }
         void
-        prefetch(caching_device_t *cache, const memref_t &memref_in)
+        prefetch(caching_device_t *cache, const memref_t &memref_in, const bool missed)
         {
-            // We implement a simple 2 next-line prefetcher.
-            memref_t memref = memref_in;
-            memref.data.addr += block_size_;
-            memref.data.type = TRACE_TYPE_HARDWARE_PREFETCH;
-            cache->request(memref);
-            memref.data.addr += block_size_;
-            cache->request(memref);
+            // We implement a simple 2 next-line prefetcher.i
+            if (missed && !type_is_prefetch(memref_in.data.type)) {
+              memref_t memref = memref_in;
+              memref.data.addr += block_size_;
+              memref.data.type = TRACE_TYPE_HARDWARE_PREFETCH;
+              cache->request(memref);
+              memref.data.addr += block_size_;
+              cache->request(memref);
+            }
         }
     };
 };