Changeset 477 for branches/RWT/communication/dspin_dhccp_param/caba/source/include

Timestamp:

Jul 26, 2013, 5:03:12 PM (11 years ago)

Author:

lgarcia

Message:

Reintroducing RWT branch merging the last modifications of the
trunk (CLACK channel)
WARNING: bugs remaining (with 1c16p and small caches (L2:16*16; L1:4*4))

Location:

branches/RWT

Files:

• . (added)
• communication (added)
• communication/dspin_dhccp_param (copied) (copied from trunk/communication/dspin_dhccp_param)
• communication/dspin_dhccp_param/caba/source/include/dspin_dhccp_param.h (modified) (5 diffs)

branches/RWT/communication/dspin_dhccp_param/caba/source/include/dspin_dhccp_param.h

@@ -41 +41 @@
  *
  * flit 1
- * ----------------------------------------------------------------------------------------------
- * EOP:0 |    DEST    |   SRCID   | NLINE MSB(2 bits)| X | WAY_INDEX(2 bits) | TYPE:0b1X | BC:0
- *       |  (10 bits) | (14 bits) |                  |   |                   |           |
- * ----------------------------------------------------------------------------------------------
+ * --------------------------------------------------------------------------------------------------------
+ * EOP:0 |    DEST    |   SRCID   | NLINE MSB(2 bits)| CONTAINS_DATA | WAY_INDEX(2 bits) | TYPE:0b1X | BC:0
+ *       |  (10 bits) | (14 bits) |                  |               |                   |           |
+ * --------------------------------------------------------------------------------------------------------
  *                                                                                 | X: 0 DATA  |
  *                                                                                 |    1 INST  |
  * flit 2
  * ----------------------------------------------------------------------------------------------
- * EOP:1 |                                                                         NLINE(32 bits)
+ * EOP:0/1 |                                                                       NLINE(32 bits)
+ * ----------------------------------------------------------------------------------------------
+ *
+ * flit N for data
+ * ----------------------------------------------------------------------------------------------
+ * EOP:0/1 |                                                                       WDATA(32 bits)
  * ----------------------------------------------------------------------------------------------
  *
@@ -175 +180 @@
     static const uint8_t  CLEANUP_NLINE_LSB_SHIFT      = 0;
     static const uint64_t CLEANUP_NLINE_LSB_MASK       = ((1ULL<<32)-1);
+    static const uint8_t  CLEANUP_DATA_UPDT_SHIFT      = 0;
+    static const uint64_t CLEANUP_DATA_UPDT_MASK       = ((1ULL<<32)-1);
+    static const uint8_t  CLEANUP_NCC_SHIFT  = 5;
+    static const uint64_t CLEANUP_NCC_MASK   = 1;
 
     static const uint8_t  MULTI_ACK_DEST_SHIFT         = CLEANUP_DEST_SHIFT;
@@ -277 +286 @@
       CLEANUP_WAY_INDEX,
       CLEANUP_NLINE_LSB,
+      CLEANUP_DATA_UPDT,
+      CLEANUP_NCC,
 
       MULTI_ACK_DEST,
@@ -321 +332 @@
         GET_FIELD(flit,CLEANUP_WAY_INDEX);
         GET_FIELD(flit,CLEANUP_NLINE_LSB);
+        GET_FIELD(flit,CLEANUP_DATA_UPDT);
+        GET_FIELD(flit,CLEANUP_NCC);
         GET_FIELD(flit,MULTI_ACK_DEST);
         GET_FIELD(flit,MULTI_ACK_UPDT_INDEX);
@@ -361 +374 @@
         SET_FIELD(flit,value,CLEANUP_WAY_INDEX);
         SET_FIELD(flit,value,CLEANUP_NLINE_LSB);
+        SET_FIELD(flit,value,CLEANUP_DATA_UPDT);
+        SET_FIELD(flit,value,CLEANUP_NCC);
         SET_FIELD(flit,value,MULTI_ACK_DEST);
         SET_FIELD(flit,value,MULTI_ACK_UPDT_INDEX);