i#7287: Decouple Cache Replacement Policies.

clients/drcachesim/CMakeLists.txt

@@ -193,8 +193,6 @@ configure_DynamoRIO_standalone(drmemtrace_invariant_checker)
 add_exported_library(drmemtrace_simulator STATIC
   simulator/simulator.cpp
   simulator/cache.cpp
-  simulator/cache_lru.cpp
-  simulator/cache_fifo.cpp
   simulator/cache_miss_analyzer.cpp
   simulator/caching_device.cpp
   simulator/caching_device_stats.cpp
@@ -204,6 +202,11 @@ add_exported_library(drmemtrace_simulator STATIC
   simulator/snoop_filter.cpp
   simulator/tlb.cpp
   simulator/tlb_simulator.cpp
+  simulator/create_cache_replacement_policy.cpp
+  simulator/policy_bit_plru.cpp
+  simulator/policy_fifo.cpp
+  simulator/policy_lfu.cpp
+  simulator/policy_lru.cpp
   )
 
 add_exported_library(drmemtrace_record_filter STATIC

clients/drcachesim/common/options.cpp

@@ -502,7 +502,9 @@ droption_t<std::string>
                           "Specifies the replacement policy for TLBs. "
                           "Supported policies: " REPLACE_POLICY_LFU
                           " (Least Frequently Used), " REPLACE_POLICY_BIT_PLRU
-                          " (Pseudo Least Recently Used).");
+                          " (Pseudo Least Recently Used) " REPLACE_POLICY_LRU
+                          " (Least Recently Used) " REPLACE_POLICY_FIFO
+                          " (First-In-First-Out)");
 
 droption_t<std::string>
     op_tool(DROPTION_SCOPE_FRONTEND,

clients/drcachesim/simulator/cache.cpp

@@ -55,6 +55,7 @@ class snoop_filter_t;
 bool
 cache_t::init(int associativity, int64_t line_size, int64_t total_size,
               caching_device_t *parent, caching_device_stats_t *stats,
+              std::unique_ptr<cache_replacement_policy_t> replacement_policy,
               prefetcher_t *prefetcher, cache_inclusion_policy_t inclusion_policy,
               bool coherent_cache, int id, snoop_filter_t *snoop_filter,
               const std::vector<caching_device_t *> &children)
@@ -65,9 +66,9 @@ cache_t::init(int associativity, int64_t line_size, int64_t total_size,
     // convert total_size to num_blocks to fit for caching_device_t::init
     int64_t num_lines = total_size / line_size;
 
-    return caching_device_t::init(associativity, line_size, num_lines, parent, stats,
-                                  prefetcher, inclusion_policy, coherent_cache, id,
-                                  snoop_filter, children);
+    return caching_device_t::init(
+        associativity, line_size, num_lines, parent, stats, std::move(replacement_policy),
+        prefetcher, inclusion_policy, coherent_cache, id, snoop_filter, children);
 }
 
 void

clients/drcachesim/simulator/cache.h

@@ -37,9 +37,11 @@
 #define _CACHE_H_ 1
 
 #include <string>
+#include <memory>
 #include <vector>
 
 #include "cache_line.h"
+#include "cache_replacement_policy.h"
 #include "cache_stats.h"
 #include "caching_device.h"
 #include "memref.h"
@@ -63,6 +65,7 @@ class cache_t : public caching_device_t {
     bool
     init(int associativity, int64_t line_size, int64_t total_size,
          caching_device_t *parent, caching_device_stats_t *stats,
+         std::unique_ptr<cache_replacement_policy_t> replacement_policy,
          prefetcher_t *prefetcher = nullptr,
          cache_inclusion_policy_t inclusion_policy =
              cache_inclusion_policy_t::NON_INC_NON_EXC,