Changeset 482 for trunk

Timestamp:

Aug 2, 2013, 3:17:15 PM (11 years ago)

Author:

joannou

Message:

Updated llsc memcache table interface for sw operation (now able to invalidate a range of addresses)

Location:

trunk

Files:

• lib/generic_llsc_global_table/include/generic_llsc_global_table.h (modified) (2 diffs)
• modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp (modified) (2 diffs)
• platforms/tsar_generic_xbar/soclib.conf (modified) (1 diff)

trunk/lib/generic_llsc_global_table/include/generic_llsc_global_table.h

@@ -432 +432 @@
 
     ////////////////////////////////////////////////////////////////////////////
+    /*
     inline void sw(const addr_t ad)
     //  This method checks if there is a valid registration for the given
@@ -448 +449 @@
         //  If there is one, invalidate it
         if(pos >= 0) r_val[pos] = false;
-
+    }
+    */
+    inline void sw(const addr_t nline, unsigned int min, unsigned int max)
+    //  This method checks if there is / are valid registration(s) for the given
+    //  range and, in case of hit(s), invalidates the registration(s)
+    {
+        // increment the sw access counter (for stats)
+        m_cpt_sw++;
+        // hit range ?
+        // YES
+        //      inval registration(s)
+        // NO
+        //      nothing
+
+        // for every address in the given range ...
+        for (unsigned int i = min; i <= max; i++)
+        {
+            //  Is there a registration for the given address ?
+            int pos = hitAddr(nline + i * 4);
+            //  If there is one, invalidate it
+            if (pos >= 0)
+            {
+                r_val[pos] = false;
+            }
+        }
     }
 

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

@@ -2590 +2590 @@
         // erase any possible new reservation when we release the lock on the
         // directory
-        m_llsc_table.sw(r_write_address.read());
+        m_llsc_table.sw(m_nline[(addr_t)r_write_address.read()],r_write_word_index.read(),r_write_word_index.read()+r_write_word_count.read());
 
         r_write_fsm = WRITE_DIR_LOCK;
@@ -5283 +5283 @@
     {
       // The CAS is a success => sw access to the llsc_global_table
-      m_llsc_table.sw(m_cmd_cas_addr_fifo.read());
+      m_llsc_table.sw(m_nline[(addr_t)m_cmd_cas_addr_fifo.read()],m_x[(addr_t)(m_cmd_cas_addr_fifo.read())],m_x[(addr_t)(m_cmd_cas_addr_fifo.read())]);
 
       // test coherence request

trunk/platforms/tsar_generic_xbar/soclib.conf

@@ +1 @@
+#config.addDescPath("/dsk/l1/misc/joannou/tsar/trunk")
+config.addDescPath("/users/cao/joannou/tsar")
+config.addDescPath("/users/cao/joannou/soclib/soclib")
 
-config.addDescPath("/Users/alain/soc/tsar-trunk-svn-2013/")
+config.systemcass.cflags=config.systemc.cflags+["-fopenmp", "-fpermissive"]
+config.systemcass.libs=config.systemc.libs+['-ldl', '-lm', '-lpthread', '-L%(libdir)s', '-lsystemc', '-rdynamic', '-fopenmp']
+#config.default = config.systemcass_
+#
+config.systemc.cflags=config.systemc.cflags+["-fopenmp", "-fpermissive"]
+config.systemc.libs=config.systemc.libs+['-ldl', '-lm', '-lpthread', '-L%(libdir)s', '-lsystemc', '-rdynamic', '-fopenmp']
+config.default = config.systemc_