Merge pull request #56 from comparch-security/fix-flush

Fix flush
comparch-security · Jan 27, 2024 · aa0fca9 · aa0fca9
2 parents 6791c22 + e8acb4d
commit aa0fca9
Show file tree

Hide file tree

Showing 18 changed files with 115,531 additions and 120,408 deletions.
diff --git a/cache/coherence.hpp b/cache/coherence.hpp
@@ -235,12 +235,19 @@ class InnerCohPortUncached : public InnerCohPortBase
     if(hit) std::tie(meta, data) = cache->access_line(ai, s, w);
 
     auto [flush, probe, probe_cmd] = policy->flush_need_sync(cmd, meta, outer->is_uncached());
-    if(!flush) return;
+    if(!flush) {
+      // do not handle flush at this level, and send it to the outer cache
+      outer->writeback_req(addr, nullptr, nullptr, policy->cmd_for_flush(), delay);
+      return;
+    }
+
+    if(!hit) return;
 
     if(probe) {
       auto [phit, pwb] = probe_req(addr, meta, data, probe_cmd, delay); // sync if necessary
       if(pwb) cache->hook_write(addr, ai, s, w, true, true, meta, data, delay); // a write occurred during the probe
     }
+
     auto writeback = policy->writeback_need_writeback(meta, outer->is_uncached());
     if(writeback.first) outer->writeback_req(addr, meta, data, writeback.second, delay); // writeback if dirty
 

diff --git a/cache/exclusive.hpp b/cache/exclusive.hpp
@@ -309,7 +309,11 @@ class ExclusiveInnerCohPortUncachedBroadcast : public InnerCohPortUncached
     if(hit) std::tie(meta, data) = cache->access_line(ai, s, w);
 
     auto [flush, probe, probe_cmd] = policy->flush_need_sync(cmd, meta, outer->is_uncached());
-    if(!flush) return;
+    if(!flush) {
+      // do not handle flush at this level, and send it to the outer cache
+      outer->writeback_req(addr, nullptr, nullptr, policy->cmd_for_flush(), delay);
+      return;
+    }
 
     if(!hit) {
       meta = cache->meta_copy_buffer(); meta->init(addr); meta->get_outer_meta()->to_invalid();
@@ -485,7 +489,14 @@ class ExclusiveInnerCohPortUncachedDirectory : public InnerCohPortUncached
     if(hit) std::tie(meta, data) = cache->access_line(ai, s, w);
 
     auto [flush, probe, probe_cmd] = policy->flush_need_sync(cmd, meta, outer->is_uncached());
-    if(!flush || !hit) return;
+    if(!flush) {
+      // do not handle flush at this level, and send it to the outer cache
+      outer->writeback_req(addr, nullptr, nullptr, policy->cmd_for_flush(), delay);
+      return;
+    }
+
+    if(!hit) return;
+
     if(meta->is_extend()) data = cache->data_copy_buffer();
 
     if(probe) {

diff --git a/cache/mi.hpp b/cache/mi.hpp
@@ -74,9 +74,11 @@ class MIPolicy : public CohPolicyBase
   }
 
   virtual std::tuple<bool, bool, coh_cmd_t> flush_need_sync(coh_cmd_t cmd, const CMMetadataBase *meta, bool uncached) const {
-    if (isLLC || (uncached && meta)) {
-      if(is_evict(cmd)) return std::make_tuple(true, true, cmd_for_probe_release());
-      else              return std::make_tuple(true, true, cmd_for_probe_writeback());
+    if (isLLC || uncached) {
+      if(meta){
+        if(is_evict(cmd)) return std::make_tuple(true, true, cmd_for_probe_release());
+        else              return std::make_tuple(true, true, cmd_for_probe_writeback());
+      } else              return std::make_tuple(true, false, cmd_for_null());
     } else
       return std::make_tuple(false, false, cmd_for_null());
   }

diff --git a/cache/msi.hpp b/cache/msi.hpp
@@ -114,12 +114,15 @@ template<typename MT, bool isL1, bool isLLC> requires C_DERIVE(MT, MetadataBroad
   }
 
   virtual std::tuple<bool, bool, coh_cmd_t> flush_need_sync(coh_cmd_t cmd, const CMMetadataBase *meta, bool uncached) const {
-    if (isLLC || (uncached && meta)) {
-      if(is_evict(cmd)) return std::make_tuple(true, true, cmd_for_probe_release());
-      else if(meta && meta->is_shared())
+    if (isLLC || uncached) {
+      if(meta) {
+        if(is_evict(cmd)) return std::make_tuple(true, true, cmd_for_probe_release());
+        else if(meta->is_shared())
+          return std::make_tuple(true, false, cmd_for_null());
+        else
+          return std::make_tuple(true, true, cmd_for_probe_writeback());
+      } else
         return std::make_tuple(true, false, cmd_for_null());
-      else
-        return std::make_tuple(true, true, cmd_for_probe_writeback());
     } else
       return std::make_tuple(false, false, cmd_for_null());
   }

diff --git a/regression/c1-l1.cpp b/regression/c1-l1.cpp
@@ -16,6 +16,6 @@ int main() {
   l1d->attach_monitor(&tracer);
   mem->attach_monitor(&tracer);
 
-  RegressionGen<1, false, AddrN, 0, Data64B> tgen;
+  RegressionGen<1, false, false, AddrN, 0, Data64B> tgen;
   return tgen.run(TestN, core, core);
 }
diff --git a/regression/c2-l2-exc-mesi.cpp b/regression/c2-l2-exc-mesi.cpp
@@ -34,6 +34,6 @@ int main() {
   l2->attach_monitor(&tracer);
   mem->attach_monitor(&tracer);
 
-  RegressionGen<NCore, true, PAddrN, SAddrN, Data64B> tgen;
+  RegressionGen<NCore, true, false, PAddrN, SAddrN, Data64B> tgen;
   return tgen.run(TestN, core_inst, core_data);
 }
diff --git a/regression/c2-l2-exc-mi.cpp b/regression/c2-l2-exc-mi.cpp
@@ -33,6 +33,6 @@ int main() {
   l2->attach_monitor(&tracer);
   mem->attach_monitor(&tracer);
 
-  RegressionGen<NCore, true, PAddrN, SAddrN, Data64B> tgen;
+  RegressionGen<NCore, true, false, PAddrN, SAddrN, Data64B> tgen;
   return tgen.run(TestN, core_inst, core_data);
 }
diff --git a/regression/c2-l2-exc.cpp b/regression/c2-l2-exc.cpp
@@ -33,6 +33,6 @@ int main() {
   l2->attach_monitor(&tracer);
   mem->attach_monitor(&tracer);
 
-  RegressionGen<NCore, true, PAddrN, SAddrN, Data64B> tgen;
+  RegressionGen<NCore, true, false, PAddrN, SAddrN, Data64B> tgen;
   return tgen.run(TestN, core_inst, core_data);
 }
diff --git a/regression/c2-l2-mesi.cpp b/regression/c2-l2-mesi.cpp
@@ -33,6 +33,6 @@ int main() {
   l2->attach_monitor(&tracer);
   mem->attach_monitor(&tracer);
 
-  RegressionGen<NCore, true, PAddrN, SAddrN, Data64B> tgen;
+  RegressionGen<NCore, true, false, PAddrN, SAddrN, Data64B> tgen;
   return tgen.run(TestN, core_inst, core_data);
 }
diff --git a/regression/c2-l2-mirage.cpp b/regression/c2-l2-mirage.cpp
@@ -36,6 +36,6 @@ int main() {
   l2->attach_monitor(&tracer);
   mem->attach_monitor(&tracer);
 
-  RegressionGen<NCore, true, PAddrN, SAddrN, Data64B> tgen;
+  RegressionGen<NCore, true, false, PAddrN, SAddrN, Data64B> tgen;
   return tgen.run(TestN, core_inst, core_data);
 }
diff --git a/regression/c2-l2.cpp b/regression/c2-l2.cpp
@@ -33,6 +33,6 @@ int main() {
   l2->attach_monitor(&tracer);
   mem->attach_monitor(&tracer);
 
-  RegressionGen<NCore, true, PAddrN, SAddrN, Data64B> tgen;
+  RegressionGen<NCore, true, false, PAddrN, SAddrN, Data64B> tgen;
   return tgen.run(TestN, core_inst, core_data);
 }
diff --git a/regression/c4-l3-exc-mesi.cpp b/regression/c4-l3-exc-mesi.cpp
@@ -40,6 +40,6 @@ int main() {
   l3->attach_monitor(&tracer);
   mem->attach_monitor(&tracer);
 
-  RegressionGen<NCore, true, PAddrN, SAddrN, Data64B> tgen;
+  RegressionGen<NCore, true, true, PAddrN, SAddrN, Data64B> tgen;
   return tgen.run(TestN, core_inst, core_data);
 }