Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/56929 )
Change subject: arch: Make the DummyVec... types the same size as RegVal.
......................................................................
arch: Make the DummyVec... types the same size as RegVal.
This makes RegClass-es which don't specify a size work with the Dummy
types of VecRegContainer and VecPredRegContainer, and avoids having to
set up extra plumbing in ISAs that don't need it.
Change-Id: I059306a54b2a9cf7a22258a01e0821e370f0590a
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/56929
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
Reviewed-by: Gabe Black <[email protected]>
---
M src/arch/generic/vec_pred_reg.hh
M src/arch/generic/vec_reg.hh
2 files changed, 61 insertions(+), 2 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/generic/vec_pred_reg.hh
b/src/arch/generic/vec_pred_reg.hh
index ad6bcce..9495911 100644
--- a/src/arch/generic/vec_pred_reg.hh
+++ b/src/arch/generic/vec_pred_reg.hh
@@ -44,6 +44,7 @@
#include <vector>
#include "base/cprintf.hh"
+#include "base/types.hh"
#include "sim/serialize_handlers.hh"
namespace gem5
@@ -394,7 +395,27 @@
/// Dummy type aliases and constants for architectures that do not
implement
/// vector predicate registers.
/// @{
-using DummyVecPredRegContainer = VecPredRegContainer<8, false>;
+struct DummyVecPredRegContainer
+{
+ RegVal filler = 0;
+ bool operator == (const DummyVecPredRegContainer &d) const { return
true; }
+ bool operator != (const DummyVecPredRegContainer &d) const { return
true; }
+};
+template <>
+struct ParseParam<DummyVecPredRegContainer>
+{
+ static bool
+ parse(const std::string &s, DummyVecPredRegContainer &value)
+ {
+ return false;
+ }
+};
+static_assert(sizeof(DummyVecPredRegContainer) == sizeof(RegVal));
+static inline std::ostream &
+operator<<(std::ostream &os, const DummyVecPredRegContainer &d)
+{
+ return os;
+}
/// @}
} // namespace gem5
diff --git a/src/arch/generic/vec_reg.hh b/src/arch/generic/vec_reg.hh
index f32f581..c818b1c 100644
--- a/src/arch/generic/vec_reg.hh
+++ b/src/arch/generic/vec_reg.hh
@@ -104,6 +104,7 @@
#include "base/cprintf.hh"
#include "base/logging.hh"
+#include "base/types.hh"
#include "sim/serialize_handlers.hh"
namespace gem5
@@ -264,7 +265,27 @@
* vector registers.
*/
/** @{ */
-using DummyVecRegContainer = VecRegContainer<8>;
+struct DummyVecRegContainer
+{
+ RegVal filler = 0;
+ bool operator == (const DummyVecRegContainer &d) const { return true; }
+ bool operator != (const DummyVecRegContainer &d) const { return true; }
+};
+template <>
+struct ParseParam<DummyVecRegContainer>
+{
+ static bool
+ parse(const std::string &s, DummyVecRegContainer &value)
+ {
+ return false;
+ }
+};
+static_assert(sizeof(DummyVecRegContainer) == sizeof(RegVal));
+static inline std::ostream &
+operator<<(std::ostream &os, const DummyVecRegContainer &d)
+{
+ return os;
+}
/** @} */
} // namespace gem5
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/56929
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: I059306a54b2a9cf7a22258a01e0821e370f0590a
Gerrit-Change-Number: 56929
Gerrit-PatchSet: 3
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Bobby Bruce <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
