Changeset 813 for branches/MESI

Timestamp:

Sep 24, 2014, 10:51:29 AM (10 years ago)

Author:

haoliu

Message:

(MESI) Bug fixed in vci_mem_cache_wrapper:

When the MULTI_ACK_FSM handles an UNC_READ_DATA request from a L1 cache or a
device peripheric, it should not be saved as a copy of the cache line in the
directory or the heap.

File:

• branches/MESI/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp (modified) (10 diffs)

branches/MESI/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp

@@ -2176 +2176 @@
                     size_t way = 0;
                     addr_t multi_ack_address = r_multi_ack_nline.read() * m_words * 4;
-                    bool match_ll = ((r_multi_ack_pktid.read() & 0x07) == TYPE_LL);
+                    bool cached_read = ((r_multi_ack_pktid.read() & 0x7) != 0) 
+                                   and ((r_multi_ack_pktid.read() & 0x7) != 0x2) 
+                                   and ((r_multi_ack_pktid.read() & 0x7) != 0x6);
+
                     DirectoryEntry entry     = m_cache_directory.read(multi_ack_address , way);
                     r_multi_ack_tag          = entry.tag;
@@ -2210 +2213 @@
                         r_multi_ack_fsm = MULTI_ACK_IVT_CHANGE; 
                     }
-                    else if (not entry.count or match_ll) // The line has been already evicted from cache L1
+                    else if (not entry.count or not cached_read) // The line has been already evicted from cache L1
                     {
                         assert(((entry.count == 1) or (entry.count == 0)) && "multi ack for a ll request, count is 1");
@@ -2257 +2260 @@
                     }
 
-                    bool match_ll = ((r_multi_ack_pktid.read() & 0x07) == TYPE_LL);
+                    bool cached_read = ((r_multi_ack_pktid.read() & 0x7) != 0) 
+                                   and ((r_multi_ack_pktid.read() & 0x7) != 0x2) 
+                                   and ((r_multi_ack_pktid.read() & 0x7) != 0x6);
 
                     if (r_multi_ack_need_data.read())
@@ -2283 +2288 @@
                     entry.ptr    = 0;
 
-                    if (match_ll)
+                    if (not cached_read)
                     {
                         entry.owner.srcid = r_multi_ack_copy.read();
@@ -5364 +5369 @@
                             << " / is_cnt = " << std::dec << victim.is_cnt
                             << " / set = " << set
-                            << "/ count = " << victim.count
+                            << " / count = " << victim.count
+                            << " / owner.srcid = " << victim.owner.srcid
+                            << " / nline = " << victim.tag*m_sets + set
                             << " / inval_required = " << inval << std::endl;
 #endif
@@ -5668 +5675 @@
 
                         if (r_xram_rsp_victim_dirty.read() and (r_xram_rsp_victim_state.read() == ENTRY_SHARED))  
-                                                     r_xram_rsp_fsm = XRAM_RSP_WRITE_DIRTY;
+                                                      r_xram_rsp_fsm = XRAM_RSP_WRITE_DIRTY;
                         else if (not_last_multi_req)  r_xram_rsp_fsm = XRAM_RSP_HEAP_REQ;
-                        else                         r_xram_rsp_fsm = XRAM_RSP_IDLE;
+                        else                          r_xram_rsp_fsm = XRAM_RSP_IDLE;
 
                         // std::cout << "cleanup sent for trt index =" << r_xram_rsp_trt_index.read() << std::endl;
@@ -5677 +5684 @@
                             std::cout << "  <MEMC " << name() << " XRAM_RSP_INVAL>"
                                 << " Send an inval request to CC_SEND FSM"
+                                << " / srcid = " << r_xram_rsp_victim_copy.read()
                                 << " / address = " << r_xram_rsp_victim_nline.read()*m_words*4 << std::endl;
 #endif
@@ -5746 +5754 @@
                         HeapEntry entry = m_heap.read(r_xram_rsp_next_ptr.read());
 
-                        xram_rsp_to_cc_send_fifo_srcid    = entry.owner.srcid;
+                        xram_rsp_to_cc_send_fifo_srcid = entry.owner.srcid;
                         xram_rsp_to_cc_send_fifo_inst  = entry.owner.inst;
                         xram_rsp_to_cc_send_fifo_put   = true;
@@ -6316 +6324 @@
                     addr_t cleanup_address = r_cleanup_nline.read() * m_words * 4;
 
-                    bool match_ll = ((r_cleanup_locked_pktid.read() & 0x07) == TYPE_LL);
+                    bool cached_read = ((r_cleanup_locked_pktid.read() & 0x7) != 0) 
+                                   and ((r_cleanup_locked_pktid.read() & 0x7) != 0x2) 
+                                   and ((r_cleanup_locked_pktid.read() & 0x7) != 0x6);
 
                     DirectoryEntry      entry;
@@ -6367 +6377 @@
                     {
                         entry.state = ENTRY_SHARED;
-                        if (match_ll)
+                        if (not cached_read)
                         {
                             entry.count       = 0;