sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

cpu: Fix barrier push to store buffer when full bug in Minor

Browse source 
This patch fixes a bug where a completing load or store which is also a
barrier can push a barrier into the store buffer without first checking
that there is a free slot.

The bug was not fatal but would print a warning that the store buffer
was full when inserting.
This commit is contained in:
Andrew Bardsley 2014-10-29 23:18:24 -05:00
parent 4024fab7fc
commit 536c72333f
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/cpu/minor/lsq.cc
View file

@ -1370,9 +1370,13 @@ LSQ::findResponse(MinorDynInstPtr inst)
/* Same instruction and complete access or a store that's
* capable of being moved to the store buffer */
if (request->inst->id == inst->id) {
if (request->isComplete() ||
(request->state == LSQRequest::StoreToStoreBuffer &&
storeBuffer.canInsert()))
bool complete = request->isComplete();
bool can_store = storeBuffer.canInsert();
bool to_store_buffer = request->state ==
LSQRequest::StoreToStoreBuffer;
if ((complete && !(request->isBarrier() && !can_store)) ||
(to_store_buffer && can_store))
{
ret = request;
}