commit 264ee109918851b181255446329e1cfd6cf86cae
author Nikos Nikoleris <nikos.nikoleris@arm.com> Thu Jul 08 10:11:58 2021 +0300
committer Bobby R. Bruce <bbruce@ucdavis.edu> Sat Jul 10 21:07:23 2021 +0000
tree 85946a4a27aa869f8a959d734ffaf02c38c41ab6
parent d63c30df974fe0bf74ceba4a84047c485fec4786

cpu-minor: Substitute calls to functions removed in c++-17

Change-Id: Ib15234b37e577afd7ff186f1ba7cc5896aea1430
Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47799
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/cpu/minor/cpu.hh

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;
     }
 

src/cpu/minor/execute.cc

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();