# HG changeset patch
# User Me
# Date 1289851699 28800
# Node ID 12bcb9728e1ce53aa79780191261d2c530841096
# Parent  5311bd32c3cbbc29674fbf2b696dd56e648ef072
Added DEBUG statements for debuggine

diff -r 5311bd32c3cb -r 12bcb9728e1c src/Application/VCilk__Matrix_Mult/Divide_Pr.c
--- a/src/Application/VCilk__Matrix_Mult/Divide_Pr.c	Mon Nov 08 03:59:51 2010 -0800
+++ b/src/Application/VCilk__Matrix_Mult/Divide_Pr.c	Mon Nov 15 12:08:19 2010 -0800
@@ -208,7 +208,7 @@
       // system, by entry-point Fn, and passed in through dividerParams.
       //So, nothing to do to send results back -- they're seen by side-effect
 
-         DEBUG( dbgAppFlow, "end divide\n")
+         DEBUG( dbgAppFlow, "*** end divide ***\n")
 
          VMS__record_interval_end_in_probe( divideProbe );
          VMS__print_stats_of_all_probes();
@@ -287,6 +287,9 @@
    slicingStrucCarrier->vecSlices      = vecSlices;
    slicingStrucCarrier->rightColSlices = rightColSlices;
 
+         DEBUG1( dbgAppFlow, "leftRowSlices %d | ", leftRowSlices->numVals );
+         DEBUG1( dbgAppFlow, "rightColSlices %d | ",rightColSlices->numVals);
+         DEBUG1( dbgAppFlow, "vecSlices %d\n", vecSlices->numVals );
    return slicingStrucCarrier;
 }
 
diff -r 5311bd32c3cb -r 12bcb9728e1c src/Application/VCilk__Matrix_Mult/Vector_Pr.c
--- a/src/Application/VCilk__Matrix_Mult/Vector_Pr.c	Mon Nov 08 03:59:51 2010 -0800
+++ b/src/Application/VCilk__Matrix_Mult/Vector_Pr.c	Mon Nov 15 12:08:19 2010 -0800
@@ -9,6 +9,7 @@
 
 #include "VCilk__Matrix_Mult.h"
 #include <math.h>
+#include <stdlib.h>
 
 
 void inline
@@ -33,6 +34,7 @@
 
    vecParams = (VecParams *)_vecParams;
 
+         DEBUG1( dbgAppFlow, "start vector %d\n", animPr->procrID)
          #ifdef TURN_ON_DEBUG_PROBES
          int32 subMatrixVectorProbe =
                    VMS__create_single_interval_probe( "subMtxVect", animPr );
@@ -70,7 +72,9 @@
       vecOfSubMatrixParams[ vecIdx ] = subMatrixPairParams;
     }
 
+         DEBUG1( dbgAppFlow, "before sync in vector %d\n", animPr->procrID)
    VCilk__sync( animPr );
+         DEBUG1( dbgAppFlow, "**after sync in vector %d\n", animPr->procrID)
 
       //now accumulate individual result matrices into final result matrix
    for( vecIdx = 0; vecIdx < numVecIdxs; vecIdx++ )
@@ -99,6 +103,7 @@
          VMS__record_interval_end_in_probe( subMatrixVectorProbe );
          #endif
          
+         DEBUG1( dbgAppFlow, "end vector %d\n", animPr->procrID)
    VCilk__dissipate_procr( animPr );
  }
 
diff -r 5311bd32c3cb -r 12bcb9728e1c src/Application/VCilk__Matrix_Mult/subMatrix_Pr.c
--- a/src/Application/VCilk__Matrix_Mult/subMatrix_Pr.c	Mon Nov 08 03:59:51 2010 -0800
+++ b/src/Application/VCilk__Matrix_Mult/subMatrix_Pr.c	Mon Nov 15 12:08:19 2010 -0800
@@ -43,7 +43,7 @@
  *When done, it sends the result to the result processor
  */
 void
-calcSubMatrixProduct( void *data, VirtProcr *animatingPr )
+calcSubMatrixProduct( void *data, VirtProcr *animPr )
  { 
    SMPairParams   *params;
    VirtProcr      *resultPr;
@@ -51,11 +51,11 @@
    SubMatrix      *leftSubMatrix, *rightSubMatrix;
 
 
-         DEBUG( dbgAppFlow, "start sub-matrix mult\n")
+         DEBUG1( dbgAppFlow, "start sub-matrix mult %d\n", animPr->procrID)
          #ifdef TURN_ON_DEBUG_PROBES
          int32 subMatrixProbe = 
-            VMS__create_single_interval_probe( "subMtx",      animatingPr);
-         VMS__record_sched_choice_into_probe( subMatrixProbe, animatingPr );
+            VMS__create_single_interval_probe( "subMtx",      animPr);
+         VMS__record_sched_choice_into_probe( subMatrixProbe, animPr );
          VMS__record_interval_start_in_probe( subMatrixProbe );
          #endif
 
@@ -65,8 +65,8 @@
    rightSubMatrix = params->rightSubMatrix;
 
       //make sure the input sub-matrices have been copied out of orig
-   copyFromOrig( leftSubMatrix, animatingPr );
-   copyTransposeFromOrig( rightSubMatrix, animatingPr );
+   copyFromOrig( leftSubMatrix, animPr );
+   copyTransposeFromOrig( rightSubMatrix, animPr );
    
    leftArray      = leftSubMatrix->array;
    rightArray     = rightSubMatrix->array;
@@ -85,7 +85,7 @@
       //This is freed in the vector processor
    int32
    resSize = leftSubMatrix->numRows * rightSubMatrix->numCols * sizeof(float32);
-   resArray = VCilk__malloc( resSize, animatingPr );
+   resArray = VCilk__malloc( resSize, animPr );
    memset( resArray, 0, resSize );
 
 
@@ -106,7 +106,8 @@
          VMS__record_interval_end_in_probe( subMatrixProbe );
          #endif
          
-   VCilk__dissipate_procr( animatingPr );
+         DEBUG1( dbgAppFlow, "end sub-matrix mult %d\n", animPr->procrID)
+   VCilk__dissipate_procr( animPr );
  }
 
 
diff -r 5311bd32c3cb -r 12bcb9728e1c src/Application/main.c
--- a/src/Application/main.c	Mon Nov 08 03:59:51 2010 -0800
+++ b/src/Application/main.c	Mon Nov 15 12:08:19 2010 -0800
@@ -26,10 +26,10 @@
    
    resultMatrix = multiplyTheseMatrices( leftMatrix, rightMatrix );
 
-   printf("\nresult matrix: \n");
+//   printf("\nresult matrix: \n"); \
    printMatrix( resultMatrix );
    
 //   VCilk__print_stats();
-   
+   fflush(stdin);
    exit(0); //cleans up
  }