Changeset 275 for trunk/platforms

Timestamp:

Nov 29, 2012, 1:21:07 PM (12 years ago)

Author:

bouyer

Message:

This VHDL implementation uses rings, use rings here too.

Location:

trunk/platforms/platform_fpga_de2-115

Files:

• platform_desc (modified) (1 diff)
• top.cpp (modified) (4 diffs)

trunk/platforms/platform_fpga_de2-115/platform_desc

@@ -12 +12 @@
         Uses('caba:vci_simhelper'),
         Uses('caba:vci_framebuffer'),
-        Uses('caba:vci_vgmn'),
+        Uses('caba:vci_simple_ring_fast',
+              ring_cmd_data_size=40,
+              ring_rsp_data_size=33
+        ),
         Uses('caba:vci_logger'),
         Uses('caba:vci_mem_cache_v4'),

trunk/platforms/platform_fpga_de2-115/top.cpp

@@ -18 +18 @@
 #include "vci_simple_ram.h"
 #include "vci_multi_tty.h"
-#include "vci_vgmn.h"
+#include "vci_simple_ring_fast.h"
 #include "vci_mem_cache_v4.h"
 #include "vci_cc_vcache_wrapper_v4.h"
@@ -222 +222 @@
         soclib::caba::VciBlockDeviceTsarV4<vci_param> *vcibd;
         soclib::caba::VciCcVCacheWrapperV4<vci_param, proc_iss > *proc3;
-        soclib::caba::VciVgmn<vci_param> *ringp;
-        soclib::caba::VciVgmn<vci_param> *ringc;
+        soclib::caba::VciSimpleRingFast<vci_param, 40, 33> *ringp;
+        soclib::caba::VciSimpleRingFast<vci_param, 40, 33> *ringc;
 #pragma omp parallel sections
   {
@@ -277 +277 @@
         signal_proc2_it4 = new sc_signal<bool>("mips2_it4");
         signal_proc2_it5 = new sc_signal<bool>("mips2_it5");
-        ringp = new soclib::caba::VciVgmn<vci_param>
-          ("ringp",maptabp, 5, 7, /*3*/1, 8);
+        ringp = new soclib::caba::VciSimpleRingFast<vci_param, 40, 33> 
+          ("ringp",maptabp, IntTab(), 4, 5, 7);
         vcixicu = new soclib::caba::VciXicu<vci_param>
           ("vcixicu", maptabp, IntTab(4), 4 /* npti */, 2 /* nhwi */, 4 /* nwti */, 12 /* nirq */);
@@ -305 +305 @@
           ("memc",maptabp,maptabc,maptabx,IntTab(0),IntTab(4),IntTab(0), IntTab(4),16,256,16, 1024, 4, 4, DEBUG_CYCLE, true);
         signal_vci_ixr_memc = new soclib::caba::VciSignals<vci_param>("vci_ixr_memc");
-        ringc = new soclib::caba::VciVgmn<vci_param>
-          ("ringc",maptabc, 5, 5, /*2*/1, 8);
+        ringc = new soclib::caba::VciSimpleRingFast<vci_param, 40, 33>
+          ("ringc",maptabc, IntTab(), 4, 5, 5);
 #ifdef VCI_LOGGER_ON_L1
         soclib::caba::VciLogger<vci_param> vci_logger0("vci_logger0",maptabp);