changeset fa3e56b6e0b6 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=fa3e56b6e0b6
description:
ruby: add BoolVec
The BoolVec typedef and insertion operator overload function simplify
usage of
vectors of type bool
diffstat:
src/mem/protocol/RubySlicc_Util.sm | 3 +
src/mem/ruby/SConscript | 1 +
src/mem/ruby/common/BoolVec.cc | 50 ++++++++++++++++++++++++++
src/mem/ruby/common/BoolVec.hh | 45 +++++++++++++++++++++++
src/mem/ruby/common/SConscript | 1 +
src/mem/ruby/slicc_interface/RubySlicc_Util.hh | 13 ++++++
6 files changed, 113 insertions(+), 0 deletions(-)
diffs (163 lines):
diff -r 7b7e352f8d7f -r fa3e56b6e0b6 src/mem/protocol/RubySlicc_Util.sm
--- a/src/mem/protocol/RubySlicc_Util.sm Mon Jul 20 09:15:18 2015 -0500
+++ b/src/mem/protocol/RubySlicc_Util.sm Fri Nov 13 17:30:56 2015 -0500
@@ -43,3 +43,6 @@
Addr makeLineAddress(Addr addr);
int getOffset(Addr addr);
int mod(int val, int mod);
+structure(BoolVec, external="yes") {
+}
+int countBoolVec(BoolVec bVec);
diff -r 7b7e352f8d7f -r fa3e56b6e0b6 src/mem/ruby/SConscript
--- a/src/mem/ruby/SConscript Mon Jul 20 09:15:18 2015 -0500
+++ b/src/mem/ruby/SConscript Fri Nov 13 17:30:56 2015 -0500
@@ -115,6 +115,7 @@
# External types
MakeInclude('common/Address.hh')
+MakeInclude('common/BoolVec.hh')
MakeInclude('common/DataBlock.hh')
MakeInclude('common/MachineID.hh')
MakeInclude('common/NetDest.hh')
diff -r 7b7e352f8d7f -r fa3e56b6e0b6 src/mem/ruby/common/BoolVec.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mem/ruby/common/BoolVec.cc Fri Nov 13 17:30:56 2015 -0500
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2015 Advanced Micro Devices, Inc.
+ * 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.
+ *
+ * Authors: Brad Beckmann
+ */
+
+#include "mem/ruby/common/BoolVec.hh"
+
+#include <iostream>
+#include <vector>
+
+std::ostream& operator<<(std::ostream& os, const BoolVec& myvector) {
+ for (const auto& it: myvector) {
+ os << " " << it;
+ }
+ return os;
+}
diff -r 7b7e352f8d7f -r fa3e56b6e0b6 src/mem/ruby/common/BoolVec.hh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mem/ruby/common/BoolVec.hh Fri Nov 13 17:30:56 2015 -0500
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2015 Advanced Micro Devices, Inc.
+ * 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.
+ *
+ * Authors: Brad Beckmann
+ */
+
+#include <ostream>
+#include <vector>
+
+typedef std::vector<bool> BoolVec;
+
+std::ostream& operator<<(std::ostream& os, const std::vector<bool>& myvector);
diff -r 7b7e352f8d7f -r fa3e56b6e0b6 src/mem/ruby/common/SConscript
--- a/src/mem/ruby/common/SConscript Mon Jul 20 09:15:18 2015 -0500
+++ b/src/mem/ruby/common/SConscript Fri Nov 13 17:30:56 2015 -0500
@@ -34,6 +34,7 @@
Return()
Source('Address.cc')
+Source('BoolVec.cc')
Source('Consumer.cc')
Source('DataBlock.cc')
Source('Histogram.cc')
diff -r 7b7e352f8d7f -r fa3e56b6e0b6
src/mem/ruby/slicc_interface/RubySlicc_Util.hh
--- a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh Mon Jul 20 09:15:18
2015 -0500
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh Fri Nov 13 17:30:56
2015 -0500
@@ -38,6 +38,7 @@
#include "debug/RubySlicc.hh"
#include "mem/packet.hh"
#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/BoolVec.hh"
#include "mem/ruby/common/DataBlock.hh"
#include "mem/ruby/common/TypeDefines.hh"
@@ -125,4 +126,16 @@
return false;
}
+inline int
+countBoolVec(BoolVec bVec)
+{
+ int count = 0;
+ for (const auto &it: bVec) {
+ if (it) {
+ count++;
+ }
+ }
+ return count;
+}
+
#endif // __MEM_RUBY_SLICC_INTERFACE_RUBYSLICCUTIL_HH__
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
