diff --git a/conformance_tests/tools/debug/src/test_debug.cpp b/conformance_tests/tools/debug/src/test_debug.cpp index 47335878c..2ba513071 100644 --- a/conformance_tests/tools/debug/src/test_debug.cpp +++ b/conformance_tests/tools/debug/src/test_debug.cpp @@ -1426,7 +1426,7 @@ void zetDebugThreadControlTest::SetUpThreadControl(ze_device_handle_t &device, LOG_INFO << "[Debugger] Interrupting all threads"; // give time to app to launch the kernel - std::this_thread::sleep_for(std::chrono::seconds(60)); + std::this_thread::sleep_for(std::chrono::seconds(6)); lzt::debug_interrupt(debugSession, thread); stopped_threads = {}; diff --git a/conformance_tests/tools/debug/src/test_debug_utils.cpp b/conformance_tests/tools/debug/src/test_debug_utils.cpp index 7a8f0a453..f65cda6dd 100644 --- a/conformance_tests/tools/debug/src/test_debug_utils.cpp +++ b/conformance_tests/tools/debug/src/test_debug_utils.cpp @@ -93,6 +93,14 @@ bool check_events_unordered(const zet_debug_session_handle_t &debug_session, return true; } +std::string to_string(ze_device_thread_t &thread) { + + std::stringstream ss; + ss << "{SLICE: " << thread.slice << " SUBSLICE: " << thread.subslice + << " EU: " << thread.eu << " THREAD: " << thread.thread << "}"; + return ss.str(); +} + void attach_and_get_module_event(uint32_t pid, process_synchro *synchro, ze_device_handle_t device, zet_debug_session_handle_t &debug_session, @@ -121,8 +129,11 @@ void attach_and_get_module_event(uint32_t pid, process_synchro *synchro, break; } + auto suffix = (debug_event.type == ZET_DEBUG_EVENT_TYPE_THREAD_STOPPED) + ? to_string(debug_event.info.thread.thread) + : ""; LOG_INFO << "[Debugger] received event: " - << lzt::debuggerEventTypeString[debug_event.type]; + << lzt::debuggerEventTypeString[debug_event.type] << suffix; if (ZET_DEBUG_EVENT_TYPE_MODULE_LOAD == debug_event.type) { LOG_INFO << "[Debugger]"