merge release code into development

CMakeLists.txt

@@ -34,11 +34,9 @@
 
 cmake_minimum_required(VERSION 3.8.0)
 
-project(ROCM_DEBUG_AGENT VERSION 2.0.3)
+project(rocm-debug-agent VERSION 2.0.3)
 
-# The project command does not set the <PROJECT-NAME>_NAME variable so must set
-# it explicitly.
-set(ROCM_DEBUG_AGENT_NAME "${PROJECT_NAME}")
+include(GNUInstallDirs)
 
 file(GLOB SOURCES "src/*.cpp")
 add_library(rocm-debug-agent SHARED ${SOURCES})
@@ -47,8 +45,8 @@ set_target_properties(rocm-debug-agent PROPERTIES
   CXX_STANDARD 17
   CXX_STANDARD_REQUIRED ON
   CXX_EXTENSIONS OFF
-  VERSION ${ROCM_DEBUG_AGENT_VERSION}
-  SOVERSION ${ROCM_DEBUG_AGENT_VERSION_MAJOR}
+  VERSION ${PROJECT_VERSION}
+  SOVERSION ${PROJECT_VERSION_MAJOR}
   NO_SYSTEM_FROM_IMPORTED ON)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
@@ -122,11 +120,11 @@ target_compile_definitions(rocm-debug-agent
 install(TARGETS rocm-debug-agent
   LIBRARY
     NAMELINK_SKIP
-    DESTINATION lib
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
   COMPONENT runtime)
 
 install(FILES LICENSE.txt README.md
-  DESTINATION share/doc/rocm-debug-agent
+  DESTINATION ${CMAKE_INSTALL_DOCDIR}
   COMPONENT runtime)
 
 enable_testing()
@@ -137,7 +135,7 @@ set(CPACK_PACKAGE_NAME rocm-debug-agent)
 set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc")
 set(CPACK_PACKAGE_CONTACT "ROCm Debugger Support <[email protected]>")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Radeon Open Compute Debug Agent (ROCdebug-agent)")
-set(CPACK_PACKAGE_VERSION ${ROCM_DEBUG_AGENT_VERSION})
+set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
 
 if(DEFINED ENV{ROCM_LIBPATCH_VERSION})

src/code_object.h

@@ -31,7 +31,7 @@
 #ifndef _ROCM_DEBUG_AGENT_CODE_OBJECT_H
 #define _ROCM_DEBUG_AGENT_CODE_OBJECT_H 1
 
-#include <amd-dbgapi.h>
+#include <amd-dbgapi/amd-dbgapi.h>
 
 #include <cstddef>
 #include <map>
@@ -98,4 +98,4 @@ class code_object_t
 
 } /* namespace amd::debug_agent */
 
-#endif /* _ROCM_DEBUG_AGENT_CODE_OBJECT_H */
+#endif /* _ROCM_DEBUG_AGENT_CODE_OBJECT_H */

src/debug_agent.cpp

@@ -32,7 +32,7 @@
 #include "debug.h"
 #include "logging.h"
 
-#include <amd-dbgapi.h>
+#include <amd-dbgapi/amd-dbgapi.h>
 #include <hsa/hsa.h>
 #include <hsa/hsa_api_trace.h>
 #include <hsa/hsa_ext_amd.h>
@@ -365,19 +365,35 @@ stop_all_wavefronts (amd_dbgapi_process_id_t process_id)
           if (event_id.handle == AMD_DBGAPI_EVENT_NONE.handle)
             break;
 
-          if (kind == AMD_DBGAPI_EVENT_KIND_WAVE_STOP)
+          if (kind == AMD_DBGAPI_EVENT_KIND_WAVE_STOP
+              || kind == AMD_DBGAPI_EVENT_KIND_WAVE_COMMAND_TERMINATED)
             {
               amd_dbgapi_wave_id_t wave_id;
               DBGAPI_CHECK (amd_dbgapi_event_get_info (
                   event_id, AMD_DBGAPI_EVENT_INFO_WAVE, sizeof (wave_id),
                   &wave_id));
 
+              agent_assert (waiting_to_stop.find (wave_id.handle)
+                            != waiting_to_stop.end ());
+
               waiting_to_stop.erase (wave_id.handle);
-              already_stopped.emplace (wave_id.handle);
 
-              agent_log (log_level_t::info, "wave_%ld is stopped",
-                         wave_id.handle);
+              if (kind == AMD_DBGAPI_EVENT_KIND_WAVE_STOP)
+                {
+                  already_stopped.emplace (wave_id.handle);
+
+                  agent_log (log_level_t::info, "wave_%ld is stopped",
+                             wave_id.handle);
+                }
+              else /* kind == AMD_DBGAPI_EVENT_KIND_COMMAND_TERMINATED */
+                {
+                  agent_log (log_level_t::info,
+                             "wave_%ld terminated while stopping",
+                             wave_id.handle);
+                }
             }
+
+          DBGAPI_CHECK (amd_dbgapi_event_processed (event_id));
         }
 
       amd_dbgapi_wave_id_t *wave_ids;
@@ -401,13 +417,47 @@ stop_all_wavefronts (amd_dbgapi_process_id_t process_id)
               continue;
             }
 
-          agent_log (log_level_t::info,
-                     "wave_%ld is running, sending stop request",
-                     wave_id.handle);
+          amd_dbgapi_wave_state_t state;
+          if (amd_dbgapi_status_t status = amd_dbgapi_wave_get_info (
+                  wave_id, AMD_DBGAPI_WAVE_INFO_STATE, sizeof (state), &state);
+              status == AMD_DBGAPI_STATUS_ERROR_INVALID_WAVE_ID)
+            {
+              /* The wave could have terminated since it was reported in the
+                 last wave list.  Skip it.  */
+              continue;
+            }
+          else if (status != AMD_DBGAPI_STATUS_SUCCESS)
+            agent_error ("amd_dbgapi_wave_get_info failed (rc=%d)", status);
+
+          if (state == AMD_DBGAPI_WAVE_STATE_STOP)
+            {
+              already_stopped.emplace (wave_ids[i].handle);
 
-          /* FIXME: The wave could be single-stepping, how are we going to
-             restore the state?  */
-          DBGAPI_CHECK (amd_dbgapi_wave_stop (wave_id));
+              agent_log (log_level_t::info, "wave_%ld is already stopped",
+                         wave_id.handle);
+              continue;
+            }
+          if (state == AMD_DBGAPI_WAVE_STATE_SINGLE_STEP)
+            {
+              /* The wave is single-stepping, it will stop and report an event
+                 once the instruction execution is complete.  */
+              agent_log (log_level_t::info, "wave_%ld is single-stepping",
+                         wave_id.handle);
+              continue;
+            }
+
+          if (amd_dbgapi_status_t status = amd_dbgapi_wave_stop (wave_id);
+              status == AMD_DBGAPI_STATUS_ERROR_INVALID_WAVE_ID)
+            {
+              /* The wave could have terminated since it was reported in the
+                 last wave list.  Skip it.  */
+              continue;
+            }
+          else if (status != AMD_DBGAPI_STATUS_SUCCESS)
+            agent_error ("amd_dbgapi_wave_stop failed (rc=%d)", status);
+
+          agent_log (log_level_t::info,
+                     "wave_%ld is running, sent stop request", wave_id.handle);
 
           waiting_to_stop.emplace (wave_id.handle);
         }
@@ -473,6 +523,8 @@ print_wavefronts (bool all_wavefronts)
       /* No more events.  */
       if (event_kind == AMD_DBGAPI_EVENT_KIND_NONE)
         break;
+
+      DBGAPI_CHECK (amd_dbgapi_event_processed (event_id));
     }
 
   std::map<amd_dbgapi_global_address_t, code_object_t> code_object_map;

src/logging.cpp

@@ -30,7 +30,7 @@
 
 #include "logging.h"
 
-#include <amd-dbgapi.h>
+#include <amd-dbgapi/amd-dbgapi.h>
 #include <cstdio>
 #include <stdarg.h>
 

test/CMakeLists.txt

@@ -34,7 +34,7 @@
 
 cmake_minimum_required(VERSION 3.8.0)
 
-project(ROCM_DEBUG_AGENT_TEST VERSION ${ROCM_DEBUG_AGENT_VERSION})
+project(rocm-debug-agent-test)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "/opt/rocm/hip/cmake")
 find_package(HIP REQUIRED MODULE)