Merge pull request #9738 from bwbarrett/feature/simplify-profile-interface

Simplify profiling interface build system

Author: bwbarrett

config/ompi_config_files.m4

@@ -6,6 +6,8 @@
 # Copyright (c) 2018      Los Alamos National Security, LLC. All rights
 #                         reserved.
 # Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
+# Copyright (c) 2021      Amazon.com, Inc. or its affiliates.  All Rights
+#                         reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -25,7 +27,6 @@ AC_DEFUN([OMPI_CONFIG_FILES],[
         ompi/debuggers/Makefile
 
         ompi/mpi/c/Makefile
-        ompi/mpi/c/profile/Makefile
         ompi/mpi/fortran/base/Makefile
         ompi/mpi/fortran/mpif-h/Makefile
         ompi/mpi/fortran/mpif-h/profile/Makefile
@@ -47,7 +48,6 @@ AC_DEFUN([OMPI_CONFIG_FILES],[
         ompi/mpi/fortran/mpiext-use-mpi/Makefile
         ompi/mpi/fortran/mpiext-use-mpi-f08/Makefile
         ompi/mpi/tool/Makefile
-        ompi/mpi/tool/profile/Makefile
 
         ompi/mpi/man/man3/Makefile
         ompi/mpi/man/man5/Makefile

config/oshmem_config_files.m4

@@ -5,6 +5,8 @@
 # Copyright (c) 2013      Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2017-2018 Research Organization for Information Science
 #                         and Technology (RIST).  All rights reserved.
+# Copyright (c) 2021      Amazon.com, Inc. or its affiliates.
+#                         All Rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -17,10 +19,8 @@ AC_DEFUN([OSHMEM_CONFIG_FILES],[
     oshmem/Makefile
     oshmem/include/Makefile
     oshmem/shmem/c/Makefile
-    oshmem/shmem/c/profile/Makefile
 
     oshmem/shmem/fortran/Makefile
-    oshmem/shmem/fortran/profile/Makefile
 
     oshmem/tools/oshmem_info/Makefile
     oshmem/tools/wrappers/Makefile

ompi/Makefile.am

@@ -19,22 +19,15 @@
 #                         and Technology (RIST).  All rights reserved.
 # Copyright (c) 2016      IBM Corporation.  All rights reserved.
 # Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
+# Copyright (c) 2021      Amazon.com, Inc. or its affiliates.  All Rights
+#                         reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
 #
 # $HEADER$
 #
 
-# We always have C bindings, but do we have profiling?
-
-if BUILD_MPI_BINDINGS_LAYER
-c_mpi_lib = mpi/c/libmpi_c_mpi.la mpi/tool/libmpi_mpit.la
-else
-c_mpi_lib =
-endif
-c_pmpi_lib = mpi/c/profile/libmpi_c_pmpi.la mpi/tool/profile/libmpi_pmpit.la
-
 # See if we have Fortran mpif.h MPI bindings
 
 if OMPI_BUILD_FORTRAN_MPIFH_BINDINGS
@@ -147,7 +140,7 @@ lib@OMPI_LIBMPI_NAME@_la_LIBADD = \
         datatype/libdatatype.la \
         debuggers/libdebuggers.la \
         mpi/c/libmpi_c.la \
-        mpi/tool/libmpi_mpit_common.la \
+        mpi/tool/libmpi_mpit.la \
         $(c_mpi_lib) \
         $(c_pmpi_lib) \
         $(mpi_fortran_base_lib) \

ompi/mpi/c/Makefile.am

@@ -17,50 +17,49 @@
 #                         reserved.
 # Copyright (c) 2015-2020 Research Organization for Information Science
 #                         and Technology (RIST).  All rights reserved.
+# Copyright (c) 2021      Amazon.com, Inc. or its affiliates.  All Rights
+#                         reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
 #
 # $HEADER$
 #
 
-SUBDIRS = profile
-
-# OMPI_BUILD_MPI_PROFILING is enabled when we want our generated MPI_* symbols
-# to be replaced by PMPI_*.
-# In this directory, we need it to be 0
-
-AM_CPPFLAGS     = -DOMPI_BUILD_MPI_PROFILING=0
-
-#
-# The top directory always builds MPI_* bindings. The bottom directory
-# always builds PMPI_* bindings. The cases where the top directory
-# needs to be built are:
-#
-# 1. When profiling is disabled.
-# 2. When profiling is enabled but weak symbol support is absent.
-#
+# The purpose of the profiling layer is to allow intercept libraries
+# which override the MPI_ namespace symbols.  We potentially compile
+# every MPI function twice.  We always build the profiling layer,
+# because the symbols that are always implemented as functions are the
+# PMPI_ namespace symbols.  We sometimes also build the non-profiling
+# layer, if weak symbols can't be used to alias the MPI_ namespace
+# into the PMPI_ namespace.
 
-noinst_LTLIBRARIES = libmpi_c.la
+noinst_LTLIBRARIES = libmpi_c.la libmpi_c_profile.la
 if BUILD_MPI_BINDINGS_LAYER
-noinst_LTLIBRARIES += libmpi_c_mpi.la
+noinst_LTLIBRARIES += libmpi_c_noprofile.la
 endif
 
 headers = bindings.h
 
-#
-# libmpi_c.la is always build because it contains some non-profilied
-# functions.
-#
-
+# attr_fn.c contains attribute manipulation functions which do not
+# profiling implications, and so are always built.
 libmpi_c_la_SOURCES = \
         attr_fn.c
+libmpi_c_la_LIBADD = libmpi_c_profile.la
+if BUILD_MPI_BINDINGS_LAYER
+libmpi_c_la_LIBADD += libmpi_c_noprofile.la
+endif
+
+# Conditionally install the header files
+if WANT_INSTALL_HEADERS
+ompidir = $(ompiincludedir)/$(subdir)
+ompi_HEADERS = $(headers)
+endif
 
 #
-# libmpi_c_mpi.la is only built in some cases (see above)
+# List of all C files that have profile versions
 #
-
-libmpi_c_mpi_la_SOURCES = \
+interface_profile_sources = \
         abort.c \
         add_error_class.c \
         add_error_code.c \
@@ -469,9 +468,8 @@ libmpi_c_mpi_la_SOURCES = \
         win_unlock_all.c \
         win_wait.c
 
-
 if OMPI_ENABLE_MPI1_COMPAT
-libmpi_c_mpi_la_SOURCES += \
+interface_profile_sources += \
         address.c \
         errhandler_create.c \
         errhandler_get.c \
@@ -484,9 +482,8 @@ libmpi_c_mpi_la_SOURCES += \
         type_ub.c
 endif
 
-# Conditionally install the header files
+libmpi_c_profile_la_SOURCES = $(interface_profile_sources)
+libmpi_c_profile_la_CPPFLAGS = -DOMPI_BUILD_MPI_PROFILING=1
 
-if WANT_INSTALL_HEADERS
-ompidir = $(ompiincludedir)/$(subdir)
-ompi_HEADERS = $(headers)
-endif
+libmpi_c_noprofile_la_SOURCES = $(interface_profile_sources)
+libmpi_c_noprofile_la_CPPFLAGS = -DOMPI_BUILD_MPI_PROFILING=0