Changeset 290 for trunk/modules

Timestamp:

Jan 25, 2013, 4:52:34 PM (12 years ago)

Author:

cfuguet

Message:

Erasing in the vci_mem_cache_v4 CLEANUP FSM the transition
between the states CLEANUP_DIR_WRITE and CLEANUP_UPT_LOCK.

If the CLEANUP FSM is in the state DIR_WRITE, is because there
is a valid entry in the Memory Cache directory for the line
concerned by the cleanup operation. Another condition to go to
the DIR_WRITE state is that the concerned line must be in counter
mode or in linked list mode with only one copy enregistered.

Therefore, once the FSM is in the DIR_WRITE state, the FSM can
do one of two things:

• The line is in counter mode and then the only thing to do is to decrement the copies counter.
• The line is not in counter mode and then the copies counter must be decremented and the copy enregistered in the directory must be erased.

If the cleanup operation goes into the second category, the srcid and the
type of cache (instruction or data) carried by the cleanup operation must
be equal to the srcid and type of cache stored in the Memory Cache directory.

If this is not the case, it is an error (An assert has been also introduced
in the code to detect this kind of problem).

File:

• trunk/modules/vci_mem_cache_v4/caba/source/src/vci_mem_cache_v4.cpp (modified) (1 diff)

trunk/modules/vci_mem_cache_v4/caba/source/src/vci_mem_cache_v4.cpp

@@ -3701 +3701 @@
         bool match         = match_srcid && match_inst;
 
+        if (not r_cleanup_is_cnt.read() and not match) {
+            std::cout
+              << "VCI_MEM_CACHE ERROR : Cleanup request on a valid"
+              << "entry using linked list mode with no corresponding"
+              << "directory or heap entry"
+              << std::endl;
+
+            exit(1);
+        }
+
         // update the cache directory (for the copies)
         DirectoryEntry entry;
-        entry.valid   = true;
-        entry.is_cnt  = r_cleanup_is_cnt.read();
-        entry.dirty   = r_cleanup_dirty.read();
-        entry.tag     = r_cleanup_tag.read();
-        entry.lock    = r_cleanup_lock.read();
-        entry.ptr     = r_cleanup_ptr.read();
-
-        if ( r_cleanup_is_cnt.read() )      // counter mode
-        {
-          entry.count  = r_cleanup_count.read() -1;
-          entry.owner.srcid   = 0;
+        entry.valid       = true;
+        entry.is_cnt      = r_cleanup_is_cnt.read();
+        entry.dirty       = r_cleanup_dirty.read();
+        entry.tag         = r_cleanup_tag.read();
+        entry.lock        = r_cleanup_lock.read();
+        entry.ptr         = r_cleanup_ptr.read();
+        entry.count       = r_cleanup_count.read() - 1;
+        entry.owner.srcid = 0;
+        entry.owner.inst  = 0;
 #if L1_MULTI_CACHE
-          entry.owner.cache_id= 0;
-#endif
-          entry.owner.inst    = 0;
-          // response to the cache
-          r_cleanup_fsm = CLEANUP_RSP;
-        }
-        else                          // linked_list mode
-        {
-          if ( match )  // hit
-          {
-            entry.count         = 0; // no more copy
-            entry.owner.srcid   = 0;
-#if L1_MULTI_CACHE
-            entry.owner.cache_id=0;
-#endif
-            entry.owner.inst    = 0;
-            r_cleanup_fsm       = CLEANUP_RSP;
-          }
-          else         // miss
-          {
-            entry.count          = r_cleanup_count.read();
-            entry.owner.srcid    = r_cleanup_copy.read();
-#if L1_MULTI_CACHE
-            entry.owner.cache_id = r_cleanup_copy_cache.read();
-#endif
-            entry.owner.inst     = r_cleanup_copy_inst.read();
-            r_cleanup_fsm        = CLEANUP_UPT_LOCK;
-          }
-        }
+        entry.owner.cache_id = 0;
+#endif
+
         m_cache_directory.write(set, way, entry);
+
+        r_cleanup_fsm = CLEANUP_RSP;
 
 #if DEBUG_MEMC_CLEANUP