Skip to content

Commit 56d775e

Browse files
WilliamK112ttnghia
WilliamK112
and
ttnghia
authored
Format native sources after cudf style changes (#4778)
## Summary - Run the repository clang-format hook after the latest cudf submodule sync on `main` - Apply only the mechanical native-source formatting changes produced by the existing pre-commit configuration - Update the expired copyright years reported by `license-header-check` ## Why A local merge of #4752 onto current `origin/main` reproduced the current `pre-commit.ci - pr` failure: the `clang-format` hook modified native source files after the cudf sync in #4777. This PR applies those hook-generated changes directly on top of current `main`, then fixes the license-header files reported by the maintainer-triggered check. ## Validation - `pre-commit run clang-format --all-files --verbose` initially reproduced the same files-were-modified failure - GitHub `pre-commit.ci - pr` passes on head `ef703bfb` - Local equivalent `license-header-check` regex passes for the 23 included changed files - `uvx pre-commit run --files src/main/cpp/faultinj/faultinj.cu src/main/cpp/profiler/ProfilerJni.cpp src/main/cpp/profiler/init_nvtxw.cpp src/main/cpp/profiler/spark_rapids_profile_converter.cpp src/main/cpp/src/KudoGpuSerializerJni.cpp src/main/cpp/src/zorder.cu src/main/cpp/tests/exception_with_row_index.cpp src/main/cpp/tests/multiply.cpp --verbose` passes - `git diff --check` passes - `git diff --check origin/main...HEAD` passes --------- Signed-off-by: WilliamK112 <164879897+WilliamK112@users.noreply.github.com> Co-authored-by: Nghia Truong <7416935+ttnghia@users.noreply.github.com>
1 parent af07851 commit 56d775e

26 files changed

Lines changed: 263 additions & 263 deletions

‎src/main/cpp/faultinj/faultinj.cu‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022-2024, NVIDIA CORPORATION.
2+
* Copyright (c) 2022-2026, NVIDIA CORPORATION.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ namespace {
5656
typedef enum { FI_TRAP, FI_ASSERT, FI_RETURN_VALUE } FaultInjectionType;
5757

5858
typedef struct {
59-
volatile uint32_t initialized;
59+
uint32_t volatile initialized;
6060
CUpti_SubscriberHandle subscriber;
6161

6262
std::string configFilePath = std::string();
@@ -81,7 +81,7 @@ void CUPTIAPI faultInjectionCallbackHandler(void* userdata,
8181
CUpti_CallbackId cbid,
8282
void* cbInfo);
8383

84-
const std::string configFilePathEnv = "FAULT_INJECTOR_CONFIG_PATH";
84+
std::string const configFilePathEnv = "FAULT_INJECTOR_CONFIG_PATH";
8585
CUptiResult cuptiInitialize(void);
8686
void readFaultInjectorConfig(void);
8787
void traceConfig(boost::property_tree::ptree const& pTree);
@@ -94,7 +94,7 @@ void globalControlInit(void)
9494
globalControl.subscriber = 0;
9595
globalControl.terminateThread = 0;
9696
spdlog::trace("checking environment {}", configFilePathEnv);
97-
const char* configFilePath = std::getenv(configFilePathEnv.c_str());
97+
char const* configFilePath = std::getenv(configFilePathEnv.c_str());
9898
spdlog::debug("{} is {}", configFilePathEnv, configFilePath);
9999
if (configFilePath) {
100100
globalControl.configFilePath = std::string(configFilePath);
@@ -145,7 +145,7 @@ __global__ static void faultInjectorKernelTrap(void) { asm("trap;"); }
145145

146146
boost::optional<boost::property_tree::ptree&> lookupConfig(
147147
boost::optional<boost::property_tree::ptree&> domainConfigs,
148-
const char* key,
148+
char const* key,
149149
CUpti_CallbackId cbid)
150150
{
151151
boost::optional<boost::property_tree::ptree&> faultConfig =
@@ -160,7 +160,7 @@ void CUPTIAPI faultInjectionCallbackHandler(void*,
160160
CUpti_CallbackId cbid,
161161
void* cbdata)
162162
{
163-
const std::string faultInjectorKernelPrefix = std::string("faultInjectorKernel");
163+
std::string const faultInjectorKernelPrefix = std::string("faultInjectorKernel");
164164

165165
CUpti_CallbackData* cbInfo = static_cast<CUpti_CallbackData*>(cbdata);
166166

@@ -243,22 +243,22 @@ void CUPTIAPI faultInjectionCallbackHandler(void*,
243243

244244
// numeric value of FaultInjectionType: 0 (PTX trap), 1 (device assert), 2
245245
// (return code)
246-
const std::string injectionTypeKey = "injectionType";
247-
const std::string substituteReturnCodeKey = "substituteReturnCode";
248-
const std::string percentKey = "percent";
249-
const std::string interceptionCountKey = "interceptionCount";
246+
std::string const injectionTypeKey = "injectionType";
247+
std::string const substituteReturnCodeKey = "substituteReturnCode";
248+
std::string const percentKey = "percent";
249+
std::string const interceptionCountKey = "interceptionCount";
250250

251-
const int injectionType = (*matchedFaultConfig)
251+
int const injectionType = (*matchedFaultConfig)
252252
.get_optional<int>(injectionTypeKey)
253253
.value_or(static_cast<int>(FI_RETURN_VALUE));
254254

255-
const int substituteReturnCode = (*matchedFaultConfig)
255+
int const substituteReturnCode = (*matchedFaultConfig)
256256
.get_optional<int>(substituteReturnCodeKey)
257257
.value_or(static_cast<int>(CUDA_SUCCESS));
258258

259-
const int injectionProbability = (*matchedFaultConfig).get_optional<int>(percentKey).value_or(0);
259+
int const injectionProbability = (*matchedFaultConfig).get_optional<int>(percentKey).value_or(0);
260260

261-
const int interceptionCount =
261+
int const interceptionCount =
262262
(*matchedFaultConfig).get_optional<int>(interceptionCountKey).value_or(INT_MAX);
263263

264264
spdlog::trace(
@@ -285,8 +285,8 @@ void CUPTIAPI faultInjectionCallbackHandler(void*,
285285

286286
if (injectionProbability < 100) {
287287
if (injectionProbability <= 0) { return; }
288-
const int rand10000 = std::rand() % 10000;
289-
const int skipThreshold = injectionProbability * 10000 / 100;
288+
int const rand10000 = std::rand() % 10000;
289+
int const skipThreshold = injectionProbability * 10000 / 100;
290290
spdlog::trace("rand1000={} skipThreshold={}", rand10000, skipThreshold);
291291
if (rand10000 >= skipThreshold) { return; }
292292
spdlog::debug(
@@ -313,7 +313,7 @@ void CUPTIAPI faultInjectionCallbackHandler(void*,
313313
spdlog::debug("updating interception count {}: before locking", interceptionCount);
314314
// TODO the lock is too coarse-grained.
315315
PTHREAD_CALL(pthread_rwlock_wrlock(&globalControl.configLock));
316-
const int interceptionCount = (*matchedFaultConfig).get<int>("interceptionCount");
316+
int const interceptionCount = (*matchedFaultConfig).get<int>("interceptionCount");
317317
(*matchedFaultConfig).put("interceptionCount", interceptionCount - 1);
318318
PTHREAD_CALL(pthread_rwlock_unlock(&globalControl.configLock));
319319
}
@@ -361,41 +361,41 @@ void readFaultInjectorConfig(void)
361361

362362
// to retrieve and the numeric value of spdlog:level::level_enum
363363
// https://github.com/gabime/spdlog/blob/d546201f127c306ec8a0082d57562a05a049af77/include/spdlog/common.h#L198-L204
364-
const std::string logLevelKey = "logLevel";
364+
std::string const logLevelKey = "logLevel";
365365

366366
// A Boolean flag as to whether to watch for config file modifications
367367
// and apply changes after initial boot config.
368368
// Currently only file-based config is supported,
369369
// TODO add a socket for remote config
370370
//
371-
const std::string dynamicConfigKey = "dynamic";
371+
std::string const dynamicConfigKey = "dynamic";
372372

373373
// An unsigned int to seed the random number generator to deterministically
374374
// recreate a fault sequence
375375
//
376-
const std::string seedKey = "seed";
376+
std::string const seedKey = "seed";
377377

378378
// To retrieve a map of driver/runtime fault configs
379379
// "functionName" -> fault config
380380
// "CUPT callback id" -> fault config
381381
// "*" -> fault config
382-
const std::string driverFaultsKey = "cudaDriverFaults";
383-
const std::string runtimeFaultsKey = "cudaRuntimeFaults";
382+
std::string const driverFaultsKey = "cudaDriverFaults";
383+
std::string const runtimeFaultsKey = "cudaRuntimeFaults";
384384

385385
PTHREAD_CALL(pthread_rwlock_wrlock(&globalControl.configLock));
386386
try {
387387
boost::property_tree::read_json(jsonStream, globalControl.configRoot);
388-
const int logLevel = globalControl.configRoot.get_optional<int>(logLevelKey).value_or(0);
388+
int const logLevel = globalControl.configRoot.get_optional<int>(logLevelKey).value_or(0);
389389

390390
globalControl.dynamic =
391391
globalControl.configRoot.get_optional<bool>(dynamicConfigKey).value_or(false);
392392

393-
const unsigned seed =
393+
unsigned const seed =
394394
globalControl.configRoot.get_optional<unsigned>(seedKey).value_or(std::time(0));
395395
spdlog::info("Seeding std::srand with {}", seed);
396396
std::srand(seed);
397397

398-
const spdlog::level::level_enum logLevelEnum = static_cast<spdlog::level::level_enum>(logLevel);
398+
spdlog::level::level_enum const logLevelEnum = static_cast<spdlog::level::level_enum>(logLevel);
399399
spdlog::info("changed log level to {}", logLevel);
400400
spdlog::set_level(logLevelEnum);
401401
traceConfig(globalControl.configRoot);
@@ -433,13 +433,13 @@ int eventCheck(int fd)
433433
void* dynamicReconfig(void*)
434434
{
435435
spdlog::debug("config watcher thread: inotify_init()");
436-
const int inotifyFd = inotify_init();
436+
int const inotifyFd = inotify_init();
437437
if (inotifyFd < 0) {
438438
spdlog::error("inotify_init() failed");
439439
return nullptr;
440440
}
441441
spdlog::debug("config watcher thread: inotify_add_watch {}", globalControl.configFilePath);
442-
const int watchFd = inotify_add_watch(inotifyFd, globalControl.configFilePath.c_str(), IN_MODIFY);
442+
int const watchFd = inotify_add_watch(inotifyFd, globalControl.configFilePath.c_str(), IN_MODIFY);
443443
if (watchFd < 0) {
444444
spdlog::error("config watcher thread: inotify_add_watch {} failed",
445445
globalControl.configFilePath);
@@ -449,16 +449,16 @@ void* dynamicReconfig(void*)
449449
constexpr auto MAX_EVENTS = 1024;
450450
constexpr auto EVENT_SIZE = sizeof(struct inotify_event);
451451

452-
const auto configFilePathStr = std::string(globalControl.configFilePath);
453-
const auto BUF_LEN = MAX_EVENTS * (EVENT_SIZE + configFilePathStr.length());
452+
auto const configFilePathStr = std::string(globalControl.configFilePath);
453+
auto const BUF_LEN = MAX_EVENTS * (EVENT_SIZE + configFilePathStr.length());
454454
char eventBuffer[BUF_LEN];
455455

456456
while (!globalControl.terminateThread) {
457457
spdlog::trace("about to call eventCheck");
458-
const int eventCheckRes = eventCheck(inotifyFd);
458+
int const eventCheckRes = eventCheck(inotifyFd);
459459
spdlog::trace("eventCheck returned {}", eventCheckRes);
460460
if (eventCheckRes > 0) {
461-
const int length = read(inotifyFd, eventBuffer, BUF_LEN);
461+
int const length = read(inotifyFd, eventBuffer, BUF_LEN);
462462
spdlog::debug("config watcher thread: read {} bytes", length);
463463
if (length < EVENT_SIZE) { continue; }
464464
for (int i = 0; i < length;) {

‎src/main/cpp/profiler/NvtxwEvents.cpp‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ namespace NvidiaNvtxw {
2727
{(flags), (type), (name), nullptr, 0, 0, nullptr, nullptr}
2828

2929
// The C string containing the event's name must be provided in a special way.
30-
static const nvtxPayloadSchemaEntry_t nameSchema[] = {PAYLOAD_ENTRY_SIMPLE(
30+
static nvtxPayloadSchemaEntry_t const nameSchema[] = {PAYLOAD_ENTRY_SIMPLE(
3131
NVTX_PAYLOAD_ENTRY_FLAG_EVENT_MESSAGE | NVTX_PAYLOAD_ENTRY_FLAG_ARRAY_ZERO_TERMINATED,
3232
NVTX_PAYLOAD_ENTRY_TYPE_CSTRING,
3333
"name")};
34-
static const nvtxPayloadSchemaAttr_t nameSchemaAttr{
34+
static nvtxPayloadSchemaAttr_t const nameSchemaAttr{
3535
/*.fieldMask = */
3636
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_TYPE | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_FLAGS |
3737
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_ENTRIES | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NUM_ENTRIES |
@@ -55,7 +55,7 @@ static const nvtxPayloadSchemaAttr_t nameSchemaAttr{
5555
/*.extension = */
5656
nullptr};
5757

58-
static const nvtxPayloadSchemaEntry_t nvtxRangeSchema[] = {
58+
static nvtxPayloadSchemaEntry_t const nvtxRangeSchema[] = {
5959
PAYLOAD_ENTRY_SIMPLE(NVTX_PAYLOAD_ENTRY_FLAG_RANGE_BEGIN | NVTX_PAYLOAD_ENTRY_FLAG_EVENT_MESSAGE,
6060
NVTX_PAYLOAD_ENTRY_TYPE_UINT64,
6161
"time_start"),
@@ -70,7 +70,7 @@ static const nvtxPayloadSchemaEntry_t nvtxRangeSchema[] = {
7070
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_COLOR_ARGB, "color"),
7171
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_UINT8, "push_pop")};
7272
// TimeBase = Relative
73-
static const nvtxPayloadSchemaAttr_t nvtxRangePushPopSchemaAttr = {
73+
static nvtxPayloadSchemaAttr_t const nvtxRangePushPopSchemaAttr = {
7474
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NAME | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_TYPE |
7575
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_ENTRIES | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NUM_ENTRIES |
7676
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_STATIC_SIZE | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_SCHEMA_ID,
@@ -84,7 +84,7 @@ static const nvtxPayloadSchemaAttr_t nvtxRangePushPopSchemaAttr = {
8484
NvidiaNvtxw::PayloadSchemaId::nvtxRangePushPopId,
8585
nullptr};
8686
// TimeBase = Relative
87-
static const nvtxPayloadSchemaAttr_t nvtxRangeStartEndSchemaAttr = {
87+
static nvtxPayloadSchemaAttr_t const nvtxRangeStartEndSchemaAttr = {
8888
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NAME | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_TYPE |
8989
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_ENTRIES | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NUM_ENTRIES |
9090
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_STATIC_SIZE | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_SCHEMA_ID,
@@ -98,7 +98,7 @@ static const nvtxPayloadSchemaAttr_t nvtxRangeStartEndSchemaAttr = {
9898
NvidiaNvtxw::PayloadSchemaId::nvtxRangeStartEndId,
9999
nullptr};
100100

101-
static const nvtxPayloadSchemaEntry_t cuptiApiSchema[] = {
101+
static nvtxPayloadSchemaEntry_t const cuptiApiSchema[] = {
102102
PAYLOAD_ENTRY_SIMPLE(NVTX_PAYLOAD_ENTRY_FLAG_RANGE_BEGIN | NVTX_PAYLOAD_ENTRY_FLAG_EVENT_MESSAGE,
103103
NVTX_PAYLOAD_ENTRY_TYPE_UINT64,
104104
"time_start"),
@@ -111,7 +111,7 @@ static const nvtxPayloadSchemaEntry_t cuptiApiSchema[] = {
111111
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_TID_UINT32, "thread_id"),
112112
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_UINT32, "correlation_id"),
113113
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_UINT32, "return_value")};
114-
static const nvtxPayloadSchemaAttr_t cuptiApiSchemaAttr = {
114+
static nvtxPayloadSchemaAttr_t const cuptiApiSchemaAttr = {
115115
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NAME | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_TYPE |
116116
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_ENTRIES | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NUM_ENTRIES |
117117
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_STATIC_SIZE | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_SCHEMA_ID,
@@ -124,7 +124,7 @@ static const nvtxPayloadSchemaAttr_t cuptiApiSchemaAttr = {
124124
0,
125125
NvidiaNvtxw::PayloadSchemaId::cuptiApiId,
126126
nullptr};
127-
static const nvtxPayloadSchemaEntry_t cuptiDeviceSchema[] = {
127+
static nvtxPayloadSchemaEntry_t const cuptiDeviceSchema[] = {
128128
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_UINT64, "global_memory_bandwidth"),
129129
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_UINT64, "global_memory_size"),
130130
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_UINT32, "constant_memory_size"),
@@ -154,7 +154,7 @@ static const nvtxPayloadSchemaEntry_t cuptiDeviceSchema[] = {
154154
PAYLOAD_ENTRY_SIMPLE(NVTX_PAYLOAD_ENTRY_FLAG_EVENT_MESSAGE | NVTX_PAYLOAD_ENTRY_FLAG_POINTER,
155155
NVTX_PAYLOAD_ENTRY_TYPE_CSTRING,
156156
"name")};
157-
static const nvtxPayloadSchemaAttr_t cuptiDeviceSchemaAttr = {
157+
static nvtxPayloadSchemaAttr_t const cuptiDeviceSchemaAttr = {
158158
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NAME | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_TYPE |
159159
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_ENTRIES | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NUM_ENTRIES |
160160
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_STATIC_SIZE | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_SCHEMA_ID,
@@ -167,7 +167,7 @@ static const nvtxPayloadSchemaAttr_t cuptiDeviceSchemaAttr = {
167167
0,
168168
NvidiaNvtxw::PayloadSchemaId::cuptiDeviceId,
169169
nullptr};
170-
static const nvtxPayloadSchemaEntry_t cuptiKernelSchema[] = {
170+
static nvtxPayloadSchemaEntry_t const cuptiKernelSchema[] = {
171171
PAYLOAD_ENTRY_SIMPLE(NVTX_PAYLOAD_ENTRY_FLAG_RANGE_BEGIN | NVTX_PAYLOAD_ENTRY_FLAG_EVENT_MESSAGE,
172172
NVTX_PAYLOAD_ENTRY_TYPE_UINT64,
173173
"time_start"),
@@ -216,7 +216,7 @@ static const nvtxPayloadSchemaEntry_t cuptiKernelSchema[] = {
216216
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_UINT8, "shared_memory_carveout_requested"),
217217
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_UINT8, "shmem_limit_config"),
218218
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_UINT8, "channel_type")};
219-
static const nvtxPayloadSchemaAttr_t cuptiKernelSchemaAttr = {
219+
static nvtxPayloadSchemaAttr_t const cuptiKernelSchemaAttr = {
220220
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NAME | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_TYPE |
221221
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_ENTRIES | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NUM_ENTRIES |
222222
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_STATIC_SIZE | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_SCHEMA_ID,
@@ -229,7 +229,7 @@ static const nvtxPayloadSchemaAttr_t cuptiKernelSchemaAttr = {
229229
0,
230230
NvidiaNvtxw::PayloadSchemaId::cuptiKernelId,
231231
nullptr};
232-
static const nvtxPayloadSchemaEntry_t cuptiMemcpySchema[] = {
232+
static nvtxPayloadSchemaEntry_t const cuptiMemcpySchema[] = {
233233
PAYLOAD_ENTRY_SIMPLE(NVTX_PAYLOAD_ENTRY_FLAG_RANGE_BEGIN | NVTX_PAYLOAD_ENTRY_FLAG_EVENT_MESSAGE,
234234
NVTX_PAYLOAD_ENTRY_TYPE_UINT64,
235235
"time_start"),
@@ -250,7 +250,7 @@ static const nvtxPayloadSchemaEntry_t cuptiMemcpySchema[] = {
250250
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_UINT8, "copy_kind"),
251251
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_UINT8, "src_kind"),
252252
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_UINT8, "dst_kind")};
253-
static const nvtxPayloadSchemaAttr_t cuptiMemcpySchemaAttr = {
253+
static nvtxPayloadSchemaAttr_t const cuptiMemcpySchemaAttr = {
254254
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NAME | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_TYPE |
255255
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_ENTRIES | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NUM_ENTRIES |
256256
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_STATIC_SIZE | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_SCHEMA_ID,
@@ -263,7 +263,7 @@ static const nvtxPayloadSchemaAttr_t cuptiMemcpySchemaAttr = {
263263
0,
264264
NvidiaNvtxw::PayloadSchemaId::cuptiMemcpyId,
265265
nullptr};
266-
static const nvtxPayloadSchemaEntry_t cuptiMemsetSchema[] = {
266+
static nvtxPayloadSchemaEntry_t const cuptiMemsetSchema[] = {
267267
PAYLOAD_ENTRY_SIMPLE(NVTX_PAYLOAD_ENTRY_FLAG_RANGE_BEGIN | NVTX_PAYLOAD_ENTRY_FLAG_EVENT_MESSAGE,
268268
NVTX_PAYLOAD_ENTRY_TYPE_UINT64,
269269
"time_start"),
@@ -283,7 +283,7 @@ static const nvtxPayloadSchemaEntry_t cuptiMemsetSchema[] = {
283283
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_UINT8, "channel_type"),
284284
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_UINT8, "mem_kind"),
285285
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_UINT8, "flags")};
286-
static const nvtxPayloadSchemaAttr_t cuptiMemsetSchemaAttr = {
286+
static nvtxPayloadSchemaAttr_t const cuptiMemsetSchemaAttr = {
287287
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NAME | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_TYPE |
288288
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_ENTRIES | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NUM_ENTRIES |
289289
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_STATIC_SIZE | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_SCHEMA_ID,
@@ -296,7 +296,7 @@ static const nvtxPayloadSchemaAttr_t cuptiMemsetSchemaAttr = {
296296
0,
297297
NvidiaNvtxw::PayloadSchemaId::cuptiMemsetId,
298298
nullptr};
299-
static const nvtxPayloadSchemaEntry_t cuptiOverheadSchema[] = {
299+
static nvtxPayloadSchemaEntry_t const cuptiOverheadSchema[] = {
300300
PAYLOAD_ENTRY_SIMPLE(NVTX_PAYLOAD_ENTRY_FLAG_RANGE_BEGIN | NVTX_PAYLOAD_ENTRY_FLAG_EVENT_MESSAGE,
301301
NVTX_PAYLOAD_ENTRY_TYPE_UINT64,
302302
"time_start"),
@@ -307,7 +307,7 @@ static const nvtxPayloadSchemaEntry_t cuptiOverheadSchema[] = {
307307
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_TID_UINT32, "thread_id"),
308308
PAYLOAD_ENTRY_SIMPLE(0, NVTX_PAYLOAD_ENTRY_TYPE_UINT8, "overhead_kind"),
309309
};
310-
static const nvtxPayloadSchemaAttr_t cuptiOverheadSchemaAttr = {
310+
static nvtxPayloadSchemaAttr_t const cuptiOverheadSchemaAttr = {
311311
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NAME | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_TYPE |
312312
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_ENTRIES | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_NUM_ENTRIES |
313313
NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_STATIC_SIZE | NVTX_PAYLOAD_SCHEMA_ATTR_FIELD_SCHEMA_ID,
@@ -323,18 +323,18 @@ static const nvtxPayloadSchemaAttr_t cuptiOverheadSchemaAttr = {
323323
#undef PAYLOAD_ENTRY_SIMPLE
324324

325325
const nvtxPayloadSchemaAttr_t* GetNameSchemaAttr() { return &nameSchemaAttr; }
326-
const nvtxPayloadSchemaAttr_t* GetNvtxRangePushPopSchemaAttr()
326+
nvtxPayloadSchemaAttr_t const* GetNvtxRangePushPopSchemaAttr()
327327
{
328328
return &nvtxRangePushPopSchemaAttr;
329329
}
330-
const nvtxPayloadSchemaAttr_t* GetNvtxRangeStartEndSchemaAttr()
330+
nvtxPayloadSchemaAttr_t const* GetNvtxRangeStartEndSchemaAttr()
331331
{
332332
return &nvtxRangeStartEndSchemaAttr;
333333
}
334-
const nvtxPayloadSchemaAttr_t* GetCuptiApiSchemaAttr() { return &cuptiApiSchemaAttr; }
335-
const nvtxPayloadSchemaAttr_t* GetCuptiDeviceSchemaAttr() { return &cuptiDeviceSchemaAttr; }
336-
const nvtxPayloadSchemaAttr_t* GetCuptiKernelSchemaAttr() { return &cuptiKernelSchemaAttr; }
337-
const nvtxPayloadSchemaAttr_t* GetCuptiMemcpySchemaAttr() { return &cuptiMemcpySchemaAttr; }
338-
const nvtxPayloadSchemaAttr_t* GetCuptiMemsetSchemaAttr() { return &cuptiMemsetSchemaAttr; }
339-
const nvtxPayloadSchemaAttr_t* GetCuptiOverheadSchemaAttr() { return &cuptiOverheadSchemaAttr; }
334+
nvtxPayloadSchemaAttr_t const* GetCuptiApiSchemaAttr() { return &cuptiApiSchemaAttr; }
335+
nvtxPayloadSchemaAttr_t const* GetCuptiDeviceSchemaAttr() { return &cuptiDeviceSchemaAttr; }
336+
nvtxPayloadSchemaAttr_t const* GetCuptiKernelSchemaAttr() { return &cuptiKernelSchemaAttr; }
337+
nvtxPayloadSchemaAttr_t const* GetCuptiMemcpySchemaAttr() { return &cuptiMemcpySchemaAttr; }
338+
nvtxPayloadSchemaAttr_t const* GetCuptiMemsetSchemaAttr() { return &cuptiMemsetSchemaAttr; }
339+
nvtxPayloadSchemaAttr_t const* GetCuptiOverheadSchemaAttr() { return &cuptiOverheadSchemaAttr; }
340340
} // namespace NvidiaNvtxw

0 commit comments

Comments
 (0)