Changeset 172 for trunk

Timestamp:

May 16, 2011, 12:55:28 PM (14 years ago)

Author:

alain

Message:

 

Location:

trunk/platforms/tsarv4_generic_xbar

Files:

• Makefile (modified) (1 diff)
• soclib.conf (modified) (1 diff)
• top.cpp (modified) (14 diffs)
• tsarv4_cluster_xbar/caba/source/src/tsarv4_cluster_xbar.cpp (modified) (1 diff)

trunk/platforms/tsarv4_generic_xbar/Makefile

@@ -1 +1 @@
 
 simulator.x: top.cpp top.desc
-        soclib-cc -P -p top.desc -I. -b caba:vci_local_crossbar -o simul.x
+        soclib-cc -P -p top.desc -I../../modules -o simul.x
 
 clean:

trunk/platforms/tsarv4_generic_xbar/soclib.conf

@@ +1 @@
+config.lib_systemcass_openmp_mine = Library(
+        parent = config.systemc,
+        dir = "/users/outil/nbsdtsar/systemcass",
+        libdir = "%(dir)s/lib-linux",
+        cflags = config.systemc.cflags+['-fopenmp']+['-O3'],
+        #cflags = config.systemc.cflags,
+        libs = ['-ldl', '-lm', '-lpthread', '-L%(libdir)s', '-lsystemc', '-rdynamic', '-fopenmp'],
+        #libs = ['-ldl', '-lm', '-lpthread', '-L%(libdir)s', '-lsystemc', '-rdynamic'],
+)
+
+config.systemcass_openmp_mine = BuildEnv(
+        parent = config.systemc_64,
+        libraries = [ config.lib_systemcass_openmp_mine ],
+        #base = config.systemc_32,
+        repos = "/dsk/l1/misc/alain/soclib-cc/head/systemcass-mine",
+        cache_file = "/dsk/l1/misc/alain/soclib-cc/head/systemcass-mine/soclib_cc.cache",
+        toolchain = config.toolchain_64,
+        #toolchain = config.dist_toolchain,
+)
+
+#config.default = config.systemcass
+config.default = config.systemcass_openmp_mine
+
 config.default.toolchain.set("cflags", config.default.toolchain.cflags + ['-DI_WANT_ILLEGAL_VCI'])
 

trunk/platforms/tsarv4_generic_xbar/top.cpp

@@ -59 +59 @@
 ///////////////////////////////////////////////////
 
-#define USE_OPENMP               0
-#define OPENMP_THREADS_NR        8
-
-#if USE_OPENMP
+#define OMP_THREADS             8
+
+#ifdef _OPENMP
 #include <omp.h>
 #endif
@@ -105 +104 @@
 #define L1_DSETS                64
 
-#define FBUF_X_SIZE             128 
-#define FBUF_Y_SIZE             128 
-
-#define BDEV_SECTOR_SIZE        128
-#define BDEV_IMAGE_NAME         "../../softs/soft_transpose_giet/images.raw"
-
-#define BOOT_SOFT_NAME          "../../softs/soft_transpose_giet/bin.soft"
+#define FBUF_X_SIZE             1024
+#define FBUF_Y_SIZE             1024
+
+#define BDEV_SECTOR_SIZE        1024
+#define BDEV_IMAGE_NAME         "../../softs/soft_filter_giet/philips_image.raw"
+
+#define BOOT_SOFT_NAME          "../../softs/soft_filter_giet/bin.soft"
 
 /////////////////////////////////////////////////////////
@@ -277 +276 @@
     bool    trace_ok       = false;             // debug activated
     size_t  from_cycle     = 0;                 // debug start cycle
+    size_t  omp_threads    = OMP_THREADS;       // number of cores for OpenMP
 
     ////////////// command line arguments //////////////////////
@@ -292 +292 @@
                 assert( ((nprocs == 1) || (nprocs == 2) || (nprocs == 4)) &&
                         "NPROCS must be equal to 1, 2, or 4");
+            }
+            else if( (strcmp(argv[n],"-THREADS") == 0) && (n+1<argc) )
+            {
+                omp_threads = atoi(argv[n+1]);
             }
             else if( (strcmp(argv[n],"-XMAX") == 0) && (n+1<argc) )
@@ -356 +360 @@
                 std::cout << "     -XFB fram_buffer_number_of_pixels" << std::endl;
                 std::cout << "     -YFB fram_buffer_number_of_lines" << std::endl;
+                std::cout << "     -THREADS number_of_cores_for_OpenMP" << std::endl;
                 exit(0);
             }
@@ -366 +371 @@
     std::cout << std::endl;
 
-#if USE_OPENMP
+#ifdef _OPENMP
         omp_set_dynamic(false);
-        omp_set_num_threads(threads_nr);
-        std::cerr << "Built with openmp version " << _OPENMP << std::endl;
+        omp_set_num_threads(omp_threads);
+        std::cout << "Built with openmp version " << _OPENMP << std::endl;
+        std::cout << "Number of threads = " << omp_threads << std::endl;
 #endif
 
@@ -607 +613 @@
     TsarV4ClusterXbar<vci_param, proc_iss, cmd_width, rsp_width>* clusters[xmax][ymax];
 
-#if USE_OPENMP
+#ifdef _OPENMP
 
 #pragma omp parallel
 {
 #pragma omp for
-    for( size_t i = 0 ; i  < (xmax * ymax); i++)
+    for( int i = 0 ; i  < (int)(xmax * ymax); i++)
     {
         size_t x = i / ymax;
@@ -618 +624 @@
 
 #pragma omp critical
+        {
         std::ostringstream sc;
         sc << "cluster_" << x << "_" << y;
@@ -652 +659 @@
              loader);
         }
-
-#else  // USE_OPENMP
+    }
+}
+
+#else  // _OPENMP
 
     for( size_t x = 0 ; x  < xmax ; x++)
@@ -701 +710 @@
     }
     
-#endif  // USE_OPENMP
+#endif  // _OPENMP
 
     ///////////////////////////////////////////////////////////////
@@ -831 +840 @@
     signal_resetn = true;
 
+    sc_start(sc_core::sc_time(ncycles, SC_NS));
+
+/*
     for ( size_t n=0 ; n<ncycles ; n++)
     {
         sc_start(sc_core::sc_time(1, SC_NS));
+
         if ( trace_ok && (n > from_cycle) )
         {
             std::cout << "****************** cycle " << std::dec << n ;
             std::cout << " ***********************************" << std::endl;
-/*
-            clusters[0][0]->proc[0]->print_trace();
+            clusters[5][7]->proc[2]->print_trace();
+            print_vci_signal("proc_5_7_2_d", clusters[5][7]->signal_vci_ini_d_proc[2]);
+
             clusters[0][0]->proc[1]->print_trace();
             clusters[0][0]->proc[2]->print_trace();
             clusters[0][0]->proc[3]->print_trace();
-
             std::cout << std::endl;  
 
@@ -855 +868 @@
             clusters[1][0]->proc[0]->print_trace();
             clusters[1][0]->proc[1]->print_trace();
-*/
             clusters[1][0]->iniwrapperd->print_trace();
             clusters[1][0]->proc[2]->print_trace();
@@ -867 +879 @@
             print_dspin_signal("g2l_1_0_d RSP", clusters[1][0]->signal_dspin_rsp_g2l_d);
             print_vci_signal("l2g_1_0_d", clusters[1][0]->signal_vci_l2g_d);
-/*
             clusters[1][0]->proc[3]->print_trace();
 
@@ -939 +950 @@
             if ( clusters[0][0]->signal_irq_bdev.read() != 0) std::cout << " IRQ_BDEV" << std::endl;
             if ( clusters[0][0]->signal_proc_it[0].read() != 0) std::cout << " IRQ_PROC" << std::endl;
+        }
+    }
 */
-        }
-    }
+
     return EXIT_SUCCESS;
 }

trunk/platforms/tsarv4_generic_xbar/tsarv4_cluster_xbar/caba/source/src/tsarv4_cluster_xbar.cpp

@@ -104 +104 @@
                 l1_d_ways,l1_d_sets,16,         // DCACHE size
                 4,                              // WBUF width
-                4                               // WBUF depth
+                8                               // WBUF depth
                 );
         }