Skip to content

Commit 99e0f96

Browse files
ggouaillardetggouaillardet
authored
Merge pull request #5413 from ggouaillardet/topic/pcollreq
mpiext/pcollreq: check subroutine parameters and add profiling symbols
2 parents 9831145 + 61b3308 commit 99e0f96

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+3237
-195
lines changed

‎ompi/mpi/c/alltoallv.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
1515
* reserved.
16-
* Copyright (c) 2014-2015 Research Organization for Information Science
16+
* Copyright (c) 2014-2018 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
1818
* $COPYRIGHT$
1919
*
@@ -31,6 +31,7 @@
3131
#include "ompi/errhandler/errhandler.h"
3232
#include "ompi/datatype/ompi_datatype.h"
3333
#include "ompi/memchecker.h"
34+
#include "ompi/runtime/ompi_spc.h"
3435

3536
#if OMPI_BUILD_MPI_PROFILING
3637
#if OPAL_HAVE_WEAK_SYMBOLS
@@ -49,6 +50,8 @@ int MPI_Alltoallv(const void *sendbuf, const int sendcounts[],
4950
{
5051
int i, size, err;
5152

53+
SPC_RECORD(OMPI_SPC_ALLTOALLV, 1);
54+
5255
MEMCHECKER(
5356
ptrdiff_t recv_ext;
5457
ptrdiff_t send_ext;

‎ompi/mpi/c/alltoallw.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
1515
* reserved.
16-
* Copyright (c) 2014-2015 Research Organization for Information Science
16+
* Copyright (c) 2014-2018 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
1818
* $COPYRIGHT$
1919
*
@@ -31,6 +31,7 @@
3131
#include "ompi/errhandler/errhandler.h"
3232
#include "ompi/datatype/ompi_datatype.h"
3333
#include "ompi/memchecker.h"
34+
#include "ompi/runtime/ompi_spc.h"
3435

3536
#if OMPI_BUILD_MPI_PROFILING
3637
#if OPAL_HAVE_WEAK_SYMBOLS
@@ -49,6 +50,8 @@ int MPI_Alltoallw(const void *sendbuf, const int sendcounts[],
4950
{
5051
int i, size, err;
5152

53+
SPC_RECORD(OMPI_SPC_ALLTOALLW, 1);
54+
5255
MEMCHECKER(
5356
ptrdiff_t recv_ext;
5457
ptrdiff_t send_ext;

‎ompi/mpi/c/exscan.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* All rights reserved.
1313
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
1414
* reserved.
15-
* Copyright (c) 2015 Research Organization for Information Science
15+
* Copyright (c) 2015-2018 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
1717
* $COPYRIGHT$
1818
*
@@ -30,6 +30,7 @@
3030
#include "ompi/datatype/ompi_datatype.h"
3131
#include "ompi/op/op.h"
3232
#include "ompi/memchecker.h"
33+
#include "ompi/runtime/ompi_spc.h"
3334

3435
#if OMPI_BUILD_MPI_PROFILING
3536
#if OPAL_HAVE_WEAK_SYMBOLS
@@ -46,6 +47,8 @@ int MPI_Exscan(const void *sendbuf, void *recvbuf, int count,
4647
{
4748
int err;
4849

50+
SPC_RECORD(OMPI_SPC_EXSCAN, 1);
51+
4952
MEMCHECKER(
5053
memchecker_datatype(datatype);
5154
memchecker_call(&opal_memchecker_base_isdefined, sendbuf, count, datatype);

‎ompi/mpi/c/iexscan.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* All rights reserved.
1313
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
1414
* reserved.
15-
* Copyright (c) 2015 Research Organization for Information Science
15+
* Copyright (c) 2015-2018 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
1717
* $COPYRIGHT$
1818
*
@@ -30,6 +30,7 @@
3030
#include "ompi/datatype/ompi_datatype.h"
3131
#include "ompi/op/op.h"
3232
#include "ompi/memchecker.h"
33+
#include "ompi/runtime/ompi_spc.h"
3334

3435
#if OMPI_BUILD_MPI_PROFILING
3536
#if OPAL_HAVE_WEAK_SYMBOLS
@@ -46,6 +47,8 @@ int MPI_Iexscan(const void *sendbuf, void *recvbuf, int count,
4647
{
4748
int err;
4849

50+
SPC_RECORD(OMPI_SPC_IEXSCAN, 1);
51+
4952
MEMCHECKER(
5053
memchecker_datatype(datatype);
5154
memchecker_call(&opal_memchecker_base_isdefined, sendbuf, count, datatype);

‎ompi/mpi/c/igatherv.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
1515
* reserved.
16-
* Copyright (c) 2015-2016 Research Organization for Information Science
17-
* and Technology (RIST). All rights reserved.
16+
* Copyright (c) 2015-2018 Research Organization for Information Science
17+
* and Technology (RIST). All rights reserved.
1818
* $COPYRIGHT$
1919
*
2020
* Additional copyrights may follow
@@ -30,6 +30,7 @@
3030
#include "ompi/errhandler/errhandler.h"
3131
#include "ompi/datatype/ompi_datatype.h"
3232
#include "ompi/memchecker.h"
33+
#include "ompi/runtime/ompi_spc.h"
3334

3435
#if OMPI_BUILD_MPI_PROFILING
3536
#if OPAL_HAVE_WEAK_SYMBOLS
@@ -47,6 +48,8 @@ int MPI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
4748
{
4849
int i, size, err;
4950

51+
SPC_RECORD(OMPI_SPC_IGATHERV, 1);
52+
5053
MEMCHECKER(
5154
ptrdiff_t ext;
5255

‎ompi/mpi/c/ineighbor_allgather.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* Copyright (c) 2012 Oak Rigde National Laboratory. All rights reserved.
1515
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
1616
* reserved.
17-
* Copyright (c) 2015-2017 Research Organization for Information Science
17+
* Copyright (c) 2015-2018 Research Organization for Information Science
1818
* and Technology (RIST). All rights reserved.
1919
* Copyright (c) 2017 IBM Corporation. All rights reserved.
2020
* $COPYRIGHT$
@@ -35,6 +35,7 @@
3535
#include "ompi/memchecker.h"
3636
#include "ompi/mca/topo/topo.h"
3737
#include "ompi/mca/topo/base/base.h"
38+
#include "ompi/runtime/ompi_spc.h"
3839

3940
#if OMPI_BUILD_MPI_PROFILING
4041
#if OPAL_HAVE_WEAK_SYMBOLS
@@ -52,6 +53,8 @@ int MPI_Ineighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype sen
5253
{
5354
int err;
5455

56+
SPC_RECORD(OMPI_SPC_INEIGHBOR_ALLGATHER, 1);
57+
5558
MEMCHECKER(
5659
int rank;
5760
ptrdiff_t ext;

‎ompi/mpi/c/ineighbor_allgatherv.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
1515
* Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
1616
* reserved.
17-
* Copyright (c) 2015-2017 Research Organization for Information Science
17+
* Copyright (c) 2015-2018 Research Organization for Information Science
1818
* and Technology (RIST). All rights reserved.
1919
* Copyright (c) 2017 IBM Corporation. All rights reserved.
2020
* $COPYRIGHT$
@@ -35,6 +35,7 @@
3535
#include "ompi/memchecker.h"
3636
#include "ompi/mca/topo/topo.h"
3737
#include "ompi/mca/topo/base/base.h"
38+
#include "ompi/runtime/ompi_spc.h"
3839

3940
#if OMPI_BUILD_MPI_PROFILING
4041
#if OPAL_HAVE_WEAK_SYMBOLS
@@ -52,6 +53,8 @@ int MPI_Ineighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype se
5253
{
5354
int i, size, err;
5455

56+
SPC_RECORD(OMPI_SPC_INEIGHBOR_ALLGATHERV, 1);
57+
5558
MEMCHECKER(
5659
int rank;
5760
ptrdiff_t ext;

‎ompi/mpi/c/ineighbor_alltoall.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* Copyright (c) 2012 Oak Ridge National Laboratory. All rights reserved.
1515
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
1616
* reserved.
17-
* Copyright (c) 2014-2015 Research Organization for Information Science
17+
* Copyright (c) 2014-2018 Research Organization for Information Science
1818
* and Technology (RIST). All rights reserved.
1919
* Copyright (c) 2017 IBM Corporation. All rights reserved.
2020
* $COPYRIGHT$
@@ -35,6 +35,7 @@
3535
#include "ompi/memchecker.h"
3636
#include "ompi/mca/topo/topo.h"
3737
#include "ompi/mca/topo/base/base.h"
38+
#include "ompi/runtime/ompi_spc.h"
3839

3940
#if OMPI_BUILD_MPI_PROFILING
4041
#if OPAL_HAVE_WEAK_SYMBOLS
@@ -53,6 +54,8 @@ int MPI_Ineighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype send
5354
size_t sendtype_size, recvtype_size;
5455
int err;
5556

57+
SPC_RECORD(OMPI_SPC_INEIGHBOR_ALLTOALL, 1);
58+
5659
MEMCHECKER(
5760
memchecker_comm(comm);
5861
if (MPI_IN_PLACE != sendbuf) {

‎ompi/mpi/c/ineighbor_alltoallv.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2012-2017 Los Alamos National Security, LLC. All rights
1515
* reserved.
16-
* Copyright (c) 2014-2015 Research Organization for Information Science
16+
* Copyright (c) 2014-2018 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
1818
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1919
* $COPYRIGHT$
@@ -34,6 +34,7 @@
3434
#include "ompi/memchecker.h"
3535
#include "ompi/mca/topo/topo.h"
3636
#include "ompi/mca/topo/base/base.h"
37+
#include "ompi/runtime/ompi_spc.h"
3738

3839
#if OMPI_BUILD_MPI_PROFILING
3940
#if OPAL_HAVE_WEAK_SYMBOLS
@@ -53,6 +54,8 @@ int MPI_Ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], const i
5354
int i, err;
5455
int indegree, outdegree;
5556

57+
SPC_RECORD(OMPI_SPC_INEIGHBOR_ALLTOALLV, 1);
58+
5659
MEMCHECKER(
5760
ptrdiff_t recv_ext;
5861
ptrdiff_t send_ext;

‎ompi/mpi/c/ineighbor_alltoallw.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2012-2017 Los Alamos National Security, LLC. All rights
1515
* reserved.
16-
* Copyright (c) 2014-2015 Research Organization for Information Science
16+
* Copyright (c) 2014-2018 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
1818
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1919
* $COPYRIGHT$
@@ -34,6 +34,7 @@
3434
#include "ompi/memchecker.h"
3535
#include "ompi/mca/topo/topo.h"
3636
#include "ompi/mca/topo/base/base.h"
37+
#include "ompi/runtime/ompi_spc.h"
3738

3839
#if OMPI_BUILD_MPI_PROFILING
3940
#if OPAL_HAVE_WEAK_SYMBOLS
@@ -53,6 +54,8 @@ int MPI_Ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], const M
5354
int i, err;
5455
int indegree, outdegree;
5556

57+
SPC_RECORD(OMPI_SPC_INEIGHBOR_ALLTOALLW, 1);
58+
5659
MEMCHECKER(
5760
ptrdiff_t recv_ext;
5861
ptrdiff_t send_ext;

0 commit comments

Comments
 (0)