From 32617c2f4f980611eed1d81d843c3a98a4e93fd2 Mon Sep 17 00:00:00 2001 From: Patrick Lavin Date: Tue, 6 Aug 2024 13:29:52 -0600 Subject: [PATCH] Refactor new Ariel automake files --- config/sst_check_ariel_mpi.m4 | 10 + src/sst/elements/ariel/api/Makefile.am | 27 +- src/sst/elements/ariel/api/arielapi.c | 13 +- src/sst/elements/ariel/configure.m4 | 4 + .../elements/ariel/frontend/pin3/fesimple.cc | 2 + .../frontend/simple/examples/stream/Makefile | 19 -- .../simple/examples/stream/Makefile.am | 12 + .../tests/refFiles/test_Ariel_ariel_ivb.out | 268 +++++++++--------- .../tests/refFiles/test_Ariel_ariel_snb.out | 164 ++++++----- .../refFiles/test_Ariel_ariel_snb_mlm.out | 108 ++++--- .../tests/refFiles/test_Ariel_memHstream.out | 83 ++++-- .../tests/refFiles/test_Ariel_runstream.out | 56 +++- .../tests/refFiles/test_Ariel_runstreamNB.out | 54 +++- .../tests/refFiles/test_Ariel_runstreamSt.out | 61 ++-- src/sst/elements/ariel/mpi/.gitignore | 2 - src/sst/elements/ariel/mpi/Makefile.am | 33 +-- .../elements/ariel/tests/testMPI/Makefile.am | 11 + .../{mpi => tests/testMPI}/ariel-reduce.py | 0 .../ariel/{mpi => tests/testMPI}/demo1.py | 0 .../ariel/{mpi => tests/testMPI}/hello.cc | 0 .../ariel/{mpi => tests/testMPI}/reduce.cc | 0 .../elements/ariel/tests/testMPI/test-mpi.py | 4 +- .../ariel/tests/testsuite_default_Ariel.py | 14 +- .../ariel/tests/testsuite_mpi_Ariel.py | 13 +- .../ariel/tests/testsuite_testio_Ariel.py | 2 +- 25 files changed, 567 insertions(+), 393 deletions(-) delete mode 100644 src/sst/elements/ariel/frontend/simple/examples/stream/Makefile create mode 100644 src/sst/elements/ariel/frontend/simple/examples/stream/Makefile.am create mode 100644 src/sst/elements/ariel/tests/testMPI/Makefile.am rename src/sst/elements/ariel/{mpi => tests/testMPI}/ariel-reduce.py (100%) rename src/sst/elements/ariel/{mpi => tests/testMPI}/demo1.py (100%) rename src/sst/elements/ariel/{mpi => tests/testMPI}/hello.cc (100%) rename src/sst/elements/ariel/{mpi => tests/testMPI}/reduce.cc (100%) diff --git a/config/sst_check_ariel_mpi.m4 b/config/sst_check_ariel_mpi.m4 index e033cdf6a3..67bff24260 100644 --- a/config/sst_check_ariel_mpi.m4 +++ b/config/sst_check_ariel_mpi.m4 @@ -40,6 +40,16 @@ AC_DEFUN([SST_CHECK_ARIEL_MPI], [ dnl will save them in new variables. ARIEL_MPICC=$MPICC ARIEL_MPICXX=$MPICXX + ARIEL_MPI_CFLAGS=$($MPICC -showme:compile) + ARIEL_MPI_LIBS=$($MPICC -showme:link) + dnl ARIEL_MPI_CFLAGS=$MPICC + dnl ARIEL_MPI_LIBS=$MPICXX + AC_MSG_NOTICE([-> Patrick <- ARIEL_MPI_CFLAGS is $ARIEL_MPI_CFLAGS]) + AC_MSG_NOTICE([-> Patrick <- ARIEL_MPI_LIBS is $ARIEL_MPI_LIBS]) + + AS_IF([test "$sst_check_ariel_mpi_happy" = "yes"], [ + AC_DEFINE([ENABLE_ARIEL_MPI], [1], [Enable Ariel MPI features]) + ]) AM_CONDITIONAL([SST_USE_ARIEL_MPI], [test "$sst_check_ariel_mpi_happy" = "yes"]) ]) diff --git a/src/sst/elements/ariel/api/Makefile.am b/src/sst/elements/ariel/api/Makefile.am index a28d6b183b..a725f10324 100644 --- a/src/sst/elements/ariel/api/Makefile.am +++ b/src/sst/elements/ariel/api/Makefile.am @@ -1,7 +1,20 @@ -CC=$(ARIEL_MPICC) -CXX=$(ARIEL_MPICXX) -CFLAGS+=-fopenmp -CXXFLAGS+=fopenmp -lib_LTLIBRARIES = libarielapi.la -libarielapi_la_SOURCES = arielapi.c arielapi.h -include_HEADERS = arielapi.h +if SST_USE_ARIEL_MPI +CFLAGS+=-fopenmp $(ARIEL_MPI_CFLAGS) +CC_LOCAL = $(ARIEL_MPICC) +else +CC_LOCAL = $(CC) +endif + +all-local: libarielapi.so libarielapi.a + +libarielapi.so: arielapi.c arielapi.h + $(CC_LOCAL) -DENABLE_ARIEL_MPI $(AM_CFLAGS) $(ARIEL_MPI_CFLAGS) -fPIC -shared -o libarielapi.so arielapi.c -fopenmp + +arielapi.o: arielapi.c arielapi.h + $(CC_LOCAL) -DENABLE_ARIEL_MPI $(AM_CFLAGS) $(ARIEL_MPI_CFLAGS) -c -o arielapi.o arielapi.c -fopenmp + +libarielapi.a: arielapi.o + ar rcs $@ $^ + +clean-local: + rm arielapi.o libarielapi.a libarielapi.so diff --git a/src/sst/elements/ariel/api/arielapi.c b/src/sst/elements/ariel/api/arielapi.c index ee5e1976d6..1fc806a67e 100644 --- a/src/sst/elements/ariel/api/arielapi.c +++ b/src/sst/elements/ariel/api/arielapi.c @@ -17,9 +17,8 @@ #include #include #include -#if __has_include() +#if ENABLE_ARIEL_MPI #include -#define HAVE_MPI_H #endif /* These definitions are replaced during simulation */ @@ -63,7 +62,7 @@ void omp_parallel_region() { } } #else - printf("ERROR: libarielapi.c: libarielapi was compiled without OpenMP enabled\n"); + printf("ERROR: arielapi.c: libarielapi was compiled without OpenMP enabled\n"); exit(1); #endif } @@ -78,14 +77,14 @@ int _api_mpi_init() { // Custom version of MPI_Init. We override the normal version in order to call an // OpenMP parallel region to ensure threads are numbered properly by the frontend. int MPI_Init(int *argc, char ***argv) { -#ifdef HAVE_MPI_H +#ifdef ENABLE_ARIEL_MPI // Communicate to the frontend that we have replaced the nomal MPI_Init with // the one in the Ariel API _api_mpi_init(); omp_parallel_region(); return PMPI_Init(argc, argv); #else - printf("Error: arielapi.c: MPI_Init called in arielapi.c but this file was compiled without MPI. Please recompile the API with `CC=mpicc make`.\n"); + printf("Error: arielapi.c: MPI_Init called in arielapi.c but this file was compiled without MPI. Please recompile the API with `CC=mpicc make`12341234.\n"); exit(1); #endif } @@ -93,14 +92,14 @@ int MPI_Init(int *argc, char ***argv) { // Custom version of MPI_Init_thread. We override the normal verison in order to call an // OpenMP parallel region to ensure threads are numbered properly by the frontend. int MPI_Init_thread(int *argc, char ***argv, int required, int *provided) { -#ifdef HAVE_MPI_H +#ifdef ENABLE_ARIEL_MPI // Communicate to the frontend that we have replaced the nomal MPI_Init_thread with // the one in the Ariel API _api_mpi_init(); omp_parallel_region(); return PMPI_Init_thread(argc, argv, required, provided); #else - printf("Error: arielapi.c: MPI_Init_thread called in arielapi.c but this file was compiled without MPI. Please recompile the API with `CC=mpicc make`.\n"); + printf("Error: arielapi.c: MPI_Init_thread called in arielapi.c but this file was compiled without MPI. Please recompile the API with `CC=mpicc make`123123.\n"); exit(1); #endif } diff --git a/src/sst/elements/ariel/configure.m4 b/src/sst/elements/ariel/configure.m4 index dac9cd74e9..c8168db1e3 100644 --- a/src/sst/elements/ariel/configure.m4 +++ b/src/sst/elements/ariel/configure.m4 @@ -16,9 +16,13 @@ AC_DEFUN([SST_ariel_CONFIG], [ AC_SUBST([ARIEL_MPICC]) AC_SUBST([ARIEL_MPICXX]) + AC_SUBST([ARIEL_MPI_CFLAGS]) + AC_SUBST([ARIEL_MPI_LIBS]) AC_CONFIG_FILES([src/sst/elements/ariel/api/Makefile]) AC_CONFIG_FILES([src/sst/elements/ariel/mpi/Makefile]) + AC_CONFIG_FILES([src/sst/elements/ariel/tests/testMPI/Makefile]) + AC_CONFIG_FILES([src/sst/elements/ariel/frontend/simple/examples/stream/Makefile]) AS_IF([test "$sst_check_ariel" = "yes"], [$1], [$2]) ]) diff --git a/src/sst/elements/ariel/frontend/pin3/fesimple.cc b/src/sst/elements/ariel/frontend/pin3/fesimple.cc index 1c0c6e6976..0343c7d3e1 100644 --- a/src/sst/elements/ariel/frontend/pin3/fesimple.cc +++ b/src/sst/elements/ariel/frontend/pin3/fesimple.cc @@ -1922,7 +1922,9 @@ VOID InstrumentRoutine(RTN rtn, VOID* args) } void fork_disable_child_output(THREADID threadid, const CONTEXT *ctx, VOID *v) { +#ifdef ARIEL_DEBUG fprintf(stderr, "Warning: fesimple cannot trace forked processes. Disabling Pin for pid %d\n", getpid()); +#endif PIN_Detach(); } diff --git a/src/sst/elements/ariel/frontend/simple/examples/stream/Makefile b/src/sst/elements/ariel/frontend/simple/examples/stream/Makefile deleted file mode 100644 index 669ff7ac28..0000000000 --- a/src/sst/elements/ariel/frontend/simple/examples/stream/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -CXX=g++ - -stream: stream.o - $(CXX) -O3 -o stream -fopenmp stream.o - -stream.o: stream.c - $(CXX) -O3 -o stream.o -fopenmp -c stream.c - -stream_mlm: stream_mlm.o - $(CXX) -O3 -o stream_mlm -fopenmp -L$(ARIELAPI) stream_mlm.o -larielapi - -stream_mlm.o: stream_malloc.c - $(CXX) -O3 -o stream_mlm.o -fopenmp -I$(ARIELAPI) -c stream_malloc.c - -all: stream stream_mlm - -clean: - rm stream stream.o stream_mlm stream_mlm.o - diff --git a/src/sst/elements/ariel/frontend/simple/examples/stream/Makefile.am b/src/sst/elements/ariel/frontend/simple/examples/stream/Makefile.am new file mode 100644 index 0000000000..7d933e9a28 --- /dev/null +++ b/src/sst/elements/ariel/frontend/simple/examples/stream/Makefile.am @@ -0,0 +1,12 @@ +API_DIR = ../../../../api + +all-local: stream stream_mlm + +clean-local: + rm -f stream stream_mlm + +stream: + $(CXX) stream.c -o stream -I$(API_DIR) -L$(API_DIR) -larielapi + +stream_mlm: + $(CXX) stream_malloc.c -o stream_mlm -I$(API_DIR) -L$(API_DIR) -larielapi diff --git a/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_ariel_ivb.out b/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_ariel_ivb.out index c0072829b8..2b72a02372 100644 --- a/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_ariel_ivb.out +++ b/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_ariel_ivb.out @@ -39,217 +39,215 @@ Creating L3 cache block: 3 in group: 3 Creating L3 cache block: 4 in group: 3 Completed configuring the SST Sandy Bridge model SSTARIEL: Function profiling is disabled. -ARIEL-SST: Did not find ARIEL_OVERRIDE_POOL in the environment, no override applies. -ARIEL-SST PIN tool activating with 12 threads -ARIEL: Default memory pool set to 0 -ARIEL: Tool is configured to begin with profiling immediately. -ARIEL: Starting program. -Identified routine: malloc/_malloc, replacing with Ariel equivalent... -Identified routine: malloc/_malloc, replacing with Ariel equivalent... -Identified routine: free/_free, replacing with Ariel equivalent... -Identified routine: malloc/_malloc, replacing with Ariel equivalent... -Identified routine: free/_free, replacing with Ariel equivalent... -Identified routine: malloc/_malloc, replacing with Ariel equivalent... -Identified routine: clock_gettime, replacing with Ariel equivalent... -Replacement complete. 0 Performing iteration 0 6 Performing iteration 0 -8 Performing iteration 0 -5 Performing iteration 0 -3 Performing iteration 0 -11 Performing iteration 0 7 Performing iteration 0 +5 Performing iteration 0 4 Performing iteration 0 -9 Performing iteration 0 10 Performing iteration 0 -1 Performing iteration 0 2 Performing iteration 0 -8 Performing iteration 1 +1 Performing iteration 0 +9 Performing iteration 0 +11 Performing iteration 0 +8 Performing iteration 0 +3 Performing iteration 0 +2 Performing iteration 1 4 Performing iteration 1 -10 Performing iteration 1 -11 Performing iteration 1 0 Performing iteration 1 1 Performing iteration 1 +10 Performing iteration 1 +8 Performing iteration 1 3 Performing iteration 1 -9 Performing iteration 1 +11 Performing iteration 1 5 Performing iteration 1 -6 Performing iteration 1 +9 Performing iteration 1 7 Performing iteration 1 -2 Performing iteration 1 -2 Performing iteration 2 -9 Performing iteration 2 -11 Performing iteration 2 -7 Performing iteration 2 -8 Performing iteration 2 -10 Performing iteration 2 +6 Performing iteration 1 0 Performing iteration 2 +5 Performing iteration 2 6 Performing iteration 2 -1 Performing iteration 2 3 Performing iteration 2 -5 Performing iteration 2 +11 Performing iteration 2 4 Performing iteration 2 +8 Performing iteration 2 +9 Performing iteration 2 +2 Performing iteration 2 +1 Performing iteration 2 +10 Performing iteration 2 +7 Performing iteration 2 +9 Performing iteration 3 +5 Performing iteration 3 +8 Performing iteration 3 +3 Performing iteration 3 11 Performing iteration 3 +4 Performing iteration 3 +0 Performing iteration 3 2 Performing iteration 3 -3 Performing iteration 3 -8 Performing iteration 3 -10 Performing iteration 3 7 Performing iteration 3 -9 Performing iteration 3 6 Performing iteration 3 +10 Performing iteration 3 1 Performing iteration 3 -0 Performing iteration 3 -5 Performing iteration 3 -4 Performing iteration 3 +9 Performing iteration 4 +10 Performing iteration 4 +8 Performing iteration 4 6 Performing iteration 4 2 Performing iteration 4 -7 Performing iteration 4 -8 Performing iteration 4 -10 Performing iteration 4 -4 Performing iteration 4 -0 Performing iteration 4 -9 Performing iteration 4 -3 Performing iteration 4 11 Performing iteration 4 5 Performing iteration 4 1 Performing iteration 4 +0 Performing iteration 4 +3 Performing iteration 4 +4 Performing iteration 4 +7 Performing iteration 4 6 Performing iteration 5 0 Performing iteration 5 -4 Performing iteration 5 -7 Performing iteration 5 -8 Performing iteration 5 -11 Performing iteration 5 -2 Performing iteration 5 -9 Performing iteration 5 1 Performing iteration 5 -10 Performing iteration 5 +2 Performing iteration 5 +8 Performing iteration 5 3 Performing iteration 5 +4 Performing iteration 5 +9 Performing iteration 5 5 Performing iteration 5 -7 Performing iteration 6 -8 Performing iteration 6 +10 Performing iteration 5 +7 Performing iteration 5 +11 Performing iteration 5 9 Performing iteration 6 -5 Performing iteration 6 -10 Performing iteration 6 -2 Performing iteration 6 +0 Performing iteration 6 +4 Performing iteration 6 +6 Performing iteration 6 3 Performing iteration 6 +2 Performing iteration 6 1 Performing iteration 6 -0 Performing iteration 6 +10 Performing iteration 6 +5 Performing iteration 6 +8 Performing iteration 6 11 Performing iteration 6 -6 Performing iteration 6 -4 Performing iteration 6 -1 Performing iteration 7 -3 Performing iteration 7 -11 Performing iteration 7 -10 Performing iteration 7 +7 Performing iteration 6 2 Performing iteration 7 +7 Performing iteration 7 9 Performing iteration 7 +4 Performing iteration 7 5 Performing iteration 7 +11 Performing iteration 7 8 Performing iteration 7 -6 Performing iteration 7 +1 Performing iteration 7 +3 Performing iteration 7 0 Performing iteration 7 -7 Performing iteration 7 -4 Performing iteration 7 -3 Performing iteration 8 -2 Performing iteration 8 +6 Performing iteration 7 +10 Performing iteration 7 +0 Performing iteration 8 1 Performing iteration 8 -5 Performing iteration 8 -6 Performing iteration 8 -11 Performing iteration 8 -10 Performing iteration 8 +3 Performing iteration 8 7 Performing iteration 8 +11 Performing iteration 8 9 Performing iteration 8 -0 Performing iteration 8 +6 Performing iteration 8 4 Performing iteration 8 8 Performing iteration 8 -6 Performing iteration 9 -3 Performing iteration 9 -0 Performing iteration 9 -5 Performing iteration 9 -11 Performing iteration 9 -2 Performing iteration 9 -1 Performing iteration 9 +5 Performing iteration 8 +10 Performing iteration 8 +2 Performing iteration 8 10 Performing iteration 9 4 Performing iteration 9 -9 Performing iteration 9 +1 Performing iteration 9 7 Performing iteration 9 +11 Performing iteration 9 8 Performing iteration 9 -8 Performing iteration 10 -11 Performing iteration 10 -9 Performing iteration 10 -10 Performing iteration 10 -7 Performing iteration 10 -0 Performing iteration 10 -1 Performing iteration 10 -4 Performing iteration 10 +5 Performing iteration 9 +2 Performing iteration 9 +3 Performing iteration 9 +9 Performing iteration 9 +0 Performing iteration 9 +6 Performing iteration 9 3 Performing iteration 10 -2 Performing iteration 10 +0 Performing iteration 10 +9 Performing iteration 10 5 Performing iteration 10 +2 Performing iteration 10 +8 Performing iteration 10 +1 Performing iteration 10 6 Performing iteration 10 -7 Performing iteration 11 +7 Performing iteration 10 +10 Performing iteration 10 +4 Performing iteration 10 +11 Performing iteration 10 +4 Performing iteration 11 6 Performing iteration 11 -11 Performing iteration 11 -5 Performing iteration 11 -9 Performing iteration 11 +7 Performing iteration 11 10 Performing iteration 11 -1 Performing iteration 11 -0 Performing iteration 11 2 Performing iteration 11 +5 Performing iteration 11 +11 Performing iteration 11 8 Performing iteration 11 3 Performing iteration 11 -4 Performing iteration 11 -6 Performing iteration 12 -10 Performing iteration 12 -11 Performing iteration 12 -9 Performing iteration 12 -8 Performing iteration 12 -1 Performing iteration 12 +1 Performing iteration 11 +9 Performing iteration 11 +0 Performing iteration 11 4 Performing iteration 12 +3 Performing iteration 12 +9 Performing iteration 12 +10 Performing iteration 12 2 Performing iteration 12 -7 Performing iteration 12 5 Performing iteration 12 +6 Performing iteration 12 +7 Performing iteration 12 +11 Performing iteration 12 0 Performing iteration 12 -3 Performing iteration 12 -4 Performing iteration 13 +8 Performing iteration 12 +1 Performing iteration 12 +8 Performing iteration 13 +11 Performing iteration 13 9 Performing iteration 13 -7 Performing iteration 13 +5 Performing iteration 13 +4 Performing iteration 13 +6 Performing iteration 13 10 Performing iteration 13 +1 Performing iteration 13 3 Performing iteration 13 -0 Performing iteration 13 -8 Performing iteration 13 2 Performing iteration 13 -5 Performing iteration 13 -1 Performing iteration 13 -11 Performing iteration 13 -6 Performing iteration 13 -10 Performing iteration 14 +0 Performing iteration 13 +7 Performing iteration 13 +5 Performing iteration 14 +0 Performing iteration 14 +3 Performing iteration 14 4 Performing iteration 14 +8 Performing iteration 14 11 Performing iteration 14 -6 Performing iteration 14 -7 Performing iteration 14 -1 Performing iteration 14 9 Performing iteration 14 -3 Performing iteration 14 -8 Performing iteration 14 +1 Performing iteration 14 2 Performing iteration 14 -0 Performing iteration 14 -5 Performing iteration 14 -11 Performing iteration 15 -4 Performing iteration 15 -5 Performing iteration 15 +10 Performing iteration 14 +6 Performing iteration 14 +7 Performing iteration 14 8 Performing iteration 15 -0 Performing iteration 15 -3 Performing iteration 15 +2 Performing iteration 15 +1 Performing iteration 15 9 Performing iteration 15 +5 Performing iteration 15 +4 Performing iteration 15 +3 Performing iteration 15 6 Performing iteration 15 -10 Performing iteration 15 -1 Performing iteration 15 -2 Performing iteration 15 +0 Performing iteration 15 +11 Performing iteration 15 7 Performing iteration 15 +10 Performing iteration 15 CORE ID: 0 PROCESSED AN EXIT EVENT Ariel Memory Management Statistics: --------------------------------------------------------------------- Page Table Sizes: -- Map entries 249 +- Map entries 308 Page Table Coverages: -- Bytes 1019904 -Simulation is complete, simulated time: 968.598 us +- Bytes 1261568 +Simulation is complete, simulated time: 2.64704 ms +ARIEL-SST: Did not find ARIEL_OVERRIDE_POOL in the environment, no override applies. +ARIEL-SST PIN tool activating with 12 threads +ARIEL: Default memory pool set to 0 +ARIEL: Tool is configured to begin with profiling immediately. +ARIEL: Starting program. +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. +Identified routine: malloc/_malloc, replacing with Ariel equivalent... +Identified routine: free/_free, replacing with Ariel equivalent... +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. diff --git a/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_ariel_snb.out b/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_ariel_snb.out index 9a3733dd22..6077f0fa0d 100644 --- a/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_ariel_snb.out +++ b/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_ariel_snb.out @@ -34,153 +34,151 @@ Creating L3 cache block: 3 in group: 3 Creating L3 cache block: 4 in group: 3 Completed configuring the SST Sandy Bridge model SSTARIEL: Function profiling is disabled. -ARIEL-SST: Did not find ARIEL_OVERRIDE_POOL in the environment, no override applies. -ARIEL-SST PIN tool activating with 8 threads -ARIEL: Default memory pool set to 0 -ARIEL: Tool is configured to begin with profiling immediately. -ARIEL: Starting program. -Identified routine: malloc/_malloc, replacing with Ariel equivalent... -Identified routine: malloc/_malloc, replacing with Ariel equivalent... -Identified routine: free/_free, replacing with Ariel equivalent... -Identified routine: malloc/_malloc, replacing with Ariel equivalent... -Identified routine: free/_free, replacing with Ariel equivalent... -Identified routine: malloc/_malloc, replacing with Ariel equivalent... -Identified routine: clock_gettime, replacing with Ariel equivalent... -Replacement complete. -0 Performing iteration 0 -5 Performing iteration 0 2 Performing iteration 0 -7 Performing iteration 0 -4 Performing iteration 0 1 Performing iteration 0 +7 Performing iteration 0 +0 Performing iteration 0 6 Performing iteration 0 3 Performing iteration 0 -0 Performing iteration 1 +5 Performing iteration 0 +4 Performing iteration 0 4 Performing iteration 1 -6 Performing iteration 1 -7 Performing iteration 1 -2 Performing iteration 1 -5 Performing iteration 1 1 Performing iteration 1 3 Performing iteration 1 -4 Performing iteration 2 -0 Performing iteration 2 -1 Performing iteration 2 -3 Performing iteration 2 +2 Performing iteration 1 +7 Performing iteration 1 +5 Performing iteration 1 +0 Performing iteration 1 +6 Performing iteration 1 +6 Performing iteration 2 5 Performing iteration 2 7 Performing iteration 2 -6 Performing iteration 2 +4 Performing iteration 2 +3 Performing iteration 2 +1 Performing iteration 2 2 Performing iteration 2 +0 Performing iteration 2 +3 Performing iteration 3 +2 Performing iteration 3 6 Performing iteration 3 -4 Performing iteration 3 5 Performing iteration 3 -1 Performing iteration 3 7 Performing iteration 3 -3 Performing iteration 3 0 Performing iteration 3 -2 Performing iteration 3 +1 Performing iteration 3 +4 Performing iteration 3 1 Performing iteration 4 -6 Performing iteration 4 -2 Performing iteration 4 -7 Performing iteration 4 5 Performing iteration 4 4 Performing iteration 4 -0 Performing iteration 4 +6 Performing iteration 4 +2 Performing iteration 4 3 Performing iteration 4 +0 Performing iteration 4 +7 Performing iteration 4 2 Performing iteration 5 -5 Performing iteration 5 -7 Performing iteration 5 4 Performing iteration 5 0 Performing iteration 5 6 Performing iteration 5 -3 Performing iteration 5 +7 Performing iteration 5 1 Performing iteration 5 -4 Performing iteration 6 -1 Performing iteration 6 +3 Performing iteration 5 +5 Performing iteration 5 +7 Performing iteration 6 +3 Performing iteration 6 +2 Performing iteration 6 5 Performing iteration 6 6 Performing iteration 6 0 Performing iteration 6 -3 Performing iteration 6 -2 Performing iteration 6 -7 Performing iteration 6 -7 Performing iteration 7 -1 Performing iteration 7 -0 Performing iteration 7 +4 Performing iteration 6 +1 Performing iteration 6 +6 Performing iteration 7 3 Performing iteration 7 +5 Performing iteration 7 4 Performing iteration 7 +1 Performing iteration 7 2 Performing iteration 7 -6 Performing iteration 7 -5 Performing iteration 7 -1 Performing iteration 8 -6 Performing iteration 8 +0 Performing iteration 7 +7 Performing iteration 7 0 Performing iteration 8 -4 Performing iteration 8 -3 Performing iteration 8 -7 Performing iteration 8 +6 Performing iteration 8 2 Performing iteration 8 5 Performing iteration 8 -0 Performing iteration 9 -4 Performing iteration 9 +3 Performing iteration 8 +7 Performing iteration 8 +1 Performing iteration 8 +4 Performing iteration 8 6 Performing iteration 9 5 Performing iteration 9 -1 Performing iteration 9 +2 Performing iteration 9 7 Performing iteration 9 3 Performing iteration 9 -2 Performing iteration 9 -6 Performing iteration 10 -2 Performing iteration 10 +0 Performing iteration 9 +4 Performing iteration 9 +1 Performing iteration 9 +4 Performing iteration 10 7 Performing iteration 10 +5 Performing iteration 10 0 Performing iteration 10 +2 Performing iteration 10 1 Performing iteration 10 -4 Performing iteration 10 -5 Performing iteration 10 3 Performing iteration 10 +6 Performing iteration 10 +2 Performing iteration 11 +1 Performing iteration 11 +0 Performing iteration 11 7 Performing iteration 11 4 Performing iteration 11 -5 Performing iteration 11 -0 Performing iteration 11 3 Performing iteration 11 +5 Performing iteration 11 6 Performing iteration 11 -1 Performing iteration 11 -2 Performing iteration 11 -3 Performing iteration 12 -0 Performing iteration 12 -6 Performing iteration 12 7 Performing iteration 12 +6 Performing iteration 12 +3 Performing iteration 12 4 Performing iteration 12 -1 Performing iteration 12 5 Performing iteration 12 +1 Performing iteration 12 2 Performing iteration 12 +0 Performing iteration 12 +3 Performing iteration 13 +7 Performing iteration 13 6 Performing iteration 13 -0 Performing iteration 13 -2 Performing iteration 13 +4 Performing iteration 13 1 Performing iteration 13 -7 Performing iteration 13 -3 Performing iteration 13 5 Performing iteration 13 -4 Performing iteration 13 -0 Performing iteration 14 -6 Performing iteration 14 -7 Performing iteration 14 +2 Performing iteration 13 +0 Performing iteration 13 5 Performing iteration 14 +6 Performing iteration 14 +0 Performing iteration 14 3 Performing iteration 14 1 Performing iteration 14 2 Performing iteration 14 4 Performing iteration 14 +7 Performing iteration 14 5 Performing iteration 15 +4 Performing iteration 15 2 Performing iteration 15 -1 Performing iteration 15 -6 Performing iteration 15 3 Performing iteration 15 +1 Performing iteration 15 7 Performing iteration 15 -4 Performing iteration 15 0 Performing iteration 15 +6 Performing iteration 15 CORE ID: 0 PROCESSED AN EXIT EVENT Ariel Memory Management Statistics: --------------------------------------------------------------------- Page Table Sizes: -- Map entries 240 +- Map entries 301 Page Table Coverages: -- Bytes 983040 -Simulation is complete, simulated time: 983.728 us +- Bytes 1232896 +Simulation is complete, simulated time: 2.80516 ms +ARIEL-SST: Did not find ARIEL_OVERRIDE_POOL in the environment, no override applies. +ARIEL-SST PIN tool activating with 8 threads +ARIEL: Default memory pool set to 0 +ARIEL: Tool is configured to begin with profiling immediately. +ARIEL: Starting program. +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. +Identified routine: malloc/_malloc, replacing with Ariel equivalent... +Identified routine: free/_free, replacing with Ariel equivalent... +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. diff --git a/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_ariel_snb_mlm.out b/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_ariel_snb_mlm.out index e7158c49ee..92df55fcc4 100644 --- a/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_ariel_snb_mlm.out +++ b/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_ariel_snb_mlm.out @@ -33,70 +33,98 @@ Creating L3 cache block: 2 in group: 3 Creating L3 cache block: 3 in group: 3 Creating L3 cache block: 4 in group: 3 Completed configuring the SST Sandy Bridge model -ArielComponent[arielcpu.cc:38:ArielCPU] Creating Ariel component... -ArielComponent[arielcpu.cc:44:ArielCPU] Configuring for 8 cores... -ArielComponent[arielcpu.cc:47:ArielCPU] Configuring for check addresses = no +ArielComponent[arielcpu.cc:37:ArielCPU] Creating Ariel component... +ArielComponent[arielcpu.cc:43:ArielCPU] Configuring for 8 cores... +ArielComponent[arielcpu.cc:46:ArielCPU] Configuring for check addresses = no ArielComponent[arielcpu.cc:120:ArielCPU] Loaded memory manager: A0:memmgr ArielComponent[arielcpu.cc:134:ArielCPU] Memory manager construction is completed. -Pin3Frontend[frontend/pin3/pin3frontend.cc:75:Pin3Frontend] Model specifies that there are 0 application arguments -Pin3Frontend[frontend/pin3/pin3frontend.cc:85:Pin3Frontend] Interception and instrumentation of multi-level memory and malloc/free calls is ENABLED. -Pin3Frontend[frontend/pin3/pin3frontend.cc:90:Pin3Frontend] Tracking the stack and dumping on malloc calls is DISABLED. -Pin3Frontend[frontend/pin3/pin3frontend.cc:97:Pin3Frontend] Malloc map file is ENABLED, using file 'malloc.txt' -Pin3Frontend[frontend/pin3/pin3frontend.cc:104:Pin3Frontend] Base pipe name: /tmp/sst_shmem_37338-0-1804289383 -Pin3Frontend[frontend/pin3/pin3frontend.cc:128:Pin3Frontend] Processing application arguments... -Pin3Frontend[frontend/pin3/pin3frontend.cc:258:Pin3Frontend] Completed processing application arguments. -Pin3Frontend[frontend/pin3/pin3frontend.cc:263:Pin3Frontend] Completed initialization of the Ariel CPU. +Pin3Frontend[frontend/pin3/pin3frontend.cc:82:Pin3Frontend] Model specifies that there are 0 application arguments +Pin3Frontend[frontend/pin3/pin3frontend.cc:92:Pin3Frontend] Interception and instrumentation of multi-level memory and malloc/free calls is ENABLED. +Pin3Frontend[frontend/pin3/pin3frontend.cc:97:Pin3Frontend] Tracking the stack and dumping on malloc calls is DISABLED. +Pin3Frontend[frontend/pin3/pin3frontend.cc:104:Pin3Frontend] Malloc map file is ENABLED, using file 'malloc.txt' +Pin3Frontend[frontend/pin3/pin3frontend.cc:111:Pin3Frontend] Base pipe name: /tmp/sst_shmem_2662350-0-1804289383 +Pin3Frontend[frontend/pin3/pin3frontend.cc:200:Pin3Frontend] Processing application arguments... +Pin3Frontend[frontend/pin3/pin3frontend.cc:335:Pin3Frontend] Completed processing application arguments. +Pin3Frontend[frontend/pin3/pin3frontend.cc:340:Pin3Frontend] Completed initialization of the Ariel CPU. ArielComponent[arielcpu.cc:170:ArielCPU] Registering ArielCPU clock at 2660MHz ArielComponent[arielcpu.cc:174:ArielCPU] Clocks registered. ArielComponent[arielcpu.cc:176:ArielCPU] Creating core to cache links... ArielComponent[arielcpu.cc:178:ArielCPU] Creating processor cores and cache links... ArielComponent[arielcpu.cc:180:ArielCPU] Configuring cores and cache links... -ArielComponent[arielcpu.cc:239:ArielCPU] Completed initialization of the Ariel CPU. -SSTARIEL: Loading Ariel Tool to connect to SST on pipe: /tmp/sst_shmem_37338-0-1804289383 max core count: 8 +ArielComponent[arielcpu.cc:235:ArielCPU] Completed initialization of the Ariel RTL Link. +ArielComponent[arielcpu.cc:235:ArielCPU] Completed initialization of the Ariel RTL Link. +ArielComponent[arielcpu.cc:235:ArielCPU] Completed initialization of the Ariel RTL Link. +ArielComponent[arielcpu.cc:235:ArielCPU] Completed initialization of the Ariel RTL Link. +ArielComponent[arielcpu.cc:235:ArielCPU] Completed initialization of the Ariel RTL Link. +ArielComponent[arielcpu.cc:235:ArielCPU] Completed initialization of the Ariel RTL Link. +ArielComponent[arielcpu.cc:235:ArielCPU] Completed initialization of the Ariel RTL Link. +ArielComponent[arielcpu.cc:235:ArielCPU] Completed initialization of the Ariel RTL Link. +ArielComponent[arielcpu.cc:247:ArielCPU] Completed initialization of the Ariel CPU. +SSTARIEL: Loading Ariel Tool to connect to SST on pipe: /tmp/sst_shmem_2662350-0-1804289383 max core count: 8 SSTARIEL: Function profiling is disabled. +SSTARIEL: Loading Ariel Tool to connect to SST on pipe: /tmp/sst_shmem_2662350-0-1804289383 max core count: 8 +SSTARIEL: Function profiling is disabled. +Allocating arrays of size 2000 elements. +Done allocating arrays. +Perfoming the fast_c compute loop... +Sum of arrays is: 6999500.000000 +Freeing arrays... +Done. +SSTARIEL: Execution completed, shutting down. +Pin3Frontend[frontend/pin3/pin3frontend.cc:347:init] Launching PIN... +Pin3Frontend[frontend/pin3/pin3frontend.cc:415:forkPINChild] Executing PIN command: /home/prlavin/tmp/delete-this-sst/pin-3.28/pin -follow_execv -ifeellucky -t /home/prlavin/tmp/delete-this-sst/install/libexec/fesimple.so -w 0 -E 1 -p /tmp/sst_shmem_2662350-0-1804289383 -v 1 -t 0 -c 8 -s 1 -m 1 -k 0 -u malloc.txt -d 0 -- /home/prlavin/tmp/delete-this-sst/sst-elements/src/sst/elements/ariel/frontend/simple/examples/stream/stream_mlm +Pin3Frontend[frontend/pin3/pin3frontend.cc:357:init] Returned from launching PIN. Waiting for child to attach. +Pin3Frontend[frontend/pin3/pin3frontend.cc:360:init] Child has attached! +CORE ID: 0 PROCESSED AN EXIT EVENT +ArielComponent[arielcpu.cc:265:finish] Ariel Processor Information: +ArielComponent[arielcpu.cc:266:finish] Completed at: 12246390 nanoseconds. +ArielComponent[arielcpu.cc:267:finish] Ariel Component Statistics (By Core) + +Ariel Memory Management Statistics: +--------------------------------------------------------------------- +Page Table Sizes: +- Demand map entries at level 0 956 +- Demand map entries at level 1 0 +Page Table Coverages: +- Demand bytes at level 0 3915776 +- Demand bytes at level 1 0 +Simulation is complete, simulated time: 12.2464 ms ARIEL-SST: Did not find ARIEL_OVERRIDE_POOL in the environment, no override applies. ARIEL-SST PIN tool activating with 8 threads ARIEL: Default memory pool set to 0 ARIEL: Tool is configured to begin with profiling immediately. ARIEL: Starting program. -Identified routine: malloc/_malloc, replacing with Ariel equivalent... +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. Identified routine: malloc/_malloc, replacing with Ariel equivalent... Identified routine: free/_free, replacing with Ariel equivalent... Identified routine: clock_gettime, replacing with Ariel equivalent... Replacement complete. -Pin3Frontend[frontend/pin3/pin3frontend.cc:270:init] Launching PIN... -Pin3Frontend[frontend/pin3/pin3frontend.cc:326:forkPINChild] Executing PIN command: /usr/local/module-pkgs/pin/pin-3.22-98547-g7a303a835-gcc-linux/pin -follow_execv -ifeellucky -t /ascldap/users/grvosku/dev/build/sst-elements/libexec/fesimple.so -w 0 -E 1 -p /tmp/sst_shmem_37338-0-1804289383 -v 1 -t 0 -c 8 -s 1 -m 1 -k 0 -u malloc.txt -d 0 -- ./stream_mlm -Pin3Frontend[frontend/pin3/pin3frontend.cc:275:init] Returned from launching PIN. Waiting for child to attach. -Pin3Frontend[frontend/pin3/pin3frontend.cc:278:init] Child has attached! +ARIEL-SST: Did not find ARIEL_OVERRIDE_POOL in the environment, no override applies. +ARIEL-SST PIN tool activating with 8 threads +ARIEL: Default memory pool set to 0 +ARIEL: Tool is configured to begin with profiling immediately. +ARIEL: Starting program. +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. Identified routine: ariel_enable, replacing with Ariel equivalent... Replacement complete. +Identified routine: ariel_disable, replacing with Ariel equivalent... +Replacement complete. +Identified routine: ariel_fence, replacing with Ariel equivalent.. +Replacement complete Identified routine: ariel_cycles, replacing with Ariel equivalent.. Replacement complete Identified routine: ariel_output_stats, replacing with Ariel equivalent.. Replacement complete Identified routine: ariel_malloc_flag, replacing with Ariel equivalent.. +Replacing api_mpi_init with mapped_api_mpi_init. +Replacement complete +Identified routine: MPI_Init. Instrumenting. +Instrumentation complete +Identified routine: MPI_Init_thread. Instrumenting. +Instrumentation complete Identified routine: malloc/_malloc, replacing with Ariel equivalent... +Identified routine: free/_free, replacing with Ariel equivalent... Identified routine: clock_gettime, replacing with Ariel equivalent... Replacement complete. -Allocating arrays of size 2000 elements. -Done allocating arrays. -Perfoming the fast_c compute loop... -Sum of arrays is: 6999500.000000 -Freeing arrays... -Done. -SSTARIEL: Execution completed, shutting down. -CORE ID: 0 PROCESSED AN EXIT EVENT -ArielComponent[arielcpu.cc:257:finish] Ariel Processor Information: -ArielComponent[arielcpu.cc:258:finish] Completed at: 1651433 nanoseconds. -ArielComponent[arielcpu.cc:259:finish] Ariel Component Statistics (By Core) - -Ariel Memory Management Statistics: ---------------------------------------------------------------------- -Page Table Sizes: -- Demand map entries at level 0 251 -- Demand map entries at level 1 0 -Page Table Coverages: -- Demand bytes at level 0 1028096 -- Demand bytes at level 1 0 -Simulation is complete, simulated time: 1.65143 ms - diff --git a/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_memHstream.out b/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_memHstream.out index 8070ddc197..d61ca86f26 100644 --- a/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_memHstream.out +++ b/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_memHstream.out @@ -1,41 +1,68 @@ SSTARIEL: Function profiling is disabled. -ARIEL-SST: Did not find ARIEL_OVERRIDE_POOL in the environment, no override applies. -ARIEL-SST PIN tool activating with 8 threads -ARIEL: Default memory pool set to 0 -ARIEL: Tool is configured to begin with profiling immediately. -ARIEL: Starting program. -Identified routine: malloc/_malloc, replacing with Ariel equivalent... -Identified routine: malloc/_malloc, replacing with Ariel equivalent... -Identified routine: free/_free, replacing with Ariel equivalent... -0:TimingDRAM::build():54:mc=0: number of channels: 1 -0:TimingDRAM::build():55:mc=0: address mapper: memHierarchy.simpleAddrMapper -0:TimingDRAM:Channel:Channel():111:mc=0:chan=0: max pending trans: 32 -0:TimingDRAM:Channel:Channel():112:mc=0:chan=0: number of ranks: 2 -0:TimingDRAM:Rank:Rank():219:mc=0:chan=0:rank=0: number of banks: 8 -0:TimingDRAM:Bank:Bank():285:mc=0:chan=0:rank=0:bank=0: CL: 10 -0:TimingDRAM:Bank:Bank():286:mc=0:chan=0:rank=0:bank=0: CL_WR: 12 -0:TimingDRAM:Bank:Bank():287:mc=0:chan=0:rank=0:bank=0: RCD: 10 -0:TimingDRAM:Bank:Bank():288:mc=0:chan=0:rank=0:bank=0: TRP: 14 -0:TimingDRAM:Bank:Bank():289:mc=0:chan=0:rank=0:bank=0: dataCycles: 2 -0:TimingDRAM:Bank:Bank():290:mc=0:chan=0:rank=0:bank=0: transactionQ: memHierarchy.reorderTransactionQ -0:TimingDRAM:Bank:Bank():291:mc=0:chan=0:rank=0:bank=0: pagePolicy: memHierarchy.simplePagePolicy -Identified routine: malloc/_malloc, replacing with Ariel equivalent... -Identified routine: free/_free, replacing with Ariel equivalent... -Identified routine: malloc/_malloc, replacing with Ariel equivalent... -Identified routine: clock_gettime, replacing with Ariel equivalent... -Replacement complete. +SSTARIEL: Function profiling is disabled. Allocating arrays of size 2000 elements. Done allocating arrays. Perfoming the fast_c compute loop... Sum of arrays is: 6999500.000000 Freeing arrays... Done. +0:TimingDRAM::TimingDRAM():52:mc=0: number of channels: 1 +0:TimingDRAM::TimingDRAM():53:mc=0: address mapper: memHierarchy.simpleAddrMapper +0:TimingDRAM:Channel:Channel():111:mc=0:chan=0: max pending trans: 32 +0:TimingDRAM:Channel:Channel():112:mc=0:chan=0: number of ranks: 2 +0:TimingDRAM:Rank:Rank():221:mc=0:chan=0:rank=0: number of banks: 8 +0:TimingDRAM:Bank:Bank():289:mc=0:chan=0:rank=0:bank=0: CL: 10 +0:TimingDRAM:Bank:Bank():290:mc=0:chan=0:rank=0:bank=0: CL_WR: 12 +0:TimingDRAM:Bank:Bank():291:mc=0:chan=0:rank=0:bank=0: RCD: 10 +0:TimingDRAM:Bank:Bank():292:mc=0:chan=0:rank=0:bank=0: TRP: 14 +0:TimingDRAM:Bank:Bank():293:mc=0:chan=0:rank=0:bank=0: dataCycles: 2 +0:TimingDRAM:Bank:Bank():294:mc=0:chan=0:rank=0:bank=0: transactionQ: memHierarchy.reorderTransactionQ +0:TimingDRAM:Bank:Bank():295:mc=0:chan=0:rank=0:bank=0: pagePolicy: memHierarchy.simplePagePolicy +memory, WARNING: Memories no longer inherit address regions from directories and no region parameters (addr_range_start, addr_range_end, interleave_size, interleave_step) were detected. All addresses will map to this memory: if this is intended, you may ignore this warning or set addr_range_start to 0 in your input deck to eliminate this warning. CORE ID: 0 PROCESSED AN EXIT EVENT Ariel Memory Management Statistics: --------------------------------------------------------------------- Page Table Sizes: -- Map entries 251 +- Map entries 964 Page Table Coverages: -- Bytes 1028096 -Simulation is complete, simulated time: 2.27996 ms +- Bytes 3948544 +Simulation is complete, simulated time: 30.2185 ms +ARIEL-SST: Did not find ARIEL_OVERRIDE_POOL in the environment, no override applies. +ARIEL-SST PIN tool activating with 8 threads +ARIEL: Default memory pool set to 0 +ARIEL: Tool is configured to begin with profiling immediately. +ARIEL: Starting program. +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. +Identified routine: malloc/_malloc, replacing with Ariel equivalent... +Identified routine: free/_free, replacing with Ariel equivalent... +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. +ARIEL-SST: Did not find ARIEL_OVERRIDE_POOL in the environment, no override applies. +ARIEL-SST PIN tool activating with 8 threads +ARIEL: Default memory pool set to 0 +ARIEL: Tool is configured to begin with profiling immediately. +ARIEL: Starting program. +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. +Identified routine: ariel_enable, replacing with Ariel equivalent... +Replacement complete. +Identified routine: ariel_disable, replacing with Ariel equivalent... +Replacement complete. +Identified routine: ariel_fence, replacing with Ariel equivalent.. +Replacement complete +Identified routine: ariel_cycles, replacing with Ariel equivalent.. +Replacement complete +Identified routine: ariel_output_stats, replacing with Ariel equivalent.. +Replacement complete +Replacing api_mpi_init with mapped_api_mpi_init. +Replacement complete +Identified routine: MPI_Init. Instrumenting. +Instrumentation complete +Identified routine: MPI_Init_thread. Instrumenting. +Instrumentation complete +Identified routine: malloc/_malloc, replacing with Ariel equivalent... +Identified routine: free/_free, replacing with Ariel equivalent... +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. diff --git a/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_runstream.out b/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_runstream.out index fd7a634718..7e8503238d 100644 --- a/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_runstream.out +++ b/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_runstream.out @@ -1,23 +1,59 @@ SSTARIEL: Function profiling is disabled. +SSTARIEL: Function profiling is disabled. Allocating arrays of size 2000 elements. Done allocating arrays. Perfoming the fast_c compute loop... Sum of arrays is: 6999500.000000 Freeing arrays... Done. +memory, WARNING: Memories no longer inherit address regions from directories and no region parameters (addr_range_start, addr_range_end, interleave_size, interleave_step) were detected. All addresses will map to this memory: if this is intended, you may ignore this warning or set addr_range_start to 0 in your input deck to eliminate this warning. CORE ID: 0 PROCESSED AN EXIT EVENT Ariel Memory Management Statistics: --------------------------------------------------------------------- Page Table Sizes: -- Map entries 375 +- Map entries 962 Page Table Coverages: -- Bytes 1536000 - a0.read_requests.0 : Accumulator : Sum.u64 = 358760; SumSQ.u64 = 358760; Count.u64 = 358760; Min.u64 = 1; Max.u64 = 1; - a0.write_requests.0 : Accumulator : Sum.u64 = 163938; SumSQ.u64 = 163938; Count.u64 = 163938; Min.u64 = 1; Max.u64 = 1; - a0.instruction_count.0 : Accumulator : Sum.u64 = 1509122; SumSQ.u64 = 1509122; Count.u64 = 1509122; Min.u64 = 1; Max.u64 = 1; - a0.cycles.0 : Accumulator : Sum.u64 = 17843878; SumSQ.u64 = 17843878; Count.u64 = 17843878; Min.u64 = 1; Max.u64 = 1; - a0.active_cycles.0 : Accumulator : Sum.u64 = 1145946; SumSQ.u64 = 1145946; Count.u64 = 1145946; Min.u64 = 1; Max.u64 = 1; - l1cache.CacheHits : Accumulator : Sum.u64 = 509638; SumSQ.u64 = 509638; Count.u64 = 509638; Min.u64 = 1; Max.u64 = 1; - l1cache.CacheMisses : Accumulator : Sum.u64 = 13195; SumSQ.u64 = 13195; Count.u64 = 13195; Min.u64 = 1; Max.u64 = 1; -Simulation is complete, simulated time: 17.8439 ms +- Bytes 3940352 + a0.read_requests.0 : Accumulator : Sum.u64 = 3593725; SumSQ.u64 = 3593725; Count.u64 = 3593725; Min.u64 = 1; Max.u64 = 1; + a0.write_requests.0 : Accumulator : Sum.u64 = 1828914; SumSQ.u64 = 1828914; Count.u64 = 1828914; Min.u64 = 1; Max.u64 = 1; + a0.instruction_count.0 : Accumulator : Sum.u64 = 14027690; SumSQ.u64 = 14027690; Count.u64 = 14027690; Min.u64 = 1; Max.u64 = 1; + a0.cycles.0 : Accumulator : Sum.u64 = 84690450; SumSQ.u64 = 84690450; Count.u64 = 84690450; Min.u64 = 1; Max.u64 = 1; + a0.active_cycles.0 : Accumulator : Sum.u64 = 13358651; SumSQ.u64 = 13358651; Count.u64 = 13358651; Min.u64 = 1; Max.u64 = 1; + l1cache.CacheHits : Accumulator : Sum.u64 = 5365922; SumSQ.u64 = 5365922; Count.u64 = 5365922; Min.u64 = 1; Max.u64 = 1; + l1cache.CacheMisses : Accumulator : Sum.u64 = 62840; SumSQ.u64 = 62840; Count.u64 = 62840; Min.u64 = 1; Max.u64 = 1; +Simulation is complete, simulated time: 84.6904 ms +ARIEL-SST: Did not find ARIEL_OVERRIDE_POOL in the environment, no override applies. +ARIEL-SST PIN tool activating with 1 threads +ARIEL: Default memory pool set to 0 +ARIEL: Tool is configured to begin with profiling immediately. +ARIEL: Starting program. +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. +ARIEL-SST: Did not find ARIEL_OVERRIDE_POOL in the environment, no override applies. +ARIEL-SST PIN tool activating with 1 threads +ARIEL: Default memory pool set to 0 +ARIEL: Tool is configured to begin with profiling immediately. +ARIEL: Starting program. +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. +Identified routine: ariel_enable, replacing with Ariel equivalent... +Replacement complete. +Identified routine: ariel_disable, replacing with Ariel equivalent... +Replacement complete. +Identified routine: ariel_fence, replacing with Ariel equivalent.. +Replacement complete +Identified routine: ariel_cycles, replacing with Ariel equivalent.. +Replacement complete +Identified routine: ariel_output_stats, replacing with Ariel equivalent.. +Replacement complete +Replacing api_mpi_init with mapped_api_mpi_init. +Replacement complete +Identified routine: MPI_Init. Instrumenting. +Instrumentation complete +Identified routine: MPI_Init_thread. Instrumenting. +Instrumentation complete +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. diff --git a/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_runstreamNB.out b/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_runstreamNB.out index 3c812e7de5..638ab9171f 100644 --- a/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_runstreamNB.out +++ b/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_runstreamNB.out @@ -1,22 +1,58 @@ SSTARIEL: Function profiling is disabled. +SSTARIEL: Function profiling is disabled. Allocating arrays of size 2000 elements. Done allocating arrays. Perfoming the fast_c compute loop... Sum of arrays is: 6999500.000000 Freeing arrays... Done. +memory, WARNING: Memories no longer inherit address regions from directories and no region parameters (addr_range_start, addr_range_end, interleave_size, interleave_step) were detected. All addresses will map to this memory: if this is intended, you may ignore this warning or set addr_range_start to 0 in your input deck to eliminate this warning. CORE ID: 0 PROCESSED AN EXIT EVENT Ariel Memory Management Statistics: --------------------------------------------------------------------- Page Table Sizes: -- Map entries 375 +- Map entries 963 Page Table Coverages: -- Bytes 1536000 - a0.read_requests.0 : Accumulator : Sum.u64 = 358751; SumSQ.u64 = 358751; Count.u64 = 358751; Min.u64 = 1; Max.u64 = 1; - a0.write_requests.0 : Accumulator : Sum.u64 = 163938; SumSQ.u64 = 163938; Count.u64 = 163938; Min.u64 = 1; Max.u64 = 1; - a0.instruction_count.0 : Accumulator : Sum.u64 = 1509429; SumSQ.u64 = 1509429; Count.u64 = 1509429; Min.u64 = 1; Max.u64 = 1; - a0.cycles.0 : Accumulator : Sum.u64 = 17352092; SumSQ.u64 = 17352092; Count.u64 = 17352092; Min.u64 = 1; Max.u64 = 1; - l1cache.CacheHits : Accumulator : Sum.u64 = 509580; SumSQ.u64 = 509580; Count.u64 = 509580; Min.u64 = 1; Max.u64 = 1; - l1cache.CacheMisses : Accumulator : Sum.u64 = 13257; SumSQ.u64 = 13257; Count.u64 = 13257; Min.u64 = 1; Max.u64 = 1; -Simulation is complete, simulated time: 17.3521 ms +- Bytes 3944448 + a0.read_requests.0 : Accumulator : Sum.u64 = 3593759; SumSQ.u64 = 3593759; Count.u64 = 3593759; Min.u64 = 1; Max.u64 = 1; + a0.write_requests.0 : Accumulator : Sum.u64 = 1828914; SumSQ.u64 = 1828914; Count.u64 = 1828914; Min.u64 = 1; Max.u64 = 1; + a0.instruction_count.0 : Accumulator : Sum.u64 = 14027744; SumSQ.u64 = 14027744; Count.u64 = 14027744; Min.u64 = 1; Max.u64 = 1; + a0.cycles.0 : Accumulator : Sum.u64 = 93496971; SumSQ.u64 = 93496971; Count.u64 = 93496971; Min.u64 = 1; Max.u64 = 1; + l1cache.CacheHits : Accumulator : Sum.u64 = 5365746; SumSQ.u64 = 5365746; Count.u64 = 5365746; Min.u64 = 1; Max.u64 = 1; + l1cache.CacheMisses : Accumulator : Sum.u64 = 62803; SumSQ.u64 = 62803; Count.u64 = 62803; Min.u64 = 1; Max.u64 = 1; +Simulation is complete, simulated time: 93.497 ms +ARIEL-SST: Did not find ARIEL_OVERRIDE_POOL in the environment, no override applies. +ARIEL-SST PIN tool activating with 1 threads +ARIEL: Default memory pool set to 0 +ARIEL: Tool is configured to begin with profiling immediately. +ARIEL: Starting program. +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. +ARIEL-SST: Did not find ARIEL_OVERRIDE_POOL in the environment, no override applies. +ARIEL-SST PIN tool activating with 1 threads +ARIEL: Default memory pool set to 0 +ARIEL: Tool is configured to begin with profiling immediately. +ARIEL: Starting program. +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. +Identified routine: ariel_enable, replacing with Ariel equivalent... +Replacement complete. +Identified routine: ariel_disable, replacing with Ariel equivalent... +Replacement complete. +Identified routine: ariel_fence, replacing with Ariel equivalent.. +Replacement complete +Identified routine: ariel_cycles, replacing with Ariel equivalent.. +Replacement complete +Identified routine: ariel_output_stats, replacing with Ariel equivalent.. +Replacement complete +Replacing api_mpi_init with mapped_api_mpi_init. +Replacement complete +Identified routine: MPI_Init. Instrumenting. +Instrumentation complete +Identified routine: MPI_Init_thread. Instrumenting. +Instrumentation complete +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. diff --git a/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_runstreamSt.out b/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_runstreamSt.out index d6b4a92bc0..44de208268 100644 --- a/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_runstreamSt.out +++ b/src/sst/elements/ariel/frontend/simple/examples/stream/tests/refFiles/test_Ariel_runstreamSt.out @@ -1,29 +1,58 @@ SSTARIEL: Function profiling is disabled. -ARIEL-SST: Did not find ARIEL_OVERRIDE_POOL in the environment, no override applies. -ARIEL-SST PIN tool activating with 1 threads -ARIEL: Default memory pool set to 0 -ARIEL: Tool is configured to begin with profiling immediately. -ARIEL: Starting program. -Identified routine: clock_gettime, replacing with Ariel equivalent... -Replacement complete. +SSTARIEL: Function profiling is disabled. Allocating arrays of size 2000 elements. Done allocating arrays. Perfoming the fast_c compute loop... Sum of arrays is: 6999500.000000 Freeing arrays... Done. +memory, WARNING: Memories no longer inherit address regions from directories and no region parameters (addr_range_start, addr_range_end, interleave_size, interleave_step) were detected. All addresses will map to this memory: if this is intended, you may ignore this warning or set addr_range_start to 0 in your input deck to eliminate this warning. CORE ID: 0 PROCESSED AN EXIT EVENT Ariel Memory Management Statistics: --------------------------------------------------------------------- Page Table Sizes: -- Map entries 376 +- Map entries 964 Page Table Coverages: -- Bytes 1540096 - a0.read_requests.0 : Accumulator : Sum.u64 = 358770; SumSQ.u64 = 358770; Count.u64 = 358770; Min.u64 = 1; Max.u64 = 1; - a0.write_requests.0 : Accumulator : Sum.u64 = 163934; SumSQ.u64 = 163934; Count.u64 = 163934; Min.u64 = 1; Max.u64 = 1; - a0.instruction_count.0 : Accumulator : Sum.u64 = 1509571; SumSQ.u64 = 1509571; Count.u64 = 1509571; Min.u64 = 1; Max.u64 = 1; - a0.cycles.0 : Accumulator : Sum.u64 = 17492057; SumSQ.u64 = 17492057; Count.u64 = 17492057; Min.u64 = 1; Max.u64 = 1; - l1cache.CacheHits : Accumulator : Sum.u64 = 509604; SumSQ.u64 = 509604; Count.u64 = 509604; Min.u64 = 1; Max.u64 = 1; - l1cache.CacheMisses : Accumulator : Sum.u64 = 13248; SumSQ.u64 = 13248; Count.u64 = 13248; Min.u64 = 1; Max.u64 = 1; -Simulation is complete, simulated time: 17.4921 ms +- Bytes 3948544 + a0.read_requests.0 : Accumulator : Sum.u64 = 3593749; SumSQ.u64 = 3593749; Count.u64 = 3593749; Min.u64 = 1; Max.u64 = 1; + a0.write_requests.0 : Accumulator : Sum.u64 = 1828914; SumSQ.u64 = 1828914; Count.u64 = 1828914; Min.u64 = 1; Max.u64 = 1; + a0.instruction_count.0 : Accumulator : Sum.u64 = 14027723; SumSQ.u64 = 14027723; Count.u64 = 14027723; Min.u64 = 1; Max.u64 = 1; + a0.cycles.0 : Accumulator : Sum.u64 = 83831179; SumSQ.u64 = 83831179; Count.u64 = 83831179; Min.u64 = 1; Max.u64 = 1; + l1cache.CacheHits : Accumulator : Sum.u64 = 5365821; SumSQ.u64 = 5365821; Count.u64 = 5365821; Min.u64 = 1; Max.u64 = 1; + l1cache.CacheMisses : Accumulator : Sum.u64 = 62888; SumSQ.u64 = 62888; Count.u64 = 62888; Min.u64 = 1; Max.u64 = 1; +Simulation is complete, simulated time: 83.8312 ms +ARIEL-SST: Did not find ARIEL_OVERRIDE_POOL in the environment, no override applies. +ARIEL-SST PIN tool activating with 1 threads +ARIEL: Default memory pool set to 0 +ARIEL: Tool is configured to begin with profiling immediately. +ARIEL: Starting program. +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. +ARIEL-SST: Did not find ARIEL_OVERRIDE_POOL in the environment, no override applies. +ARIEL-SST PIN tool activating with 1 threads +ARIEL: Default memory pool set to 0 +ARIEL: Tool is configured to begin with profiling immediately. +ARIEL: Starting program. +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. +Identified routine: ariel_enable, replacing with Ariel equivalent... +Replacement complete. +Identified routine: ariel_disable, replacing with Ariel equivalent... +Replacement complete. +Identified routine: ariel_fence, replacing with Ariel equivalent.. +Replacement complete +Identified routine: ariel_cycles, replacing with Ariel equivalent.. +Replacement complete +Identified routine: ariel_output_stats, replacing with Ariel equivalent.. +Replacement complete +Replacing api_mpi_init with mapped_api_mpi_init. +Replacement complete +Identified routine: MPI_Init. Instrumenting. +Instrumentation complete +Identified routine: MPI_Init_thread. Instrumenting. +Instrumentation complete +Identified routine: clock_gettime, replacing with Ariel equivalent... +Replacement complete. diff --git a/src/sst/elements/ariel/mpi/.gitignore b/src/sst/elements/ariel/mpi/.gitignore index 0cd642e8d6..d1037c1166 100644 --- a/src/sst/elements/ariel/mpi/.gitignore +++ b/src/sst/elements/ariel/mpi/.gitignore @@ -1,6 +1,4 @@ *.o *.so -reduce -hello mpilauncher fakepin diff --git a/src/sst/elements/ariel/mpi/Makefile.am b/src/sst/elements/ariel/mpi/Makefile.am index 6488923a56..cd68a10455 100644 --- a/src/sst/elements/ariel/mpi/Makefile.am +++ b/src/sst/elements/ariel/mpi/Makefile.am @@ -1,20 +1,13 @@ -if SST_USE_ARIEL_MPI -CC=$(ARIEL_MPICC) -CXX=$(ARIEL_MPICXX) -# ffopenmp only needed to detect when MPI+OpenMP is used improperly -CFLAGS+=$(ARIEL_CFLAGS) -fopenmp -CXXFLAGS+=$(ARIEL_CXXFLAGS) -fopenmp -endif - -AM_CPPFLAGS += -I../api $(MPI_CPPFLAGS) $(ARIEL_CFLAGS) -bin_PROGRAMS = hello reduce mpilauncher fakepin - -mpilauncher_SOURCES = mpilauncher.cc -hello_SOURCES = hello.cc -reduce_SOURCES = reduce.cc -fakepin_SOURCES = fakepin.cc - -hello_LDADD = ../api/libarielapi.la $(MPI_LIBS) $(MPILIBS) -reduce_LDADD = ../api/libarielapi.la $(MPI_LIBS) $(MPILIBS) - -AM_DEFAULT_VERBOSITY = 1 +all-local: mpilauncher + +mpilauncher: + $(ARIEL_MPICXX) mpilauncher.cc -o mpilauncher +fakepin: + $(ARIEL_MPICXX) fakepin.cc -o fakepin +hello: + $(ARIEL_MPICXX) hello.cc -o hello -I../api -L../api -larielapi -fopenmp +reduce: + $(ARIEL_MPICXX) reduce.cc -o reduce -I../api -L../api -larielapi -fopenmp + +clean-local: + rm -f mpilauncher fakepin diff --git a/src/sst/elements/ariel/tests/testMPI/Makefile.am b/src/sst/elements/ariel/tests/testMPI/Makefile.am new file mode 100644 index 0000000000..438534e669 --- /dev/null +++ b/src/sst/elements/ariel/tests/testMPI/Makefile.am @@ -0,0 +1,11 @@ +all-local: hello reduce + +clean-local: + rm -f hello reduce + +API_DIR=../../api + +hello: + $(ARIEL_MPICXX) hello.cc -o hello -I$(API_DIR) -L$(API_DIR) -larielapi -fopenmp +reduce: + $(ARIEL_MPICXX) reduce.cc -o reduce -I$(API_DIR) -L$(API_DIR) -larielapi -fopenmp diff --git a/src/sst/elements/ariel/mpi/ariel-reduce.py b/src/sst/elements/ariel/tests/testMPI/ariel-reduce.py similarity index 100% rename from src/sst/elements/ariel/mpi/ariel-reduce.py rename to src/sst/elements/ariel/tests/testMPI/ariel-reduce.py diff --git a/src/sst/elements/ariel/mpi/demo1.py b/src/sst/elements/ariel/tests/testMPI/demo1.py similarity index 100% rename from src/sst/elements/ariel/mpi/demo1.py rename to src/sst/elements/ariel/tests/testMPI/demo1.py diff --git a/src/sst/elements/ariel/mpi/hello.cc b/src/sst/elements/ariel/tests/testMPI/hello.cc similarity index 100% rename from src/sst/elements/ariel/mpi/hello.cc rename to src/sst/elements/ariel/tests/testMPI/hello.cc diff --git a/src/sst/elements/ariel/mpi/reduce.cc b/src/sst/elements/ariel/tests/testMPI/reduce.cc similarity index 100% rename from src/sst/elements/ariel/mpi/reduce.cc rename to src/sst/elements/ariel/tests/testMPI/reduce.cc diff --git a/src/sst/elements/ariel/tests/testMPI/test-mpi.py b/src/sst/elements/ariel/tests/testMPI/test-mpi.py index 9ed724da3b..8ddad8a1cc 100644 --- a/src/sst/elements/ariel/tests/testMPI/test-mpi.py +++ b/src/sst/elements/ariel/tests/testMPI/test-mpi.py @@ -45,9 +45,7 @@ ######################################################################### ## Set component parameters and fill subcomponent slots ######################################################################### -# The test executable are located in a directory with all of the other -# files that need to be compiled with MPI enabled -exe = f'../../mpi/{args.program}' +exe = f'./{args.program}' # 2.4GHz cores. One for each omp thread core.addParams({ diff --git a/src/sst/elements/ariel/tests/testsuite_default_Ariel.py b/src/sst/elements/ariel/tests/testsuite_default_Ariel.py index d9979605c7..dcd7e4bf00 100644 --- a/src/sst/elements/ariel/tests/testsuite_default_Ariel.py +++ b/src/sst/elements/ariel/tests/testsuite_default_Ariel.py @@ -177,14 +177,14 @@ def _setup_ariel_test_files(self): self.ArielElementompmybarrierDir = "{0}/testopenMP/ompmybarrier".format(test_path) # Build the Ariel API library - ArielApiDir = "{0}/api".format(self.ArielElementDir) - cmd = "make" - rtn0 = OSCommand(cmd, set_cwd=ArielApiDir).run() - log_debug("Ariel api/libarielapi.so Make result = {0}; output =\n{1}".format(rtn0.result(), rtn0.output())) - os.environ["ARIELAPI"] = ArielApiDir + #ArielApiDir = "{0}/api".format(self.ArielElementDir) + #cmd = "make" + #rtn0 = OSCommand(cmd, set_cwd=ArielApiDir).run() + #log_debug("Ariel api/libarielapi.so Make result = {0}; output =\n{1}".format(rtn0.result(), rtn0.output())) + #os.environ["ARIELAPI"] = ArielApiDir # Now build the Ariel stream example - cmd = "make all" + cmd = "make" rtn1 = OSCommand(cmd, set_cwd=self.ArielElementStreamDir).run() log_debug("Ariel frontend/simple/examples/Makefile Make result = {0}; output =\n{1}".format(rtn1.result(), rtn1.output())) @@ -194,7 +194,7 @@ def _setup_ariel_test_files(self): log_debug("Ariel ompmybarrier Make result = {0}; output =\n{1}".format(rtn2.result(), rtn2.output())) # Check that everything compiled OK - self.assertTrue(rtn0.result() == 0, "libarielapi failed to compile") + #self.assertTrue(rtn0.result() == 0, "libarielapi failed to compile") self.assertTrue(rtn1.result() == 0, "stream apps failed to compile") self.assertTrue(rtn2.result() == 0, "ompmybarrier.c failed to compile") diff --git a/src/sst/elements/ariel/tests/testsuite_mpi_Ariel.py b/src/sst/elements/ariel/tests/testsuite_mpi_Ariel.py index 6ce405c27a..8e2e9b45ce 100644 --- a/src/sst/elements/ariel/tests/testsuite_mpi_Ariel.py +++ b/src/sst/elements/ariel/tests/testsuite_mpi_Ariel.py @@ -159,6 +159,7 @@ def ariel_Template(self, threads, ranks, program="hello", tracerank=0, testtimeo # Set paths ArielElementDir = os.path.abspath("{0}/../".format(test_path)) ArielElementAPIDir = "{0}/api".format(ArielElementDir) + ArielElementMPIDir = "{0}/mpi".format(ArielElementDir) ArielElementTestMPIDir = "{0}/tests/testMPI".format(ArielElementDir) libpath = os.environ.get("LD_LIBRARY_PATH") @@ -211,7 +212,6 @@ def ariel_Template(self, threads, ranks, program="hello", tracerank=0, testtimeo self.assert_nonzero_stat(statfile, f"core.read_requests.{i}") self.assert_nonzero_stat(statfile, f"cache_{i}.CacheMisses") - ####################### def _setup_ariel_test_files(self): @@ -221,19 +221,20 @@ def _setup_ariel_test_files(self): test_path = self.get_testsuite_dir() outdir = self.get_test_output_run_dir() + # Set the paths to the various directories self.ArielElementDir = os.path.abspath("{0}/../".format(test_path)) self.ArielElementTestMPIDir = "{0}/tests/testMPI".format(self.ArielElementDir) + self.ArielElementAPIDir = "{0}/api".format(self.ArielElementDir) - # Apps may need this. TODO: verify - os.environ["ARIELAPI"] = ArielApiDir + # In case the user has not put the lib directory on their LD_LIBRARY_PATH + os.environ["ARIELAPI"] = self.ArielElementAPIDir # Build the test mpi programs cmd = "make" rtn1 = OSCommand(cmd, set_cwd=self.ArielElementTestMPIDir).run() - log_debug("Ariel ariel/tests/testMPI make result = {1}; output =\n{2}".format(ArielElementTestMPIDir, rtn1.result(), rtn1.output())) + log_debug("Ariel tests/testMPI `make` result = {1}; output =\n{2}".format(self.ArielElementTestMPIDir, rtn1.result(), rtn1.output())) # Check that everything compiled OK - self.assertTrue(rtn0.result() == 0, "libarielapi failed to compile") - self.assertTrue(rtn1.result() == 0, "mpi test binaries failed to compile") + self.assertTrue(rtn1.result() == 0, "MPI test binaries failed to compile") diff --git a/src/sst/elements/ariel/tests/testsuite_testio_Ariel.py b/src/sst/elements/ariel/tests/testsuite_testio_Ariel.py index 3008429099..f9ee10a34c 100644 --- a/src/sst/elements/ariel/tests/testsuite_testio_Ariel.py +++ b/src/sst/elements/ariel/tests/testsuite_testio_Ariel.py @@ -234,7 +234,7 @@ def _setup_ariel_test_files(self): # Build the testio binary cmd = "make testio" rtn1 = OSCommand(cmd, set_cwd=self.ArielElementTestIODir).run() - log_debug("Ariel ariel/tests/testIO make result = {1}; output =\n{2}".format(ArielElementTestIODir, rtn1.result(), rtn1.output())) + log_debug("Ariel ariel/tests/testIO make result = {1}; output =\n{2}".format(self.ArielElementTestIODir, rtn1.result(), rtn1.output())) # Check that everything compiled OK self.assertTrue(rtn0.result() == 0, "libarielapi failed to compile")