Revert "added PUT_DONE_TAG statistic information"
authorYanhua Sun <sun51@hopper10.(none)>
Wed, 21 Mar 2012 02:25:50 +0000 (19:25 -0700)
committerYanhua Sun <sun51@hopper10.(none)>
Wed, 21 Mar 2012 02:25:50 +0000 (19:25 -0700)
This reverts commit a5f0310ed2007030943c2a504f7cf0354af25ad2.

examples/charm++/hello/1darray/Makefile
examples/converse/pingpong/pingpong.C
src/arch/gemini_gni/machine.c
tests/charm++/commSpeed/Makefile
tests/charm++/commSpeed/pgm.C

index bd5b53444bb76848be2411a69c1c3f5ad81893b4..a2cd44ab732ba9f315cf2593090698b55eb6d73e 100644 (file)
@@ -7,9 +7,6 @@ all: hello
 hello: $(OBJS)
        $(CHARMC) -language charm++ -o hello $(OBJS)
 
-hello.prj: $(OBJS)
-       $(CHARMC) -language charm++ -o hello.prj -tracemode projections  $(OBJS)
-
 hello.decl.h: hello.ci
        $(CHARMC)  hello.ci
 
index 53801bc7569ef6bf205aa72716cca37e241474cf..630751e28a755695b00baa2bd051d25c579c34e6 100644 (file)
@@ -10,7 +10,7 @@
 #include <converse.h>
 
 enum {nCycles = 1000};
-enum { maxMsgSize = 1 << 18 };
+enum { maxMsgSize = 1 << 14 };
 
 CpvDeclare(int,msgSize);
 CpvDeclare(int,cycleNum);
@@ -20,7 +20,7 @@ CpvDeclare(int,node1Handler);
 CpvStaticDeclare(double,startTime);
 CpvStaticDeclare(double,endTime);
 
-#define USE_PERSISTENT     1
+#define USE_PERSISTENT     0
 
 #if USE_PERSISTENT
 PersistentHandle h;
@@ -120,7 +120,7 @@ CmiStartFn mymain()
     CpvInitialize(int,msgSize);
     CpvInitialize(int,cycleNum);
     
-    CpvAccess(msgSize)= 1024 + CmiMsgHeaderSizeBytes;
+    CpvAccess(msgSize)= 512 + CmiMsgHeaderSizeBytes;
     
     CpvInitialize(int,exitHandler);
     CpvAccess(exitHandler) = CmiRegisterHandler((CmiHandler) exitHandlerFunc);
index 520b2ee463533589220178a4700147a76cf6ad85..0f93a816cc26dabc2b07dc13499cba32bf3fdaa8 100644 (file)
@@ -374,7 +374,7 @@ static CmiNodeLock           rx_cq_lock;
 static CmiNodeLock           smsg_mailbox_lock;
 static CmiNodeLock           smsg_rx_cq_lock;
 static CmiNodeLock           *mempool_lock;
-//#define     CMK_WITH_STATS      1
+//#define     CMK_WITH_STATS      0
 typedef struct msg_list
 {
     uint32_t destNode;
@@ -771,15 +771,11 @@ typedef struct comm_thread_stats
     uint64_t  ack_count;
     uint64_t  big_msg_ack_count;
     uint64_t  smsg_count;
-    uint64_t  direct_put_done_count;
-    uint64_t  put_done_count;
     //times of calling SmsgSend
     uint64_t  try_smsg_data_count;
     uint64_t  try_lmsg_init_count;
     uint64_t  try_ack_count;
     uint64_t  try_big_msg_ack_count;
-    uint64_t  try_direct_put_done_count;
-    uint64_t  try_put_done_count;
     uint64_t  try_smsg_count;
     
     double    max_time_in_send_buffered_smsg;
@@ -808,8 +804,6 @@ static void init_comm_stats()
             else  if( tag == LMSG_INIT_TAG) comm_stats.lmsg_init_count++;  \
             else  if( tag == ACK_TAG) comm_stats.ack_count++;  \
             else  if( tag == BIG_MSG_TAG) comm_stats.big_msg_ack_count++;  \
-            else  if( tag == PUT_DONE_TAG ) comm_stats.put_done_count++;  \
-            else  if( tag == DIRECT_PUT_DONE_TAG ) comm_stats.direct_put_done_count++;  \
             comm_stats.smsg_count++; \
             double inbuff_time = CmiWallTimer() - creation_time;   \
             if(inbuff_time > comm_stats.max_time_in_send_buffered_smsg) comm_stats.max_time_in_send_buffered_smsg= inbuff_time; \
@@ -821,8 +815,6 @@ static void init_comm_stats()
             else  if( tag == LMSG_INIT_TAG) comm_stats.try_lmsg_init_count++;  \
             else  if( tag == ACK_TAG) comm_stats.try_ack_count++;  \
             else  if( tag == BIG_MSG_TAG) comm_stats.try_big_msg_ack_count++;  \
-            else  if( tag == PUT_DONE_TAG ) comm_stats.try_put_done_count++;  \
-            else  if( tag == DIRECT_PUT_DONE_TAG ) comm_stats.try_direct_put_done_count++;  \
             comm_stats.try_smsg_count++; \
         }
 
@@ -845,13 +837,13 @@ static void init_comm_stats()
 static void print_comm_stats()
 {
     fprintf(counterLog, "Node[%d]SMSG time in buffer\t[max:%f\tAverage:%f](milisecond)\n", myrank, 1000*comm_stats.max_time_in_send_buffered_smsg, 1000.0*comm_stats.all_time_in_send_buffered_smsg/comm_stats.smsg_count);
-    fprintf(counterLog, "Node[%d]Smsg  Msgs  \t[Total:%lld\t Data:%lld\t Lmsg_Init:%lld\t ACK:%lld\t BIG_MSG_ACK:%lld Direct_put_done:%lld\t Persistent_put_done:%lld]\n", myrank, 
+    fprintf(counterLog, "Node[%d]Smsg  Msgs  \t[Total:%lld\t Data:%lld\t Lmsg_Init:%lld\t ACK:%lld\t BIG_MSG_ACK:%lld]\n", myrank, 
             comm_stats.smsg_count, comm_stats.smsg_data_count, comm_stats.lmsg_init_count, 
-            comm_stats.ack_count, comm_stats.big_msg_ack_count, comm_stats.direct_put_done_count, comm_stats.put_done_count);
+            comm_stats.ack_count, comm_stats.big_msg_ack_count);
     
-    fprintf(counterLog, "Node[%d]SmsgSendCalls\t[Total:%lld\t Data:%lld\t Lmsg_Init:%lld\t ACK:%lld\t BIG_MSG_ACK:%lld Direct_put_done:%lld\t Persistent_put_done:%lld]\n\n", myrank, 
+    fprintf(counterLog, "Node[%d]SmsgSendCalls\t[Total:%lld\t Data:%lld\t Lmsg_Init:%lld\t ACK:%lld\t BIG_MSG_ACK:%lld]\n\n", myrank, 
             comm_stats.try_smsg_count, comm_stats.try_smsg_data_count, comm_stats.try_lmsg_init_count, 
-            comm_stats.try_ack_count, comm_stats.try_big_msg_ack_count, comm_stats.try_direct_put_done_count, comm_stats.try_put_done_count);
+            comm_stats.try_ack_count, comm_stats.try_big_msg_ack_count);
 
     fprintf(counterLog, "Node[%d]Rdma Transaction [count:%lld\t calls:%lld]\n", myrank, comm_stats.rdma_count, comm_stats.try_rdma_count);
     fprintf(counterLog, "Node[%d]Rdma time from control arrives to rdma init [MAX:%f\t Average:%f](milisecond)\n", myrank, 1000.0*comm_stats.max_time_from_control_to_rdma_init, 1000.0*comm_stats.all_time_from_control_to_rdma_init/comm_stats.rdma_count); 
index 00c757f09fb47197eccb57992b8980cf859df2ae..1e1cb390c96c495f7c456739e8b5e1e40444130a 100644 (file)
@@ -5,9 +5,6 @@ all: commSpeed
 commSpeed: pgm.o Worker.o
        $(CHARMC) -language charm++ -o commSpeed pgm.o Worker.o
 
-commSpeed.prj: pgm.o Worker.o
-       $(CHARMC) -language charm++ -o commSpeed.prj -tracemode projections pgm.o Worker.o
-
 Pgm.decl.h: pgm.ci 
        $(CHARMC)  pgm.ci
 
index 855a204a345a81b5bb7c78051fd6adcaf23105dd..934742cff0ddbab719a3750cc7368dbd85eb76fa 100644 (file)
@@ -51,8 +51,8 @@ void main::finish(double avgLocal, double avgRemote)
     iterations++;
     localAvg = localAvg / (CkNumPes()*2*numMsgs);
     remoteAvg = remoteAvg / (CkNumPes()*2*numMsgs);
-    //CkPrintf("%d PE Time for Iteration %d= %3.9f\nREMOTE: Avg=%3.9f  LOCAL: Avg=%3.9f\n",
-       //     CkNumPes(), iterations, CkWallTimer()-startTime, remoteAvg, localAvg);
+    CkPrintf("%d PE Time for Iteration %d= %3.9f\nREMOTE: Avg=%3.9f  LOCAL: Avg=%3.9f\n",
+            CkNumPes(), iterations, CkWallTimer()-startTime, remoteAvg, localAvg);
     if (iterations == numIter) {
       CkPrintf("%d PE Time for all %d iterations: %3.9f\n", CkNumPes(), numIter, CkWallTimer()-initTime);
       CkExit();