Merge pull request #1092 from sstsimulator/devel

Automatically Merged using SST Master Branch Merger

Author: sst-autotester

src/sst/elements/ember/shmem/motifs/emberShmemGetNBI.h

@@ -58,13 +58,12 @@ class EmberShmemGetNBIGenerator : public EmberShmemGenerator {
             }
 			assert( 2 == m_num_pes );
             m_other_pe = (m_my_pe + 1) % m_num_pes;
-            enQ_malloc( evQ, &m_src, m_nelems * sizeof(TYPE) * 2);
+            enQ_malloc( evQ, &m_src, m_nelems * sizeof(TYPE));
+            enQ_malloc( evQ, &m_dest, m_nelems * sizeof(TYPE));
             break;
 
         case 2:
 
-            m_dest = m_src.offset<TYPE>(m_nelems );
-
             for ( int i = 0; i < m_nelems; i++ ) {
                 m_src.at<TYPE>(i) = m_my_pe + i;
             }
@@ -73,8 +72,9 @@ class EmberShmemGetNBIGenerator : public EmberShmemGenerator {
 
             enQ_barrier_all( evQ );
             enQ_getTime( evQ, &m_startTime );
-	    	if ( m_my_pe == 1 ) { 
+	    	if ( m_my_pe == 0 ) { 
 				++m_phase;
+                enQ_barrier_all( evQ );
 			}
             break;
 
@@ -86,12 +86,13 @@ class EmberShmemGetNBIGenerator : public EmberShmemGenerator {
 	        } else {
                 enQ_quiet( evQ );
                 enQ_getTime( evQ, &m_stopTime );
+                enQ_barrier_all( evQ );
 			}
             break;
 
         case 4:
             ret = true;
-            if ( 0 == m_my_pe ) {
+            if ( m_my_pe != 0 ) {
 				double time = m_stopTime-m_startTime;
                 printf("%d:%s: count=%d, %.3lf ns \n",m_my_pe, getMotifName().c_str(), m_count,time/(double)m_count);
             }

src/sst/elements/ember/test/loadInfo.py

@@ -293,7 +293,6 @@ def readWorkList(self, workList ):
 
 			ranksPerNode = self.numCores 
 			nidList = []
-
 			while len(cmdList):
 				if "-" != cmdList[0][0]:
 					break
@@ -329,6 +328,11 @@ def readWorkList(self, workList ):
 	def parseCmd(self, motifPrefix, motifSuffix, cmdList, cmdNum ):
 		motif = {} 
 
+		tmp = cmdList[0].split('.')
+		if  len(tmp) == 2:
+			motifPrefix = tmp[0] + '.'
+			cmdList[0] = tmp[1]
+
 		tmp = 'motif' + str(cmdNum) + '.name'
 		motif[ tmp ] = motifPrefix + cmdList[0] + motifSuffix
 		cmdList.pop(0)