Changeset 505 for trunk

Timestamp:

Sep 1, 2013, 7:49:00 PM (11 years ago)

Author:

cfuguet

Message:

Modifications in vci_mem_cache:

• Erasing the unnecessary registers r_write_to_ixr_cmd_put and r_cas_to_ixr_cmd_put. The IXR_CMD FSM can get this information from the xram_read bit stored in the TRT entries.

• In the IXR_CMD FSM, the r_ixr_cmd_wdata does not need to be written when it is a GET request.

Location:

trunk/modules/vci_mem_cache/caba/source

Files:

• include/vci_mem_cache.h (modified) (2 diffs)
• src/vci_mem_cache.cpp (modified) (9 diffs)

trunk/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h

@@ -716 +716 @@
       // Buffer between WRITE fsm and IXR_CMD fsm 
       sc_signal<bool>     r_write_to_ixr_cmd_req;     // valid request
-      sc_signal<bool>     r_write_to_ixr_cmd_put;     // request type (GET/PUT)
       sc_signal<size_t>   r_write_to_ixr_cmd_index;   // TRT index 
 
@@ -820 +819 @@
       // Buffer between CAS fsm and IXR_CMD fsm 
       sc_signal<bool>     r_cas_to_ixr_cmd_req;   // valid request
-      sc_signal<bool>     r_cas_to_ixr_cmd_put;   // request type (GET/PUT)
       sc_signal<size_t>   r_cas_to_ixr_cmd_index; // TRT index 
 

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

@@ -3310 +3310 @@
                     {
                         r_write_to_ixr_cmd_req   = true;
-                        r_write_to_ixr_cmd_put   = false;
                         r_write_to_ixr_cmd_index = r_write_trt_index.read();
                         r_write_fsm              = WRITE_RSP;
@@ -3511 +3510 @@
                     {
                         r_write_to_ixr_cmd_req     = true;
-                        r_write_to_ixr_cmd_put     = true;
                         r_write_to_ixr_cmd_index   = r_write_trt_index.read();
                         r_write_fsm = WRITE_IDLE;
@@ -3612 +3610 @@
                         r_ixr_cmd_word    = 0;
                         r_ixr_cmd_fsm     = IXR_CMD_READ_SEND;
-                        for( size_t i=0 ; i<m_words ; i++ ) r_ixr_cmd_wdata[i] = entry.wdata[i];
 
 #if DEBUG_MEMC_IXR_CMD
@@ -3634 +3631 @@
                         r_ixr_cmd_word    = 0;
                         r_ixr_cmd_fsm     = IXR_CMD_WRITE_SEND;
-                        for( size_t i=0 ; i<m_words ; i++ ) r_ixr_cmd_wdata[i] = entry.wdata[i];
+
+                        // Read data from TRT if PUT transaction
+                        if (not entry.xram_read)
+                        {
+                            for( size_t i=0 ; i<m_words ; i++ ) r_ixr_cmd_wdata[i] = entry.wdata[i];
+                        }
 
 #if DEBUG_MEMC_IXR_CMD
@@ -3656 +3658 @@
                         r_ixr_cmd_word    = 0;
                         r_ixr_cmd_fsm     = IXR_CMD_CAS_SEND;
-                        for( size_t i=0 ; i<m_words ; i++ ) r_ixr_cmd_wdata[i] = entry.wdata[i];
+
+                        // Read data from TRT if PUT transaction
+                        if (not entry.xram_read)
+                        {
+                            for( size_t i=0 ; i<m_words ; i++ ) r_ixr_cmd_wdata[i] = entry.wdata[i];
+                        }
 
 #if DEBUG_MEMC_IXR_CMD
@@ -3733 +3740 @@
                     if (p_vci_ixr.cmdack)
                     {
-                        if (r_write_to_ixr_cmd_put.read())   // PUT
+                        if (not r_ixr_cmd_get.read())   // PUT
                         {
                             if (r_ixr_cmd_word.read() == (m_words - 2))
@@ -3770 +3777 @@
                     if (p_vci_ixr.cmdack)
                     {
-                        if (r_cas_to_ixr_cmd_put.read()) // PUT
+                        if (not r_ixr_cmd_get.read()) // PUT
                         {
                             if (r_ixr_cmd_word.read() == (m_words - 2))
@@ -5665 +5672 @@
                     {
                         r_cas_to_ixr_cmd_req     = true;
-                        r_cas_to_ixr_cmd_put     = true;
                         r_cas_to_ixr_cmd_index   = r_cas_trt_index.read();
                         r_cas_fsm                = CAS_IDLE;
@@ -5802 +5808 @@
                     {
                         r_cas_to_ixr_cmd_req        = true;
-                        r_cas_to_ixr_cmd_put        = false;
                         r_cas_to_ixr_cmd_index      = r_cas_trt_index.read();
                         r_cas_fsm                   = CAS_WAIT;