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

base: Fix CircularQueue's operator-= when negative subtraction

Browse Source 
Using operator-= when the rhs is a negative value is equivalent
to using += on -rhs. This is fixing rounding in that scenario.

Change-Id: Ia22e51f81a6805d27fd6b2115d288bb23421d00f
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/17528
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
This commit is contained in:
Giacomo Travaglini
2019-03-21 15:41:04 +00:00
parent bbcbde7a92
commit d94e5b5d91
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/base/circular_queue.hh
View File

@@ -323,12 +323,12 @@ class CircularQueue : private std::vector<T>
assert(_cq);
/* C does not do euclidean division, so we have to adjust */
if (t >= 0)
if (t >= 0) {
_round += (-t + _idx) / _cq->capacity();
else
_round += (-t + _idx - _cq->capacity() + 1) / _cq->capacity();
_idx = _cq->moduloSub(_idx, t);
_idx = _cq->moduloSub(_idx, t);
} else {
*this += -t;
}
return *this;
}

3
src/base/circular_queue.test.cc
View File

@@ -198,8 +198,10 @@ TEST(CircularQueueTest, IteratorsOp)
cq.push_back(first_value);
cq.push_back(second_value);
auto negative_offset = -(cq_size + 1);
auto it_1 = cq.begin();
auto it_2 = cq.begin() + 1;
auto it_3 = cq.begin() - negative_offset;
// Operators test
ASSERT_TRUE(it_1 != it_2);
@@ -213,6 +215,7 @@ TEST(CircularQueueTest, IteratorsOp)
ASSERT_EQ(it_1, it_2 - 1);
ASSERT_EQ(it_2 - it_1, 1);
ASSERT_EQ(it_1 - it_2, -1);
ASSERT_EQ(it_3._round, 1);
auto temp_it = it_1;
ASSERT_EQ(++temp_it, it_2);