Skip to content

Commit fb85f01

Browse files
authored
Add NVTX support for performance analysis (#144)
- Instrumented important methods in cuCIM with NVTX so can see performance bottlenecks easily with NSight systems. - Tracing can be enabled through config file or environment variable or through API and less than 1% performance overheads in normal execution.
1 parent f80bf00 commit fb85f01

37 files changed

+1223
-126
lines changed

3rdparty/LICENSE.NVTX

Lines changed: 218 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.
202+
203+
204+
--- LLVM Exceptions to the Apache 2.0 License ----
205+
206+
As an exception, if, as a result of your compiling your source code, portions
207+
of this Software are embedded into an Object form of such source code, you
208+
may redistribute such embedded portions in such Object form without complying
209+
with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
210+
211+
In addition, if you combine or link compiled forms of this Software with
212+
software that is licensed under the GPLv2 ("Combined Software") and if a
213+
court of competent jurisdiction determines that the patent provision (Section
214+
3), the indemnity provision (Section 9) or other Section of the License
215+
conflicts with the conditions of the GPLv2, you may retroactively and
216+
prospectively choose to deem waived or otherwise exclude such Section(s) of
217+
the License, but only in their entirety and only with respect to the Combined
218+
Software.

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ include(ExternalProject)
106106
option(CUCIM_SUPPORT_GDS "Support cufile library" ON)
107107
option(CUCIM_STATIC_GDS "Use static cufile library" OFF)
108108
option(CUCIM_SUPPORT_CUDA "Support CUDA" ON)
109+
option(CUCIM_SUPPORT_NVTX "Support NVTX" ON)
109110

110111
# Setup CXX11 ABI
111112
# : Adds CXX11 ABI definition to the compiler command line for targets in the current directory,
@@ -127,6 +128,7 @@ superbuild_depend(cli11)
127128
superbuild_depend(json)
128129
superbuild_depend(libcuckoo)
129130
superbuild_depend(boost-header-only)
131+
superbuild_depend(nvtx3)
130132

131133
################################################################################
132134
# Define some names
@@ -213,6 +215,8 @@ install(DIRECTORY
213215
# Copy 3rdparty headers
214216
install(DIRECTORY
215217
${deps-fmt_SOURCE_DIR}/include/
218+
${deps-nvtx3_SOURCE_DIR}/c/include/
219+
${deps-nvtx3_SOURCE_DIR}/cpp/include/
216220
DESTINATION
217221
${CMAKE_INSTALL_INCLUDEDIR}/${CUCIM_PACKAGE_NAME}/3rdparty)
218222

LICENSE-3rdparty.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,3 +263,9 @@ gputil
263263
- https://github.com/anderskm/gputil/blob/master/LICENSE.txt
264264
- Copyright: Anders Krogh Mortensen
265265
- Usage: Checking memory usage in Python applications.
266+
267+
NVTX (NVIDIA Tool Extension Library)
268+
- License: Apache-2.0 License
269+
- https://raw.githubusercontent.com/NVIDIA/NVTX/release-v3/LICENSE.txt
270+
- Copyright: NVIDIA Corporation
271+
- Usage: Support for profiling with NVIDIA Nsight Systems

cpp/CMakeLists.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ add_library(${CUCIM_PACKAGE_NAME}
6565
include/cucim/memory/memory_manager.h
6666
include/cucim/plugin/image_format.h
6767
include/cucim/plugin/plugin_config.h
68+
include/cucim/profiler/nvtx3.h
69+
include/cucim/profiler/profiler.h
70+
include/cucim/profiler/profiler_config.h
6871
include/cucim/util/cuda.h
6972
include/cucim/util/file.h
7073
include/cucim/util/platform.h
@@ -100,6 +103,8 @@ add_library(${CUCIM_PACKAGE_NAME}
100103
src/memory/memory_manager.cu
101104
src/plugin/image_format.cpp
102105
src/plugin/plugin_config.cpp
106+
src/profiler/profiler.cpp
107+
src/profiler/profiler_config.cpp
103108
src/util/file.cpp
104109
src/util/platform.cpp)
105110

@@ -139,6 +144,7 @@ target_compile_definitions(${CUCIM_PACKAGE_NAME}
139144
CUCIM_SUPPORT_GDS=$<BOOL:${CUCIM_SUPPORT_GDS}>
140145
CUCIM_STATIC_GDS=$<BOOL:${CUCIM_STATIC_GDS}>
141146
CUCIM_SUPPORT_CUDA=$<BOOL:${CUCIM_SUPPORT_CUDA}>
147+
CUCIM_SUPPORT_NVTX=$<BOOL:${CUCIM_SUPPORT_NVTX}>
142148
_GLIBCXX_USE_CXX11_ABI=0 # TODO: create two library, one with CXX11 ABI and one without it.
143149
)
144150

@@ -160,6 +166,7 @@ target_link_libraries(${CUCIM_PACKAGE_NAME}
160166
deps::libcuckoo
161167
deps::boost-header-only
162168
deps::json
169+
deps::nvtx3
163170
)
164171

165172
if (CUCIM_STATIC_GDS)
@@ -177,7 +184,7 @@ target_include_directories(${CUCIM_PACKAGE_NAME}
177184
# $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/gds/lib> # for GDS header
178185
# $<BUILD_INTERFACE:${THRUST_INCLUDE_DIR}>
179186
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
180-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${CUCIM_PACKAGE_NAME}/3rdparty> # for 3rdparty libraries such as dlpack and fmt
187+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${CUCIM_PACKAGE_NAME}/3rdparty> # for 3rdparty libraries such as dlpack, nvtx3, and fmt
181188
PRIVATE
182189
${CMAKE_CURRENT_LIST_DIR}/src
183190
)
@@ -198,6 +205,7 @@ target_compile_definitions(${CUCIM_PACKAGE_NAME}-header-only
198205
CUCIM_SUPPORT_GDS=$<BOOL:${CUCIM_SUPPORT_GDS}>
199206
CUCIM_STATIC_GDS=$<BOOL:${CUCIM_STATIC_GDS}>
200207
CUCIM_SUPPORT_CUDA=$<BOOL:${CUCIM_SUPPORT_CUDA}>
208+
CUCIM_SUPPORT_NVTX=$<BOOL:${CUCIM_SUPPORT_NVTX}>
201209
CUCIM_HEADER_ONLY=1
202210
)
203211
target_compile_features(${CUCIM_PACKAGE_NAME}-header-only INTERFACE ${CUCIM_REQUIRED_FEATURES})

cpp/cmake/deps/nvtx3.cmake

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#
2+
# Copyright (c) 2021, NVIDIA CORPORATION.
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
#
15+
16+
if (NOT TARGET deps::nvtx3)
17+
FetchContent_Declare(
18+
deps-nvtx3
19+
GIT_REPOSITORY https://github.com/NVIDIA/NVTX.git
20+
GIT_TAG 3c98c8425b0376fd8653aac7cfc6a864f3897752
21+
# GIT_SHALLOW TRUE # TODO (#168): Uncomment this when the official release of nvtx3-cpp is available
22+
)
23+
FetchContent_GetProperties(deps-nvtx3)
24+
if (NOT deps-nvtx3_POPULATED)
25+
message(STATUS "Fetching nvtx3 sources")
26+
FetchContent_Populate(deps-nvtx3)
27+
message(STATUS "Fetching nvtx3 sources - done")
28+
endif ()
29+
30+
# Create shared library
31+
cucim_set_build_shared_libs(ON) # since nvtx3 is header-only library, this may not needed.
32+
33+
add_subdirectory(${deps-nvtx3_SOURCE_DIR}/cpp ${deps-nvtx3_BINARY_DIR} EXCLUDE_FROM_ALL)
34+
cucim_restore_build_shared_libs()
35+
36+
add_library(deps::nvtx3 INTERFACE IMPORTED GLOBAL)
37+
target_link_libraries(deps::nvtx3 INTERFACE nvtx3-cpp)
38+
set(deps-nvtx3_SOURCE_DIR ${deps-nvtx3_SOURCE_DIR} CACHE INTERNAL "" FORCE)
39+
mark_as_advanced(deps-nvtx3_SOURCE_DIR)
40+
endif ()

cpp/include/cucim/config/config.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "cucim/cache/cache_type.h"
2222
#include "cucim/cache/image_cache_config.h"
2323
#include "cucim/plugin/plugin_config.h"
24+
#include "cucim/profiler/profiler_config.h"
2425

2526
#include <string>
2627
#include <string_view>
@@ -40,6 +41,7 @@ class EXPORT_VISIBLE Config
4041

4142
cucim::cache::ImageCacheConfig& cache();
4243
cucim::plugin::PluginConfig& plugin();
44+
cucim::profiler::ProfilerConfig& profiler();
4345

4446
std::string shm_name() const;
4547
pid_t pid() const;
@@ -50,11 +52,14 @@ class EXPORT_VISIBLE Config
5052
std::string get_config_path() const;
5153
bool parse_config(std::string& path);
5254
void set_default_configuration();
55+
void override_from_envs();
56+
void init_configs();
5357

5458
std::string source_path_;
5559

5660
cucim::cache::ImageCacheConfig cache_;
5761
cucim::plugin::PluginConfig plugin_;
62+
cucim::profiler::ProfilerConfig profiler_;
5863
};
5964

6065
} // namespace cucim::config

0 commit comments

Comments
 (0)