Changeset 278 for trunk/platforms/platform_fpga_de2-115

Timestamp:

Dec 4, 2012, 1:31:51 PM (12 years ago)

Author:

bouyer

Message:

The ring is cpu-ungry, so give one thread per ring when running under
systemcass-openmp.
While there, decrease the max frosen cycle for CPUs to 50000

File:

• trunk/platforms/platform_fpga_de2-115/top.cpp (modified) (7 diffs)

trunk/platforms/platform_fpga_de2-115/top.cpp

@@ -51 +51 @@
 #ifdef _OPENMP
         omp_set_dynamic(false);
-        omp_set_num_threads(3);
+        omp_set_num_threads(5);
         //omp_set_num_threads(1);
         std::cerr << "Built with openmp version " << _OPENMP << std::endl;
@@ -232 +232 @@
         proc0 = new soclib::caba::VciCcVCacheWrapperV4<vci_param, proc_iss >
           ("proc0", 0, maptabp, maptabc, IntTab(0),IntTab(0),IntTab(0),
-            8,8,8,8,4,64,16,4,64,16,4, 4, 0, 0, 4, 1000000, DEBUG_CYCLE, true);
+            8,8,8,8,4,64,16,4,64,16,4, 4, 0, 0, 4, 50000, DEBUG_CYCLE, true);
         signal_proc0_it0 = new sc_signal<bool>("mips0_it0");
         signal_proc0_it1 = new sc_signal<bool>("mips0_it1");
@@ -243 +243 @@
         proc1 = new soclib::caba::VciCcVCacheWrapperV4<vci_param, proc_iss >
           ("proc1", 1, maptabp, maptabc, IntTab(1),IntTab(1),IntTab(1),
-            8,8,8,8,4,64,16,4,64,16,4, 4, 0, 0, 4, 1000000, DEBUG_CYCLE, true);
+            8,8,8,8,4,64,16,4,64,16,4, 4, 0, 0, 4, 50000, DEBUG_CYCLE, true);
         signal_proc1_it0 = new sc_signal<bool>("mips1_it0");
         signal_proc1_it1 = new sc_signal<bool>("mips1_it1");
@@ -270 +270 @@
         proc2 = new soclib::caba::VciCcVCacheWrapperV4<vci_param, proc_iss >
           ("proc2", 2, maptabp, maptabc, IntTab(2),IntTab(2),IntTab(2),
-            8,8,8,8,4,64,16,4,64,16,4, 4, 0, 0, 4, 1000000, DEBUG_CYCLE, true);
+            8,8,8,8,4,64,16,4,64,16,4, 4, 0, 0, 4, 50000, DEBUG_CYCLE, true);
         signal_proc2_it0 = new sc_signal<bool>("mips2_it0");
         signal_proc2_it1 = new sc_signal<bool>("mips2_it1");
@@ -277 +277 @@
         signal_proc2_it4 = new sc_signal<bool>("mips2_it4");
         signal_proc2_it5 = new sc_signal<bool>("mips2_it5");
-        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 */);
@@ -291 +289 @@
       {
 #endif
+        ringc = new soclib::caba::VciSimpleRingFast<vci_param, 40, 33>
+          ("ringc",maptabc, IntTab(), 4, 5, 5);
+#if 1
+      }
+    }
+#pragma omp section
+    {
+#pragma omp critical
+      {
+#endif
+        ringp = new soclib::caba::VciSimpleRingFast<vci_param, 40, 33> 
+          ("ringp",maptabp, IntTab(), 4, 5, 7);
+#if 1
+      }
+    }
+#pragma omp section
+    {
+#pragma omp critical
+      {
+#endif
         proc3 = new soclib::caba::VciCcVCacheWrapperV4<vci_param, proc_iss >
           ("proc3", 3, maptabp, maptabc, IntTab(3),IntTab(3),IntTab(3),
-            8,8,8,8,4,64,16,4,64,16,4, 4, 0, 0, 4, 1000000, DEBUG_CYCLE, true);
+            8,8,8,8,4,64,16,4,64,16,4, 4, 0, 0, 4, 50000, DEBUG_CYCLE, true);
         signal_proc3_it0 = new sc_signal<bool>("mips3_it0");
         signal_proc3_it1 = new sc_signal<bool>("mips3_it1");
@@ -305 +323 @@
           ("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::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);