[gem5-dev] Change in gem5/gem5[develop]: fastmodel: Remove scs_prefix_appli_output binding.
Chris January has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/31077 )
Change subject: fastmodel: Remove scs_prefix_appli_output binding.
..
fastmodel: Remove scs_prefix_appli_output binding.
The scx_prefix_appli_output function is removed in recent Fast Models
releases.
Change-Id: I324b911ec7ed68b7d0c324ac20a9795515e4de57
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/31077
Reviewed-by: Gabe Black
Maintainer: Gabe Black
Tested-by: kokoro
---
M src/arch/arm/fastmodel/fastmodel.cc
1 file changed, 12 insertions(+), 2 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/fastmodel/fastmodel.cc
b/src/arch/arm/fastmodel/fastmodel.cc
index 27a39fc..48a92b2 100644
--- a/src/arch/arm/fastmodel/fastmodel.cc
+++ b/src/arch/arm/fastmodel/fastmodel.cc
@@ -1,4 +1,16 @@
/*
+ * Copyright (c) 2020 ARM Limited
+ * 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.
+ *
* Copyright 2019 Google, Inc.
*
* Redistribution and use in source and binary forms, with or without
@@ -85,8 +97,6 @@
pybind11::arg("debug") = false)
.def("scx_enable_cadi_log", &scx::scx_enable_cadi_log,
pybind11::arg("log") = true)
-.def("scx_prefix_appli_output", &scx::scx_prefix_appli_output,
- pybind11::arg("prefix") = true)
.def("scx_print_port_number", &scx::scx_print_port_number,
pybind11::arg("print") = true)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31077
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: I324b911ec7ed68b7d0c324ac20a9795515e4de57
Gerrit-Change-Number: 31077
Gerrit-PatchSet: 5
Gerrit-Owner: Chris January
Gerrit-Reviewer: Chris January
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: fastmodel: Fix hierachical Iris component names.
Chris January has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/31076 )
Change subject: fastmodel: Fix hierachical Iris component names.
..
fastmodel: Fix hierachical Iris component names.
Recent releases of Fast Models structure Iris resources in a hierarchy.
Use the parent resource ID if set to construct the hierachical name of
components when constructing the resource map.
Change-Id: Iafafa26d5aff560c3b2e93894f81f770c0e98079
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/31076
Reviewed-by: Gabe Black
Maintainer: Gabe Black
Tested-by: kokoro
---
M src/arch/arm/fastmodel/iris/thread_context.cc
1 file changed, 27 insertions(+), 2 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/fastmodel/iris/thread_context.cc
b/src/arch/arm/fastmodel/iris/thread_context.cc
index a2cf2bf..070a386 100644
--- a/src/arch/arm/fastmodel/iris/thread_context.cc
+++ b/src/arch/arm/fastmodel/iris/thread_context.cc
@@ -1,4 +1,16 @@
/*
+ * Copyright (c) 2020 ARM Limited
+ * 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.
+ *
* Copyright 2019 Google, Inc.
*
* Redistribution and use in source and binary forms, with or without
@@ -204,9 +216,22 @@
std::vector resources;
call().resource_getList(_instId, resources);
+std::map
+idToResource;
+for (const auto &resource: resources) {
+idToResource[resource.rscId] = &resource;
+}
ResourceMap resourceMap;
-for (auto &resource: resources)
-resourceMap[resource.name] = resource;
+for (const auto &resource: resources) {
+std::string name = resource.name;
+iris::ResourceId parentId = resource.parentRscId;
+while (parentId != iris::IRIS_UINT64_MAX) {
+const auto *parent = idToResource[parentId];
+name = parent->name + "." + name;
+parentId = parent->parentRscId;
+}
+resourceMap[name] = resource;
+}
initFromIrisInstance(resourceMap);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31076
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: Iafafa26d5aff560c3b2e93894f81f770c0e98079
Gerrit-Change-Number: 31076
Gerrit-PatchSet: 5
Gerrit-Owner: Chris January
Gerrit-Reviewer: Chris January
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: fastmodel: Implement GIC DTB auto-generation.
Chris January has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/31078 )
Change subject: fastmodel: Implement GIC DTB auto-generation.
..
fastmodel: Implement GIC DTB auto-generation.
Implement generateDeviceTree for FastModelGIC so the interrupt
controller is automatically added to the DTB. This is sufficient to
allow a VExpressFastmodel system model to boot Linux without an
explicit DTB.
Change-Id: I69d86fd8bba1b86768c8a118d2de079a56179854
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/31078
Reviewed-by: Giacomo Travaglini
Maintainer: Gabe Black
Tested-by: kokoro
---
M src/arch/arm/fastmodel/GIC/FastModelGIC.py
1 file changed, 75 insertions(+), 0 deletions(-)
Approvals:
Giacomo Travaglini: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/fastmodel/GIC/FastModelGIC.py
b/src/arch/arm/fastmodel/GIC/FastModelGIC.py
index d682e85..0980cc4 100644
--- a/src/arch/arm/fastmodel/GIC/FastModelGIC.py
+++ b/src/arch/arm/fastmodel/GIC/FastModelGIC.py
@@ -1,3 +1,15 @@
+# Copyright (c) 2020 ARM Limited
+# 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.
+#
# Copyright 2019 Google, Inc.
#
# Redistribution and use in source and binary forms, with or without
@@ -24,6 +36,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from m5.params import *
+from m5.util.fdthelper import *
from m5.SimObject import SimObject
from m5.objects.FastModel import AmbaInitiatorSocket, AmbaTargetSocket
@@ -463,6 +476,9 @@
redistributor = VectorGicv3CommsInitiatorSocket(
'GIC communication initiator')
+# Used for DTB autogeneration
+_state = FdtState(addr_cells=2, size_cells=2, interrupt_cells=3)
+
def get_redist_bases(self):
"""
The format of reg_base_per_redistributor is
@@ -497,3 +513,62 @@
]
return ranges
+
+def interruptCells(self, int_type, int_num, int_flag):
+"""
+Interupt cells generation helper:
+Following specifications described in
+
+
Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt
+"""
+prop = self._state.interruptCells(0)
+assert len(prop) >= 3
+prop[0] = int_type
+prop[1] = int_num
+prop[2] = int_flag
+return prop
+
+def generateDeviceTree(self, state):
+sc_gic = self.sc_gic
+
+node = FdtNode("interrupt-controller")
+node.appendCompatible(["arm,gic-v3"])
+node.append(self._state.interruptCellsProperty())
+node.append(self._state.addrCellsProperty())
+node.append(self._state.sizeCellsProperty())
+node.append(FdtProperty("ranges"))
+node.append(FdtProperty("interrupt-controller"))
+
+redist_stride = 0x4 if sc_gic.has_gicv4_1 else 0x2
+node.append(FdtPropertyWords("redistributor-stride",
+state.sizeCells(redist_stride)))
+
+regs = (
+state.addrCells(sc_gic.reg_base) +
+state.sizeCells(0x1) +
+state.addrCells(self.get_redist_bases()[0]) +
+state.sizeCells(0x200) )
+
+node.append(FdtPropertyWords("reg", regs))
+# Maintenance interrupt (PPI 25).
+node.append(FdtPropertyWords("interrupts",
+self.interruptCells(1, 9, 0xf04)))
+
+node.appendPhandle(self)
+
+# Generate the ITS device tree
+its_frame_size = 0x1
+its_bases = [
+sc_gic.its0_base, sc_gic.its1_base, sc_gic.its2_base,
+sc_gic.its3_base
+]
+for its_base in its_bases:
+its_node = self.generateBasicPioDeviceNode(state, "gic-its",
+ its_base,
+ 2 * its_frame_size)
+its_node.appendCompatible(["arm,gic-v3-its"])
+its_node.append(FdtProperty("msi-controller"))
+its_node.append(FdtPropertyWords("#msi-cells", [1]))
+node.append(its_node)
+
+yield node
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31078
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:
[gem5-dev] Change in gem5/gem5[develop]: fastmodel: Add missing dependencies.
Chris January has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/31075 )
Change subject: fastmodel: Add missing dependencies.
..
fastmodel: Add missing dependencies.
Add -latomic library required by recent Fast Models releases.
Add SystemCExport directory for tlm_has_get_protocol_types.h include.
Change-Id: Ia0c275d55f5077499588228737ed1ff5975cd5db
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/31075
Tested-by: kokoro
Reviewed-by: Gabe Black
Maintainer: Gabe Black
---
M src/arch/arm/fastmodel/SConscript
1 file changed, 18 insertions(+), 7 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/fastmodel/SConscript
b/src/arch/arm/fastmodel/SConscript
index 2fd4ba0..c9b08b1 100644
--- a/src/arch/arm/fastmodel/SConscript
+++ b/src/arch/arm/fastmodel/SConscript
@@ -1,3 +1,15 @@
+# Copyright (c) 2020 ARM Limited
+# 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.
+#
# Copyright 2019 Google, Inc.
#
# Redistribution and use in source and binary forms, with or without
@@ -114,6 +126,7 @@
'armctmodel',
'fmruntime',
'IrisSupport',
+'atomic',
'dl',
'rt',
)
@@ -374,10 +387,8 @@
Command(gic_protocol_dest.File(header), gic_protocol_src.File(header),
Copy('${TARGET}', '${SOURCE}'))
-lisa_protocol_types_header_path = 'include/lisa_protocol_types.h'
-lisa_protocol_types_header_target = \
-gic_protocol_dest.File(lisa_protocol_types_header_path)
-lisa_protocol_types_header_src = \
-examples_common_dir.File(lisa_protocol_types_header_path)
-Command(lisa_protocol_types_header_target, lisa_protocol_types_header_src,
-Copy('${TARGET}', '${SOURCE}'))
+common_headers = ('lisa_protocol_types.h', 'tlm_has_get_protocol_types.h')
+for header in common_headers:
+header_target = gic_protocol_dest.Dir('include').File(header)
+header_src = examples_common_dir.Dir('include').File(header)
+Command(header_target, header_src, Copy('${TARGET}', '${SOURCE}'))
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31075
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: Ia0c275d55f5077499588228737ed1ff5975cd5db
Gerrit-Change-Number: 31075
Gerrit-PatchSet: 4
Gerrit-Owner: Chris January
Gerrit-Reviewer: Chris January
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: configs: Add earlycon to default kernel_cmd.
Chris January has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/31074 ) Change subject: configs: Add earlycon to default kernel_cmd. .. configs: Add earlycon to default kernel_cmd. The earlyprintk kernel command line argument does not take a value on Arm. Rather pass early console name using the earlycon command line argument. Change-Id: Ie14fc425e87c50a0b59fa4270a3743ed4fe97589 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/31074 Reviewed-by: Andreas Sandberg Maintainer: Andreas Sandberg Tested-by: kokoro --- M configs/example/arm/fs_bigLITTLE.py 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Andreas Sandberg: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/configs/example/arm/fs_bigLITTLE.py b/configs/example/arm/fs_bigLITTLE.py index 228d11c..29f5c6b 100644 --- a/configs/example/arm/fs_bigLITTLE.py +++ b/configs/example/arm/fs_bigLITTLE.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2017, 2019 ARM Limited +# Copyright (c) 2016-2017, 2019-2020 ARM Limited # All rights reserved. # # The license below extends only to copyright in the software and shall @@ -219,7 +219,8 @@ m5.ticks.fixGlobalFrequency() kernel_cmd = [ -"earlyprintk=pl011,0x1c09", +"earlyprintk", +"earlycon=pl011,0x1c09", "console=ttyAMA0", "lpj=19988480", "norandmaps", -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31074 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: Ie14fc425e87c50a0b59fa4270a3743ed4fe97589 Gerrit-Change-Number: 31074 Gerrit-PatchSet: 2 Gerrit-Owner: Chris January Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Chris January Gerrit-Reviewer: Giacomo Travaglini Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: fastmodel: Implement GIC DTB auto-generation.
Chris January has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/31078 )
Change subject: fastmodel: Implement GIC DTB auto-generation.
..
fastmodel: Implement GIC DTB auto-generation.
Implement generateDeviceTree for FastModelGIC so the interrupt
controller is automatically added to the DTB. This is sufficient to
allow a VExpressFastmodel system model to boot Linux without an
explicit DTB.
Change-Id: I69d86fd8bba1b86768c8a118d2de079a56179854
---
M src/arch/arm/fastmodel/GIC/FastModelGIC.py
1 file changed, 74 insertions(+), 0 deletions(-)
diff --git a/src/arch/arm/fastmodel/GIC/FastModelGIC.py
b/src/arch/arm/fastmodel/GIC/FastModelGIC.py
index d682e85..c1f9b72 100644
--- a/src/arch/arm/fastmodel/GIC/FastModelGIC.py
+++ b/src/arch/arm/fastmodel/GIC/FastModelGIC.py
@@ -1,3 +1,15 @@
+# Copyright (c) 2020 ARM Limited
+# 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.
+#
# Copyright 2019 Google, Inc.
#
# Redistribution and use in source and binary forms, with or without
@@ -24,6 +36,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from m5.params import *
+from m5.util.fdthelper import *
from m5.SimObject import SimObject
from m5.objects.FastModel import AmbaInitiatorSocket, AmbaTargetSocket
@@ -463,6 +476,9 @@
redistributor = VectorGicv3CommsInitiatorSocket(
'GIC communication initiator')
+# Used for DTB autogeneration
+_state = FdtState(addr_cells=2, size_cells=2, interrupt_cells=3)
+
def get_redist_bases(self):
"""
The format of reg_base_per_redistributor is
@@ -497,3 +513,61 @@
]
return ranges
+
+def interruptCells(self, int_type, int_num, int_flag):
+"""
+Interupt cells generation helper:
+Following specifications described in
+
+
Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt
+"""
+prop = self._state.interruptCells(0)
+assert len(prop) >= 3
+prop[0] = int_type
+prop[1] = int_num
+prop[2] = int_flag
+return prop
+
+def generateDeviceTree(self, state):
+sc_gic = self.sc_gic
+
+node = FdtNode("interrupt-controller")
+node.appendCompatible(["arm,gic-v3"])
+node.append(self._state.interruptCellsProperty())
+node.append(self._state.addrCellsProperty())
+node.append(self._state.sizeCellsProperty())
+node.append(FdtProperty("ranges"))
+node.append(FdtProperty("interrupt-controller"))
+
+redist_stride = 0x4 if sc_gic.has_gicv4_1 else 0x2
+node.append(FdtPropertyWords("redistributor-stride",
+state.sizeCells(redist_stride)))
+
+regs = (
+state.addrCells(sc_gic.reg_base) +
+state.sizeCells(0x1) +
+state.addrCells(self.get_redist_bases()[0]) +
+state.sizeCells(0x200) )
+
+node.append(FdtPropertyWords("reg", regs))
+node.append(FdtPropertyWords("interrupts",
+self.interruptCells(1, 9, 0xf04)))
+
+node.appendPhandle(self)
+
+# Generate the ITS device tree
+gic_frame_size = 0x1
+its_bases = [
+sc_gic.its0_base, sc_gic.its1_base, sc_gic.its2_base,
+sc_gic.its3_base
+]
+for its_base in its_bases:
+its_node = self.generateBasicPioDeviceNode(state, "gic-its",
+ its_base,
+ 2 * gic_frame_size)
+its_node.appendCompatible(["arm,gic-v3-its"])
+its_node.append(FdtProperty("msi-controller"))
+its_node.append(FdtPropertyWords("#msi-cells", [1]))
+node.append(its_node)
+
+yield node
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31078
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: I69d86fd8bba1b86768c8a118d2de079a56179854
Gerrit-Change-Number: 31078
Gerrit-PatchSet: 1
Gerrit-Owner: Chris January
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_ur
[gem5-dev] Change in gem5/gem5[develop]: fastmodel: Remove scs_prefix_appli_output binding.
Chris January has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/31077 )
Change subject: fastmodel: Remove scs_prefix_appli_output binding.
..
fastmodel: Remove scs_prefix_appli_output binding.
The scx_prefix_appli_output function is removed in recent Fast Models
releases.
Change-Id: I324b911ec7ed68b7d0c324ac20a9795515e4de57
---
M src/arch/arm/fastmodel/fastmodel.cc
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/arch/arm/fastmodel/fastmodel.cc
b/src/arch/arm/fastmodel/fastmodel.cc
index 27a39fc..96bb744 100644
--- a/src/arch/arm/fastmodel/fastmodel.cc
+++ b/src/arch/arm/fastmodel/fastmodel.cc
@@ -1,4 +1,16 @@
/*
+ * Copyright (c) 2020 ARM Limited
+ * 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.
+ *
* Copyright 2019 Google, Inc.
*
* Redistribution and use in source and binary forms, with or without
@@ -52,7 +64,7 @@
// especially since there are other preferred methods for setting
up
// the parameters of a component.
.def("scx_set_parameter",
- static_cast&)>(
+ static_cast(
&scx::scx_set_parameter))
.def("scx_get_parameter",
static_cast(
@@ -85,8 +97,6 @@
pybind11::arg("debug") = false)
.def("scx_enable_cadi_log", &scx::scx_enable_cadi_log,
pybind11::arg("log") = true)
-.def("scx_prefix_appli_output", &scx::scx_prefix_appli_output,
- pybind11::arg("prefix") = true)
.def("scx_print_port_number", &scx::scx_print_port_number,
pybind11::arg("print") = true)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31077
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: I324b911ec7ed68b7d0c324ac20a9795515e4de57
Gerrit-Change-Number: 31077
Gerrit-PatchSet: 1
Gerrit-Owner: Chris January
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: fastmodel: Fix hierachical Iris component names.
Chris January has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/31076 )
Change subject: fastmodel: Fix hierachical Iris component names.
..
fastmodel: Fix hierachical Iris component names.
Recent releases of Fast Models structure Iris resources in a hierarchy.
Use the parent resource ID if set to construct the hierachical name of
components when constructing the resource map.
Change-Id: Iafafa26d5aff560c3b2e93894f81f770c0e98079
---
M src/arch/arm/fastmodel/iris/thread_context.cc
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/arch/arm/fastmodel/iris/thread_context.cc
b/src/arch/arm/fastmodel/iris/thread_context.cc
index a2cf2bf..f89180c 100644
--- a/src/arch/arm/fastmodel/iris/thread_context.cc
+++ b/src/arch/arm/fastmodel/iris/thread_context.cc
@@ -1,4 +1,16 @@
/*
+ * Copyright (c) 2020 ARM Limited
+ * 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.
+ *
* Copyright 2019 Google, Inc.
*
* Redistribution and use in source and binary forms, with or without
@@ -205,8 +217,16 @@
call().resource_getList(_instId, resources);
ResourceMap resourceMap;
-for (auto &resource: resources)
-resourceMap[resource.name] = resource;
+for (auto &resource: resources) {
+std::string name = resource.name;
+if (resource.parentRscId != iris::IRIS_UINT64_MAX) {
+for (auto &parentResource: resources) {
+if (parentResource.rscId == resource.parentRscId)
+name = parentResource.name + "." + resource.name;
+}
+}
+resourceMap[name] = resource;
+}
initFromIrisInstance(resourceMap);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31076
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: Iafafa26d5aff560c3b2e93894f81f770c0e98079
Gerrit-Change-Number: 31076
Gerrit-PatchSet: 1
Gerrit-Owner: Chris January
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: configs: Add earlycon to default kernel_cmd.
Chris January has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/31074 ) Change subject: configs: Add earlycon to default kernel_cmd. .. configs: Add earlycon to default kernel_cmd. The earlyprintk kernel command line argument does not take a value on Arm. Rather pass early console name using the earlycon command line argument. Change-Id: Ie14fc425e87c50a0b59fa4270a3743ed4fe97589 --- M configs/example/arm/fs_bigLITTLE.py 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/example/arm/fs_bigLITTLE.py b/configs/example/arm/fs_bigLITTLE.py index 228d11c..29f5c6b 100644 --- a/configs/example/arm/fs_bigLITTLE.py +++ b/configs/example/arm/fs_bigLITTLE.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2017, 2019 ARM Limited +# Copyright (c) 2016-2017, 2019-2020 ARM Limited # All rights reserved. # # The license below extends only to copyright in the software and shall @@ -219,7 +219,8 @@ m5.ticks.fixGlobalFrequency() kernel_cmd = [ -"earlyprintk=pl011,0x1c09", +"earlyprintk", +"earlycon=pl011,0x1c09", "console=ttyAMA0", "lpj=19988480", "norandmaps", -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31074 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: Ie14fc425e87c50a0b59fa4270a3743ed4fe97589 Gerrit-Change-Number: 31074 Gerrit-PatchSet: 1 Gerrit-Owner: Chris January Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[develop]: fastmodel: Add missing dependencies.
Chris January has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/31075 )
Change subject: fastmodel: Add missing dependencies.
..
fastmodel: Add missing dependencies.
Add -latomic library required by recent Fast Models releases.
Add SystemCExport directory for tlm_has_get_protocol_types.h include.
Change-Id: Ia0c275d55f5077499588228737ed1ff5975cd5db
---
M src/arch/arm/fastmodel/SConscript
1 file changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/arch/arm/fastmodel/SConscript
b/src/arch/arm/fastmodel/SConscript
index 2fd4ba0..afcfbde 100644
--- a/src/arch/arm/fastmodel/SConscript
+++ b/src/arch/arm/fastmodel/SConscript
@@ -1,3 +1,15 @@
+# Copyright (c) 2020 ARM Limited
+# 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.
+#
# Copyright 2019 Google, Inc.
#
# Redistribution and use in source and binary forms, with or without
@@ -94,6 +106,7 @@
pvlib_home.Dir('include/fmruntime'),
pvlib_home.Dir('include/fmruntime/eslapi'),
pvlib_home.Dir('Iris/include'),
+pvlib_home.Dir('examples/SystemCExport/Common'),
systemc_home.Dir('include'),
@@ -114,6 +127,7 @@
'armctmodel',
'fmruntime',
'IrisSupport',
+'atomic',
'dl',
'rt',
)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31075
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: Ia0c275d55f5077499588228737ed1ff5975cd5db
Gerrit-Change-Number: 31075
Gerrit-PatchSet: 1
Gerrit-Owner: Chris January
Gerrit-MessageType: newchange
___
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
