Changeset 1007 for branches/reconfiguration/platforms/tsar_generic_iob/top.cpp

Timestamp:

Jul 16, 2015, 3:17:49 PM (9 years ago)

Author:

cfuguet

Message:

reconf: update the reconfiguration/tsar_generic_iob to comply with new
constructor parameters of the NIC and CHBUF_DMA peripherals.

File:

• branches/reconfiguration/platforms/tsar_generic_iob/top.cpp (modified) (7 diffs)

branches/reconfiguration/platforms/tsar_generic_iob/top.cpp

@@ -151 +151 @@
 #define almos_archinfo_pathname   "arch-info.bin@0xBFC08000:D"
 
-///////////////////////////////////////////////////
+///////////////////////////////////////////////////////////
 //               Parallelisation
-///////////////////////////////////////////////////
-#define USE_OPENMP _OPENMP
-
-#if USE_OPENMP
+//
+// The _OPENMP flag is defined automatically by the
+// compilation environment when compiling with the OpenMP
+// support
+///////////////////////////////////////////////////////////
+#if _OPENMP
 #include <omp.h>
 #endif
@@ -512 +514 @@
    std::cout << std::endl;
 
-#if USE_OPENMP
+#if _OPENMP
    omp_set_dynamic(false);
    omp_set_num_threads(threads_nr);
@@ -990 +992 @@
                                           maptab_iox,
                                           NB_NIC_CHANNELS,
-                                          0,                // mac_4 address
-                                          0,                // mac_2 address
-                                          nicMode );
+                                          0,           // mac_4 address
+                                          0,           // mac_2 address
+                                          nicMode,
+                                          12 );        // Inter Frame Gap
 
    // Chained Buffer DMA controller
@@ -1001 +1004 @@
                                           IntTab(0, IOX_CDMA_TGT_ID),
                                           64,          // burst size (bytes)
-                                          2*NB_NIC_CHANNELS );
+                                          NB_CMA_CHANNELS,
+                                          4 );         // # pipelined burst
 #else
    VciTargetError<vci_param_ext> merror_nic( "merror_nic",
@@ -1077 +1081 @@
    TsarCluster* clusters[X_SIZE][Y_SIZE];
 
-#if USE_OPENMP
+#if _OPENMP
 #pragma omp parallel
     {
@@ -1087 +1091 @@
             size_t y = i % Y_SIZE;
 
-#if USE_OPENMP
+#if _OPENMP
 #pragma omp critical
             {
@@ -1170 +1174 @@
             );
 
-#if USE_OPENMP
+#if _OPENMP
             } // end critical
 #endif
         } // end for
-#if USE_OPENMP
+#if _OPENMP
     }
 #endif