Skip to content

Performance analysis #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chrispbradley wants to merge 9 commits into
base: devel
Choose a base branch
from
Open

Performance analysis #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a777086
Fixes for adding with diagnostics flag.
chrispbradley Sep 19, 2016
064b669
Starting to add performance analysis variables.
chrispbradley Sep 22, 2016
00e2ae2
Merge branch 'buildfixes' of https://github.com/chrispbradley/manage …
chrispbradley Sep 23, 2016
175b7bf
Addition of instrumention option, scorep instrumentation and adjustme…
chrispbradley Sep 25, 2016
f97da80
More instrumentation additions.
chrispbradley Sep 28, 2016
33e3dc1
Score-p instrumentation
chrispbradley Sep 30, 2016
76f1696
Fixes to get vtune working
chrispbradley Oct 2, 2016
329c71f
Bug fix
chrispbradley Oct 2, 2016
495ecbb
Fixing typos and bugs from review.
chrispbradley Nov 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@
# If you want to initialize your OpenCMISS installation to developer defaults, define the EVEL variable to any value.
# It's not a typo, the command line for this results in -DEVEL=<myvalue> :-)
#
# =========== Instrumentation ===========
#
# INSTRUMENTATION: []|none|scorep|vtune
# Specify any code instrumentation systems for use in performance analysis.
#
# none : no instrumentation
# scorep: score-p instrumentation
# vtune : Intel vtune instrumentation (only available with Intel compilers)
# Note that this variable will be used case-insensitive.
# If no instrumentation is specified none will be used as the default.
#
# ============== Toolchain ==============
#
# TOOLCHAIN: []|gnu|clang|mingw|intel|ibm
Expand Down Expand Up @@ -100,6 +111,8 @@ cmake_minimum_required(VERSION ${OPENCMISS_CMAKE_MIN_VERSION} FATAL_ERROR)

# Need to set the compilers before any project call
include(OCToolchainCompilers)
# Set any instrumentation options before any project call
include(OCInstrumentation)

########################################################################
# Ready to start the "build project"
Expand Down Expand Up @@ -303,4 +316,4 @@ endif()
message(STATUS "@")
printnextsteps()

log("Finished configuration in ${CMAKE_CURRENT_BINARY_DIR}")
log("Finished configuration in ${CMAKE_CURRENT_BINARY_DIR}")
101 changes: 70 additions & 31 deletions CMakeModules/FindMPI.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,18 +159,18 @@ get_property(ENABLED_LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
#

# Start out with the generic MPI compiler names, as these are most commonly used.
set(_MPI_C_COMPILER_NAMES mpicc mpcc mpicc_r mpcc_r)
set(_MPI_CXX_COMPILER_NAMES mpicxx mpiCC mpcxx mpCC mpic++ mpc++
set(_MPI_Generic_C_COMPILER_NAMES mpicc mpcc mpicc_r mpcc_r)
set(_MPI_Generic_CXX_COMPILER_NAMES mpicxx mpiCC mpcxx mpCC mpic++ mpc++
mpicxx_r mpiCC_r mpcxx_r mpCC_r mpic++_r mpc++_r)
set(_MPI_Fortran_COMPILER_NAMES #mpif77 mpif77_r mpf77 mpf77_r
set(_MPI_Generic_Fortran_COMPILER_NAMES #mpif77 mpif77_r mpf77 mpf77_r
mpif90 mpif90_r mpf90 mpf90_r
mpif95 mpif95_r mpf95 mpf95_r)

# GNU compiler names
set(_MPI_GNU_C_COMPILER_NAMES mpigcc mpgcc mpigcc_r mpgcc_r)
set(_MPI_GNU_C_COMPILER_NAMES mpgcc mpigcc_r mpgcc_r)
set(_MPI_GNU_CXX_COMPILER_NAMES mpig++ mpg++ mpig++_r mpg++_r)
set(_MPI_GNU_Fortran_COMPILER_NAMES #mpig77 mpig77_r mpg77 mpg77_r
mpigfortran mpgfortran mpigfortran_r mpgfortran_r)
mpgfortran mpigfortran_r mpgfortran_r)

# Intel MPI compiler names
set(_MPI_Intel_C_COMPILER_NAMES mpiicc)
Expand All @@ -188,7 +188,7 @@ set(_MPI_XL_CXX_COMPILER_NAMES mpixlcxx mpixlC mpixlc++ mpxl
mpixlcxx_r mpixlC_r mpixlc++_r mpxlcxx_r mpxlc++_r mpixlc++_r mpxlCC_r)
set(_MPI_XL_Fortran_COMPILER_NAMES mpixlf95 mpixlf95_r mpxlf95 mpxlf95_r
mpixlf90 mpixlf90_r mpxlf90 mpxlf90_r
#mpixlf77 mpixlf77_r mpxlf77 mpxlf77_r
#mpixlf77 mpixlf77_r mpxlf77 mpxlf77_r
mpixlf mpixlf_r mpxlf mpxlf_r)

############################################################
Expand All @@ -197,14 +197,32 @@ set(_MPI_XL_Fortran_COMPILER_NAMES mpixlf95 mpixlf95_r mpxlf95 mpxlf95
# append vendor-specific compilers to the list if we either don't know the compiler id,
# or if we know it matches the regular compiler.
foreach (lang C CXX Fortran)
set(_MPI_${lang}_COMPILER_NAMES )
if (lang IN_LIST ENABLED_LANGUAGES)
foreach (id GNU Intel PGI XL)
if (NOT CMAKE_${lang}_COMPILER_ID OR CMAKE_${lang}_COMPILER_ID STREQUAL id)
#Add in add instrumentation wrappers
if(OC_INSTRUMENTATION STREQUAL "scorep")
# Replace mpi compiler name with the appropriate scorep wrapper name
foreach (mpicompiler ${_MPI_Generic_${lang}_COMPILER_NAMES})
list(INSERT _MPI_${lang}_COMPILER_NAMES 0 "scorep-${mpicompiler}")
endforeach()
else()
list(INSERT _MPI_${lang}_COMPILER_NAMES 0 ${_MPI_Generic_${lang}_COMPILER_NAMES})
endif()
foreach (id GNU Intel PGI XL)
if (NOT CMAKE_${lang}_COMPILER_ID OR CMAKE_${lang}_COMPILER_ID STREQUAL id)
#Add in add instrumentation wrappers
if(OC_INSTRUMENTATION STREQUAL "scorep")
# Replace mpi compiler name with the appropriate scorep wrapper name
foreach (mpicompiler ${_MPI_${id}_${lang}_COMPILER_NAMES})
list(INSERT _MPI_${lang}_COMPILER_NAMES 0 "scorep-${mpicompiler}")
endforeach()
else()
list(INSERT _MPI_${lang}_COMPILER_NAMES 0 ${_MPI_${id}_${lang}_COMPILER_NAMES})
endif()
unset(_MPI_${id}_${lang}_COMPILER_NAMES) # clean up the namespace here
endforeach()
messagev("Looking for _MPI_${lang}_COMPILER_NAMES=${_MPI_${lang}_COMPILER_NAMES}")
endif()
unset(_MPI_${id}_${lang}_COMPILER_NAMES) # clean up the namespace here
endforeach()
messagev(STATUS "Looking for _MPI_${lang}_COMPILER_NAMES=${_MPI_${lang}_COMPILER_NAMES}")
endif()
endforeach()

Expand All @@ -230,8 +248,12 @@ if (DEFINED MPI_HOME)
else()
# Allow all paths, and add an extra path if set
set(PATHOPT )
# Start with MPI_HOME from the environment, of given
set(_MPI_PREFIX_PATH $ENV{MPI_HOME})
# CPB 11/11/16 Don't look at MPI_HOME environment variable. Some MPI distros set this but others don't. This can mean that
# the MPI_HOME environment variable might clash with what has been specified via the -DMPI= option. The common MPI_HOME's
# are covered below regardless.
# Start with MPI_HOME from the environment, of given
#set(_MPI_PREFIX_PATH $ENV{MPI_HOME})

@hsorby hsorby Nov 11, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a comment as to why this is not desired?

@chrispbradley chrispbradley Nov 11, 2016

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added a comment. Basically some MPI environs set this when they are installed and this can then clash with the MPI environ specified via -DMPI=...

set(_MPI_PREFIX_PATH )
# Check if a mpi mnemonic is given
# Standard local paths will be added below later
if(DEFINED MPI)
Expand Down Expand Up @@ -296,12 +318,16 @@ else()

# Build a list of prefixes to search for MPI.
set(_MPI_PREFIX_PATH_COPY ${_MPI_PREFIX_PATH})
set(_MPI_PREFIX_PATH )
messagev("CMAKE_SYSTEM_PREFIX_PATH = ${CMAKE_SYSTEM_PREFIX_PATH}")
messagev("_MPI_PREFIX_PATH_COPY = ${_MPI_PREFIX_PATH_COPY}")
foreach(SystemPrefixDir
${CMAKE_SYSTEM_PREFIX_PATH}
# Add some more paths
/usr/lib /usr/lib64
/usr/local/lib /usr/local/lib64)
${CMAKE_SYSTEM_PREFIX_PATH}
# Add some more paths
/usr/lib /usr/lib64
/usr/local/lib /usr/local/lib64)
foreach(MpiPackageDir ${_MPI_PREFIX_PATH_COPY})
messagev("SystemPrefixDir = ${SystemPrefixDir} MpiPackageDir = ${MpiPackageDir}")
messagev("Trying path ${SystemPrefixDir}/${MpiPackageDir}")
if(EXISTS ${SystemPrefixDir}/${MpiPackageDir})
messagev("Path added")
Expand Down Expand Up @@ -359,6 +385,7 @@ function (_mpi_check_compiler compiler options cmdvar resvar)
endif()
set(${cmdvar} "${cmdline}" PARENT_SCOPE)
set(${resvar} "${success}" PARENT_SCOPE)
messagev("Checking MPI compiler; compiler=${compiler}; options=${options}; cmdline=${cmdline}; result=${success}")
endfunction()

#
Expand Down Expand Up @@ -386,7 +413,8 @@ function (interrogate_mpi_compiler lang try_libs)
# compiler, MPI_${lang}_COMPILER won't be equal to MPI_${lang}_NO_INTERROGATE, and we'll
# inspect that compiler anew. This allows users to set new compilers w/o rm'ing cache.
string(COMPARE NOTEQUAL "${MPI_${lang}_NO_INTERROGATE}" "${MPI_${lang}_COMPILER}" interrogate)


messagev("lang=${lang}; MPI_${lang}_COMPILER=${MPI_${lang}_COMPILER}; MPI_${lang}_NO_INTERROGATE=${MPI_${lang}_NO_INTERROGATE}; interrogate=${interrogate}")
# If MPI is set already in the cache, don't bother with interrogating the compiler.
if (interrogate AND ((NOT MPI_${lang}_INCLUDE_PATH) OR (NOT MPI_${lang}_LIBRARIES)))
if (MPI_${lang}_COMPILER)
Expand Down Expand Up @@ -733,7 +761,7 @@ function(is_file_executable file result_var)

get_filename_component(file_full "${file}" ABSOLUTE)
string(TOLOWER "${file_full}" file_full_lower)
#messagev("file_full='${file_full}'")
messagev("file_full='${file_full}'")

# If file name ends in .exe on Windows, *assume* executable:
#
Expand Down Expand Up @@ -777,9 +805,9 @@ function(is_file_executable file result_var)
string(REPLACE "${file_full}" " _file_full_ " file_ov "${file_ov}")
string(TOLOWER "${file_ov}" file_ov)

#messagev("file_ov='${file_ov}'")
messagev("file_ov='${file_ov}'")
if("${file_ov}" MATCHES "symbolic link")
#messagev("symlink!")
messagev("symlink!")
if(NOT readlink_cmd)
find_program(readlink_cmd "readlink")
mark_as_advanced(readlink_cmd)
Expand All @@ -789,15 +817,15 @@ function(is_file_executable file result_var)
OUTPUT_VARIABLE resolved_link
OUTPUT_STRIP_TRAILING_WHITESPACE
)
#messagev("recursive call: is_exec(${resolved_link} recursive_result)")
messagev("recursive call: is_exec(${resolved_link} recursive_result)")
is_file_executable(${resolved_link} recursive_result)
#messagev("recursive result: ${recursive_result}")
messagev("recursive result: ${recursive_result}")
set(${result_var} ${recursive_result} PARENT_SCOPE)
else()
message(WARNING "No 'readlink' command, cant resolve symlink '${file_full}'")
endif()
elseif("${file_ov}" MATCHES "executable")
#messagev("executable!")
messagev("executable!")
#if("${file_ov}" MATCHES "text")
# messagev("but text, so *not* a binary executable!")
#else()
Expand Down Expand Up @@ -933,7 +961,7 @@ endfunction()
############################################################

# Most mpi distros have some form of mpiexec which gives us something we can reliably look for.
#messagev("MPI executable: names=${_MPI_EXEC_NAMES},hints=${_MPI_PREFIX_PATH},PATH_SUFFIXES=${_BIN_SUFFIX},PATHOPT=${PATHOPT}")
messagev("MPI executable: names=${_MPI_EXEC_NAMES},hints=${_MPI_PREFIX_PATH},PATH_SUFFIXES=${_BIN_SUFFIX},PATHOPT=${PATHOPT}")
find_program(MPIEXEC
NAMES ${_MPI_EXEC_NAMES}
HINTS ${_MPI_PREFIX_PATH}
Expand Down Expand Up @@ -987,7 +1015,7 @@ endforeach()
set(_MPI_DETECTED_MNEMONICS )
foreach (lang C CXX Fortran)
if (lang IN_LIST ENABLED_LANGUAGES)
#messagev("MPI_${lang}_COMPILER '${MPI_${lang}_COMPILER}': CMAKE_${lang}_COMPILER_WORKS=${CMAKE_${lang}_COMPILER_WORKS}")
messagev("MPI_${lang}_COMPILER '${MPI_${lang}_COMPILER}': CMAKE_${lang}_COMPILER_WORKS=${CMAKE_${lang}_COMPILER_WORKS}")
if (CMAKE_${lang}_COMPILER_WORKS)
# If the user supplies a compiler *name* instead of an absolute path, assume that we need to find THAT compiler.
if (MPI_${lang}_COMPILER)
Expand All @@ -996,7 +1024,7 @@ foreach (lang C CXX Fortran)
set(try_libs FALSE)
is_file_executable(${MPI_${lang}_COMPILER} MPI_COMPILER_IS_EXECUTABLE)
if (NOT MPI_COMPILER_IS_EXECUTABLE)
#messagev("User-defined MPI_${lang}_COMPILER is NOT an executable, looking for matching executable")
messagev("User-defined MPI_${lang}_COMPILER is NOT an executable, looking for matching executable")
# Get rid of our default list of names and just search for the name the user wants.
set(_MPI_${lang}_COMPILER_NAMES ${MPI_${lang}_COMPILER})
set(MPI_${lang}_COMPILER "MPI_${lang}_COMPILER-NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
Expand All @@ -1005,19 +1033,29 @@ foreach (lang C CXX Fortran)
set(try_libs TRUE)
endif()

#messagev("Looking for MPI_${lang}_COMPILER with names ${_MPI_${lang}_COMPILER_NAMES} at ${_MPI_PREFIX_PATH} + environment PATH")
messagev("Looking for MPI_${lang}_COMPILER with names ${_MPI_${lang}_COMPILER_NAMES} at ${_MPI_PREFIX_PATH}")
# Try and find the MPI compiler. First look in the hints directories
find_program(MPI_${lang}_COMPILER
NAMES ${_MPI_${lang}_COMPILER_NAMES}
HINTS ${_MPI_PREFIX_PATH}
PATH_SUFFIXES ${_BIN_SUFFIX}
${PATHOPT})
NO_DEFAULT_PATH)
interrogate_mpi_compiler(${lang} ${try_libs})
mark_as_advanced(MPI_${lang}_COMPILER)
if(NOT $MPI_${lang}_FOUND AND NOT PATHOPT STREQUAL NO_DEFAULT_PATH)
# If the MPI compiler is not found then look in wider paths.
messagev("Looking for MPI_${lang}_COMPILER with names ${_MPI_${lang}_COMPILER_NAMES} at ${_MPI_PREFIX_PATH} + environment PATH")
find_program(MPI_${lang}_COMPILER
NAMES ${_MPI_${lang}_COMPILER_NAMES}
HINTS ${_MPI_PREFIX_PATH}
PATH_SUFFIXES ${_BIN_SUFFIX}
${PATHOPT})
interrogate_mpi_compiler(${lang} ${try_libs})
endif()

# last ditch try -- if nothing works so far, just try running the regular compiler and
# see if we can create an MPI executable.
set(regular_compiler_worked 0)
if (NOT MPI_${lang}_LIBRARIES OR NOT MPI_${lang}_INCLUDE_PATH)
if (NOT MPI_${lang}_FOUND)

@hsorby hsorby Nov 11, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm hoping the full implications of this change are understood.

@chrispbradley chrispbradley Nov 11, 2016

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we are trying to find an MPI compiler. This is done via an interrogate_mpi_compiler call which sets the MPI_${lang}_FOUND variable based directly on the LIBRARIES and INCLUDE_PATH variables as above.

try_regular_compiler(${lang} regular_compiler_worked)
endif()

Expand All @@ -1032,6 +1070,7 @@ foreach (lang C CXX Fortran)
if(MPI_${lang}_FOUND)
messagev("Found MPI-${lang}!")
check_mpi_type(${lang})
mark_as_advanced(MPI_${lang}_COMPILER)
endif()

# See that the found MPI is compatible with the toolchain.
Expand Down
23 changes: 21 additions & 2 deletions CMakeScripts/OCArchitecturePath.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
# :watcom: The Watcom toolchain
# :unknown: Unknown compiler
#
# :instrumenation: Any instrumentation systems
# Otherwise, the path element is skipped.
# :multithreading: If :var:`OC_USE_MULTITHREADING` is enabled, this segment is :path:`/mt`.
# Otherwise, the path element is skipped.
# :mpi: Denotes the used MPI implementation along with the mpi build type.
Expand Down Expand Up @@ -72,10 +74,14 @@ function(getArchitecturePath VARNAME VARNAME_MPI)
# The full architecture path without mpi is the same but with "no_mpi" at the same level
string(REPLACE "/${MPI_PART}" "/no_mpi" ARCHPATH_NOMPI ${ARCHPATH})
set(${VARNAME} ${ARCHPATH_NOMPI} PARENT_SCOPE)

#log("Architecture path (No MPI) = ${ARCHPATH}" DEBUG)
#log("Architecture path (MPI) = ${ARCHPATH_NOMPI}" DEBUG)

endfunction()

# This function assembles a short version (the beginning) of the architecture path
# We have [ARCH][COMPILER][MT]
# We have [ARCH][COMPILER][INSTRUMENTATION][MT]
#
function(getShortArchitecturePath VARNAME)

Expand All @@ -91,8 +97,21 @@ function(getShortArchitecturePath VARNAME)
# Compiler
getCompilerPathElem(COMPILER)
SET(ARCHPATH ${ARCHPATH}/${COMPILER})


#log("OC_INSTRUMENTATION = ${OC_INSTRUMENTATION}" DEBUG)

# Profiling
# Instrumentation
if (OC_INSTRUMENTATION STREQUAL "scorep")
SET(ARCHPATH ${ARCHPATH}/scorep)
elseif(OC_INSTRUMENTATION STREQUAL "vtune")
SET(ARCHPATH ${ARCHPATH}/vtune)
#log("In here. ARCHPATH = ${ARCHPATH}" DEBUG)
elseif(OC_INSTRUMENTATION STREQUAL "none")
#Do nothing
else()
message(WARNING "Unknown instrumentation option. Ignoring.")
endif()

# Multithreading
if (OC_MULTITHREADING)
Expand Down
23 changes: 1 addition & 22 deletions CMakeScripts/OCCollectComponentDefinitions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,34 +21,13 @@ LIST(APPEND COMPONENT_COMMON_DEFS
-DCMAKE_NO_SYSTEM_FROM_IMPORTED=YES
-DCMAKE_DEBUG_POSTFIX=${CMAKE_DEBUG_POSTFIX}
-DCMAKE_POSITION_INDEPENDENT_CODE=YES # -fPIC flag - always enable
-DOC_INSTRUMENTATION=${OC_INSTRUMENTATION}
-DWARN_ALL=${OC_WARN_ALL}
-DCHECK_ALL=${OC_CHECK_ALL}
-DWITH_PROFILING=${OC_PROFILING}
-DCMAKE_INSTALL_DEFAULT_COMPONENT_NAME=Development
)

# Add compilers and flags
foreach(lang C CXX Fortran)
# Define flags
if (CMAKE_${lang}_FLAGS)
LIST(APPEND COMPONENT_COMMON_DEFS
-DCMAKE_${lang}_FLAGS=${CMAKE_${lang}_FLAGS}
)
endif()
# Also forward build-type specific flags
foreach(BUILDTYPE RELEASE DEBUG)
if (CMAKE_${lang}_FLAGS_${BUILDTYPE})
LIST(APPEND COMPONENT_COMMON_DEFS
-DCMAKE_${lang}_FLAGS_${BUILDTYPE}=${CMAKE_${lang}_FLAGS_${BUILDTYPE}}
)
endif()
endforeach()
# Note: we dont define the compilers in the COMPONENT_COMMON_DEFS any more,
# as the OCComponentSetupMacros re-defines the compilers if MPI wrappers
# are found. To make the definitions list less confusing we'll completely leave
# out compiler definitions here and just define them in the OCComponentSetupMacros#addAndConfigureLocalComponent
endforeach()

# Pass on local lookup flags (consumed by find_package calls)
foreach(COMP ${OPENCMISS_COMPONENTS})
LIST(APPEND COMPONENT_COMMON_DEFS
Expand Down
Loading