derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Nikos Nikoleris
2021-07-08 10:11:58 +03:00
committed by Bobby R. Bruce
parent d63c30df97
commit 264ee10991
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpu/minor/cpu.hh
View File

@@ -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 @@ class MinorCPU : public BaseCPU
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;
}

4
src/cpu/minor/execute.cc
View File

@@ -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 @@ Execute::minorTrace() const
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();