Changeset 137 for trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel

Timestamp:

Feb 16, 2011, 1:42:13 PM (14 years ago)

Author:

simerabe

Message:

replacing old ring versions with new one

Location:

trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel

Files:

• Makefile (modified) (1 diff)
• platform_desc (modified) (2 diffs)
• segmentation.h (modified) (2 diffs)
• top.cpp (modified) (9 diffs)

trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel/Makefile

@@ -1 +1 @@
 ARCH=mips32el
 SIMULATION_ARGS=100000
+SOCLIB_CC_ADD_ARGS=-I. -t systemcass
 SOCLIB?=$(shell soclib-cc --getpath)
 export SOCLIB

trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel/platform_desc

@@ -9 +9 @@
         Uses('caba:vci_logger'),
         Uses('caba:vci_multi_tty'),
-        Uses('caba:vci_vgmn'),
+        Uses('caba:vci_simple_ring_fast',
+        ring_cmd_data_size = 40,
+        ring_rsp_data_size = 33),
         Uses('caba:vci_mem_cache_v1'),
         Uses('common:elf_file_loader'),
@@ -20 +22 @@
         rflag_size = 1,
         srcid_size = 8,
-        pktid_size = 6,
-        trdid_size = 6,
+        pktid_size = 4,
+        trdid_size = 4,
         wrplen_size = 1
 )

trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel/segmentation.h

@@ -19 +19 @@
 //      base address required by MIPS processor
 /////////////////////////////////////////////////////////////////
-#define MMU
+//#define MMU
 
 #define RESET_BASE      0xBFC00000
-#define RESET_SIZE      0x00000040
+#define RESET_SIZE      0x00001000
 
 #define EXCEP_BASE      0x80000000
-#define EXCEP_SIZE      0x000002e0
+#define EXCEP_SIZE      0x00001000
 
 #define TEXT_BASE       0x00400000
-#define TEXT_SIZE       0x000011c8
+#define TEXT_SIZE       0x00100000
 /////////////////////////////////////////////////////////////////
 //      global data segment (initialised)
@@ -34 +34 @@
 
 #define MC_M_BASE       0x10000000
-#define MC_M_SIZE       0x0000eb20
+#define MC_M_SIZE       0x00100000
 
-/////////////////////////////////////////////////////////////////
-//      page table (initialised)
-/////////////////////////////////////////////////////////////////
-#define PTD_ADDR        0x40400000
-#define PTE_ADDR        0x40402000
-#define IPTE_ADDR       0x40403000
-#define TAB_SIZE        0x00010000
-
-#define V_TTY_BASE      0x00800000
-#define V_TIMER_BASE    0x00C00000      // timer virtual address
 //////////////////////////////////////////////////////////
 //      System devices

trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel/top.cpp

@@ -11 +11 @@
 #include "vci_simple_ram.h"
 #include "vci_multi_tty.h"
-#include "vci_vgmn.h"
+#include "vci_simple_ring_fast.h"
 #include "vci_mem_cache_v1.h"
 #include "vci_cc_xcache_wrapper_v1.h"
@@ -30 +30 @@
 
         // Define VCI parameters
-        typedef soclib::caba::VciParams<4,8,32,1,1,1,8,6,6,1> vci_param;
+        typedef soclib::caba::VciParams<4,8,32,1,1,1,8,4,4,1> vci_param;
         typedef soclib::common::Iss2Simhelper<soclib::common::Mips32ElIss> proc_iss;
         // Mapping table
@@ -36 +36 @@
         soclib::common::MappingTable maptabp(32, IntTab(8), IntTab(8), 0x00300000);
 
-        maptabp.add(Segment("reset", RESET_BASE, RESET_SIZE, IntTab(2), true));
-        maptabp.add(Segment("excep", EXCEP_BASE, EXCEP_SIZE, IntTab(2), true));
-        maptabp.add(Segment("text" , TEXT_BASE , TEXT_SIZE , IntTab(2), true));
+        maptabp.add(Segment("reset", RESET_BASE, RESET_SIZE, IntTab(0), true));
+        maptabp.add(Segment("excep", EXCEP_BASE, EXCEP_SIZE, IntTab(0), true));
+        maptabp.add(Segment("text" , TEXT_BASE , TEXT_SIZE , IntTab(0), true));
         maptabp.add(Segment("tty"  , TTY_BASE  , TTY_SIZE  , IntTab(1), false));
-        maptabp.add(Segment("mc_m" , MC_M_BASE , MC_M_SIZE , IntTab(2), true ));
+        maptabp.add(Segment("mc_m" , MC_M_BASE , MC_M_SIZE , IntTab(0), true ));
  
         std::cout << maptabp << std::endl;
@@ -114 +114 @@
         soclib::caba::VciSignals<vci_param> signal_vci_tgt_tty("vci_tgt_tty");
 
-        soclib::caba::VciSignals<vci_param> signal_vci_tgt_rom("vci_tgt_rom");
-
         soclib::caba::VciSignals<vci_param> signal_vci_tgt_xram("vci_tgt_xram");
 
@@ -134 +132 @@
         // Components
         soclib::caba::VciCcXCacheWrapperV1<vci_param, proc_iss > 
-        proc0("proc0", 0, maptabp, maptabc, IntTab(0),IntTab(0),IntTab(0),4,64,16,4,64,16);
+        proc0("proc0", 0, maptabp, maptabc, IntTab(0),IntTab(0),IntTab(0),4,4,16,4,4,16);
 
         soclib::caba::VciCcXCacheWrapperV1<vci_param, proc_iss > 
-        proc1("proc1", 1, maptabp, maptabc, IntTab(1),IntTab(1),IntTab(1),4,64,16,4,64,16);
+        proc1("proc1", 1, maptabp, maptabc, IntTab(1),IntTab(1),IntTab(1),4,4,16,4,4,16);
 
         soclib::caba::VciCcXCacheWrapperV1<vci_param, proc_iss > 
-        proc2("proc2", 2, maptabp, maptabc, IntTab(2),IntTab(2),IntTab(2),4,64,16,4,64,16);
+        proc2("proc2", 2, maptabp, maptabc, IntTab(2),IntTab(2),IntTab(2),4,4,16,4,4,16);
 
         soclib::caba::VciCcXCacheWrapperV1<vci_param, proc_iss > 
-        proc3("proc3", 3, maptabp, maptabc, IntTab(3),IntTab(3),IntTab(3),4,64,16,4,64,16);
-
-        soclib::caba::VciSimpleRam<vci_param> 
-        rom("rom", IntTab(0), maptabp, loader);
+        proc3("proc3", 3, maptabp, maptabc, IntTab(3),IntTab(3),IntTab(3),4,4,16,4,4,16);
 
         soclib::caba::VciSimpleRam<vci_param> 
@@ -152 +147 @@
 
         soclib::caba::VciMemCacheV1<vci_param> 
-        memc("memc",maptabp,maptabc,maptabx,IntTab(0),IntTab(4),IntTab(2), IntTab(4),4,16,16);
+        memc("memc",maptabp,maptabc,maptabx,IntTab(0),IntTab(4),IntTab(0), IntTab(4),16,16,16);
         
         soclib::caba::VciMultiTty<vci_param> 
@@ -163 +158 @@
 //      soclib::caba::VciLogger<vci_param> vci_logger_memc("vci_logger_memc",maptabp);
 
-//      soclib::caba::VciSimpleRingNetwork<vci_param> 
-//      ringd("ringd",maptabp, IntTab(), 2, 4, 3);
-        soclib::caba::VciVgmn<vci_param> 
-        ringd("ringd",maptabp, 4, 3, 2, 2);
-
-//      soclib::caba::VciSimpleRingNetwork<vci_param> 
-//      ringc("ringc",maptabc, IntTab(), 2, 5, 5);
-        soclib::caba::VciVgmn<vci_param> 
-        ringc("ringc",maptabc, 5, 5, 2, 2);
-
-//      soclib::caba::VciSimpleRingNetwork<vci_param> 
-//      ringx("ringx",maptabx, IntTab(), 2, 1, 1);
-        soclib::caba::VciVgmn<vci_param> 
-        ringx("ringx",maptabx, 1, 1, 2, 2);
+        soclib::caba::VciSimpleRingFast<vci_param, 40 , 33> 
+        ringd("ringd",maptabp, IntTab(), 2, 4, 2);
+//      soclib::caba::VciVgmn<vci_param> 
+//      ringd("ringd",maptabp, 4, 3, 2, 2);
+
+        soclib::caba::VciSimpleRingFast<vci_param, 40 , 33> 
+        ringc("ringc",maptabc, IntTab(), 2, 5, 5);
+//      soclib::caba::VciVgmn<vci_param> 
+//      ringc("ringc",maptabc, 5, 5, 2, 2);
+
+        soclib::caba::VciSimpleRingFast<vci_param, 40 , 33> 
+        ringx("ringx",maptabx, IntTab(), 2, 1, 1);
+//      soclib::caba::VciVgmn<vci_param> 
+//      ringx("ringx",maptabx, 1, 1, 2, 2);
 
         // Net-List
@@ -228 +223 @@
         proc3.p_vci_tgt(signal_vci_tgt_proc3);
 
-        rom.p_clk(signal_clk);
-        rom.p_resetn(signal_resetn);
-        rom.p_vci(signal_vci_tgt_rom);
-
 //  vci_logger_proc0.p_clk(signal_clk);
 //  vci_logger_proc0.p_resetn(signal_resetn);
@@ -277 +268 @@
         ringd.p_to_initiator[2](signal_vci_ini_rw_proc2);
         ringd.p_to_initiator[3](signal_vci_ini_rw_proc3);
-        ringd.p_to_target[0](signal_vci_tgt_rom);
+        ringd.p_to_target[0](signal_vci_tgt_memc);
         ringd.p_to_target[1](signal_vci_tgt_tty);
-        ringd.p_to_target[2](signal_vci_tgt_memc);
 
         ringc.p_clk(signal_clk);