Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/47799 )
Change subject: cpu-minor: Substitute calls to functions removed in c++-17
......................................................................
cpu-minor: Substitute calls to functions removed in c++-17
Change-Id: Ib15234b37e577afd7ff186f1ba7cc5896aea1430
Signed-off-by: Nikos Nikoleris <nikos.nikole...@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47799
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Maintainer: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/cpu/minor/cpu.hh
M src/cpu/minor/execute.cc
2 files changed, 9 insertions(+), 3 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/cpu/minor/cpu.hh b/src/cpu/minor/cpu.hh
index 57b73b7..9ed93db 100644
--- a/src/cpu/minor/cpu.hh
+++ b/src/cpu/minor/cpu.hh
@@ -45,9 +45,10 @@
#define __CPU_MINOR_CPU_HH__
#include "base/compiler.hh"
+#include "base/random.hh"
+#include "cpu/base.hh"
#include "cpu/minor/activity.hh"
#include "cpu/minor/stats.hh"
-#include "cpu/base.hh"
#include "cpu/simple_thread.hh"
#include "enums/ThreadPolicy.hh"
#include "params/MinorCPU.hh"
@@ -184,7 +185,10 @@
for (ThreadID i = 0; i < numThreads; i++) {
prio_list.push_back(i);
}
- std::random_shuffle(prio_list.begin(), prio_list.end());
+
+ std::shuffle(prio_list.begin(), prio_list.end(),
+ random_mt.gen);
+
return prio_list;
}
diff --git a/src/cpu/minor/execute.cc b/src/cpu/minor/execute.cc
index 793ed7e..81850cb 100644
--- a/src/cpu/minor/execute.cc
+++ b/src/cpu/minor/execute.cc
@@ -37,6 +37,8 @@
#include "cpu/minor/execute.hh"
+#include <functional>
+
#include "arch/locked_mem.hh"
#include "cpu/minor/cpu.hh"
#include "cpu/minor/exec_context.hh"
@@ -1685,7 +1687,7 @@
stalled.str(), executeInfo[0].drainState, isInbetweenInsts(0));
std::for_each(funcUnits.begin(), funcUnits.end(),
- std::mem_fun(&FUPipeline::minorTrace));
+ std::mem_fn(&FUPipeline::minorTrace));
executeInfo[0].inFlightInsts->minorTrace();
executeInfo[0].inFUMemInsts->minorTrace();
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47799
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: Ib15234b37e577afd7ff186f1ba7cc5896aea1430
Gerrit-Change-Number: 47799
Gerrit-PatchSet: 4
Gerrit-Owner: Nikos Nikoleris <nikos.nikole...@arm.com>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: ZHENGRONG WANG <seanyukig...@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
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
