p47068915
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!7698 Add support for rechecking watchpoints 

Merge pull request !7698 from Harshvardhan Gupta/add-recheck
This commit is contained in:
mindspore-ci-bot 2020-10-24 05:52:26 +08:00 committed by Gitee
parent ef89a34bae 81e90c5ece
commit 9b4bcd3027
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mindspore/ccsrc/debug/debugger/debugger.cc
View File

@ -269,7 +269,8 @@ void Debugger::PostExecute() {
if (device_target_ != kGPUDevice) {
num_step_++;
MS_LOG(INFO) << "Debugger suspend at end of step; number of steps executed: " << num_step_;
SendWatchpointsAndSuspend(CheckWatchpoints());
SendWatchpoints(CheckWatchpoints());
CommandLoop();
} else {
CommandLoop();
}
@ -302,7 +303,8 @@ void Debugger::PostExecuteNode() {
if (is_watchpoint) {
auto hits = CheckWatchpoints(cur_name_);
if (!hits.empty()) {
SendWatchpointsAndSuspend(hits);
SendWatchpoints(hits);
CommandLoop();
hit_empty_flag = false;
}
}
@ -455,7 +457,10 @@ void Debugger::CommandLoop() {
break;
case DebuggerCommand::kRunCMD:
MS_LOG(INFO) << "RunCMD";
{
if (GetRunLevel(reply) == "recheck") {
MS_LOG(INFO) << "rechecking all watchpoints";
SendWatchpoints(CheckWatchpoints());
} else {
// print run cmd content
// get run_level and node_name
run_level_ = GetRunLevel(reply);
@ -463,10 +468,10 @@ void Debugger::CommandLoop() {
MS_LOG(INFO) << "run_level: " << run_level_;
MS_LOG(INFO) << "node_name_: " << node_name_;
}
// exit loop
run = true;
// exit loop
run = true;
}
break;
case DebuggerCommand::kSetCMD:
MS_LOG(INFO) << "SetCMD";
@ -653,7 +658,7 @@ std::list<WatchpointHit> Debugger::CheckWatchpoints(const std::string &watchnode
return hits;
}
void Debugger::SendWatchpointsAndSuspend(const std::list<WatchpointHit> &points) {
void Debugger::SendWatchpoints(const std::list<WatchpointHit> &points) {
// send info about watchpoint
if (!points.empty()) {
EventReply reply = grpc_client_->SendWatchpointHits(points);
@ -661,8 +666,6 @@ void Debugger::SendWatchpointsAndSuspend(const std::list<WatchpointHit> &points)
MS_LOG(ERROR) << "Error: SendWatchpointHits failed";
}
}
// enter command loop
CommandLoop();
}
DebugServices *Debugger::debug_services() const { return debug_services_.get(); }

4
mindspore/ccsrc/debug/debugger/debugger.h
View File

@ -161,8 +161,8 @@ class Debugger : public std::enable_shared_from_this<Debugger> {
// return names of tensors and what condition they hit
std::list<WatchpointHit> CheckWatchpoints(const std::string &watchnode = std::string());
// send watchpoints that hit and enter command wait loop
void SendWatchpointsAndSuspend(const std::list<WatchpointHit> &points);
// send watchpoints that hit
void SendWatchpoints(const std::list<WatchpointHit> &points);
// Find if any operation overflow happened and return their names
std::vector<std::string> CheckOpOverflow();