changeset f1fe63d949c0 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=f1fe63d949c0
description:
ruby: set: reimplement using std::bitset
The current Set data structure is slow and therefore is being
reimplemented
using std::bitset. A maximum limit of 64 is being set on the number of
controllers of each type. This means that for simulating a system with
more
controllers of a given type, one would need to change the value of the
variable
NUMBER_BITS_PER_SET
diffstat:
src/mem/ruby/common/NetDest.hh | 6 +-
src/mem/ruby/common/SConscript | 1 -
src/mem/ruby/common/Set.cc | 341 -----------------------------------------
src/mem/ruby/common/Set.hh | 213 ++++++++++++++++---------
4 files changed, 139 insertions(+), 422 deletions(-)
diffs (truncated from 648 to 300 lines):
diff -r ee2fcca7b58a -r f1fe63d949c0 src/mem/ruby/common/NetDest.hh
--- a/src/mem/ruby/common/NetDest.hh Sat Sep 05 09:34:24 2015 -0500
+++ b/src/mem/ruby/common/NetDest.hh Sat Sep 05 09:34:25 2015 -0500
@@ -26,11 +26,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-// NetDest specifies the network destination of a Message
-// This is backward compatible with the Set class that was previously
-// used to specify network destinations.
-// NetDest supports both node networks and component networks
-
#ifndef __MEM_RUBY_COMMON_NETDEST_HH__
#define __MEM_RUBY_COMMON_NETDEST_HH__
@@ -40,6 +35,7 @@
#include "mem/ruby/common/Set.hh"
#include "mem/ruby/common/MachineID.hh"
+// NetDest specifies the network destination of a Message
class NetDest
{
public:
diff -r ee2fcca7b58a -r f1fe63d949c0 src/mem/ruby/common/SConscript
--- a/src/mem/ruby/common/SConscript Sat Sep 05 09:34:24 2015 -0500
+++ b/src/mem/ruby/common/SConscript Sat Sep 05 09:34:25 2015 -0500
@@ -38,5 +38,4 @@
Source('DataBlock.cc')
Source('Histogram.cc')
Source('NetDest.cc')
-Source('Set.cc')
Source('SubBlock.cc')
diff -r ee2fcca7b58a -r f1fe63d949c0 src/mem/ruby/common/Set.cc
--- a/src/mem/ruby/common/Set.cc Sat Sep 05 09:34:24 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,341 +0,0 @@
-/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
- * All rights reserved.
- *
- * 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.
- */
-
-// modified (rewritten) 05/20/05 by Dan Gibson to accomimdate FASTER
-// >32 bit set sizes
-
-#include <cassert>
-#include <cstdio>
-
-#include "base/misc.hh"
-#include "mem/ruby/common/Set.hh"
-
-Set::Set()
-{
- m_p_nArray = NULL;
- m_nArrayLen = 0;
- m_nSize = 0;
-}
-
-Set::Set(const Set& obj)
-{
- m_p_nArray = NULL;
- setSize(obj.m_nSize);
-
- // copy from the host to this array
- for (int i = 0; i < m_nArrayLen; i++)
- m_p_nArray[i] = obj.m_p_nArray[i];
-}
-
-Set::Set(int size)
-{
- m_p_nArray = NULL;
- m_nArrayLen = 0;
- m_nSize = 0;
- if (size > 0)
- setSize(size);
-}
-
-Set::~Set()
-{
- if (m_p_nArray && m_p_nArray != &m_p_nArray_Static[0])
- delete [] m_p_nArray;
- m_p_nArray = NULL;
-}
-
-void
-Set::clearExcess()
-{
- // now just ensure that no bits over the maximum size were set
-#ifdef _LP64
- unsigned long mask = 0x7FFFFFFFFFFFFFFF;
-#else
- unsigned long mask = 0x7FFFFFFF;
-#endif
-
- // the number of populated spaces in the higest-order array slot
- // is: m_nSize % LONG_BITS, so the uppermost LONG_BITS -
- // m_nSize%64 bits should be cleared
- if ((m_nSize % LONG_BITS) != 0) {
- for (int j = 0; j < 64 - (m_nSize & INDEX_MASK); j++) {
- m_p_nArray[m_nArrayLen - 1] &= mask;
- mask = mask >> 1;
- }
- }
-}
-
-
-/*
- * This function should set all the bits in the current set that are
- * already set in the parameter set
- */
-void
-Set::addSet(const Set& set)
-{
- assert(getSize()==set.getSize());
- for (int i = 0; i < m_nArrayLen; i++)
- m_p_nArray[i] |= set.m_p_nArray[i];
-}
-
-/*
- * This function clears bits that are =1 in the parameter set
- */
-void
-Set::removeSet(const Set& set)
-{
- assert(m_nSize == set.m_nSize);
- for (int i = 0; i < m_nArrayLen; i++)
- m_p_nArray[i] &= ~set.m_p_nArray[i];
-}
-
-/*
- * this function sets all bits in the set
- */
-void
-Set::broadcast()
-{
- for (int i = 0; i < m_nArrayLen; i++)
- m_p_nArray[i] = -1; // note that -1 corresponds to all 1's in 2's comp.
-
- clearExcess();
-}
-
-/*
- * This function returns the population count of 1's in the set
- */
-int
-Set::count() const
-{
- int counter = 0;
-
- for (int i = 0; i < m_nArrayLen; i++) {
- unsigned long mask = 0x01;
-
- for (int j = 0; j < LONG_BITS; j++) {
- // FIXME - significant performance loss when array
- // population << LONG_BITS
- if ((m_p_nArray[i] & mask) != 0) {
- counter++;
- }
- mask = mask << 1;
- }
- }
-
- return counter;
-}
-
-/*
- * This function checks for set equality
- */
-bool
-Set::isEqual(const Set& set) const
-{
- assert(m_nSize == set.m_nSize);
-
- for (int i = 0; i < m_nArrayLen; i++)
- if (m_p_nArray[i] != set.m_p_nArray[i])
- return false;
-
- return true;
-}
-
-/*
- * This function returns the NodeID (int) of the least set bit
- */
-NodeID
-Set::smallestElement() const
-{
- assert(count() > 0);
- for (int i = 0; i < m_nArrayLen; i++) {
- if (m_p_nArray[i] != 0) {
- // the least-set bit must be in here
- unsigned long x = m_p_nArray[i];
-
- for (int j = 0; j < LONG_BITS; j++) {
- if (x & 1) {
- return LONG_BITS * i + j;
- }
-
- x = x >> 1;
- }
-
- panic("No smallest element of an empty set.");
- }
- }
-
- panic("No smallest element of an empty set.");
-}
-
-/*
- * this function returns true iff all bits are set
- */
-bool
-Set::isBroadcast() const
-{
- // check the fully-loaded words by equal to 0xffffffff
- // only the last word may not be fully loaded, it is not
- // fully loaded iff m_nSize % 32 or 64 !=0 => fully loaded iff
- // m_nSize % 32 or 64 == 0
-
- int max = (m_nSize % LONG_BITS) == 0 ? m_nArrayLen : m_nArrayLen - 1;
- for (int i = 0; i < max; i++) {
- if (m_p_nArray[i] != -1) {
- return false;
- }
- }
-
- // now check the last word, which may not be fully loaded
- unsigned long mask = 1;
- for (int j = 0; j < (m_nSize % LONG_BITS); j++) {
- if ((mask & m_p_nArray[m_nArrayLen-1]) == 0) {
- return false;
- }
- mask = mask << 1;
- }
-
- return true;
-}
-
-/*
- * this function returns true iff no bits are set
- */
-bool
-Set::isEmpty() const
-{
- // here we can simply check if all = 0, since we ensure
- // that "extra slots" are all zero
- for (int i = 0; i < m_nArrayLen ; i++)
- if (m_p_nArray[i])
- return false;
-
- return true;
-}
-
-// returns the logical OR of "this" set and orSet
-Set
-Set::OR(const Set& orSet) const
-{
- Set result(m_nSize);
- assert(m_nSize == orSet.m_nSize);
- for (int i = 0; i < m_nArrayLen; i++)
- result.m_p_nArray[i] = m_p_nArray[i] | orSet.m_p_nArray[i];
-
- return result;
-}
-
-// returns the logical AND of "this" set and andSet
-Set
-Set::AND(const Set& andSet) const
-{
- Set result(m_nSize);
- assert(m_nSize == andSet.m_nSize);
-
- for (int i = 0; i < m_nArrayLen; i++) {
- result.m_p_nArray[i] = m_p_nArray[i] & andSet.m_p_nArray[i];
- }
-
- return result;
-}
-
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
