This class had been trying to keep all indices within the modulus of the queue size, and to use all elements in the underlying storage by making the empty and full conditions alias, differentiated by a bool. To keep track of the difference between a storage location on one trip around the queue vs other times around, ie an alias once the indices had wrapped, it also keep track of a "round" value in both the queue itself, and any iterators it created. All this bookkeeping significantly complicated the data structure. Instead, this change modifies it to keep track of a monotonically increasing index which is wrapped at the time it's used. Only the head index and current size need to be tracked in the queue itself, and only a pointer to the queue and an index need to be tracked in the iterators. Theoretically, it's possible that this value could overflow eventually since it increases forever, unlike before where the index wrapped and was never larger than the queue's capacity. In practice, the type of the index was changed from a uint32_t to a size_t, probably a 64 bit value in modern systems, which will hold much larger values. Also, the round counter and the index values together acted like a smaller than 64 bit value anyway, since the round counter would overflow after 2^32 times around a less than 2^32 entry queue. One minor interface difference is that the head() and tail() values returned by the queue are no longer pre-wrapped to be modulo the queue's capacity. As long as consumers don't try to be overly clever and feed in fixed values, do their own bounds checking, etc., something that would be cumbersome considering the wrapping nature of the structure, this shouldn't be an issue. Also, since external consumers no longer need to worry about wrapping, since only one of them was used in only one place, and because they weren't even marked as part of the interface, the modulo helper functions have been eliminated from the queue. If other code wants to perform modulo arithmetic for some reason (which the queue no longer requires) they can accomplish basically the same thing in basically the same amount of code using normal math. Also, rather than inherit from std::vector, this change makes the vector internal to the queue. That prevents methods of the vector that aren't aware of the circular nature of the structure from leaking out if they're not overridden or otherwise proactively blocked. On top of simplifying the implementation, this also makes it perform *slightly* better. To measure that, I ran the following command: $ time build/ARM/base/circular_queue.test.opt --gtest_repeat=100000 > /dev/null and found a few percent improvement in total run time. While this difference was small and not measured against realistic usage of the data structure, it was still measurable, and at minimum doesn't seem to have hurt performance. Change-Id: Ic2baa28de135be7086fa94579bbec451d69b3b15 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38478 Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br> Maintainer: Gabe Black <gabe.black@gmail.com> Tested-by: kokoro <noreply+kokoro@google.com>
266 lines
8.2 KiB
C++
266 lines
8.2 KiB
C++
/*
|
|
* Copyright (c) 2018 ARM Limited
|
|
* All rights reserved
|
|
*
|
|
* The license below extends only to copyright in the software and shall
|
|
* not be construed as granting a license to any other intellectual
|
|
* property including but not limited to intellectual property relating
|
|
* to a hardware implementation of the functionality of the software
|
|
* licensed hereunder. You may use the software subject to the license
|
|
* terms below provided that you ensure that this notice is replicated
|
|
* unmodified and in its entirety in all distributions of the software,
|
|
* modified or unmodified, in source code or in binary form.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met: redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer;
|
|
* redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution;
|
|
* neither the name of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
#include "base/circular_queue.hh"
|
|
|
|
/** Testing that once instantiated with a fixed size,
|
|
* the queue is still empty */
|
|
TEST(CircularQueueTest, Empty)
|
|
{
|
|
const auto cq_size = 8;
|
|
CircularQueue<uint32_t> cq(cq_size);
|
|
|
|
ASSERT_EQ(cq.capacity(), cq_size);
|
|
ASSERT_EQ(cq.size(), 0);
|
|
ASSERT_TRUE(cq.empty());
|
|
}
|
|
|
|
/** Testing that once instantiated with a fixed size,
|
|
* the queue has Head = Tail + 1 */
|
|
TEST(CircularQueueTest, HeadTailEmpty)
|
|
{
|
|
const auto cq_size = 8;
|
|
CircularQueue<uint32_t> cq(cq_size);
|
|
ASSERT_EQ(cq.head(), (cq.tail() + 1) % cq_size);
|
|
}
|
|
|
|
/** Adding elements to the circular queue.
|
|
* Once an element has been added we test the new value
|
|
* of front() and back() (head an tail). Since we are just
|
|
* adding elements and not removing them, we expect the front
|
|
* value to be fixed and the back value to change, matching
|
|
* the latest pushed value.*/
|
|
TEST(CircularQueueTest, AddingElements)
|
|
{
|
|
const auto cq_size = 8;
|
|
CircularQueue<uint32_t> cq(cq_size);
|
|
|
|
const auto first_element = 0xAAAAAAAA;
|
|
cq.push_back(first_element);
|
|
ASSERT_EQ(cq.front(), first_element);
|
|
ASSERT_EQ(cq.back(), first_element);
|
|
|
|
const auto second_element = 0x55555555;
|
|
cq.push_back(second_element);
|
|
ASSERT_EQ(cq.front(), first_element);
|
|
ASSERT_EQ(cq.back(), second_element);
|
|
|
|
ASSERT_EQ(cq.size(), 2);
|
|
}
|
|
|
|
/** Removing elements from the circular queue.
|
|
* We add two elements and we consequently remove them.
|
|
* After removing them we check that the elements have been
|
|
* effectively removed, which means the circular queue is
|
|
* empty */
|
|
TEST(CircularQueueTest, RemovingElements)
|
|
{
|
|
const auto cq_size = 8;
|
|
CircularQueue<uint32_t> cq(cq_size);
|
|
|
|
// Adding first element
|
|
const auto first_element = 0xAAAAAAAA;
|
|
cq.push_back(first_element);
|
|
|
|
// Adding second element
|
|
const auto second_element = 0x55555555;
|
|
cq.push_back(second_element);
|
|
|
|
auto initial_head = cq.head();
|
|
auto initial_tail = cq.tail();
|
|
|
|
// Removing first and second element
|
|
cq.pop_front();
|
|
ASSERT_EQ(cq.head(), initial_head + 1);
|
|
ASSERT_EQ(cq.tail(), initial_tail);
|
|
|
|
cq.pop_front();
|
|
ASSERT_EQ(cq.head(), initial_head + 2);
|
|
ASSERT_EQ(cq.tail(), initial_tail);
|
|
|
|
ASSERT_EQ(cq.size(), 0);
|
|
ASSERT_TRUE(cq.empty());
|
|
}
|
|
|
|
/** Testing CircularQueue::full
|
|
* This tests adds elements to the queue and checks that it is full,
|
|
* which means:
|
|
* - CircularQueue::full == true
|
|
* - Head = Tail + 1
|
|
*/
|
|
TEST(CircularQueueTest, Full)
|
|
{
|
|
const auto cq_size = 8;
|
|
CircularQueue<uint32_t> cq(cq_size);
|
|
|
|
const auto value = 0xAAAAAAAA;
|
|
for (auto idx = 0; idx < cq_size; idx++) {
|
|
cq.push_back(value);
|
|
}
|
|
|
|
ASSERT_TRUE(cq.full());
|
|
ASSERT_EQ(cq.head(), (cq.tail() + 1) % cq_size);
|
|
}
|
|
|
|
/** Testing CircularQueue::begin(), CircularQueue::end()
|
|
* This tests the following:
|
|
* - In an empty queue, begin() == end()
|
|
* - After pushing some elements in the queue, the begin()
|
|
* and end() iterators are correctly misaligned
|
|
*/
|
|
TEST(CircularQueueTest, BeginEnd)
|
|
{
|
|
const auto cq_size = 8;
|
|
CircularQueue<uint32_t> cq(cq_size);
|
|
|
|
// Begin/End are the same (empty)
|
|
ASSERT_EQ(cq.begin(), cq.end());
|
|
|
|
const auto first_value = 0xAAAAAAAA;
|
|
const auto second_value = 0x55555555;
|
|
|
|
cq.push_back(first_value);
|
|
cq.push_back(second_value);
|
|
|
|
// End = Begin + 2
|
|
ASSERT_EQ(cq.begin() + 2, cq.end());
|
|
}
|
|
|
|
/** Testing that begin() and end() (-1) iterators
|
|
* actually point to the correct values
|
|
* so that dereferencing them leads to a match with the
|
|
* values of (front() and back())
|
|
*/
|
|
TEST(CircularQueueTest, BeginFrontEndBack)
|
|
{
|
|
const auto cq_size = 8;
|
|
CircularQueue<uint32_t> cq(cq_size);
|
|
|
|
const auto front_value = 0xAAAAAAAA;
|
|
const auto back_value = 0x55555555;
|
|
|
|
cq.push_back(front_value);
|
|
cq.push_back(back_value);
|
|
|
|
ASSERT_EQ(*(cq.begin()), cq.front());
|
|
ASSERT_EQ(*(cq.end() - 1), cq.back());
|
|
}
|
|
|
|
/** Testing circular queue iterators:
|
|
* By allocating two iterators to a queue we test several
|
|
* operators.
|
|
*/
|
|
TEST(CircularQueueTest, IteratorsOp)
|
|
{
|
|
const auto cq_size = 8;
|
|
CircularQueue<uint32_t> cq(cq_size);
|
|
|
|
const auto first_value = 0xAAAAAAAA;
|
|
const auto second_value = 0x55555555;
|
|
cq.push_back(first_value);
|
|
cq.push_back(second_value);
|
|
|
|
auto it_1 = cq.begin();
|
|
auto it_2 = cq.begin() + 1;
|
|
|
|
// Operators test
|
|
ASSERT_TRUE(it_1 != it_2);
|
|
ASSERT_FALSE(it_1 == it_2);
|
|
ASSERT_FALSE(it_1 > it_2);
|
|
ASSERT_FALSE(it_1 >= it_2);
|
|
ASSERT_TRUE(it_1 < it_2);
|
|
ASSERT_TRUE(it_1 <= it_2);
|
|
ASSERT_EQ(*it_1, first_value);
|
|
ASSERT_EQ(it_1 + 1, it_2);
|
|
ASSERT_EQ(it_1, it_2 - 1);
|
|
ASSERT_EQ(it_2 - it_1, 1);
|
|
ASSERT_EQ(it_1 - it_2, -1);
|
|
|
|
auto temp_it = it_1;
|
|
ASSERT_EQ(++temp_it, it_2);
|
|
ASSERT_EQ(--temp_it, it_1);
|
|
ASSERT_EQ(temp_it++, it_1);
|
|
ASSERT_EQ(temp_it, it_2);
|
|
ASSERT_EQ(temp_it--, it_2);
|
|
ASSERT_EQ(temp_it, it_1);
|
|
}
|
|
|
|
/**
|
|
* Testing a full loop, which is incrementing one iterator until
|
|
* it wraps and has the same index as the starting iterator.
|
|
* This test checks that even if they have the same index, they are
|
|
* not the same iterator since they have different round.
|
|
*/
|
|
TEST(CircularQueueTest, FullLoop)
|
|
{
|
|
const auto cq_size = 8;
|
|
CircularQueue<uint32_t> cq(cq_size);
|
|
|
|
// ending_it does a full loop and points at the same
|
|
// index as starting_it but with a different round
|
|
auto starting_it = cq.begin();
|
|
auto ending_it = starting_it + cq_size;
|
|
|
|
ASSERT_EQ(ending_it - starting_it, cq_size);
|
|
ASSERT_TRUE(starting_it != ending_it);
|
|
}
|
|
|
|
/**
|
|
* Testing correct behaviour when rounding multiple times:
|
|
* - Round indexes in sync
|
|
* - Difference between begin() and end() iterator is still
|
|
* equal to the CircularQueue size.
|
|
*/
|
|
TEST(CircularQueueTest, MultipleRound)
|
|
{
|
|
const auto cq_size = 8;
|
|
CircularQueue<uint32_t> cq(cq_size);
|
|
|
|
// Filling the queue making it round multiple times
|
|
auto items_added = cq_size * 3;
|
|
for (auto idx = 0; idx < items_added; idx++) {
|
|
cq.push_back(0);
|
|
}
|
|
|
|
auto starting_it = cq.begin();
|
|
auto ending_it = cq.end();
|
|
|
|
ASSERT_EQ(ending_it - starting_it, cq_size);
|
|
}
|