Commit ae473b44 authored by Andreas Marek's avatar Andreas Marek

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
......
This diff is collapsed.
/* 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
......
This diff is collapsed.
AC_PREREQ([2.69])
AC_INIT([elpa],[2014.06.003], [elpa-library@rzg.mpg.de])
AC_INIT([elpa],[2014.06.004], [elpa-library@rzg.mpg.de])
AC_SUBST([PACKAGE_VERSION])
AC_CONFIG_SRCDIR([src/elpa1.F90])
......@@ -100,6 +100,15 @@ install_complex_bgq=no
install_complex_avx_block1=no
install_complex_avx_block2=no
dnl build with ftimings support
AC_MSG_CHECKING(whether ELPA should be build with ftimings support)
AC_ARG_WITH([ftimings],
AS_HELP_STRING([--with-ftimings],
[detailed timings, default no.]),
[with_ftimings=yes],
[with_ftimings=no])
AC_MSG_RESULT([${with_ftimings}])
dnl build with the possibilty to redirect stdout and stderr
dnl per MPI task in a file
AC_MSG_CHECKING(whether stdout/stderr file redirect should be enabled)
......@@ -114,7 +123,28 @@ if test x"${with_redirect}" = x"yes"; then
AC_DEFINE([HAVE_REDIRECT], [1], [Redirect stdout and stderr of test programs per MPI tasks to a file])
fi
AM_CONDITIONAL([HAVE_REDIRECT],[test x"$with_redirect" = x"yes"])
if test x"${with_ftimings}" = x"yes"; then
AC_DEFINE([HAVE_DETAILED_TIMINGS], [1], [Enable more timings])
AC_ARG_ENABLE([papi],
[AS_HELP_STRING([--disable-papi],[Do not use PAPI to also measure flop count, autodetected by default])],
[want_papi=$enableval],[want_papi="auto"])
papi_found=unknown
if test x"$want_papi" != x"no" ; then
AC_CHECK_LIB([papi],[PAPI_library_init],[papi_found="yes"],[papi_found="no"])
if test x"$want_papi" = x"yes" ; then
if test x"$papi_found" = x"no" ; then
AC_MSG_ERROR(["Could not find usable PAPI installation, please adjust CFLAGS, LDFLAGS"])
fi
fi
fi
if test x"$papi_found" = x"yes"; then
AC_DEFINE([HAVE_LIBPAPI], [1], [Use the PAPI library])
LIBS="-lpapi $LIBS"
fi
fi
AM_CONDITIONAL([HAVE_DETAILED_TIMINGS],[test x"$with_ftimings" = x"yes"])
AC_MSG_CHECKING(whether SSE assembler kernel can be compiled)
$CC -c $srcdir/src/elpa2_kernels/elpa2_kernels_asm_x86_64.s -o test.o 2>/dev/null
......
This diff is collapsed.
This diff is collapsed.
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.
"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.
An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.
A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".
The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.
The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:
a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:
a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this license
document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:
a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.
c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.
1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.
e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
This diff is collapsed.
! Copyright 2014 Lorenz Hüdepohl
!
! This file is part of ftimings.
!
! ftimings is free software: you can redistribute it and/or modify
! it under the terms of the GNU Lesser General Public License as published by
! the Free Software Foundation, either version 3 of the License, or
! (at your option) any later version.
!
! ftimings is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! GNU Lesser General Public License for more details.
!
! You should have received a copy of the GNU Lesser General Public License
! along with ftimings. If not, see <http://www.gnu.org/licenses/>.
module ftimings_type
use, intrinsic :: iso_c_binding, only : C_INT64_T, C_DOUBLE, C_LONG_LONG, C_LONG, C_INT
implicit none
integer, parameter :: rk = C_DOUBLE
integer, parameter :: name_length = 40
end module
! Copyright 2014 Lorenz Hüdepohl
!
! This file is part of ftimings.
!
! ftimings is free software: you can redistribute it and/or modify
! it under the terms of the GNU Lesser General Public License as published by
! the Free Software Foundation, either version 3 of the License, or
! (at your option) any later version.
!
! ftimings is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! GNU Lesser General Public License for more details.
!
! You should have received a copy of the GNU Lesser General Public License
! along with ftimings. If not, see <http://www.gnu.org/licenses/>.
#ifdef HAVE_CONFIG_H
#include "config-f90.h"
#endif
module ftimings_value
use ftimings_type
implicit none
public
type value_t
integer(kind=C_INT64_T) :: micros = 0 ! microseconds spent in this node
integer(kind=C_LONG) :: virtualmem = 0 ! newly created virtual memory
integer(kind=C_LONG) :: maxrsssize = 0 ! newly used max. resident mem ("high water mark")
integer(kind=C_LONG) :: rsssize = 0 ! newly used resident memory
integer(kind=C_LONG_LONG) :: flop_count = 0 ! floating point operations done in this node
integer(kind=C_LONG_LONG) :: ldst = 0 ! number of loads and stores
end type
interface operator(+)
module procedure value_add
end interface
interface operator(-)
module procedure value_minus
module procedure value_inverse
end interface
type(value_t), parameter :: null_value = value_t(micros = 0, &
rsssize = 0, &
virtualmem = 0, &
maxrsssize = 0, &
flop_count = 0)
contains
pure elemental function value_add(a,b) result(c)
class(value_t), intent(in) :: a, b
type(value_t) :: c
c%micros = a%micros + b%micros
c%rsssize = a%rsssize + b%rsssize
c%virtualmem = a%virtualmem + b%virtualmem
c%maxrsssize = a%maxrsssize + b%maxrsssize
#ifdef HAVE_LIBPAPI
c%flop_count = a%flop_count + b%flop_count
c%ldst = a%ldst + b%ldst
#endif
end function
pure elemental function value_minus(a,b) result(c)
class(value_t), intent(in) :: a, b
type(value_t) :: c
c%micros = a%micros - b%micros
c%rsssize = a%rsssize - b%rsssize
c%virtualmem = a%virtualmem - b%virtualmem
c%maxrsssize = a%maxrsssize - b%maxrsssize
#ifdef HAVE_LIBPAPI
c%flop_count = a%flop_count - b%flop_count
c%ldst = a%ldst - b%ldst
#endif
end function
pure elemental function value_inverse(a) result(neg_a)
class(value_t), intent(in) :: a
type(value_t) :: neg_a
neg_a%micros = - a%micros
neg_a%rsssize = - a%rsssize
neg_a%virtualmem = - a%virtualmem
neg_a%maxrsssize = - a%maxrsssize
#ifdef HAVE_LIBPAPI
neg_a%flop_count = - a%flop_count
neg_a%ldst = - a%ldst
#endif
end function
end module
/* Copyright 2014 Andreas Marek, Lorenz Hüdepohl
*
* This file is part of ftimings.
*
* ftimings is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* ftimings is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with ftimings. If not, see <http://www.gnu.org/licenses/>.
*/
#include <sys/types.h>
#define _GNU_SOURCE
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
long ftimings_highwater_mark() {
long hwm = 0L;
char line[1024];
FILE* fp = NULL;
if ((fp = fopen( "/proc/self/status", "r" )) == NULL ) {
return 0L;
}
/* Read memory size data from /proc/pid/status */
while(fgets(line, sizeof line, fp)) {
if (sscanf(line, "VmHWM: %ld kB", &hwm) == 1) {
break;
}
}
fclose(fp);
return hwm * 1024L;
}
/* Copyright 2014 Lorenz Hüdepohl
*
* This file is part of ftimings.
*
* ftimings is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* ftimings is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with ftimings. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
static int event_set;
static int tried_papi_init = 0;
static int papi_available = 0;
static int flops_available = 0;
static int ldst_available = 0;
#ifdef HAVE_LIBPAPI
#include <papi.h>
int ftimings_papi_init(void) {
int ret;
if (tried_papi_init) {
return papi_available;
}
#pragma omp critical
{
/* Think about it :) */
if (tried_papi_init) {
goto end;
}
tried_papi_init = 1;
event_set = PAPI_NULL;
if ((ret = PAPI_library_init(PAPI_VER_CURRENT)) < 0) {
fprintf(stderr, "ftimings: %s:%d: PAPI_library_init(%d): %s\n",
__FILE__, __LINE__, PAPI_VER_CURRENT, PAPI_strerror(ret));
goto error;
}
if ((ret = PAPI_create_eventset(&event_set)) < 0) {
fprintf(stderr, "ftimings: %s:%d PAPI_create_eventset(): %s\n",
__FILE__, __LINE__, PAPI_strerror(ret));
goto error;
}
/* Check FLOP counter availability */
if ((ret = PAPI_query_event(PAPI_DP_OPS)) < 0) {
fprintf(stderr, "ftimings: %s:%d: PAPI_query_event(PAPI_DP_OPS): %s\n",
__FILE__, __LINE__, PAPI_strerror(ret));
flops_available = 0;
} else if ((ret = PAPI_add_event(event_set, PAPI_DP_OPS)) < 0) {
fprintf(stderr, "ftimings: %s:%d PAPI_add_event(): %s\n",
__FILE__, __LINE__, PAPI_strerror(ret));
flops_available = 0;
} else {
flops_available = 1;
}
/* Loads + Stores */
if ((ret = PAPI_query_event(PAPI_LD_INS)) < 0) {
fprintf(stderr, "ftimings: %s:%d: PAPI_query_event(PAPI_LD_INS): %s\n",
__FILE__, __LINE__, PAPI_strerror(ret));
ldst_available = 0;
} else if ((ret = PAPI_query_event(PAPI_SR_INS)) < 0) {
fprintf(stderr, "ftimings: %s:%d: PAPI_query_event(PAPI_SR_INS): %s\n",
__FILE__, __LINE__, PAPI_strerror(ret));
ldst_available = 0;
} else if ((ret = PAPI_add_event(event_set, PAPI_LD_INS)) < 0) {
fprintf(stderr, "ftimings: %s:%d PAPI_add_event(event_set, PAPI_LD_INS): %s\n",
__FILE__, __LINE__, PAPI_strerror(ret));
ldst_available = 0;
} else if ((ret = PAPI_add_event(event_set, PAPI_SR_INS)) < 0) {
fprintf(stderr, "ftimings: %s:%d PAPI_add_event(event_set, PAPI_SR_INS): %s\n",
__FILE__, __LINE__, PAPI_strerror(ret));
ldst_available = 0;
} else {
ldst_available = 1;
}
/* Start */
if ((ret = PAPI_start(event_set)) < 0) {
fprintf(stderr, "ftimings: %s:%d PAPI_start(): %s\n",
__FILE__, __LINE__, PAPI_strerror(ret));
goto error;
}
goto end;
error:
/* PAPI works */
papi_available = 0;
end:
/* PAPI works */
papi_available = 1;
} /* End of critical region */
return papi_available;
}
int ftimings_flop_init(void) {
int ret;
if (!tried_papi_init) {
ftimings_papi_init();
}
return flops_available;
}
int ftimings_loads_stores_init(void) {
int ret;
if (!tried_papi_init) {
ftimings_papi_init();
}
return ldst_available;
}
void ftimings_papi_counters(long long *flops, long long *ldst) {
long long res[3];
int i, ret;
if ((ret = PAPI_read(event_set, &res[0])) < 0) {
fprintf(stderr, "PAPI_read: %s\n", PAPI_strerror(ret));
exit(1);
}
i = 0;
if (flops_available) {
*flops = res[i++];
} else {
*flops = 0LL;
}
if (ldst_available) {
*ldst = res[i++];
*ldst += res[i++];
} else {
*ldst = 0LL;
}
}
#endif
/* Copyright 2014 Lorenz Hüdepohl
*
* This file is part of ftimings.
*
* ftimings is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* ftimings is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with ftimings. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdio.h>
#include <unistd.h>
long ftimings_resident_set_size() {
long rss = 0L;
FILE* fp = NULL;
if ((fp = fopen( "/proc/self/statm", "r" )) == NULL ) {
return 0L;
}
if (fscanf(fp, "%*s%ld", &rss) != 1) {
fclose(fp);
return (size_t)0L; /* Can't read? */
}
fclose(fp);
return rss * sysconf( _SC_PAGESIZE);
}
/* Copyright 2014 Lorenz Hüdepohl
*
* This file is part of ftimings.
*
* ftimings is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* ftimings is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with ftimings. If not, see <http://www.gnu.org/licenses/>.
*/
#include <sys/time.h>
#include <stdio.h>
#include <unistd.h>
#include <stdint.h>
#include <stddef.h>
#include <stdlib.h>
#ifdef HAVE_CONFIG_H
#include "config-f90.h"
#endif
/* Return number of microseconds since 1.1.1970, in a 64 bit integer.
* (with 2^64 us ~ 6 * 10^5 years, this should be sufficiently overflow safe)
*/
int64_t ftimings_microseconds_since_epoch(void) {
struct timeval tv;
if (gettimeofday(&tv, NULL) != 0) {
perror("gettimeofday");
exit(1);
}
return (int64_t) (tv.tv_sec) * ((int64_t) 1000000) + (int64_t)(tv.tv_usec);
}
/* Copyright 2014 Andreas Marek, Lorenz Hüdepohl
*
* This file is part of ftimings.
*
* ftimings is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* ftimings is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with ftimings. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdio.h>
#include <unistd.h>
long ftimings_virtual_memory() {
long rss = 0L;
FILE* fp = NULL;
if ((fp = fopen( "/proc/self/statm", "r" )) == NULL ) {
return 0L;
}
if (fscanf(fp, "%ld", &rss) != 1) {
fclose(fp);
return (size_t)0L; /* Can't read? */
}
fclose(fp);
return rss * sysconf( _SC_PAGESIZE);
}
module timings
use ftimings
implicit none
type(timer_t) :: timer
end module timings
......@@ -70,7 +70,9 @@ program read_real
#ifdef HAVE_REDIRECT
use redirect
#endif
#ifdef HAVE_DETAILED_TIMINGS
use timings
#endif
implicit none
include 'mpif.h'
......@@ -141,6 +143,32 @@ program read_real
endif
#endif
#ifdef HAVE_DETAILED_TIMINGS