Added ReOMP examples

autogen.sh

@@ -9,7 +9,4 @@ touch NEWS README AUTHORS ChangeLog
 echo "Running libtoolize --automake --copy ... "
 libtoolize --automake --copy 
 echo "Running autoreconf --verbose --install"
-autoreconf --verbose --install
-echo "Cleaning up ..."
-rm -rf autom4te.cache 
-echo "Now run ./configure."
+autoreconf --verbose --install && echo "Cleaning up ..." && rm -rf autom4te.cache && echo "Now run ./configure."

buildme_example/buildme_bgq-gnu.sh

@@ -0,0 +1 @@
+./autogen.sh; ./configure --prefix=/g/g90/sato5/repo/rempi/install_bgq-gnu/ --enable-cdc --with-stack-pmpi=/g/g90/sato5/repo/rempi-stackp/ --with-clmpi=/g/g90/sato5/repo/rempi-clmpi/install_bgq-gnu// --with-bluegene --with-zlib-static=/usr/local/tools/zlib-1.2.6/ MPICC=/usr/local/tools/compilers/ibm/mpicxx-fastmpi-mpich-312 MPIFC=/usr/local/tools/compilers/ibm/mpif90-fastmpi-mpich-312

buildme_example/buildme_x86-64.sh

@@ -0,0 +1,3 @@
+
+./autogen.sh; ./configure --prefix=/g/g90/sato5/repo/rempi/install_x86-64/ --enable-cdc --with-stack-pmpi=/g/g90/sato5/repo/rempi-stackp/ --with-clmpi=/g/g90/sato5/repo/rempi-clmpi/install_x86-64/
+

buildme_example/buildme_x86-64_paradis.sh

@@ -0,0 +1,3 @@
+
+
+./autogen.sh; ./configure --prefix=/g/g90/sato5/repo/rempi/install_x86-64/ MPICC=/usr/local/bin/mpiicpc

buildme_example/buildme_x86-64_qs.sh

@@ -0,0 +1,4 @@
+
+
+#./autogen.sh; ./configure --prefix=/g/g90/sato5/repo/rempi/install_x86-64/ MPICC=/usr/apps/gnu/4.9.3/bin/mpig++ 
+./autogen.sh; ./configure --prefix=/g/g90/sato5/repo/rempi/install_x86-64/ MPICC=mpig++ 

configure.ac

@@ -139,9 +139,14 @@ fi
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
 	Makefile 
-	src/Makefile 
-	src/llvm/Makefile 
+	src/Makefile
+	src/common/Makefile
+	src/rempi/Makefile
+	src/reomp/Makefile
 	test/Makefile
+	test/common/Makefile
+	test/rempi/Makefile
+	test/reomp/Makefile
 	scripts/Makefile
 	scripts/rempi
 	scripts/rempi_record

src/Makefile.am

@@ -1,117 +1,2 @@
-SUBDIRS = llvm
-AM_CFLAGS = -fPIC -g -Wall -pthread -std=c++0x -I$(clmpi_DIR)/include/ -I$(libz_a_INCLUDE) 
-AM_CXXFLAGS = $(AM_CFLAGS)
-
-rempi_SOURCES =  \
-		rempi_pmpi.cpp \
-		rempi_err.cpp \
-		rempi_mem.cpp \
-		rempi_util.cpp \
-		rempi_compression_util.cpp \
-		rempi_config.cpp \
-                rempi_re.cpp \
-	        rempi_sig_handler.cpp \
-	        rempi_status.cpp \
-	        rempi_mf.cpp \
-		rempi_msg_buffer.cpp \
-		rempi_recorder.cpp \
-		rempi_recorder_cdc.cpp \
-		rempi_recorder_rep.cpp \
-		rempi_mpi_init.cpp \
-		rempi_request_mg.cpp \
-		rempi_event_list.cpp \
-	     	rempi_event.cpp \
-		rempi_cp.cpp \
-		rempi_clock.cpp \
-	     	rempi_clock_delta_compression.cpp \
-		rempi_encoder.cpp \
-		rempi_encoder_basic.cpp \
-		rempi_encoder_cdc.cpp \
-		rempi_encoder_rep.cpp \
-		rempi_thread.cpp \
-		rempi_io_thread.cpp \
-		rempi_stm.cpp \
-		rempi_mutex.cpp
-
-lib_LTLIBRARIES = librempi.la
-librempi_la_SOURCES  = $(rempi_SOURCES)
-librempi_la_LIBADD =  $(libz_a_LIB)
-librempi_la_CFLAGS = -lz -lstdc++ -lintlc
-librempi_la_CPPFLAGS = -DREMPI_LITE
-librempi_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -L/opt/ibm/xlC/13.1.5/lib 
-
-if ENABLE_CDC
-
-librempix_la_LIBRARY = librempix.la
-librempix_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
-lib_LTLIBRARIES += $(librempix_la_LIBRARY) 
-# ===== librempix ===== 
-
-librempix_la_SOURCES = $(rempi_SOURCES)
-
-# user-defined custom name             
-librempix_la_OBJECT    = ./librempix_la-librempix.lo
-librempix_la_OBJECT_O  = $(librempix_la_OBJECT:%.lo=%.o)
-librempix_la_OBJECTS_O = $(librempix_la_OBJECTS:%.lo=%.o)
-librempix_la_STACK_PMPI_OBJECT_O = ./librempix.o
-librempix_la_LIBS_OBJECT_O = $(librempix_la_OBJECT:%.lo=.libs/%.o)
-librempix_la_LIBS_OBJECTS_O  = $(librempix_la_OBJECTS:%.lo=.libs/%.o)
-librempix_la_LIBS_STACK_PMPI_OBJECT_O = ./.libs/librempix.o
-
-libclmpi_o_OBJECT = $(clmpi_DIR)/lib/libclmpi.o
-libclmpi_o_LIB_OBJECT = $(clmpi_DIR)/lib/.libs/libclmpi.o
-
-
-# ===== Object file installation =====                     
-install_pic_libdir = $(libdir)/.libs
-dist_install_pic_lib_SCRIPTS = $(librempix_la_LIBS_STACK_PMPI_OBJECT_O) 
-install_non_pic_libdir = $(libdir)
-dist_install_non_pic_lib_SCRIPTS = $(librempix_la_STACK_PMPI_OBJECT_O) 
-
-$(librempix_la_STACK_PMPI_OBJECT_O):
-$(librempix_la_LIBS_STACK_PMPI_OBJECT_O):
-
-$(librempix_la_OBJECT_O): $(librempix_la_OBJECTS_O)
-	ld -o $(librempix_la_OBJECT_O) -r $(librempix_la_OBJECTS_O)
-
-$(librempix_la_LIBS_OBJECT_O): $(librempix_la_LIBS_OBJECTS_O)
-	ld -o $(librempix_la_LIBS_OBJECT_O) -r $(librempix_la_LIBS_OBJECTS_O)
-
-$(librempix_la_LIBRARY): $(librempix_la_OBJECTS) $(librempix_la_DEPENDENCIES) $(librempix_la_OBJECT_O) $(librempix_la_LIBS_OBJECT_O)
-	$(stack_pmpi_DIR)/stack_pmpi $(librempix_la_STACK_PMPI_OBJECT_O) $(librempix_la_OBJECT_O) $(libclmpi_o_OBJECT)
-	$(stack_pmpi_DIR)/stack_pmpi $(librempix_la_LIBS_STACK_PMPI_OBJECT_O) $(librempix_la_LIBS_OBJECT_O) $(libclmpi_o_LIB_OBJECT)
-	echo "# Generated by `$(abs_top_builddir)/libtool --version | head -n 1`" >  $(librempix_la_OBJECT)
-	echo "pic_object='$(librempix_la_LIBS_STACK_PMPI_OBJECT_O)'" >> $(librempix_la_OBJECT)
-	echo "non_pic_object='$(librempix_la_STACK_PMPI_OBJECT_O)'" >> $(librempix_la_OBJECT)
-	$(CXXLINK) -rpath $(libdir) $(librempix_la_OBJECT) $(librempix_la_LIBADD) $(LIBS) $(librempix_la_LDFLAGS) 
-endif
-
-# if ENABLE_CDC
-# librempix_a_LIB = librempix.a
-# lib_LIBRARIES = $(librempix_a_LIB)
-# librempix_so_LIB = librempix.so
-# librempix_a_SOURCES = $(rempi_SOURCES)
-# librempix_a_CFLAGS = -lz -lstdc++ -lintlc
-# librempix_a_LD_OBJECT = librempix.ar.o
-# librempix_a_STACK_PMPI_OBJECT = librempix.stack_pmpi.o
-# clmpi_o_OBJECT = $(clmpi_DIR)/lib/libclmpi.o
-# clmpi_o_LIB_OBJECT = $(clmpi_DIR)/lib/.libs/libclmpi.o
-# workaround_libdir = $(libdir)
-# dist_workaround_lib_SCRIPTS = $(librempix_so_LIB)
-
-
-# $(librempix_a_LIB): $(librempix_a_OBJECTS) $(clmpi_o_OBJECT)
-# 	ld -o $(librempix_a_LD_OBJECT) -r $(librempix_a_OBJECTS) $(libz_a_LIB)
-# 	$(stack_pmpi_DIR)/stack_pmpi $(librempix_a_STACK_PMPI_OBJECT) $(librempix_a_LD_OBJECT) $(clmpi_o_OBJECT)
-# 	ar cr $@ $(librempix_a_STACK_PMPI_OBJECT)
-# 	ranlib $@
-
-# $(librempix_so_LIB): $(librempix_a_LIB)
-# 	$(MPICC) $(AM_CXXFLAGS) $(librempix_a_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) -shared -o $@ $(librempix_a_STACK_PMPI_OBJECT)
-
-# all-local: $(librempix_a_LIB) $(librempix_so_LIB)
-
-# clean-local:
-# 	-rm -f $(librempix_a_LIB) $(librempix_so_LIB) $(librempix_a_OBJECTS) $(librempix_a_LD_OBJECT) $(librempix_a_STACK_PMPI_OBJECT)
-
-# endif
+SUBDIRS = rempi reomp
+ACLOCAL_AMFLAGS = -I m4

src/rempi/Makefile.am

@@ -0,0 +1,117 @@
+SUBDIRS =
+AM_CFLAGS = -fPIC -g -Wall -pthread -std=c++0x -I$(clmpi_DIR)/include/ -I$(libz_a_INCLUDE) 
+AM_CXXFLAGS = $(AM_CFLAGS)
+
+rempi_SOURCES =  \
+		rempi_pmpi.cpp \
+		rempi_err.cpp \
+		rempi_mem.cpp \
+		rempi_util.cpp \
+		rempi_compression_util.cpp \
+		rempi_config.cpp \
+                rempi_re.cpp \
+	        rempi_sig_handler.cpp \
+	        rempi_status.cpp \
+	        rempi_mf.cpp \
+		rempi_msg_buffer.cpp \
+		rempi_recorder.cpp \
+		rempi_recorder_cdc.cpp \
+		rempi_recorder_rep.cpp \
+		rempi_mpi_init.cpp \
+		rempi_request_mg.cpp \
+		rempi_event_list.cpp \
+	     	rempi_event.cpp \
+		rempi_cp.cpp \
+		rempi_clock.cpp \
+	     	rempi_clock_delta_compression.cpp \
+		rempi_encoder.cpp \
+		rempi_encoder_basic.cpp \
+		rempi_encoder_cdc.cpp \
+		rempi_encoder_rep.cpp \
+		rempi_thread.cpp \
+		rempi_io_thread.cpp \
+		rempi_stm.cpp \
+		rempi_mutex.cpp
+
+lib_LTLIBRARIES = librempi.la
+librempi_la_SOURCES  = $(rempi_SOURCES)
+librempi_la_LIBADD =  $(libz_a_LIB)
+librempi_la_CFLAGS = -lz -lstdc++ -lintlc
+librempi_la_CPPFLAGS = -DREMPI_LITE
+librempi_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -L/opt/ibm/xlC/13.1.5/lib 
+
+if ENABLE_CDC
+
+librempix_la_LIBRARY = librempix.la
+librempix_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
+lib_LTLIBRARIES += $(librempix_la_LIBRARY) 
+# ===== librempix ===== 
+
+librempix_la_SOURCES = $(rempi_SOURCES)
+
+# user-defined custom name             
+librempix_la_OBJECT    = ./librempix_la-librempix.lo
+librempix_la_OBJECT_O  = $(librempix_la_OBJECT:%.lo=%.o)
+librempix_la_OBJECTS_O = $(librempix_la_OBJECTS:%.lo=%.o)
+librempix_la_STACK_PMPI_OBJECT_O = ./librempix.o
+librempix_la_LIBS_OBJECT_O = $(librempix_la_OBJECT:%.lo=.libs/%.o)
+librempix_la_LIBS_OBJECTS_O  = $(librempix_la_OBJECTS:%.lo=.libs/%.o)
+librempix_la_LIBS_STACK_PMPI_OBJECT_O = ./.libs/librempix.o
+
+libclmpi_o_OBJECT = $(clmpi_DIR)/lib/libclmpi.o
+libclmpi_o_LIB_OBJECT = $(clmpi_DIR)/lib/.libs/libclmpi.o
+
+
+# ===== Object file installation =====                     
+install_pic_libdir = $(libdir)/.libs
+dist_install_pic_lib_SCRIPTS = $(librempix_la_LIBS_STACK_PMPI_OBJECT_O) 
+install_non_pic_libdir = $(libdir)
+dist_install_non_pic_lib_SCRIPTS = $(librempix_la_STACK_PMPI_OBJECT_O) 
+
+$(librempix_la_STACK_PMPI_OBJECT_O):
+$(librempix_la_LIBS_STACK_PMPI_OBJECT_O):
+
+$(librempix_la_OBJECT_O): $(librempix_la_OBJECTS_O)
+	ld -o $(librempix_la_OBJECT_O) -r $(librempix_la_OBJECTS_O)
+
+$(librempix_la_LIBS_OBJECT_O): $(librempix_la_LIBS_OBJECTS_O)
+	ld -o $(librempix_la_LIBS_OBJECT_O) -r $(librempix_la_LIBS_OBJECTS_O)
+
+$(librempix_la_LIBRARY): $(librempix_la_OBJECTS) $(librempix_la_DEPENDENCIES) $(librempix_la_OBJECT_O) $(librempix_la_LIBS_OBJECT_O)
+	$(stack_pmpi_DIR)/stack_pmpi $(librempix_la_STACK_PMPI_OBJECT_O) $(librempix_la_OBJECT_O) $(libclmpi_o_OBJECT)
+	$(stack_pmpi_DIR)/stack_pmpi $(librempix_la_LIBS_STACK_PMPI_OBJECT_O) $(librempix_la_LIBS_OBJECT_O) $(libclmpi_o_LIB_OBJECT)
+	echo "# Generated by `$(abs_top_builddir)/libtool --version | head -n 1`" >  $(librempix_la_OBJECT)
+	echo "pic_object='$(librempix_la_LIBS_STACK_PMPI_OBJECT_O)'" >> $(librempix_la_OBJECT)
+	echo "non_pic_object='$(librempix_la_STACK_PMPI_OBJECT_O)'" >> $(librempix_la_OBJECT)
+	$(CXXLINK) -rpath $(libdir) $(librempix_la_OBJECT) $(librempix_la_LIBADD) $(LIBS) $(librempix_la_LDFLAGS) 
+endif
+
+# if ENABLE_CDC
+# librempix_a_LIB = librempix.a
+# lib_LIBRARIES = $(librempix_a_LIB)
+# librempix_so_LIB = librempix.so
+# librempix_a_SOURCES = $(rempi_SOURCES)
+# librempix_a_CFLAGS = -lz -lstdc++ -lintlc
+# librempix_a_LD_OBJECT = librempix.ar.o
+# librempix_a_STACK_PMPI_OBJECT = librempix.stack_pmpi.o
+# clmpi_o_OBJECT = $(clmpi_DIR)/lib/libclmpi.o
+# clmpi_o_LIB_OBJECT = $(clmpi_DIR)/lib/.libs/libclmpi.o
+# workaround_libdir = $(libdir)
+# dist_workaround_lib_SCRIPTS = $(librempix_so_LIB)
+
+
+# $(librempix_a_LIB): $(librempix_a_OBJECTS) $(clmpi_o_OBJECT)
+# 	ld -o $(librempix_a_LD_OBJECT) -r $(librempix_a_OBJECTS) $(libz_a_LIB)
+# 	$(stack_pmpi_DIR)/stack_pmpi $(librempix_a_STACK_PMPI_OBJECT) $(librempix_a_LD_OBJECT) $(clmpi_o_OBJECT)
+# 	ar cr $@ $(librempix_a_STACK_PMPI_OBJECT)
+# 	ranlib $@
+
+# $(librempix_so_LIB): $(librempix_a_LIB)
+# 	$(MPICC) $(AM_CXXFLAGS) $(librempix_a_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) -shared -o $@ $(librempix_a_STACK_PMPI_OBJECT)
+
+# all-local: $(librempix_a_LIB) $(librempix_so_LIB)
+
+# clean-local:
+# 	-rm -f $(librempix_a_LIB) $(librempix_so_LIB) $(librempix_a_OBJECTS) $(librempix_a_LD_OBJECT) $(librempix_a_STACK_PMPI_OBJECT)
+
+# endif

src/rempi_re.cpp → src/rempi/rempi_re.cpp

@@ -41,7 +41,7 @@
 #include "rempi_request_mg.h"
 #include "rempi_sig_handler.h"
 
-#include "llvm/reomp.h"
+#include "../reomp/reomp.h"
 
 using namespace std;
 

src/llvm/Makefile.am → src/reomp/Makefile.am

@@ -1,7 +1,6 @@
 AM_CFLAGS = -fPIC -g -Wall -pthread -std=c++0x -rdynamic
 AM_CXXFLAGS = $(AM_CFLAGS)
 
-
 lib_LTLIBRARIES = libreompir.la libreomp.la
 
 reompir_SOURCES =  \

src/llvm/mutil.cpp → src/reomp/mutil.cpp

@@ -30,7 +30,7 @@ typedef struct
 } timer_counters_t;
 
 using namespace std;
-int mutil_my_rank = -1;
+int mutil_my_rank = 0;
 char mutil_hostname[256];
 char header[128];
 char message[2048];

src/llvm/mutil.h → src/reomp/mutil.h

@@ -39,9 +39,10 @@ extern char mutil_hostname[256];
 		    __FILE__, __LINE__);	\
   } while(0)
 
-
-
-
+#define MUTIL_PRT(prt_fmt, ...)					\
+  do {								\
+    MUTIL_FUNC(print)(" "	prt_fmt, ## __VA_ARGS__);	\
+  } while(0)
 
 /*if __VA_ARGS__ is empty, the previous comma can be removed by "##" statement*/
 #define MUTIL_DBGI(i, dbg_fmt, ...)		\
@@ -76,6 +77,7 @@ void MUTIL_FUNC(set_configuration)(int *argc, char ***argv);
 void MUTIL_FUNC(assert)(int b);
 void MUTIL_FUNC(init)(int r);
 void MUTIL_FUNC(err)(const char* fmt, ...);
+void MUTIL_FUNC(print)(const char* fmt, ...);
 void MUTIL_FUNC(erri)(int r, const char* fmt, ...);
 void MUTIL_FUNC(alert)(const char* fmt, ...);
 void MUTIL_FUNC(dbg_log_print)();

src/llvm/reomp.cpp → src/reomp/reomp.cpp

@@ -49,7 +49,7 @@ void reomp_finalize()
   REOMP_PROFILE(reomp_profile_print());
   REOMP_PROFILE(reomp_profile_finalize());
   end_time = reomp_util_get_time();
-  MUTIL_DBG("ReOMP time: %f", end_time - start_time);
+  //  MUTIL_DBG("ReOMP time: %f", end_time - start_time);
   return;
 }
 

src/llvm/reomp_config.cpp → src/reomp/reomp_config.cpp

@@ -66,16 +66,16 @@ void reomp_config_init()
     }
   }
 
-  MUTIL_DBG("=============================");
-  MUTIL_DBG("ReOMP mode   : %s=%d", REOMP_ENV_NAME_MODE, reomp_config.mode);
-  MUTIL_DBG("ReOMP method : %s=%d", REOMP_ENV_NAME_METHOD, reomp_config.method);
+  MUTIL_PRT("=============================");
+  MUTIL_PRT("ReOMP mode   : %s=%d", REOMP_ENV_NAME_MODE, reomp_config.mode);
+  MUTIL_PRT("ReOMP method : %s=%d", REOMP_ENV_NAME_METHOD, reomp_config.method);
 #ifdef REOMP_PROFILE_ENABLE
-  MUTIL_DBG("ReOMP profile level: %s=%d", REOMP_ENV_NAME_PROFILE, reomp_config.profile_level);
+  MUTIL_PRT("ReOMP profile level: %s=%d", REOMP_ENV_NAME_PROFILE, reomp_config.profile_level);
 #else
-  MUTIL_DBG("ReOMP profile level: %s is not defined", REOMP_ENV_NAME_PROFILE);
+  MUTIL_PRT("ReOMP profile level: %s is not defined", REOMP_ENV_NAME_PROFILE);
 #endif
-  MUTIL_DBG("ReOMP dir    : %s=%s", REOMP_ENV_NAME_DIR, reomp_config.record_dir);
-  MUTIL_DBG("=============================");
+  MUTIL_PRT("ReOMP dir    : %s=%s", REOMP_ENV_NAME_DIR, reomp_config.record_dir);
+  MUTIL_PRT("=============================");
 
   return;
 }

src/llvm/reomp_drace.cpp → src/reomp/reomp_drace.cpp

@@ -703,8 +703,9 @@ static void drace_parse_archer_log()
   struct dirent *dp;
 
   if (NULL == (env = getenv("TSAN_OPTIONS"))) {
-    drace_parse_archer_error();
-  }
+    // drace_parse_archer_error();
+    return;
+  } 
   /* e.g.)  env="history_size=7 log_path=rempi_drace_test.log" */
   log_path = strstr(env, "log_path");
   if(log_path == NULL) {

src/llvm/reomp_gate_clock.cpp → src/reomp/reomp_gate_clock.cpp

@@ -169,7 +169,7 @@ static void reomp_cgate_finalize_file()
   MUTIL_TIMER(MUTIL_TIMER_GET_TIME, REOMP_TIMER_ENTIRE, &entire_time);
   MUTIL_TIMER(MUTIL_TIMER_GET_TIME, REOMP_TIMER_GATE_TIME, &gate_time);
   MUTIL_TIMER(MUTIL_TIMER_GET_TIME, REOMP_TIMER_IO_TIME, &io_time);
-  MUTIL_DBG("Overhead: %f (Gate: %f, IO: %f) method= %d", entire_time, gate_time, io_time, reomp_config.method);
+  //  MUTIL_DBG("Overhead: %f (Gate: %f, IO: %f) method= %d", entire_time, gate_time, io_time, reomp_config.method);
   return;
 }