Unverified Commit ae473b44 authored by Andreas Marek's avatar Andreas Marek
Browse files

ELPA 2014.06.004 Optional usage of detailed timings

At build time it can be specified that the ELPA test
programs give more detailed timing information, which
is usefull for performace measurements
parent 7ddffdbd
......@@ -11,6 +11,18 @@ libelpa@SUFFIX@_la_LINK = $(FCLINK) $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSIO
libelpa@SUFFIX@_la_SOURCES = src/elpa1.F90 src/elpa2.F90
if HAVE_DETAILED_TIMINGS
libelpa@SUFFIX@_la_SOURCES += src/timer.F90 \
src/ftimings/ftimings.F90 \
src/ftimings/ftimings_type.F90 \
src/ftimings/ftimings_value.F90 \
src/ftimings/highwater_mark.c \
src/ftimings/resident_set_size.c \
src/ftimings/time.c \
src/ftimings/virtual_memory.c \
src/ftimings/papi.c
endif
if WITH_REAL_GENERIC_KERNEL
libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real.f90
endif
......
......@@ -81,19 +81,29 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@WITH_REAL_GENERIC_KERNEL_TRUE@am__append_1 = src/elpa2_kernels/elpa2_kernels_real.f90
@WITH_COMPLEX_GENERIC_KERNEL_TRUE@am__append_2 = src/elpa2_kernels/elpa2_kernels_complex.f90
@WITH_REAL_GENERIC_SIMPLE_KERNEL_TRUE@am__append_3 = src/elpa2_kernels/elpa2_kernels_real_simple.f90
@WITH_COMPLEX_GENERIC_SIMPLE_KERNEL_TRUE@am__append_4 = src/elpa2_kernels/elpa2_kernels_complex_simple.f90
@WITH_REAL_BGP_KERNEL_TRUE@am__append_5 = src/elpa2_kernels/elpa2_kernels_real_bgp.f90
@WITH_REAL_BGQ_KERNEL_TRUE@am__append_6 = src/elpa2_kernels/elpa2_kernels_real_bgq.f90
@WITH_REAL_SSE_KERNEL_TRUE@am__append_7 = src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
@WITH_COMPLEX_SSE_KERNEL_TRUE@@WITH_REAL_SSE_KERNEL_FALSE@am__append_8 = src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
@WITH_REAL_AVX_BLOCK2_KERNEL_TRUE@am__append_9 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c
@WITH_REAL_AVX_BLOCK4_KERNEL_TRUE@am__append_10 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.c
@WITH_REAL_AVX_BLOCK6_KERNEL_TRUE@am__append_11 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.c
@WITH_COMPLEX_AVX_BLOCK1_KERNEL_TRUE@am__append_12 = src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp
@WITH_COMPLEX_AVX_BLOCK2_KERNEL_TRUE@am__append_13 = src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.cpp
@HAVE_DETAILED_TIMINGS_TRUE@am__append_1 = src/timer.F90 \
@HAVE_DETAILED_TIMINGS_TRUE@ src/ftimings/ftimings.F90 \
@HAVE_DETAILED_TIMINGS_TRUE@ src/ftimings/ftimings_type.F90 \
@HAVE_DETAILED_TIMINGS_TRUE@ src/ftimings/ftimings_value.F90 \
@HAVE_DETAILED_TIMINGS_TRUE@ src/ftimings/highwater_mark.c \
@HAVE_DETAILED_TIMINGS_TRUE@ src/ftimings/resident_set_size.c \
@HAVE_DETAILED_TIMINGS_TRUE@ src/ftimings/time.c \
@HAVE_DETAILED_TIMINGS_TRUE@ src/ftimings/virtual_memory.c \
@HAVE_DETAILED_TIMINGS_TRUE@ src/ftimings/papi.c
@WITH_REAL_GENERIC_KERNEL_TRUE@am__append_2 = src/elpa2_kernels/elpa2_kernels_real.f90
@WITH_COMPLEX_GENERIC_KERNEL_TRUE@am__append_3 = src/elpa2_kernels/elpa2_kernels_complex.f90
@WITH_REAL_GENERIC_SIMPLE_KERNEL_TRUE@am__append_4 = src/elpa2_kernels/elpa2_kernels_real_simple.f90
@WITH_COMPLEX_GENERIC_SIMPLE_KERNEL_TRUE@am__append_5 = src/elpa2_kernels/elpa2_kernels_complex_simple.f90
@WITH_REAL_BGP_KERNEL_TRUE@am__append_6 = src/elpa2_kernels/elpa2_kernels_real_bgp.f90
@WITH_REAL_BGQ_KERNEL_TRUE@am__append_7 = src/elpa2_kernels/elpa2_kernels_real_bgq.f90
@WITH_REAL_SSE_KERNEL_TRUE@am__append_8 = src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
@WITH_COMPLEX_SSE_KERNEL_TRUE@@WITH_REAL_SSE_KERNEL_FALSE@am__append_9 = src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
@WITH_REAL_AVX_BLOCK2_KERNEL_TRUE@am__append_10 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c
@WITH_REAL_AVX_BLOCK4_KERNEL_TRUE@am__append_11 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.c
@WITH_REAL_AVX_BLOCK6_KERNEL_TRUE@am__append_12 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.c
@WITH_COMPLEX_AVX_BLOCK1_KERNEL_TRUE@am__append_13 = src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp
@WITH_COMPLEX_AVX_BLOCK2_KERNEL_TRUE@am__append_14 = src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.cpp
bin_PROGRAMS = elpa1_test_real@SUFFIX@$(EXEEXT) \
elpa1_test_complex@SUFFIX@$(EXEEXT) \
elpa2_test_real@SUFFIX@$(EXEEXT) \
......@@ -160,7 +170,11 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
LTLIBRARIES = $(lib_LTLIBRARIES)
libelpa@SUFFIX@_la_LIBADD =
am__libelpa@SUFFIX@_la_SOURCES_DIST = src/elpa1.F90 src/elpa2.F90 \
src/elpa2_kernels/elpa2_kernels_real.f90 \
src/timer.F90 src/ftimings/ftimings.F90 \
src/ftimings/ftimings_type.F90 src/ftimings/ftimings_value.F90 \
src/ftimings/highwater_mark.c src/ftimings/resident_set_size.c \
src/ftimings/time.c src/ftimings/virtual_memory.c \
src/ftimings/papi.c src/elpa2_kernels/elpa2_kernels_real.f90 \
src/elpa2_kernels/elpa2_kernels_complex.f90 \
src/elpa2_kernels/elpa2_kernels_real_simple.f90 \
src/elpa2_kernels/elpa2_kernels_complex_simple.f90 \
......@@ -173,33 +187,42 @@ am__libelpa@SUFFIX@_la_SOURCES_DIST = src/elpa1.F90 src/elpa2.F90 \
src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp \
src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.cpp
am__dirstamp = $(am__leading_dot)dirstamp
@WITH_REAL_GENERIC_KERNEL_TRUE@am__objects_1 = src/elpa2_kernels/elpa2_kernels_real.lo
@WITH_COMPLEX_GENERIC_KERNEL_TRUE@am__objects_2 = src/elpa2_kernels/elpa2_kernels_complex.lo
@WITH_REAL_GENERIC_SIMPLE_KERNEL_TRUE@am__objects_3 = src/elpa2_kernels/elpa2_kernels_real_simple.lo
@WITH_COMPLEX_GENERIC_SIMPLE_KERNEL_TRUE@am__objects_4 = src/elpa2_kernels/elpa2_kernels_complex_simple.lo
@WITH_REAL_BGP_KERNEL_TRUE@am__objects_5 = src/elpa2_kernels/elpa2_kernels_real_bgp.lo
@WITH_REAL_BGQ_KERNEL_TRUE@am__objects_6 = src/elpa2_kernels/elpa2_kernels_real_bgq.lo
@WITH_REAL_SSE_KERNEL_TRUE@am__objects_7 = src/elpa2_kernels/elpa2_kernels_asm_x86_64.lo
@WITH_COMPLEX_SSE_KERNEL_TRUE@@WITH_REAL_SSE_KERNEL_FALSE@am__objects_8 = src/elpa2_kernels/elpa2_kernels_asm_x86_64.lo
@WITH_REAL_AVX_BLOCK2_KERNEL_TRUE@am__objects_9 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.lo
@WITH_REAL_AVX_BLOCK4_KERNEL_TRUE@am__objects_10 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.lo
@WITH_REAL_AVX_BLOCK6_KERNEL_TRUE@am__objects_11 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.lo
@WITH_COMPLEX_AVX_BLOCK1_KERNEL_TRUE@am__objects_12 = src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.lo
@WITH_COMPLEX_AVX_BLOCK2_KERNEL_TRUE@am__objects_13 = src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.lo
@HAVE_DETAILED_TIMINGS_TRUE@am__objects_1 = src/timer.lo \
@HAVE_DETAILED_TIMINGS_TRUE@ src/ftimings/ftimings.lo \
@HAVE_DETAILED_TIMINGS_TRUE@ src/ftimings/ftimings_type.lo \
@HAVE_DETAILED_TIMINGS_TRUE@ src/ftimings/ftimings_value.lo \
@HAVE_DETAILED_TIMINGS_TRUE@ src/ftimings/highwater_mark.lo \
@HAVE_DETAILED_TIMINGS_TRUE@ src/ftimings/resident_set_size.lo \
@HAVE_DETAILED_TIMINGS_TRUE@ src/ftimings/time.lo \
@HAVE_DETAILED_TIMINGS_TRUE@ src/ftimings/virtual_memory.lo \
@HAVE_DETAILED_TIMINGS_TRUE@ src/ftimings/papi.lo
@WITH_REAL_GENERIC_KERNEL_TRUE@am__objects_2 = src/elpa2_kernels/elpa2_kernels_real.lo
@WITH_COMPLEX_GENERIC_KERNEL_TRUE@am__objects_3 = src/elpa2_kernels/elpa2_kernels_complex.lo
@WITH_REAL_GENERIC_SIMPLE_KERNEL_TRUE@am__objects_4 = src/elpa2_kernels/elpa2_kernels_real_simple.lo
@WITH_COMPLEX_GENERIC_SIMPLE_KERNEL_TRUE@am__objects_5 = src/elpa2_kernels/elpa2_kernels_complex_simple.lo
@WITH_REAL_BGP_KERNEL_TRUE@am__objects_6 = src/elpa2_kernels/elpa2_kernels_real_bgp.lo
@WITH_REAL_BGQ_KERNEL_TRUE@am__objects_7 = src/elpa2_kernels/elpa2_kernels_real_bgq.lo
@WITH_REAL_SSE_KERNEL_TRUE@am__objects_8 = src/elpa2_kernels/elpa2_kernels_asm_x86_64.lo
@WITH_COMPLEX_SSE_KERNEL_TRUE@@WITH_REAL_SSE_KERNEL_FALSE@am__objects_9 = src/elpa2_kernels/elpa2_kernels_asm_x86_64.lo
@WITH_REAL_AVX_BLOCK2_KERNEL_TRUE@am__objects_10 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.lo
@WITH_REAL_AVX_BLOCK4_KERNEL_TRUE@am__objects_11 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.lo
@WITH_REAL_AVX_BLOCK6_KERNEL_TRUE@am__objects_12 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.lo
@WITH_COMPLEX_AVX_BLOCK1_KERNEL_TRUE@am__objects_13 = src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.lo
@WITH_COMPLEX_AVX_BLOCK2_KERNEL_TRUE@am__objects_14 = src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.lo
am_libelpa@SUFFIX@_la_OBJECTS = src/elpa1.lo src/elpa2.lo \
$(am__objects_1) $(am__objects_2) $(am__objects_3) \
$(am__objects_4) $(am__objects_5) $(am__objects_6) \
$(am__objects_7) $(am__objects_8) $(am__objects_9) \
$(am__objects_10) $(am__objects_11) $(am__objects_12) \
$(am__objects_13)
$(am__objects_13) $(am__objects_14)
libelpa@SUFFIX@_la_OBJECTS = $(am_libelpa@SUFFIX@_la_OBJECTS)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am__elpa1_test_complex@SUFFIX@_SOURCES_DIST = test/test_complex.F90 \
test/util.F90 test/redir.c test/redirect.F90
@HAVE_REDIRECT_TRUE@am__objects_14 = test/redir.$(OBJEXT) \
@HAVE_REDIRECT_TRUE@am__objects_15 = test/redir.$(OBJEXT) \
@HAVE_REDIRECT_TRUE@ test/redirect.$(OBJEXT)
am_elpa1_test_complex@SUFFIX@_OBJECTS = test/test_complex.$(OBJEXT) \
test/util.$(OBJEXT) $(am__objects_14)
test/util.$(OBJEXT) $(am__objects_15)
elpa1_test_complex@SUFFIX@_OBJECTS = \
$(am_elpa1_test_complex@SUFFIX@_OBJECTS)
elpa1_test_complex@SUFFIX@_DEPENDENCIES = $(build_lib)
......@@ -210,7 +233,7 @@ am__v_lt_1 =
am__elpa1_test_real@SUFFIX@_SOURCES_DIST = test/test_real.F90 \
test/util.F90 test/redir.c test/redirect.F90
am_elpa1_test_real@SUFFIX@_OBJECTS = test/test_real.$(OBJEXT) \
test/util.$(OBJEXT) $(am__objects_14)
test/util.$(OBJEXT) $(am__objects_15)
elpa1_test_real@SUFFIX@_OBJECTS = \
$(am_elpa1_test_real@SUFFIX@_OBJECTS)
elpa1_test_real@SUFFIX@_DEPENDENCIES = $(build_lib)
......@@ -219,14 +242,14 @@ am__elpa2_print_kernels@SUFFIX@_SOURCES_DIST = \
test/redir.c test/redirect.F90
am_elpa2_print_kernels@SUFFIX@_OBJECTS = \
src/print_available_elpa2_kernels.$(OBJEXT) \
test/util.$(OBJEXT) $(am__objects_14)
test/util.$(OBJEXT) $(am__objects_15)
elpa2_print_kernels@SUFFIX@_OBJECTS = \
$(am_elpa2_print_kernels@SUFFIX@_OBJECTS)
elpa2_print_kernels@SUFFIX@_DEPENDENCIES = $(build_lib)
am__elpa2_test_complex@SUFFIX@_SOURCES_DIST = test/test_complex2.F90 \
test/util.F90 test/redir.c test/redirect.F90
am_elpa2_test_complex@SUFFIX@_OBJECTS = test/test_complex2.$(OBJEXT) \
test/util.$(OBJEXT) $(am__objects_14)
test/util.$(OBJEXT) $(am__objects_15)
elpa2_test_complex@SUFFIX@_OBJECTS = \
$(am_elpa2_test_complex@SUFFIX@_OBJECTS)
elpa2_test_complex@SUFFIX@_DEPENDENCIES = $(build_lib)
......@@ -235,7 +258,7 @@ am__elpa2_test_complex_choose_kernel_with_api@SUFFIX@_SOURCES_DIST = \
test/redir.c test/redirect.F90
am_elpa2_test_complex_choose_kernel_with_api@SUFFIX@_OBJECTS = \
test/test_complex2_choose_kernel_with_api.$(OBJEXT) \
test/util.$(OBJEXT) $(am__objects_14)
test/util.$(OBJEXT) $(am__objects_15)
elpa2_test_complex_choose_kernel_with_api@SUFFIX@_OBJECTS = $(am_elpa2_test_complex_choose_kernel_with_api@SUFFIX@_OBJECTS)
elpa2_test_complex_choose_kernel_with_api@SUFFIX@_DEPENDENCIES = \
$(build_lib)
......@@ -244,14 +267,14 @@ am__elpa2_test_complex_default_kernel@SUFFIX@_SOURCES_DIST = \
test/redir.c test/redirect.F90
am_elpa2_test_complex_default_kernel@SUFFIX@_OBJECTS = \
test/test_complex2_default_kernel.$(OBJEXT) \
test/util.$(OBJEXT) $(am__objects_14)
test/util.$(OBJEXT) $(am__objects_15)
elpa2_test_complex_default_kernel@SUFFIX@_OBJECTS = \
$(am_elpa2_test_complex_default_kernel@SUFFIX@_OBJECTS)
elpa2_test_complex_default_kernel@SUFFIX@_DEPENDENCIES = $(build_lib)
am__elpa2_test_real@SUFFIX@_SOURCES_DIST = test/test_real2.F90 \
test/util.F90 test/redir.c test/redirect.F90
am_elpa2_test_real@SUFFIX@_OBJECTS = test/test_real2.$(OBJEXT) \
test/util.$(OBJEXT) $(am__objects_14)
test/util.$(OBJEXT) $(am__objects_15)
elpa2_test_real@SUFFIX@_OBJECTS = \
$(am_elpa2_test_real@SUFFIX@_OBJECTS)
elpa2_test_real@SUFFIX@_DEPENDENCIES = $(build_lib)
......@@ -260,7 +283,7 @@ am__elpa2_test_real_choose_kernel_with_api@SUFFIX@_SOURCES_DIST = \
test/redir.c test/redirect.F90
am_elpa2_test_real_choose_kernel_with_api@SUFFIX@_OBJECTS = \
test/test_real2_choose_kernel_with_api.$(OBJEXT) \
test/util.$(OBJEXT) $(am__objects_14)
test/util.$(OBJEXT) $(am__objects_15)
elpa2_test_real_choose_kernel_with_api@SUFFIX@_OBJECTS = \
$(am_elpa2_test_real_choose_kernel_with_api@SUFFIX@_OBJECTS)
elpa2_test_real_choose_kernel_with_api@SUFFIX@_DEPENDENCIES = \
......@@ -270,7 +293,7 @@ am__elpa2_test_real_default_kernel@SUFFIX@_SOURCES_DIST = \
test/redirect.F90
am_elpa2_test_real_default_kernel@SUFFIX@_OBJECTS = \
test/test_real2_default_kernel.$(OBJEXT) test/util.$(OBJEXT) \
$(am__objects_14)
$(am__objects_15)
elpa2_test_real_default_kernel@SUFFIX@_OBJECTS = \
$(am_elpa2_test_real_default_kernel@SUFFIX@_OBJECTS)
elpa2_test_real_default_kernel@SUFFIX@_DEPENDENCIES = $(build_lib)
......@@ -762,7 +785,7 @@ libelpa@SUFFIX@_la_SOURCES = src/elpa1.F90 src/elpa2.F90 \
$(am__append_4) $(am__append_5) $(am__append_6) \
$(am__append_7) $(am__append_8) $(am__append_9) \
$(am__append_10) $(am__append_11) $(am__append_12) \
$(am__append_13)
$(am__append_13) $(am__append_14)
#if WITH_AVX_SANDYBRIDGE
# libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c \
......@@ -939,6 +962,29 @@ src/$(DEPDIR)/$(am__dirstamp):
@: > src/$(DEPDIR)/$(am__dirstamp)
src/elpa1.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
src/elpa2.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
src/timer.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
src/ftimings/$(am__dirstamp):
@$(MKDIR_P) src/ftimings
@: > src/ftimings/$(am__dirstamp)
src/ftimings/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) src/ftimings/$(DEPDIR)
@: > src/ftimings/$(DEPDIR)/$(am__dirstamp)
src/ftimings/ftimings.lo: src/ftimings/$(am__dirstamp) \
src/ftimings/$(DEPDIR)/$(am__dirstamp)
src/ftimings/ftimings_type.lo: src/ftimings/$(am__dirstamp) \
src/ftimings/$(DEPDIR)/$(am__dirstamp)
src/ftimings/ftimings_value.lo: src/ftimings/$(am__dirstamp) \
src/ftimings/$(DEPDIR)/$(am__dirstamp)
src/ftimings/highwater_mark.lo: src/ftimings/$(am__dirstamp) \
src/ftimings/$(DEPDIR)/$(am__dirstamp)
src/ftimings/resident_set_size.lo: src/ftimings/$(am__dirstamp) \
src/ftimings/$(DEPDIR)/$(am__dirstamp)
src/ftimings/time.lo: src/ftimings/$(am__dirstamp) \
src/ftimings/$(DEPDIR)/$(am__dirstamp)
src/ftimings/virtual_memory.lo: src/ftimings/$(am__dirstamp) \
src/ftimings/$(DEPDIR)/$(am__dirstamp)
src/ftimings/papi.lo: src/ftimings/$(am__dirstamp) \
src/ftimings/$(DEPDIR)/$(am__dirstamp)
src/elpa2_kernels/$(am__dirstamp):
@$(MKDIR_P) src/elpa2_kernels
@: > src/elpa2_kernels/$(am__dirstamp)
......@@ -1115,6 +1161,8 @@ mostlyclean-compile:
-rm -f src/*.lo
-rm -f src/elpa2_kernels/*.$(OBJEXT)
-rm -f src/elpa2_kernels/*.lo
-rm -f src/ftimings/*.$(OBJEXT)
-rm -f src/ftimings/*.lo
-rm -f test/*.$(OBJEXT)
distclean-compile:
......@@ -1125,6 +1173,11 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@src/elpa2_kernels/$(DEPDIR)/elpa2_kernels_real_sse-avx_2hv.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/elpa2_kernels/$(DEPDIR)/elpa2_kernels_real_sse-avx_4hv.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/elpa2_kernels/$(DEPDIR)/elpa2_kernels_real_sse-avx_6hv.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/ftimings/$(DEPDIR)/highwater_mark.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/ftimings/$(DEPDIR)/papi.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/ftimings/$(DEPDIR)/resident_set_size.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/ftimings/$(DEPDIR)/time.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/ftimings/$(DEPDIR)/virtual_memory.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/redir.Po@am__quote@
.F90.o:
......@@ -1209,6 +1262,7 @@ clean-libtool:
-rm -rf .libs _libs
-rm -rf src/.libs src/_libs
-rm -rf src/elpa2_kernels/.libs src/elpa2_kernels/_libs
-rm -rf src/ftimings/.libs src/ftimings/_libs
distclean-libtool:
-rm -f libtool config.lt
......@@ -1780,6 +1834,8 @@ distclean-generic:
-rm -f src/$(am__dirstamp)
-rm -f src/elpa2_kernels/$(DEPDIR)/$(am__dirstamp)
-rm -f src/elpa2_kernels/$(am__dirstamp)
-rm -f src/ftimings/$(DEPDIR)/$(am__dirstamp)
-rm -f src/ftimings/$(am__dirstamp)
-rm -f test/$(DEPDIR)/$(am__dirstamp)
-rm -f test/$(am__dirstamp)
......@@ -1793,7 +1849,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf src/elpa2_kernels/$(DEPDIR) test/$(DEPDIR)
-rm -rf src/elpa2_kernels/$(DEPDIR) src/ftimings/$(DEPDIR) test/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-local distclean-tags
......@@ -1842,7 +1898,7 @@ installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
-rm -rf src/elpa2_kernels/$(DEPDIR) test/$(DEPDIR)
-rm -rf src/elpa2_kernels/$(DEPDIR) src/ftimings/$(DEPDIR) test/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
......
/* config.h.in. Generated from configure.ac by autoheader. */
/* Enable more timings */
#undef HAVE_DETAILED_TIMINGS
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
......@@ -12,6 +15,9 @@
/* can use module iso_fortran_env */
#undef HAVE_ISO_FORTRAN_ENV
/* Use the PAPI library */
#undef HAVE_LIBPAPI
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for elpa 2014.06.003.
# Generated by GNU Autoconf 2.69 for elpa 2014.06.004.
#
# Report bugs to <elpa-library@rzg.mpg.de>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='elpa'
PACKAGE_TARNAME='elpa'
PACKAGE_VERSION='2014.06.003'
PACKAGE_STRING='elpa 2014.06.003'
PACKAGE_VERSION='2014.06.004'
PACKAGE_STRING='elpa 2014.06.004'
PACKAGE_BUGREPORT='elpa-library@rzg.mpg.de'
PACKAGE_URL=''
 
......@@ -710,6 +710,8 @@ FCFLAGS
ac_ct_FC
FC
MPIFC
HAVE_DETAILED_TIMINGS_FALSE
HAVE_DETAILED_TIMINGS_TRUE
HAVE_REDIRECT_FALSE
HAVE_REDIRECT_TRUE
am__fastdepCXX_FALSE
......@@ -820,7 +822,9 @@ enable_option_checking
enable_silent_rules
enable_maintainer_mode
enable_dependency_tracking
with_ftimings
with_redirect
enable_papi
with_avx_optimization
with_openmp
enable_openmp
......@@ -1407,7 +1411,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures elpa 2014.06.003 to adapt to many kinds of systems.
\`configure' configures elpa 2014.06.004 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1477,7 +1481,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of elpa 2014.06.003:";;
short | recursive ) echo "Configuration of elpa 2014.06.004:";;
esac
cat <<\_ACEOF
 
......@@ -1494,6 +1498,8 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--disable-papi Do not use PAPI to also measure flop count,
autodetected by default
--disable-openmp do not use OpenMP
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes]
......@@ -1504,6 +1510,7 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-ftimings detailed timings, default no.
--with-redirect for test programs, allow redirection of
stdout/stderr per MPI taks in a file (useful for
ftimings), default no.
......@@ -1636,7 +1643,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
elpa configure 2014.06.003
elpa configure 2014.06.004
generated by GNU Autoconf 2.69
 
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1726,21 +1733,21 @@ fi
 
} # ac_fn_cxx_try_compile
 
# ac_fn_fc_try_compile LINENO
# ---------------------------
# Try to compile conftest.$ac_ext, and return whether this succeeded.
ac_fn_fc_try_compile ()
# ac_fn_c_try_link LINENO
# -----------------------
# Try to link conftest.$ac_ext, and return whether this succeeded.
ac_fn_c_try_link ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
rm -f conftest.$ac_objext
if { { ac_try="$ac_compile"
rm -f conftest.$ac_objext conftest$ac_exeext
if { { ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
$as_echo "$ac_try_echo"; } >&5
(eval "$ac_compile") 2>conftest.err
(eval "$ac_link") 2>conftest.err
ac_status=$?
if test -s conftest.err; then
grep -v '^ *+' conftest.err >conftest.er1
......@@ -1749,9 +1756,12 @@ $as_echo "$ac_try_echo"; } >&5
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && {
test -z "$ac_fc_werror_flag" ||
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then :
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
test -x conftest$ac_exeext
}; then :
ac_retval=0
else
$as_echo "$as_me: failed program was:" >&5
......@@ -1759,26 +1769,31 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
ac_retval=1
fi
# Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
# created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
 
} # ac_fn_fc_try_compile
} # ac_fn_c_try_link
 
# ac_fn_fc_try_link LINENO
# ------------------------
# Try to link conftest.$ac_ext, and return whether this succeeded.
ac_fn_fc_try_link ()
# ac_fn_fc_try_compile LINENO
# ---------------------------
# Try to compile conftest.$ac_ext, and return whether this succeeded.
ac_fn_fc_try_compile ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
rm -f conftest.$ac_objext conftest$ac_exeext
if { { ac_try="$ac_link"
rm -f conftest.$ac_objext
if { { ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
$as_echo "$ac_try_echo"; } >&5
(eval "$ac_link") 2>conftest.err
(eval "$ac_compile") 2>conftest.err
ac_status=$?
if test -s conftest.err; then
grep -v '^ *+' conftest.err >conftest.er1
......@@ -1789,10 +1804,7 @@ $as_echo "$ac_try_echo"; } >&5
test $ac_status = 0; } && {
test -z "$ac_fc_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
test -x conftest$ac_exeext
}; then :
} && test -s conftest.$ac_objext; then :
ac_retval=0
else
$as_echo "$as_me: failed program was:" >&5
......@@ -1800,20 +1812,15 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
ac_retval=1
fi
# Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
# created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
 
} # ac_fn_fc_try_link
} # ac_fn_fc_try_compile
 
# ac_fn_c_try_link LINENO
# -----------------------
# ac_fn_fc_try_link LINENO
# ------------------------
# Try to link conftest.$ac_ext, and return whether this succeeded.
ac_fn_c_try_link ()
ac_fn_fc_try_link ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
rm -f conftest.$ac_objext conftest$ac_exeext
......@@ -1833,7 +1840,7 @@ $as_echo "$ac_try_echo"; } >&5
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && {
test -z "$ac_c_werror_flag" ||
test -z "$ac_fc_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
......@@ -1854,7 +1861,7 @@ fi
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
 
} # ac_fn_c_try_link
} # ac_fn_fc_try_link
 
# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
# -------------------------------------------------------
......@@ -2119,7 +2126,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
 
It was created by elpa $as_me 2014.06.003, which was
It was created by elpa $as_me 2014.06.004, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
$ $0 $@
......@@ -2986,7 +2993,7 @@ fi
 
# Define the identity of the package.
PACKAGE='elpa'
VERSION='2014.06.003'
VERSION='2014.06.004'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -5052,6 +5059,19 @@ install_complex_bgq=no
install_complex_avx_block1=no
install_complex_avx_block2=no
 
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ELPA should be build with ftimings support" >&5
$as_echo_n "checking whether ELPA should be build with ftimings support... " >&6; }
# Check whether --with-ftimings was given.
if test "${with_ftimings+set}" = set; then :
withval=$with_ftimings; with_ftimings=yes
else
with_ftimings=no
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_ftimings}" >&5
$as_echo "${with_ftimings}" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdout/stderr file redirect should be enabled" >&5
$as_echo_n "checking whether stdout/stderr file redirect should be enabled... " >&6; }
 
......@@ -5079,6 +5099,83 @@ else
fi
 
 
if test x"${with_ftimings}" = x"yes"; then
$as_echo "#define HAVE_DETAILED_TIMINGS 1" >>confdefs.h
# Check whether --enable-papi was given.
if test "${enable_papi+set}" = set; then :
enableval=$enable_papi; want_papi=$enableval
else
want_papi="auto"
fi
papi_found=unknown
if test x"$want_papi" != x"no" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PAPI_library_init in -lpapi" >&5
$as_echo_n "checking for PAPI_library_init in -lpapi... " >&6; }
if ${ac_cv_lib_papi_PAPI_library_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpapi $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char PAPI_library_init ();
int
main ()
{
return PAPI_library_init ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_papi_PAPI_library_init=yes
else
ac_cv_lib_papi_PAPI_library_init=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_papi_PAPI_library_init" >&5
$as_echo "$ac_cv_lib_papi_PAPI_library_init" >&6; }
if test "x$ac_cv_lib_papi_PAPI_library_init" = xyes; then :
papi_found="yes"
else
papi_found="no"
fi
if test x"$want_papi" = x"yes" ; then
if test x"$papi_found" = x"no" ; then
as_fn_error $? "\"Could not find usable PAPI installation, please adjust CFLAGS, LDFLAGS\"" "$LINENO" 5
fi
fi
fi
if test x"$papi_found" = x"yes"; then
$as_echo "#define HAVE_LIBPAPI 1" >>confdefs.h
LIBS="-lpapi $LIBS"
fi
fi
if test x"$with_ftimings" = x"yes"; then
HAVE_DETAILED_TIMINGS_TRUE=
HAVE_DETAILED_TIMINGS_FALSE='#'
else
HAVE_DETAILED_TIMINGS_TRUE='#'
HAVE_DETAILED_TIMINGS_FALSE=
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether SSE assembler kernel can be compiled" >&5
$as_echo_n "checking whether SSE assembler kernel can be compiled... " >&6; }
 
......@@ -21346,6 +21443,10 @@ if test -z "${HAVE_REDIRECT_TRUE}" && test -z "${HAVE_REDIRECT_FALSE}"; then
as_fn_error $? "conditional \"HAVE_REDIRECT\" was never defined.