diff --git a/src/apex/hip_trace.cpp b/src/apex/hip_trace.cpp index 5f18cb4a..dd51710e 100644 --- a/src/apex/hip_trace.cpp +++ b/src/apex/hip_trace.cpp @@ -81,7 +81,7 @@ using namespace std; #include "memory_wrapper.hpp" // Macro to check ROC-tracer calls status -#define ROCTRACER_CALL(call) \ +#define ROCTRACER_CALL_CHECK(call) \ do { \ int err = call; \ if (err != 0) { \ @@ -1009,7 +1009,7 @@ void activity_callback(const char* begin, const char* end, void* arg) { abort(); } - ROCTRACER_CALL(roctracer_next_record(record, &record)); + ROCTRACER_CALL_CHECK(roctracer_next_record(record, &record)); } } @@ -1031,37 +1031,37 @@ void init_hip_tracing() { memset(&properties, 0, sizeof(roctracer_properties_t)); properties.buffer_size = 0x1000; properties.buffer_callback_fun = activity_callback; - ROCTRACER_CALL(roctracer_open_pool(&properties)); + ROCTRACER_CALL_CHECK(roctracer_open_pool(&properties)); // Enable HIP API callbacks - ROCTRACER_CALL(roctracer_enable_domain_callback(ACTIVITY_DOMAIN_HIP_API, handle_hip, NULL)); + ROCTRACER_CALL_CHECK(roctracer_enable_domain_callback(ACTIVITY_DOMAIN_HIP_API, handle_hip, NULL)); if (apex_options::use_hip_kfd_api()) { #if defined(APEX_HAVE_ROCTRACER_KFD) // Enable KFD API tracing - ROCTRACER_CALL(roctracer_enable_domain_callback(ACTIVITY_DOMAIN_KFD_API, handle_roc_kfd, NULL)); + ROCTRACER_CALL_CHECK(roctracer_enable_domain_callback(ACTIVITY_DOMAIN_KFD_API, handle_roc_kfd, NULL)); #endif #if defined(APEX_WITH_HSA) // Enable HIP HSA (OpenMP?) callbacks - ROCTRACER_CALL(roctracer_enable_domain_callback(ACTIVITY_DOMAIN_HSA_API, handle_roc_hsa, NULL)); + ROCTRACER_CALL_CHECK(roctracer_enable_domain_callback(ACTIVITY_DOMAIN_HSA_API, handle_roc_hsa, NULL)); #endif } // Enable rocTX - ROCTRACER_CALL(roctracer_enable_domain_callback(ACTIVITY_DOMAIN_ROCTX, handle_roctx, NULL)); + ROCTRACER_CALL_CHECK(roctracer_enable_domain_callback(ACTIVITY_DOMAIN_ROCTX, handle_roctx, NULL)); // Enable HIP activity tracing - //ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HIP_API)); + //ROCTRACER_CALL_CHECK(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HIP_API)); // FYI, ACTIVITY_DOMAIN_HIP_OPS = ACTIVITY_DOMAIN_HCC_OPS = ACTIVITY_DOMAIN_HIP_VDI... - ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HIP_OPS)); + ROCTRACER_CALL_CHECK(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HIP_OPS)); if (apex_options::use_hip_kfd_api()) { #if defined(APEX_WITH_HSA) // disabled for now to simplify compiling - ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HSA_OPS)); + ROCTRACER_CALL_CHECK(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HSA_OPS)); #endif #if defined(APEX_HAVE_ROCTRACER_KFD) - ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_KFD_API)); + ROCTRACER_CALL_CHECK(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_KFD_API)); #endif } // Enable PC sampling - //ROCTRACER_CALL(roctracer_enable_op_activity(ACTIVITY_DOMAIN_HSA_OPS, HSA_OP_ID_RESERVED1)); + //ROCTRACER_CALL_CHECK(roctracer_enable_op_activity(ACTIVITY_DOMAIN_HSA_OPS, HSA_OP_ID_RESERVED1)); roctracer_start(); //std::cout << "RocTracer started" << std::endl; } @@ -1069,38 +1069,38 @@ void init_hip_tracing() { // Stop tracing routine void flush_hip_trace() { if (!apex_options::use_hip()) { return; } - ROCTRACER_CALL(roctracer_flush_activity()); + ROCTRACER_CALL_CHECK(roctracer_flush_activity()); } void stop_hip_trace() { if (!apex_options::use_hip()) { return; } roctracer_stop(); /* CAllbacks */ - ROCTRACER_CALL(roctracer_disable_domain_callback(ACTIVITY_DOMAIN_HIP_API)); + ROCTRACER_CALL_CHECK(roctracer_disable_domain_callback(ACTIVITY_DOMAIN_HIP_API)); if (apex_options::use_hip_kfd_api()) { #if defined(APEX_WITH_HSA) - ROCTRACER_CALL(roctracer_disable_domain_callback(ACTIVITY_DOMAIN_HSA_API)); + ROCTRACER_CALL_CHECK(roctracer_disable_domain_callback(ACTIVITY_DOMAIN_HSA_API)); #endif #if defined(APEX_HAVE_ROCTRACER_KFD) - ROCTRACER_CALL(roctracer_disable_domain_callback(ACTIVITY_DOMAIN_KFD_API)); + ROCTRACER_CALL_CHECK(roctracer_disable_domain_callback(ACTIVITY_DOMAIN_KFD_API)); #endif } - ROCTRACER_CALL(roctracer_disable_domain_callback(ACTIVITY_DOMAIN_ROCTX)); + ROCTRACER_CALL_CHECK(roctracer_disable_domain_callback(ACTIVITY_DOMAIN_ROCTX)); /* Activity */ - //ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HIP_API)); + //ROCTRACER_CALL_CHECK(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HIP_API)); // FYI, ACTIVITY_DOMAIN_HIP_OPS = ACTIVITY_DOMAIN_HCC_OPS = ACTIVITY_DOMAIN_HIP_VDI... - ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HIP_OPS)); - ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_EXT_API)); + ROCTRACER_CALL_CHECK(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HIP_OPS)); + ROCTRACER_CALL_CHECK(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_EXT_API)); if (apex_options::use_hip_kfd_api()) { #if defined(APEX_WITH_HSA) - ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HSA_API)); + ROCTRACER_CALL_CHECK(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HSA_API)); #endif #if defined(APEX_HAVE_ROCTRACER_KFD) - ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_KFD_API)); + ROCTRACER_CALL_CHECK(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_KFD_API)); #endif } - ROCTRACER_CALL(roctracer_flush_activity()); + ROCTRACER_CALL_CHECK(roctracer_flush_activity()); #if defined(APEX_WITH_HSA) hsa_shut_down(); #endif diff --git a/src/examples/Overhead/testOverhead.cpp b/src/examples/Overhead/testOverhead.cpp index 38a8cd58..844cfb8f 100644 --- a/src/examples/Overhead/testOverhead.cpp +++ b/src/examples/Overhead/testOverhead.cpp @@ -162,15 +162,11 @@ int main(int argc, char **argv) pthread_barrier_init(&barrier, NULL, numthreads); #endif unsigned i; - int timed = 0; - int untimed = 0; for (i = 0 ; i < numthreads ; i++) { if (i % 2 == 0) { pthread_create(&(thread[i]), NULL, someUntimedThread, reinterpret_cast(static_cast(i))); - untimed++; } else { pthread_create(&(thread[i]), NULL, someThread, reinterpret_cast(static_cast(i))); - timed++; } } for (i = 0 ; i < numthreads ; i++) { diff --git a/src/openmp/ompt_sync_region_wait.c b/src/openmp/ompt_sync_region_wait.c index bb438ffd..0231be7e 100644 --- a/src/openmp/ompt_sync_region_wait.c +++ b/src/openmp/ompt_sync_region_wait.c @@ -8,13 +8,12 @@ */ int main (int argc, char** argv) { - int i, n, chunk; + int i, n; double a[100], b[100], result; apex_set_use_screen_output(1); /* Some initializations */ n = 100; - chunk = 10; result = 0.0; for (i=0; i < n; i++) { a[i] = i * 1.0; diff --git a/src/openmp/ompt_target_matmult.c b/src/openmp/ompt_target_matmult.c index d72068e5..cb0e49e9 100644 --- a/src/openmp/ompt_target_matmult.c +++ b/src/openmp/ompt_target_matmult.c @@ -24,7 +24,6 @@ #define elem(_m,_i,_j) (_m[((_i)*NRA) + (_j)]) float* allocateMatrix(int rows, int cols) { - int i; float *matrix = (float*)malloc((sizeof(float*)) * rows * cols); #pragma omp target enter data map(alloc:matrix[0:rows*cols]) return matrix; diff --git a/src/unit_tests/C/apex_new_task.c b/src/unit_tests/C/apex_new_task.c index 950e6567..d70df71c 100644 --- a/src/unit_tests/C/apex_new_task.c +++ b/src/unit_tests/C/apex_new_task.c @@ -10,7 +10,7 @@ #define PTHREAD_STACK_MIN 1024*16 #endif -long unsigned int task_id = -1; +long unsigned int task_id = 0; #define FIB_RESULTS_PRE 41 int fib_results[FIB_RESULTS_PRE] = {0,1,1,2,3,5,8,13,21,34,55,89,144,233,377,610,987,1597,2584,4181,6765,10946,17711,28657,46368,75025,121393,196418,317811,514229,832040,1346269,2178309,3524578,5702887,9227465,14930352,24157817,39088169,63245986,102334155};