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

rocprofiler issue80 fixup #98

Merged
merged 1 commit into from
Oct 12, 2023
Merged

rocprofiler issue80 fixup #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 21 additions & 23 deletions src/components/rocm/roc_profiler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ struct rocd_ctx {
int feature_count;
rocprofiler_t **contexts;
rocc_bitmap_t device_map;
rocprofiler_properties_t *ctx_prop;
} sampling;
} u;
};
Expand Down Expand Up @@ -622,17 +623,6 @@ get_ntv_events_cb(const rocprofiler_info_data_t info, void *ntv_arg)
* rocp_ctx_{open,close,start,stop,read,reset} sampling mode utility functions
*
*/
static struct {
int device_state[PAPI_ROCM_MAX_DEV_COUNT];
int queue_ref_count;
rocprofiler_properties_t ctx_prop;
} sampling_global_state = {{ 0 }, 0, { NULL, 128, NULL, NULL }};

#define SAMPLING_CONTEXT_PROP (sampling_global_state.ctx_prop)
#define SAMPLING_CONTEXT_PROP_QUEUE (SAMPLING_CONTEXT_PROP.queue)
#define SAMPLING_FETCH_AND_INCREMENT_QUEUE_COUNTER() (sampling_global_state.queue_ref_count++)
#define SAMPLING_DECREMENT_AND_FETCH_QUEUE_COUNTER() (--sampling_global_state.queue_ref_count)

static int init_features(unsigned int *, int, rocprofiler_feature_t *);
static int sampling_ctx_init(unsigned int *, int, rocp_ctx_t *);
static int sampling_ctx_finalize(rocp_ctx_t *);
Expand Down Expand Up @@ -881,6 +871,7 @@ sampling_ctx_init(unsigned int *events_id, int num_events, rocp_ctx_t *rocp_ctx)
int num_devs;
rocprofiler_feature_t *features = NULL;
rocprofiler_t **contexts = NULL;
rocprofiler_properties_t *ctx_prop = NULL;
long long *counters = NULL;
*rocp_ctx = NULL;

Expand All @@ -901,6 +892,12 @@ sampling_ctx_init(unsigned int *events_id, int num_events, rocp_ctx_t *rocp_ctx)
goto fn_fail;
}

ctx_prop = papi_calloc(num_devs, sizeof(*ctx_prop));
if (ctx_prop == NULL) {
papi_errno = PAPI_ENOMEM;
goto fn_fail;
}

features = papi_calloc(num_events, sizeof(*features));
if (features == NULL) {
papi_errno = PAPI_ENOMEM;
Expand Down Expand Up @@ -930,6 +927,7 @@ sampling_ctx_init(unsigned int *events_id, int num_events, rocp_ctx_t *rocp_ctx)
(*rocp_ctx)->u.sampling.contexts = contexts;
(*rocp_ctx)->u.sampling.counters = counters;
(*rocp_ctx)->u.sampling.device_map = bitmap;
(*rocp_ctx)->u.sampling.ctx_prop = ctx_prop;

fn_exit:
return papi_errno;
Expand Down Expand Up @@ -965,6 +963,10 @@ sampling_ctx_finalize(rocp_ctx_t *rocp_ctx)
papi_free((*rocp_ctx)->u.sampling.contexts);
}

if ((*rocp_ctx)->u.sampling.ctx_prop) {
papi_free((*rocp_ctx)->u.sampling.ctx_prop);
}

if ((*rocp_ctx)->u.sampling.counters) {
papi_free((*rocp_ctx)->u.sampling.counters);
}
Expand All @@ -984,6 +986,7 @@ ctx_open(rocp_ctx_t rocp_ctx)
int dev_feature_offset = 0;
int dev_count;
rocprofiler_t **contexts = rocp_ctx->u.sampling.contexts;
rocprofiler_properties_t *ctx_prop = rocp_ctx->u.sampling.ctx_prop;

papi_errno = rocc_dev_get_count(rocp_ctx->u.sampling.device_map, &dev_count);
if (papi_errno != PAPI_OK) {
Expand All @@ -1001,14 +1004,12 @@ ctx_open(rocp_ctx_t rocp_ctx)
rocprofiler_feature_t *dev_features = features + dev_feature_offset;

const uint32_t mode =
(SAMPLING_FETCH_AND_INCREMENT_QUEUE_COUNTER() == 0) ?
ROCPROFILER_MODE_STANDALONE | ROCPROFILER_MODE_CREATEQUEUE |
ROCPROFILER_MODE_SINGLEGROUP :
ROCPROFILER_MODE_STANDALONE | ROCPROFILER_MODE_SINGLEGROUP;
ROCPROFILER_MODE_STANDALONE | ROCPROFILER_MODE_CREATEQUEUE | ROCPROFILER_MODE_SINGLEGROUP;

ctx_prop[i].queue_depth = 128;
hsa_status_t rocp_errno = rocp_open_p(device_table_p->devices[dev_id], dev_features,
dev_feature_count, &contexts[i], mode,
&SAMPLING_CONTEXT_PROP);
&ctx_prop[i]);
if (rocp_errno != HSA_STATUS_SUCCESS) {
papi_errno = PAPI_EMISC;
goto fn_fail;
Expand All @@ -1027,15 +1028,15 @@ ctx_open(rocp_ctx_t rocp_ctx)
fn_fail:
for (j = 0; j < i; ++j) {
rocp_close_p(contexts[j]);
SAMPLING_DECREMENT_AND_FETCH_QUEUE_COUNTER();
hsa_queue_destroy_p(ctx_prop[j].queue);
}
goto fn_exit;
}

int
ctx_close(rocp_ctx_t rocp_ctx)
{
int papi_errno = PAPI_OK;
int papi_errno;
int i, devs_count;
rocc_dev_get_count(rocp_ctx->u.sampling.device_map, &devs_count);

Expand All @@ -1044,11 +1045,8 @@ ctx_close(rocp_ctx_t rocp_ctx)
papi_errno = PAPI_EMISC;
}

if (SAMPLING_DECREMENT_AND_FETCH_QUEUE_COUNTER() == 0) {
if (hsa_queue_destroy_p(SAMPLING_CONTEXT_PROP_QUEUE) != HSA_STATUS_SUCCESS) {
papi_errno = PAPI_EMISC;
}
SAMPLING_CONTEXT_PROP_QUEUE = NULL;
if (hsa_queue_destroy_p(rocp_ctx->u.sampling.ctx_prop[i].queue) != HSA_STATUS_SUCCESS) {
papi_errno = PAPI_EMISC;
}
}

Expand Down
2 changes: 0 additions & 2 deletions src/components/rocm/tests/sample_multi_thread_monitoring.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

int main(int argc, char *argv[])
{
test_skip(__FILE__, __LINE__, "sample_multi_thread", PAPI_OK);

setenv("ROCP_HSA_INTERCEPT", "0", 1);

multi_thread(argc, argv);
Expand Down
2 changes: 0 additions & 2 deletions src/components/rocm/tests/sample_single_thread_monitoring.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

int main(int argc, char *argv[])
{
test_skip(__FILE__, __LINE__, "sample_single_thread", PAPI_OK);

setenv("ROCP_HSA_INTERCEPT", "0", 1);

single_thread(argc, argv);
Expand Down