Changeset 802 for trunk/platforms/tsar_generic_iob/top.cpp

Timestamp:

Sep 12, 2014, 3:10:04 PM (10 years ago)

Author:

cfuguet

Message:

tsar_generic_iob: Using the new P_WIDTH constant from hard_config.h

• This constant is used in the clusters to compute the procesor id which now is: (((x << Y_WIDTH) + y) << P_WIDTH) + lpid

• Introducing the p_width constant in the arch.py and non_distributed_arch.py files

File:

• trunk/platforms/tsar_generic_iob/top.cpp (modified) (11 diffs)

trunk/platforms/tsar_generic_iob/top.cpp

@@ -186 +186 @@
 //////////////////////i/////////////////////////////////////
 
-#include "../../../giet_vm/hard_config.h"
+#include "hard_config.h"
 
 ////////////////////////////////////////////////////////////
@@ -336 +336 @@
    size_t   cluster_iob0     = cluster(0,0);               // cluster containing IOB0
    size_t   cluster_iob1     = cluster(XMAX-1,YMAX-1);     // cluster containing IOB1
-   size_t   x_width          = 4;                          // at most 256 clusters
-   size_t   y_width          = 4;                          // at most 256 clusters
+   size_t   x_width          = X_WIDTH;                    // # of bits for x
+   size_t   y_width          = Y_WIDTH;                    // # of bits for y
+   size_t   p_width          = P_WIDTH;                    // # of bits for lpid
 
 #if USING_OPENMP
@@ -347 +348 @@
    assert( (X_WIDTH == 4) and (Y_WIDTH == 4) and
    "ERROR: we must have X_WIDTH == Y_WIDTH == 4");
+
+   assert( P_WIDTH <= 3 and
+   "ERROR: we must have P_WIDTH <= 3");
 
    ////////////// command line arguments //////////////////////
@@ -399 +403 @@
          {
             debug_proc_id     = atoi(argv[n+1]);
-            size_t cluster_xy = debug_proc_id / NB_PROCS_MAX ;
+            size_t cluster_xy = debug_proc_id >> P_WIDTH ;
             size_t x          = cluster_xy >> 4;
             size_t y          = cluster_xy & 0xF;
@@ -444 +448 @@
            "The YMAX parameter cannot be larger than 16" );
 
-   assert( (NB_PROCS_MAX <= 8) and
-           "The NB_PROCS_MAX parameter cannot be larger than 8" );
+   assert( (NB_PROCS_MAX <= (1 << P_WIDTH)) and
+           "NB_PROCS_MAX parameter cannot be larger than 2^P_WIDTH" );
 
    assert( (NB_DMA_CHANNELS <= 4) and
@@ -459 +463 @@
              << " - XMAX            = " << XMAX << std::endl
              << " - YMAX            = " << YMAX << std::endl
-             << " - NB_PROCS_MAX    = " << NB_PROCS_MAX <<  std::endl
+             << " - NB_PROCS_MAX    = " << NB_PROCS_MAX << std::endl
              << " - NB_TTY_CHANNELS = " << NB_TTY_CHANNELS <<  std::endl
              << " - NB_DMA_CHANNELS = " << NB_DMA_CHANNELS <<  std::endl
@@ -602 +606 @@
                                IntTab( cluster(x,y), INT_IOBX_INI_ID ) );
 
-         for ( size_t p = 0 ; p < NB_PROCS_MAX ; p++ )
+         for ( size_t p = 0 ; p < NB_PROCS_MAX; p++ )
          maptab_int.srcid_map( IntTab( cluster(x,y), PROC_LOCAL_SRCID+p ),
                                IntTab( cluster(x,y), INT_PROC_INI_ID+p ) );
@@ -1038 +1042 @@
                 y_width,
                 vci_srcid_width - x_width - y_width,            // l_id width,
+                p_width,
 
                 INT_MEMC_TGT_ID,
@@ -1438 +1443 @@
             if ( debug_proc_id != 0xFFFFFFFF )
             {
-                size_t l          = debug_proc_id % NB_PROCS_MAX ;
-                size_t cluster_xy = debug_proc_id / NB_PROCS_MAX ;
+                size_t l          = debug_proc_id & ((1<<P_WIDTH)-1) ;
+                size_t cluster_xy = debug_proc_id >> P_WIDTH ;
                 size_t x          = cluster_xy >> 4;
                 size_t y          = cluster_xy & 0xF;
@@ -1460 +1465 @@
                 // local interrupts in cluster(x,y)
                 if( clusters[x][y]->signal_irq_memc.read() )
-                std::cout << "### IRQ_MMC_" << std::dec << x << "_" << y 
+                std::cout << "### IRQ_MMC_" << std::dec << x << "_" << y
                           << " ACTIVE" << std::endl;
 
@@ -1466 +1471 @@
                 {
                     if( clusters[x][y]->signal_irq_mdma[c].read() )
-                    std::cout << "### IRQ_DMA_" << std::dec << x << "_" << y << "_" << c 
+                    std::cout << "### IRQ_DMA_" << std::dec << x << "_" << y << "_" << c
                               << " ACTIVE" << std::endl;
                 }
- 
+
                 for ( size_t c = 0 ; c < NB_PROCS_MAX ; c++ )
                 {
                     if( clusters[x][y]->signal_proc_it[c].read() )
-                    std::cout << "### IRQ_PROC_" << std::dec << x << "_" << y << "_" << c 
+                    std::cout << "### IRQ_PROC_" << std::dec << x << "_" << y << "_" << c
                               << " ACTIVE" << std::endl;
                 }