Changeset 351 for branches/v5/platforms/tsar_generic_mmu/top.cpp

Timestamp:

Apr 4, 2013, 2:36:54 PM (11 years ago)

Author:

joannou

Message:

Got rid of intermediate v5 version. _dspin_coherence versions changed to main version for v5. Changed components names and platforms to fit the new names

Location:

branches/v5/platforms/tsar_generic_mmu

Files:

• . (moved) (moved from branches/v5/platforms/tsar_generic_mmu_dspin_coherence)
• top.cpp (modified) (6 diffs)

branches/v5/platforms/tsar_generic_mmu/top.cpp

@@ -424 +424 @@
    std::cout << maptabd << std::endl;
 
-   // coherence network
-   // - tgtid_c_proc = srcid_c_proc = local procid
-   // - tgtid_c_memc = srcid_c_memc = NB_PROCS_MAX
-   MappingTable maptabc(address_width, 
-         IntTab(x_width + y_width, srcid_width - x_width - y_width), 
-         IntTab(x_width + y_width, srcid_width - x_width - y_width), 
-         0x00FF0000);
-
-   for (size_t x = 0; x < CLUSTER_X; x++)
-   {
-      for (size_t y = 0; y < CLUSTER_Y; y++)
-      {
-         sc_uint<address_width> offset  = cluster(x,y) << (address_width-x_width-y_width);
-
-         // cleanup requests must be routed to the memory cache
-         std::ostringstream sh;
-         sh << "c_seg_memc_" << x << "_" << y;
-         maptabc.add(Segment(sh.str(), (NB_PROCS_MAX << (address_width - srcid_width)) + offset, 
-                     0x10, IntTab(cluster(x,y), NB_PROCS_MAX), false));
-
-         // update & invalidate requests must be routed to the proper processor
-         for ( size_t p = 0 ; p < NB_PROCS_MAX ; p++) 
-         {
-            std::ostringstream sp;
-            sp << "c_seg_proc_" << x << "_" << y << "_" << p;
-            maptabc.add( Segment( sp.str() , (p << (address_width - srcid_width)) + offset , 
-                         0x10 , IntTab(cluster(x,y), p) , false)); 
-         }
-      }
-   }
-   std::cout << maptabc << std::endl;
 
    // external network
@@ -557 +526 @@
                 cluster(x,y),
                 maptabd,
-                maptabc,
                 maptabx,
                 x_width,
                 y_width,
+                4, //local_id_width
                 MEMC_TGTID,
                 XICU_TGTID,
@@ -724 +693 @@
          std::cout << " ************************************************" << std::endl;
 
-   //          clusters[0][0]->proc[0]->print_trace();
+//             clusters[0][0]->proc[0]->print_trace();
      //        clusters[0][0]->proc[1]->print_trace();
-             clusters[0][0]->proc[2]->print_trace();
+   //          clusters[1][0]->proc[2]->print_trace();
        //      clusters[0][0]->proc[3]->print_trace();
-             clusters[0][0]->memc->print_trace();
+  //           clusters[0][0]->memc->print_trace();
          // trace proc[debug_proc_id] 
-/*
          if ( debug_proc_id < (CLUSTER_X * CLUSTER_Y * NB_PROCS_MAX) )
          {
@@ -739 +707 @@
 
              clusters[proc_x][proc_y]->signal_vci_ini_d_proc[0].print_trace("proc_ini_d");
-             clusters[proc_x][proc_y]->signal_vci_ini_c_proc[0].print_trace("proc_ini_c");
-             clusters[proc_x][proc_y]->signal_vci_tgt_c_proc[0].print_trace("proc_tgt_c");
+             clusters[proc_x][proc_y]->signal_dspin_c_from_proc[0].print_trace("from_proc_c");
+             clusters[proc_x][proc_y]->signal_dspin_c_to_proc[0].print_trace("to_proc_c");
          }
 
@@ -752 +720 @@
 
              clusters[memc_x][memc_y]->signal_vci_tgt_d_memc.print_trace("memc_tgt_d");
-             clusters[memc_x][memc_y]->signal_vci_ini_c_memc.print_trace("memc_ini_c");
-             clusters[memc_x][memc_y]->signal_vci_tgt_c_memc.print_trace("memc_tgt_c");
+             clusters[memc_x][memc_y]->signal_dspin_c_from_memc.print_trace("from_memc_c");
+             clusters[memc_x][memc_y]->signal_dspin_c_to_memc.print_trace("to_memc_c");
          }
 
@@ -776 +744 @@
 // clusters[1][1]->signal_vci_tgt_d_mdma.print_trace("mdma_1_1_tgt_d  ");
 // clusters[1][1]->signal_vci_ini_d_mdma.print_trace("mdma_1_1_ini_d  ");
-*/
       }