diff options
| -rw-r--r-- | src/sim/System.py | 2 | ||||
| -rw-r--r-- | src/sim/pseudo_inst.cc | 22 |
2 files changed, 18 insertions, 6 deletions
diff --git a/src/sim/System.py b/src/sim/System.py index 74dfdca53..cdf97f8a9 100644 --- a/src/sim/System.py +++ b/src/sim/System.py @@ -73,6 +73,8 @@ class System(MemObject): cache_line_size = Param.Unsigned(64, "Cache line size in bytes") + exit_on_work_items = Param.Bool(True, "Exit from the simulation loop when " + "encountering work item annotations.") work_item_id = Param.Int(-1, "specific work item id") num_work_ids = Param.Int(16, "Number of distinct work item types") work_begin_cpu_id_exit = Param.Int(-1, diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc index fb19b21b1..260ffec6e 100644 --- a/src/sim/pseudo_inst.cc +++ b/src/sim/pseudo_inst.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 ARM Limited + * Copyright (c) 2010-2012, 2015 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -616,13 +616,18 @@ void workbegin(ThreadContext *tc, uint64_t workid, uint64_t threadid) { DPRINTF(PseudoInst, "PseudoInst::workbegin(%i, %i)\n", workid, threadid); - tc->getCpuPtr()->workItemBegin(); System *sys = tc->getSystemPtr(); const System::Params *params = sys->params(); - sys->workItemBegin(threadid, workid); - DPRINTF(WorkItems, "Work Begin workid: %d, threadid %d\n", workid, + if (params->exit_on_work_items) { + exitSimLoop("workbegin", static_cast<int>(workid)); + return; + } + + DPRINTF(WorkItems, "Work Begin workid: %d, threadid %d\n", workid, threadid); + tc->getCpuPtr()->workItemBegin(); + sys->workItemBegin(threadid, workid); // // If specified, determine if this is the specific work item the user @@ -674,12 +679,17 @@ void workend(ThreadContext *tc, uint64_t workid, uint64_t threadid) { DPRINTF(PseudoInst, "PseudoInst::workend(%i, %i)\n", workid, threadid); - tc->getCpuPtr()->workItemEnd(); System *sys = tc->getSystemPtr(); const System::Params *params = sys->params(); - sys->workItemEnd(threadid, workid); + + if (params->exit_on_work_items) { + exitSimLoop("workend", static_cast<int>(workid)); + return; + } DPRINTF(WorkItems, "Work End workid: %d, threadid %d\n", workid, threadid); + tc->getCpuPtr()->workItemEnd(); + sys->workItemEnd(threadid, workid); // // If specified, determine if this is the specific work item the user |