From e30ef9911f5c80130210e6995b01b1355c4059bd Mon Sep 17 00:00:00 2001 From: seanzw Date: Wed, 3 Jun 2020 19:59:50 -0700 Subject: [PATCH 1/2] mem-ruby: Fix Prefetcher to RubyPrefetcher in StateMachine. After renaming Prefetcher to RubyPrefetcher, the slicc generator should be updated to correctly initialize the prefetcher with the controller. Change-Id: Ia12a4640c35aaedd70a4a14e5a10793b060ba924 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/29974 Reviewed-by: Jason Lowe-Power Maintainer: Bobby R. Bruce Tested-by: kokoro --- src/mem/slicc/symbols/StateMachine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mem/slicc/symbols/StateMachine.py b/src/mem/slicc/symbols/StateMachine.py index 8e3a1f84b6..2e9700fcfc 100644 --- a/src/mem/slicc/symbols/StateMachine.py +++ b/src/mem/slicc/symbols/StateMachine.py @@ -87,7 +87,7 @@ class StateMachine(Symbol): self.symtab.registerSym(param.ident, var) - if str(param.type_ast.type) == "Prefetcher": + if str(param.type_ast.type) == "RubyPrefetcher": self.prefetchers.append(var) self.states = OrderedDict() From 96fce476785a834f102ae69a895e661cf08e47cd Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Mon, 8 Jun 2020 15:21:35 -0700 Subject: [PATCH 2/2] misc: Updated release notes and version number Change-Id: Ib8583c23f47010222c08ff5aa9cffb842235c784 --- RELEASE-NOTES.md | 4 ++++ src/Doxyfile | 2 +- src/base/version.cc | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 2b88db757e..3542de9fe7 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,7 @@ +# Version 20.0.0.2 + +**[HOTFIX]** A patch was applied to fix the RubyPrefetcher with MESI_Three_Level. Prior to this fix a segfault occurred. + # Version 20.0.0.1 **[HOTFIX]** A fix was applied to stop incorrect clock frequences being reported due to rounding errors. diff --git a/src/Doxyfile b/src/Doxyfile index 178890020c..cd1a9474e1 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = gem5 # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v20.0.0.1 +PROJECT_NUMBER = v20.0.0.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index 2040268402..7e89b992ee 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -26,4 +26,4 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -const char *gem5Version = "20.0.0.1"; +const char *gem5Version = "20.0.0.2";