Skip to content
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.

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

Add initial MPI_T-like profiling support in Mercury #350

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
6d26e00
Add initial MPI_T-like profiling support in Mercury
srini009 Mar 4, 2020
16c6512
Add in Mercury-style comments
srini009 Mar 11, 2020
05b796b
Add intiial change to remove use of global variables
srini009 Mar 26, 2020
a7e5988
Add atomics
srini009 Mar 31, 2020
0948b0f
Add atomics and remove all global variables
srini009 Apr 1, 2020
efa77e9
Add comments
srini009 Apr 1, 2020
237c6ee
Add note pointing to the MPI spec that this profiling interface is ba…
srini009 Apr 8, 2020
61df90a
Add PVARs for serialization/deserialization time
srini009 May 27, 2020
a784eca
Correct PVAR data gathering logic
srini009 May 27, 2020
7060882
Merge branch 'master' into mercury_profiling_interface
srini009 May 27, 2020
c8d73b9
Adding PVAR for backfill queue size
srini009 Jun 30, 2020
b7fdd9b
Merging from master
srini009 Jun 30, 2020
c174d8d
Merge branch 'master' into mercury_profiling_interface
srini009 Jul 22, 2020
6dbd7c2
Merge branch 'master' into mercury_profiling_interface
srini009 Jul 24, 2020
e168c03
Add checksum
srini009 Jul 30, 2020
ce29621
Add checksum
srini009 Jul 30, 2020
8ee302f
Merge branch 'mercury_profiling_interface' of https://github.com/srin…
srini009 Aug 15, 2020
c223544
Add more data printf
srini009 Aug 21, 2020
d607861
Add apex calls for extra payload
srini009 Aug 24, 2020
329dcba
Add PVAR for current handles posted
srini009 Aug 25, 2020
7e46221
Remove APEX instrumentation
srini009 Aug 26, 2020
5c62fd2
Add new PVAR definitions
srini009 Aug 26, 2020
7573858
Add implementation for new PVARs inside mercury.c
srini009 Aug 27, 2020
f31582b
Add more changes
srini009 Aug 27, 2020
3b9768b
Update the number of PVARs exported
srini009 Aug 27, 2020
8a11087
Remove the PVAR hash table
srini009 Aug 27, 2020
8a05135
Merge branch 'mercury_profiling_interface' of https://github.com/srin…
srini009 Aug 31, 2020
1fa40af
Integrate additional PVARs into Mercury
srini009 Aug 31, 2020
97203e3
Add new counter PVARs
srini009 Aug 31, 2020
73688a2
Remove print statement
srini009 Aug 31, 2020
9457bd6
Add the correct PVAR for internal RDMA transfer size
srini009 Sep 1, 2020
fb148c8
Add config file
srini009 Sep 1, 2020
4e39c83
Merge conflicts
srini009 Oct 4, 2020
e96b7a0
Fix issue with handle modifications
srini009 Oct 5, 2020
f69ddad
Add correction
srini009 Oct 6, 2020
d5f7c1a
Removing config file
srini009 Oct 6, 2020
ace64be
Merge branch 'mercury_profiling_interface' of https://github.com/srin…
srini009 Oct 6, 2020
c0e2321
Fix merge conflicts while reverting
srini009 Oct 12, 2020
a55bc1e
Add typo correction
srini009 Oct 12, 2020
d98a378
Merge branch 'mercury_profiling_interface' of https://github.com/srin…
srini009 Oct 13, 2020
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
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[submodule "Testing/driver/kwsys"]
path = Testing/driver/kwsys
url = https://github.com/mercury-hpc/kwsys.git
[submodule "src/mchecksum"]
path = src/mchecksum
url = https://github.com/mercury-hpc/mchecksum.git
[submodule "src/boost"]
path = src/boost
url = https://github.com/mercury-hpc/preprocessor.git
4 changes: 4 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ set(MERCURY_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/mercury_core_header.c
${CMAKE_CURRENT_SOURCE_DIR}/mercury_header.c
${CMAKE_CURRENT_SOURCE_DIR}/mercury_proc.c
${CMAKE_CURRENT_SOURCE_DIR}/mercury_prof_interface.c
${CMAKE_CURRENT_SOURCE_DIR}/mercury_prof_pvar_impl.c
${CMAKE_CURRENT_SOURCE_DIR}/mercury_proc_bulk.c
${CMAKE_CURRENT_SOURCE_DIR}/proc_extra/mercury_proc_string.c
${CMAKE_CURRENT_SOURCE_DIR}/proc_extra/mercury_string_object.c
Expand Down Expand Up @@ -237,6 +239,8 @@ set(MERCURY_HEADERS
${CMAKE_CURRENT_BINARY_DIR}/mercury_config.h
${CMAKE_CURRENT_SOURCE_DIR}/mercury.h
${CMAKE_CURRENT_SOURCE_DIR}/mercury_bulk.h
${CMAKE_CURRENT_SOURCE_DIR}/mercury_prof_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/mercury_prof_types.h
${CMAKE_CURRENT_SOURCE_DIR}/mercury_core.h
${CMAKE_CURRENT_SOURCE_DIR}/mercury_core_header.h
${CMAKE_CURRENT_SOURCE_DIR}/mercury_core_types.h
Expand Down
1 change: 0 additions & 1 deletion src/mchecksum
Submodule mchecksum deleted from 5b6475
11 changes: 11 additions & 0 deletions src/mchecksum/CMake/CheckSSE42.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#include <nmmintrin.h>

int main(void)
{
unsigned int result = ~(unsigned int)0;

result = _mm_crc32_u8(result, 0x0);

return result;
}

22 changes: 22 additions & 0 deletions src/mchecksum/CMake/FindISAL.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# - Try to find ISA-L
# Once done this will define
# ISAL_FOUND - System has ISA-L
# ISAL_INCLUDE_DIRS - The ISA-L include directories
# ISAL_LIBRARIES - The libraries needed to use ISA-L

find_path(ISAL_INCLUDE_DIR isa-l.h
HINTS /usr/local/include /usr/include)

find_library(ISAL_LIBRARY NAMES isal
HINTS /usr/local/lib /usr/lib)

set(ISAL_LIBRARIES ${ISAL_LIBRARY})
set(ISAL_INCLUDE_DIRS ${ISAL_INCLUDE_DIR})

include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set ISAL_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(ISAL DEFAULT_MSG
ISAL_LIBRARY ISAL_INCLUDE_DIR)

mark_as_advanced(ISAL_INCLUDE_DIR ISAL_LIBRARY)
31 changes: 31 additions & 0 deletions src/mchecksum/CMake/Git/Git.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#=============================================================================
# Copyright 2011 Kitware, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#=============================================================================

# Check for a hint left by the 'GitInfo' script.
if(NOT GIT_EXECUTABLE)
get_filename_component(_Git_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
include(${_Git_DIR}/GitInfo.cmake OPTIONAL)
if(GitInfo_GIT_EXECUTABLE)
if(EXISTS "${GitInfo_GIT_EXECUTABLE}")
set(GIT_EXECUTABLE "${GitInfo_GIT_EXECUTABLE}")
elseif(EXISTS "${GitInfo_GIT_EXECUTABLE}.exe")
set(GIT_EXECUTABLE "${GitInfo_GIT_EXECUTABLE}.exe")
endif()
endif()
endif()

# Find Git.
find_package(Git)
57 changes: 57 additions & 0 deletions src/mchecksum/CMake/Git/GitInfo
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#!/usr/bin/env bash
#=============================================================================
# Copyright 2011 Kitware, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#=============================================================================

# Path conversion function.
case "$(uname)" in
*CYGWIN*)
native_path() {
cygpath -m "$1"
}
;;
*MINGW*)
native_path() {
cmd //c echo "$1" | sed 's/^"//;s/"$//'
}
;;
*)
native_path() {
echo "$1"
}
;;
esac

# Compute native path to "git" executable.
if git="$(type -p git)"; then
git="$(native_path "${git}")"
else
git=''
fi

# Compute native path to ".git" dir.
if dir="$(git rev-parse --git-dir)"; then
dir="$(cd "$dir"; pwd)"
git_dir="$(native_path "${dir}")"
else
git_dir=''
fi

# Store the values in a CMake file next to this script.
echo >"${BASH_SOURCE%/*}/GitInfo.cmake" '# Generated by GitInfo
set(GitInfo 1)
set(GitInfo_GIT_EXECUTABLE "'"$git"'")
set(GitInfo_GIT_DIR "'"$git_dir"'")
'
202 changes: 202 additions & 0 deletions src/mchecksum/CMake/Git/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
5 changes: 5 additions & 0 deletions src/mchecksum/CMake/Git/NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Git Support Scripts
Copyright 2011 Kitware, Inc.

This product includes software developed at Kitware, Inc.
(http://www.kitware.com/).
Loading