Jason Lowe-Power has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67937?usp=email )
Change subject: cpu: Add fatal in BaseCPU for wrong workloads
......................................................................
cpu: Add fatal in BaseCPU for wrong workloads
The CPU models assume that the number of workloads (Processes) is equal
to the number of threads when using SE mode. This wasn't checked leading
to a segfault if there were no workloads. This change makes the error
more clear.
Change-Id: I9a7b21112b8f819c6eeca944ee0d73ae9ce9a57b
Signed-off-by: Jason Lowe-Power <ja...@lowepower.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67937
Reviewed-by: Ayaz Akram <yazak...@ucdavis.edu>
Maintainer: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/cpu/base.cc
1 file changed, 25 insertions(+), 0 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Ayaz Akram: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/cpu/base.cc b/src/cpu/base.cc
index 60d443a..d2c0a78 100644
--- a/src/cpu/base.cc
+++ b/src/cpu/base.cc
@@ -182,6 +182,12 @@
"of threads (%i).\n", params().isa.size(), numThreads);
}
+ if (!FullSystem && params().workload.size() != numThreads) {
+ fatal("Number of processes (cpu.workload) (%i) assigned to the
CPU "
+ "does not equal number of threads (%i).\n",
+ params().workload.size(), numThreads);
+ }
+
modelResetPort.onChange([this](const bool &new_val) {
setReset(new_val);
});
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67937?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I9a7b21112b8f819c6eeca944ee0d73ae9ce9a57b
Gerrit-Change-Number: 67937
Gerrit-PatchSet: 3
Gerrit-Owner: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Ayaz Akram <yazak...@ucdavis.edu>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
