experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Address review comments.

Browse Source 
Restructure the loop structures in Populate() of deadness analysis.
This commit is contained in:
Trent Lo 2019-05-20 15:47:08 -07:00
parent 19d007224c
commit 83909d218f
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tensorflow/compiler/jit/deadness_analysis.cc
View File

@ -958,7 +958,7 @@ Status GetFullFrame(const Node* n, absl::Span<const ControlFlowInfo> cfi_infos,
// If the node is inside some frames, get the name of the outermost non-empty // If the node is inside some frames, get the name of the outermost non-empty
// frame. Otherwise, get an empty frame name. // frame. Otherwise, get an empty frame name.
Status GetRootFrame(const Node* n, absl::Span<const ControlFlowInfo> cfi_infos, Status GetRootFrame(const Node* n, absl::Span<const ControlFlowInfo> cfi_infos,
absl::string_view frame) { string* frame) {
int depth = 0; int depth = 0;
const ControlFlowInfo* cfi_iter = &cfi_infos[n->id()]; const ControlFlowInfo* cfi_iter = &cfi_infos[n->id()];
while (!cfi_iter->parent_frame->IsSource()) { while (!cfi_iter->parent_frame->IsSource()) {
@ -972,7 +972,7 @@ Status GetRootFrame(const Node* n, absl::Span<const ControlFlowInfo> cfi_infos,
} }
} }
frame = cfi_iter->frame_name; *frame = cfi_iter->frame_name;
return Status::OK(); return Status::OK();
} }
@ -1057,8 +1057,7 @@ Status GetFrameBasedTopologicalOrder(const Graph* g,
// other frames. // other frames.
string frame_name = cf_infos[ready_exits.front()->id()].frame_name; string frame_name = cf_infos[ready_exits.front()->id()].frame_name;
CHECK_EQ(ready_exits.size(), num_exits[frame_name]); CHECK_EQ(ready_exits.size(), num_exits[frame_name]);
ready.insert(ready.end(), ready_exits.begin(), ready.insert(ready.end(), ready_exits.begin(), ready_exits.end());
ready_exits.end());
ready_exits.clear(); ready_exits.clear();
} else { } else {
// Otherwise, try moving nodes from ready_enters to `ready`. // Otherwise, try moving nodes from ready_enters to `ready`.
@ -1067,8 +1066,7 @@ Status GetFrameBasedTopologicalOrder(const Graph* g,
string frame_name = iter->first; string frame_name = iter->first;
const std::vector<Node*>& ready_enters = iter->second; const std::vector<Node*>& ready_enters = iter->second;
if (ready_enters.size() == num_enters[frame_name]) { if (ready_enters.size() == num_enters[frame_name]) {
ready.insert(ready.end(), ready_enters.begin(), ready.insert(ready.end(), ready_enters.begin(), ready_enters.end());
ready_enters.end());
ready_enters_per_frame.erase(iter); ready_enters_per_frame.erase(iter);
break; break;
} }
@ -1257,27 +1255,29 @@ Status DeadnessAnalysisImpl::Populate(bool force_pessimistic) {
GetFrameBasedTopologicalOrder(&graph_, control_flow_info_, &topo)); GetFrameBasedTopologicalOrder(&graph_, control_flow_info_, &topo));
size_t frame_start = 0; size_t frame_start = 0;
for (size_t i = 0; i < topo.size(); ++i) { while (frame_start < topo.size()) {
// Collect nodes until we see a node who has a different root frame. // Batching nodes who have the same root frame.
if (i != topo.size() - 1) { string cur_frame_name;
absl::string_view i_frame_name, next_frame_name; TF_RETURN_IF_ERROR(
TF_RETURN_IF_ERROR(GetRootFrame(topo[i], control_flow_info_, GetRootFrame(topo[frame_start], control_flow_info_, &cur_frame_name));
i_frame_name)); size_t frame_end = frame_start;
TF_RETURN_IF_ERROR(GetRootFrame(topo[i + 1], control_flow_info_, for (size_t i = frame_start + 1; i < topo.size(); ++i) {
next_frame_name)); string i_frame_name;
if (i_frame_name == next_frame_name) { TF_RETURN_IF_ERROR(
continue; GetRootFrame(topo[i], control_flow_info_, &i_frame_name));
if (i_frame_name == cur_frame_name) {
frame_end = i;
} else {
break;
} }
} }
string frame_name = control_flow_info_[topo[i]->id()].frame_name;
absl::Span<Node*> sub_topo(topo.data() + frame_start, absl::Span<Node*> sub_topo(topo.data() + frame_start,
/*length=*/i - frame_start + 1); /*length=*/frame_end - frame_start + 1);
frame_start = i + 1; frame_start = frame_end + 1;
// First, try the optimistic mode. // First, try the optimistic mode.
bool success = false; bool success = false;
if (!force_pessimistic && !frame_name.empty()) { if (!force_pessimistic && !cur_frame_name.empty()) {
TF_RETURN_IF_ERROR( TF_RETURN_IF_ERROR(
PopulateFrame(sub_topo, /*use_optimistic_mode=*/true, &success)); PopulateFrame(sub_topo, /*use_optimistic_mode=*/true, &success));
} }
@ -1287,7 +1287,7 @@ Status DeadnessAnalysisImpl::Populate(bool force_pessimistic) {
TF_RETURN_IF_ERROR( TF_RETURN_IF_ERROR(
PopulateFrame(sub_topo, /*use_optimistic_mode=*/false, nullptr)); PopulateFrame(sub_topo, /*use_optimistic_mode=*/false, nullptr));
} }
VLOG(2) << "Done populating frame " << frame_name << " using the " VLOG(2) << "Done populating frame " << cur_frame_name << " using the "
<< (success ? "optimistic" : "pessimistic") << " mode."; << (success ? "optimistic" : "pessimistic") << " mode.";
} }