Changeset 823 for soft/giet_vm/applications/rosenfeld/src-par/mca_main.c

Timestamp:

Jun 14, 2016, 5:23:56 PM (8 years ago)

Author:

meunier

Message:

• Improved scripts for simulations and graphes
• Continued to clean up the lib nrc2 (from nrio2x.x to nrmem1.c)
• Added a version (Fast - Parmerge - No stats)

File:

• soft/giet_vm/applications/rosenfeld/src-par/mca_main.c (modified) (8 diffs)

soft/giet_vm/applications/rosenfeld/src-par/mca_main.c

@@ -43 +43 @@
 #define MAX_THREADS 256
 #define DEFAULT_NTHREADS 1
+#define DEFAULT_NRUNS 1
 #define DEFAULT_IN_FILENAME "/misc/cadastre.pgm"
 #define DEFAULT_OUT_FILENAME "out.bmp"
@@ -233 +234 @@
 
 
-// -----------------------------------------------------------
-void mca_test2(int num_threads, char * infile, char * outfile)
-// -----------------------------------------------------------
+// -------------------------------------------------------------------------
+void mca_test2(int num_threads, int num_runs, char * infile, char * outfile)
+// -------------------------------------------------------------------------
 {
     int i0, i1, j0, j1;
@@ -277 +278 @@
     MCA_Set_ImageL(mca, E);
     MCA_Set_NP(mca, num_threads);
+    MCA_Set_NR(mca, num_runs);
     
     // -- MCA init
@@ -316 +318 @@
 
 
-// --------------------------------------------------------------
-int main_test_mca(int num_threads, char * infile, char * outfile)
-// --------------------------------------------------------------
+// ----------------------------------------------------------------------------
+int main_test_mca(int num_threads, int num_runs, char * infile, char * outfile)
+// ----------------------------------------------------------------------------
 {
     CLOCK_INIT(num_threads, 4); // 4 = Number of steps in body
     CLOCK_APP_START;
 
-    mca_test2(num_threads, infile, outfile);
+    mca_test2(num_threads, num_runs, infile, outfile);
 
     CLOCK_APP_END;
@@ -349 +351 @@
     int ch;
     int num_threads = DEFAULT_NTHREADS;
+    int num_runs = DEFAULT_NRUNS;
 
     MCA_VERBOSE1(printf("*** Starting application Rosenfeld ***\n"));
 
 #if TARGET_OS != GIETVM // @QM I think the giet has some random (uninitialized) values for argc and argv
-    while ((ch = getopt(argc, argv, "i:o:n:hdg")) != EOF) {
+    while ((ch = getopt(argc, argv, "i:o:n:r:hdg")) != EOF) {
         switch (ch) {
         case 'i':
@@ -363 +366 @@
         case 'n':
             num_threads = atoi(optarg);
+            break;
+        case 'r':
+            num_runs = atoi(optarg);
             break;
         case 'h':
@@ -409 +415 @@
     MCA_VERBOSE1(printf("Parameters:\n"));
     MCA_VERBOSE1(printf("- Number of threads: %d\n", num_threads));
+    MCA_VERBOSE1(printf("- Number of images processed: %d\n", num_runs));
     MCA_VERBOSE1(printf("- Input file: %s\n", infile));
     MCA_VERBOSE1(printf("- Output file: %s\n", outfile));
@@ -450 +457 @@
 
     pthread_mutex_init(&print_lock, PTHREAD_PROCESS_PRIVATE);
-    main_test_mca(num_threads, infile, outfile);
+    main_test_mca(num_threads, num_runs, infile, outfile);
 
     return 0;