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.

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

Use registered strings for NVTX. Add more NVTX annotations. #518

Merged
merged 7 commits into from
Oct 31, 2024
Merged

Use registered strings for NVTX. Add more NVTX annotations. #518

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f3868a
Use registered strings for nvtx. Add more nvtx annotations
kingcrimsontianyu Oct 27, 2024
461b289
Improve implementation a bit
kingcrimsontianyu Oct 28, 2024
88cb16b
Further tweaks
kingcrimsontianyu Oct 28, 2024
21eca70
Add NVTX marker
kingcrimsontianyu Oct 28, 2024
4008099
Update
kingcrimsontianyu Oct 30, 2024
4d01c21
Further changes and cleanup
kingcrimsontianyu Oct 31, 2024
48785d3
Merge branch 'branch-24.12' into improve_nvtx
madsbk Oct 31, 2024
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
Prev Previous commit
Next Next commit
Update
  • Loading branch information
@kingcrimsontianyu
kingcrimsontianyu committed Oct 30, 2024
commit 4008099dbc294daec71f64d9e5eecc07b1d2b773
22 changes: 11 additions & 11 deletions cpp/include/kvikio/utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,32 +288,32 @@ struct libkvikio_domain {
};

// Macro to concatenate two tokens x and y.
#define CONCAT_HELPER(x, y) x##y
#define CONCAT(x, y) CONCAT_HELPER(x, y)
#define KVIKIO_CONCAT_HELPER(x, y) x##y
#define KVIKIO_CONCAT(x, y) KVIKIO_CONCAT_HELPER(x, y)

// Macro to create a static, registered string that will not have a name conflict with any
// registered string defined in the same scope.
#define REGISTER_STRING(msg) \
#define KVIKIO_REGISTER_STRING(msg) \
[](const char* a_msg) -> auto& { \
static nvtx3::registered_string_in<libkvikio_domain> a_reg_str{a_msg}; \
return a_reg_str; \
}(msg)

// Macro overloads of KVIKIO_NVTX_FUNC_RANGE
#define KVIKIO_NVTX_FUNC_RANGE_1() NVTX3_FUNC_RANGE_IN(libkvikio_domain)
#define KVIKIO_NVTX_FUNC_RANGE_2(msg, val) \
nvtx3::scoped_range_in<libkvikio_domain> CONCAT(_kvikio_nvtx_range, __LINE__) \
{ \
nvtx3::event_attributes \
{ \
REGISTER_STRING(msg), nvtx3::payload { convert_to_64bit(val) } \
} \
#define KVIKIO_NVTX_FUNC_RANGE_2(msg, val) \
nvtx3::scoped_range_in<libkvikio_domain> KVIKIO_CONCAT(_kvikio_nvtx_range, __LINE__) \
{ \
nvtx3::event_attributes \
{ \
KVIKIO_REGISTER_STRING(msg), nvtx3::payload { convert_to_64bit(val) } \
} \
}
#define GET_KVIKIO_NVTX_FUNC_RANGE_MACRO(_1, _2, NAME, ...) NAME

#define KVIKIO_NVTX_MARKER_IMPL(msg, val) \
nvtx3::mark_in<libkvikio_domain>( \
nvtx3::event_attributes{REGISTER_STRING(msg), nvtx3::payload{convert_to_64bit(val)}})
nvtx3::event_attributes{KVIKIO_REGISTER_STRING(msg), nvtx3::payload{convert_to_64bit(val)}})

#endif

Expand Down
Loading