Zhantong Qiu has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67193?usp=email )
(
13 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: base,python: Added PcCountPair type and parameter
......................................................................
base,python: Added PcCountPair type and parameter
This commit introduces a PcCountPair type that stores a Program Counter
address and an integer of counts for the Program Counter address.
The PcCountPair can be used in the same way and hashable in both C++
and Python.
Change-Id: I66d93e2c6a1d286cb9dd795ba97f8d887f67d503
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67193
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Bobby Bruce <bbr...@ucdavis.edu>
Maintainer: Bobby Bruce <bbr...@ucdavis.edu>
---
A src/cpu/probes/pc_count_pair.hh
M src/python/m5/params.py
M src/python/pybind11/core.cc
3 files changed, 185 insertions(+), 0 deletions(-)
Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/cpu/probes/pc_count_pair.hh
b/src/cpu/probes/pc_count_pair.hh
new file mode 100644
index 0000000..fd6bc63
--- /dev/null
+++ b/src/cpu/probes/pc_count_pair.hh
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2023 The Regents of the University of California.
+ * 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.
+ */
+
+#ifndef __PC_COUNT_PAIR_HH__
+#define __PC_COUNT_PAIR_HH__
+
+#include "base/types.hh"
+
+namespace gem5
+{
+
+class PcCountPair
+{
+
+ private:
+
+ /** The Program Counter address */
+ Addr pc;
+ /** The count of the Program Counter address */
+ int count;
+
+ public:
+
+ /** Explicit constructor assigning the pc and count values */
+ explicit constexpr PcCountPair(Addr _pc, int _count) :
+ pc(_pc), count(_count) {}
+
+ /** Default constructor for parameter classes */
+ PcCountPair() : pc(0), count(0) {}
+
+ /** Returns the Program Counter address */
+ constexpr Addr getPC() const { return pc; }
+ /** Returns the count of the Program */
+ constexpr int getCount() const { return count; }
+
+ /** Greater than comparison */
+ constexpr bool
+ operator>(const PcCountPair& cc) const
+ {
+ return count > cc.getCount();
+ }
+
+ /** Equal comparison */
+ constexpr bool
+ operator==(const PcCountPair& cc) const
+ {
+ return (pc == cc.getPC() && count == cc.getCount());
+ }
+
+ /** String format */
+ std::string
+ to_string() const
+ {
+ std::string s = "(" + std::to_string(pc)
+ + "," + std::to_string(count) + ")";
+ return s;
+ }
+
+ /** Enable hashing for this parameter */
+ struct HashFunction
+ {
+ size_t operator()(const PcCountPair& item) const
+ {
+ size_t xHash = std::hash<int>()(item.pc);
+ size_t yHash = std::hash<int>()(item.count);
+ return xHash * 2 + yHash;
+ }
+ };
+
+};
+
+} // namespace gem5
+
+#endif // __PC_COUNT_PAIR_HH__
diff --git a/src/python/m5/params.py b/src/python/m5/params.py
index e76380b..92e913b 100644
--- a/src/python/m5/params.py
+++ b/src/python/m5/params.py
@@ -854,6 +854,46 @@
return "0x%x" % int(val)
+class PcCountPair(ParamValue):
+ # This parameter stores a Program Counter address and the a count
value for
+ # the Program Counter address
+ cxx_type = "PcCountPair"
+ cmd_line_settable = True
+
+ def __init__(self, _pc, _count):
+ self.pc = _pc
+ self.count = _count
+
+ def get_pc(self):
+ return self.pc
+
+ def get_count(self):
+ return self.count
+
+ def getValue(self):
+ # convert Python PcCountPair into C++ PcCountPair
+ from _m5.pc import PcCountPair
+
+ return PcCountPair(self.pc, self.count)
+
+ def __str__(self):
+ return "(%i,%i)" % (self.pc, self.count)
+
+ def __eq__(self, other):
+ return self.pc == other.get_pc() and self.count ==
other.get_count()
+
+ def __hash__(self):
+ return hash((int(self.pc), int(self.count)))
+
+ @classmethod
+ def cxx_predecls(cls, code):
+ code('#include "cpu/probes/pc_count_pair.hh"')
+
+ @classmethod
+ def pybind_predecls(cls, code):
+ code('#include "cpu/probes/pc_count_pair.hh"')
+
+
class AddrRange(ParamValue):
cxx_type = "AddrRange"
@@ -2426,4 +2466,5 @@
"VectorMasterPort",
"VectorSlavePort",
"DeprecatedParam",
+ "PcCountPair",
]
diff --git a/src/python/pybind11/core.cc b/src/python/pybind11/core.cc
index 8946675..bd83a74 100644
--- a/src/python/pybind11/core.cc
+++ b/src/python/pybind11/core.cc
@@ -58,6 +58,7 @@
#include "sim/drain.hh"
#include "sim/serialize.hh"
#include "sim/sim_object.hh"
+#include "cpu/probes/pc_count_pair.hh"
namespace py = pybind11;
@@ -164,6 +165,31 @@
}
static void
+init_pc(py::module_ &m_native)
+{
+ py::module_ m = m_native.def_submodule("pc");
+ py::class_<PcCountPair>(m, "PcCountPair")
+ .def(py::init<>())
+ .def(py::init<Addr, int>())
+ .def("__eq__", [](const PcCountPair& self, py::object other) {
+ py::int_ pyPC = other.attr("get_pc")();
+ py::int_ pyCount = other.attr("get_count")();
+ uint64_t cPC = pyPC.cast<uint64_t>();
+ int cCount = pyCount.cast<int>();
+ return (self.getPC() == cPC && self.getCount() == cCount);
+ })
+ .def("__hash__", [](const PcCountPair& self){
+ py::int_ pyPC = py::cast(self.getPC());
+ py::int_ pyCount = py::cast(self.getCount());
+ return py::hash(py::make_tuple(pyPC, pyCount));
+ })
+ .def("__str__", &PcCountPair::to_string)
+ .def("get_pc", &PcCountPair::getPC)
+ .def("get_count", &PcCountPair::getCount)
+ ;
+}
+
+static void
init_net(py::module_ &m_native)
{
py::module_ m = m_native.def_submodule("net");
@@ -307,6 +333,7 @@
init_range(m_native);
init_net(m_native);
init_loader(m_native);
+ init_pc(m_native);
}
} // namespace gem5
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67193?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I66d93e2c6a1d286cb9dd795ba97f8d887f67d503
Gerrit-Change-Number: 67193
Gerrit-PatchSet: 16
Gerrit-Owner: Zhantong Qiu <zt...@ucdavis.edu>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Zhantong Qiu <zt...@ucdavis.edu>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-CC: Jason Lowe-Power <power...@gmail.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
