Bobby Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/56247 )
Change subject: fastmodel: Fix cluster build failed
......................................................................
fastmodel: Fix cluster build failed
FastModelCortexCluster subclasses don't have `type` property. They don't
need to be specified in sim_objects for generating *Params class.
Change-Id: Ic09e494042e05d68c890f9603b8b78a4a8d815a9
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/55305
Reviewed-by: Gabe Black <gabe.bl...@gmail.com>
Maintainer: Gabe Black <gabe.bl...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/56247
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Maintainer: Jason Lowe-Power <power...@gmail.com>
---
M src/arch/arm/fastmodel/CortexA76/SConscript
M src/arch/arm/fastmodel/CortexR52/SConscript
2 files changed, 21 insertions(+), 4 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/fastmodel/CortexA76/SConscript
b/src/arch/arm/fastmodel/CortexA76/SConscript
index ce51268..016f613 100644
--- a/src/arch/arm/fastmodel/CortexA76/SConscript
+++ b/src/arch/arm/fastmodel/CortexA76/SConscript
@@ -39,8 +39,7 @@
SimObject('FastModelCortexA76.py', sim_objects=[
'FastModelCortexA76', 'FastModelCortexA76Cluster'] +
- [f'FastModelScxEvsCortexA76x{num}' for num in (1, 2, 3, 4)] +
- [f'FastModelCortexA76x{num}' for num in (1, 2, 3, 4)])
+ [f'FastModelScxEvsCortexA76x{num}' for num in (1, 2, 3, 4)])
Source('cortex_a76.cc')
Source('evs.cc')
Source('thread_context.cc')
diff --git a/src/arch/arm/fastmodel/CortexR52/SConscript
b/src/arch/arm/fastmodel/CortexR52/SConscript
index 4e5e147..c1dc1fe 100644
--- a/src/arch/arm/fastmodel/CortexR52/SConscript
+++ b/src/arch/arm/fastmodel/CortexR52/SConscript
@@ -40,8 +40,7 @@
SimObject('FastModelCortexR52.py', sim_objects=[
'FastModelCortexR52', 'FastModelCortexR52Cluster'] +
- [f'FastModelScxEvsCortexR52x{num}' for num in (1, 2, 3, 4)] +
- [f'FastModelCortexR52x{num}' for num in (1, 2, 3, 4)])
+ [f'FastModelScxEvsCortexR52x{num}' for num in (1, 2, 3, 4)])
Source('cortex_r52.cc')
Source('evs.cc')
Source('thread_context.cc')
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/56247
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: minor-release-v21-2-1
Gerrit-Change-Id: Ic09e494042e05d68c890f9603b8b78a4a8d815a9
Gerrit-Change-Number: 56247
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-CC: Yu-hsin Wang <yuhsi...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
