roctracer test with disabled hip api activity

Change-Id: I6d2139a67810cafb9ccb94bf57f55e85e1ab0982


[ROCm/roctracer commit: 3b62c5c6b9]

projects/roctracer/test/CMakeLists.txt

@@ -37,6 +37,8 @@ add_custom_target( mytest
   COMMAND sh -xc "cp ${TEST_DIR}/MatrixTranspose/MatrixTranspose ${PROJECT_BINARY_DIR}/test"
   COMMAND ${TEST_CFLAGS} make -C "${TEST_DIR}/MatrixTranspose_test"
   COMMAND sh -xc "cp ${TEST_DIR}/MatrixTranspose_test/MatrixTranspose ${PROJECT_BINARY_DIR}/test/MatrixTranspose_test"
+  COMMAND HIP_API_ACTIVITY_ON=1 ${TEST_CFLAGS} make -C "${TEST_DIR}/MatrixTranspose_test"
+  COMMAND sh -xc "cp ${TEST_DIR}/MatrixTranspose_test/MatrixTranspose ${PROJECT_BINARY_DIR}/test/MatrixTranspose_hipaact_test"
   COMMAND MGPU_TEST=1 ${TEST_CFLAGS} make -C "${TEST_DIR}/MatrixTranspose_test"
   COMMAND sh -xc "cp ${TEST_DIR}/MatrixTranspose_test/MatrixTranspose ${PROJECT_BINARY_DIR}/test/MatrixTranspose_mgpu"
   COMMAND C_TEST=1 ${TEST_CFLAGS} make -C "${TEST_DIR}/MatrixTranspose_test"

projects/roctracer/test/MatrixTranspose_test/Makefile

@@ -29,6 +29,9 @@ endif
 ifeq ($(MGPU_TEST), 1)
 	FLAGS += -DMGPU_TEST=1
 endif
+ifeq ($(HIP_API_ACTIVITY_ON), 1)
+        FLAGS += -DHIP_API_ACTIVITY_ON=1
+endif
 
 .PHONY: test
 

projects/roctracer/test/MatrixTranspose_test/MatrixTranspose.cpp

@@ -369,7 +369,9 @@ void init_tracing() {
   // Enable HIP API callbacks
   ROCTRACER_CALL(roctracer_enable_domain_callback(ACTIVITY_DOMAIN_HIP_API, api_callback, NULL));
   // Enable HIP activity tracing
+#if HIP_API_ACTIVITY_ON
   ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HIP_API));
+#endif
   ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HCC_OPS));
   // Enable PC sampling
   ROCTRACER_CALL(roctracer_enable_op_activity(ACTIVITY_DOMAIN_HSA_OPS, HSA_OP_ID_PCSAMPLE));
@@ -390,7 +392,9 @@ void start_tracing() {
 // Stop tracing routine
 void stop_tracing() {
   ROCTRACER_CALL(roctracer_disable_domain_callback(ACTIVITY_DOMAIN_HIP_API));
+#if HIP_API_ACTIVITY_ON
   ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HIP_API));
+#endif
   ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HCC_OPS));
   ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HSA_OPS));
   ROCTRACER_CALL(roctracer_disable_domain_callback(ACTIVITY_DOMAIN_KFD_API));

projects/roctracer/test/golden_traces/tests_trace_cmp_levels.txt

@@ -1,5 +1,6 @@
 MatrixTranspose_ctest_trace 3
 MatrixTranspose_test_trace 1
+MatrixTranspose_hipaact_test_trace 1
 MatrixTranspose_mgpu_trace 1
 MatrixTranspose_kfd_trace 0
 MatrixTranspose_sys_trace 0

projects/roctracer/test/run.sh

@@ -79,6 +79,7 @@ eval_test() {
 # rocTrecer is used explicitely by test
 eval_test "standalone C test" "LD_PRELOAD=libkfdwrapper64.so ./test/MatrixTranspose_ctest" MatrixTranspose_ctest_trace
 eval_test "standalone HIP test" "LD_PRELOAD=libkfdwrapper64.so ./test/MatrixTranspose_test" MatrixTranspose_test_trace
+eval_test "standalone HIP test" "LD_PRELOAD=libkfdwrapper64.so ./test/MatrixTranspose_hipaact_test" MatrixTranspose_hipaact_test_trace
 eval_test "standalone HIP MGPU test" "LD_PRELOAD=libkfdwrapper64.so ./test/MatrixTranspose_mgpu" MatrixTranspose_mgpu_trace
 
 # Tool test