From 6a6668bbc4b038b98eb3ee64ffb034719316afd9 Mon Sep 17 00:00:00 2001 From: Tuan Ta Date: Mon, 2 Apr 2018 16:22:01 -0400 Subject: [PATCH] cpu: stop scheduling suspended threads in all stages of MinorCPU This patch makes suspended threads non-schedulable in Fetch1, Fetch2, Decode and Execute stages in MinorCPU. Change-Id: Ie79857e13b7b782d9c58c32310993a132b609cf9 Reviewed-on: https://gem5-review.googlesource.com/c/9625 Reviewed-by: Jason Lowe-Power Reviewed-by: Giacomo Gabrielli Maintainer: Jason Lowe-Power --- src/cpu/minor/decode.cc | 4 +++- src/cpu/minor/execute.cc | 10 ++++++++-- src/cpu/minor/fetch2.cc | 4 +++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/cpu/minor/decode.cc b/src/cpu/minor/decode.cc index 390ca5f11..94d3dec03 100644 --- a/src/cpu/minor/decode.cc +++ b/src/cpu/minor/decode.cc @@ -314,7 +314,9 @@ Decode::getScheduledThread() } for (auto tid : priority_list) { - if (getInput(tid) && !decodeInfo[tid].blocked) { + if (cpu.getContext(tid)->status() == ThreadContext::Active && + getInput(tid) && + !decodeInfo[tid].blocked) { threadPriority = tid; return tid; } diff --git a/src/cpu/minor/execute.cc b/src/cpu/minor/execute.cc index 93c0895ac..d7cb475c6 100644 --- a/src/cpu/minor/execute.cc +++ b/src/cpu/minor/execute.cc @@ -1676,7 +1676,12 @@ Execute::getCommittingThread() for (auto tid : priority_list) { ExecuteThreadInfo &ex_info = executeInfo[tid]; - bool can_commit_insts = !ex_info.inFlightInsts->empty(); + + bool is_thread_active = + cpu.getContext(tid)->status() == ThreadContext::Active; + bool can_commit_insts = !ex_info.inFlightInsts->empty() && + is_thread_active; + if (can_commit_insts) { QueuedInst *head_inflight_inst = &(ex_info.inFlightInsts->front()); MinorDynInstPtr inst = head_inflight_inst->inst; @@ -1742,7 +1747,8 @@ Execute::getIssuingThread() } for (auto tid : priority_list) { - if (getInput(tid)) { + if (cpu.getContext(tid)->status() == ThreadContext::Active && + getInput(tid)) { issuePriority = tid; return tid; } diff --git a/src/cpu/minor/fetch2.cc b/src/cpu/minor/fetch2.cc index 09a06fc24..180890147 100644 --- a/src/cpu/minor/fetch2.cc +++ b/src/cpu/minor/fetch2.cc @@ -584,7 +584,9 @@ Fetch2::getScheduledThread() } for (auto tid : priority_list) { - if (getInput(tid) && !fetchInfo[tid].blocked) { + if (cpu.getContext(tid)->status() == ThreadContext::Active && + getInput(tid) && + !fetchInfo[tid].blocked) { threadPriority = tid; return tid; } -- 2.30.2