Mahyar Samani has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/51613 )
Change subject: misc: Adding GUPSGen to components library.
......................................................................
misc: Adding GUPSGen to components library.
This change adds GUPSGenCore, GUPSGen, GUPSGenEP, and GUPSGenPAR.
GUPSGenCore inherits from AbstractGeneratorCore. It is used for
implementing GUPSGen, GUPSGenEP, and GUPSGenPAR which inherit from
AbstractProcessor. GUPSGen does not implement a multi-core
generator as there are two ways to implement GUPS in parallel.
GUPSGenEP implement GUPS in it Embarrassingly Parallel variant
where multiple instances of GUPS update separate partitions of the
memory. GUPSGenPAR impelements GUPS in its Parallel variant where
multiple generators acccess the same partition of the memory in
parallel.
Change-Id: I57fb327a1ddefb6735ee59a0d7b4609e50af3517
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/51613
Reviewed-by: Bobby R. Bruce <bbr...@ucdavis.edu>
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
Maintainer: Jason Lowe-Power <power...@gmail.com>
---
A src/python/gem5/components/processors/gups_generator_core.py
A src/python/gem5/components/processors/gups_generator_par.py
M src/python/SConscript
A src/python/gem5/components/processors/gups_generator.py
A src/python/gem5/components/processors/gups_generator_ep.py
5 files changed, 357 insertions(+), 0 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, but someone else must approve; Looks
good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/python/SConscript b/src/python/SConscript
index b4aaae0..41c91e7 100644
--- a/src/python/SConscript
+++ b/src/python/SConscript
@@ -150,6 +150,14 @@
PySource('gem5.components.processors',
'gem5/components/processors/cpu_types.py')
PySource('gem5.components.processors',
+ 'gem5/components/processors/gups_generator_core.py')
+PySource('gem5.components.processors',
+ 'gem5/components/processors/gups_generator.py')
+PySource('gem5.components.processors',
+ 'gem5/components/processors/gups_generator_ep.py')
+PySource('gem5.components.processors',
+ 'gem5/components/processors/gups_generator_par.py')
+PySource('gem5.components.processors',
'gem5/components/processors/linear_generator_core.py')
PySource('gem5.components.processors',
'gem5/components/processors/linear_generator.py')
diff --git a/src/python/gem5/components/processors/gups_generator.py
b/src/python/gem5/components/processors/gups_generator.py
new file mode 100644
index 0000000..11b2e71
--- /dev/null
+++ b/src/python/gem5/components/processors/gups_generator.py
@@ -0,0 +1,78 @@
+# Copyright (c) 2021 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.
+
+
+from ...utils.override import overrides
+from m5.objects import Addr
+
+from ..boards.mem_mode import MemMode
+
+from .gups_generator_core import GUPSGeneratorCore
+
+from .abstract_processor import AbstractProcessor
+from ..boards.abstract_board import AbstractBoard
+
+
+class GUPSGenerator(AbstractProcessor):
+ def __init__(
+ self,
+ start_addr: Addr,
+ mem_size: str,
+ update_limit: int = 0,
+ ):
+ """The GUPSGenerator class
+ This class defines the interface for a single core GUPSGenerator,
this
+ generator could be used in place of a processor. For multicore
versions
+ of this generator look at GUPSGeneraorEP (EP stands for
embarrassingly
+ parallel) and GUPSGeneratorPAR (PAR stands for parallel). The two
+ variants are specified by the HPCC benchmark.
+
+ :param start_addr: The start address for allocating the update
table.
+ :param mem_size: The size of memory to allocate for the update
table.
+ Should be a power of 2.
+ :param update_limit: The number of updates to do before terminating
+ simulation. Pass zero to run the benchmark to completion (The
amount of
+ time it takes to simulate depends on )
+ """
+ super(GUPSGenerator, self).__init__(
+ cores=[
+ GUPSGeneratorCore(
+ start_addr=start_addr,
+ mem_size=mem_size,
+ update_limit=update_limit,
+ )
+ ]
+ )
+
+ @overrides(AbstractProcessor)
+ def incorporate_processor(self, board: AbstractBoard) -> None:
+ board.set_mem_mode(MemMode.TIMING)
+
+ def start_traffic(self):
+ # This function should be implemented so that GUPSGenerator could
be
+ # used in the same scripts that use LinearGenerator,
RandomGenerator,
+ # and ComplexGenrator
+ pass
diff --git a/src/python/gem5/components/processors/gups_generator_core.py
b/src/python/gem5/components/processors/gups_generator_core.py
new file mode 100644
index 0000000..ed8493b
--- /dev/null
+++ b/src/python/gem5/components/processors/gups_generator_core.py
@@ -0,0 +1,50 @@
+# Copyright (c) 2021 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.
+
+from m5.objects import Port, GUPSGen, Addr
+
+from ...utils.override import overrides
+from .abstract_generator_core import AbstractGeneratorCore
+
+
+class GUPSGeneratorCore(AbstractGeneratorCore):
+ def __init__(
+ self,
+ start_addr: Addr,
+ mem_size: str,
+ update_limit: int,
+ ):
+ """
+ Create a GUPSGeneratorCore as the main generator.
+ """
+ super(GUPSGeneratorCore, self).__init__()
+ self.generator = GUPSGen(
+ start_addr=start_addr, mem_size=mem_size,
update_limit=update_limit
+ )
+
+ @overrides(AbstractGeneratorCore)
+ def connect_dcache(self, port: Port) -> None:
+ self.generator.port = port
diff --git a/src/python/gem5/components/processors/gups_generator_ep.py
b/src/python/gem5/components/processors/gups_generator_ep.py
new file mode 100644
index 0000000..5ab0682
--- /dev/null
+++ b/src/python/gem5/components/processors/gups_generator_ep.py
@@ -0,0 +1,100 @@
+# Copyright (c) 2021 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.
+
+
+from ...utils.override import overrides
+from m5.objects import Addr
+from m5.util.convert import toMemorySize
+
+from ..boards.mem_mode import MemMode
+
+from .gups_generator_core import GUPSGeneratorCore
+
+from .abstract_processor import AbstractProcessor
+from ..boards.abstract_board import AbstractBoard
+
+
+class GUPSGeneratorEP(AbstractProcessor):
+ def __init__(
+ self,
+ num_cores: int,
+ start_addr: Addr,
+ mem_size: str,
+ update_limit: int = 0,
+ ):
+ """The GUPSGeneratorEP class
+ This class defines the interface for multi core GUPSGenerator, this
+ generator could be used in place of a processor. In terms of
+ benchmarking this generator implements the embarrassigly parallel
+ variant of the GUPS benchmark as specified by HPCC website.
+
+ :param start_addr: The start address for allocating the update
table.
+ :param mem_size: The size of memory to allocate for the update
table.
+ Should be a power of 2.
+ :param update_limit: The number of updates to do before terminating
+ simulation. Pass zero to run the benchmark to completion (The
amount of
+ time it takes to simulate depends on )
+ """
+ super(GUPSGeneratorEP, self).__init__(
+ cores=self._create_cores(
+ num_cores=num_cores,
+ start_addr=start_addr,
+ mem_size=mem_size,
+ update_limit=update_limit,
+ )
+ )
+
+ def _create_cores(
+ self,
+ num_cores: int,
+ start_addr: Addr,
+ mem_size: str,
+ update_limit: int,
+ ):
+ """
+ Helper function to create cores.
+ """
+ mem_size_int = toMemorySize(mem_size)
+ chunk_size = int(mem_size_int / num_cores)
+ table_size = str(chunk_size) + "B"
+ return [
+ GUPSGeneratorCore(
+ start_addr=start_addr + i * chunk_size,
+ mem_size=table_size,
+ update_limit=update_limit,
+ )
+ for i in range(num_cores)
+ ]
+
+ @overrides(AbstractProcessor)
+ def incorporate_processor(self, board: AbstractBoard) -> None:
+ board.set_mem_mode(MemMode.TIMING)
+
+ def start_traffic(self):
+ # This function should be implemented so that GUPSGeneratorEP
could be
+ # used in the same scripts that use LinearGenerator,
RandomGenerator,
+ # and ComplexGenrator
+ pass
diff --git a/src/python/gem5/components/processors/gups_generator_par.py
b/src/python/gem5/components/processors/gups_generator_par.py
new file mode 100644
index 0000000..942100d
--- /dev/null
+++ b/src/python/gem5/components/processors/gups_generator_par.py
@@ -0,0 +1,96 @@
+# Copyright (c) 2021 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.
+
+
+from ...utils.override import overrides
+from m5.objects import Addr
+
+from ..boards.mem_mode import MemMode
+
+from .gups_generator_core import GUPSGeneratorCore
+
+from .abstract_processor import AbstractProcessor
+from ..boards.abstract_board import AbstractBoard
+
+
+class GUPSGeneratorPAR(AbstractProcessor):
+ def __init__(
+ self,
+ num_cores: int,
+ start_addr: Addr,
+ mem_size: str,
+ update_limit: int = 0,
+ ):
+ """The GUPSGeneratorPAR class
+ This class defines the interface for multi core GUPSGenerator, this
+ generator could be used in place of a processor. In terms of
+ benchmarking this generator implements the parallel (3rd)
+ variant of the GUPS benchmark as specified by HPCC website.
+
+ :param start_addr: The start address for allocating the update
table.
+ :param mem_size: The size of memory to allocate for the update
table.
+ Should be a power of 2.
+ :param update_limit: The number of updates to do before terminating
+ simulation. Pass zero to run the benchmark to completion (The
amount of
+ time it takes to simulate depends on )
+ """
+ super(GUPSGeneratorPAR, self).__init__(
+ cores=self._create_cores(
+ num_cores=num_cores,
+ start_addr=start_addr,
+ mem_size=mem_size,
+ update_limit=update_limit,
+ )
+ )
+
+ def _create_cores(
+ self,
+ num_cores: int,
+ start_addr: Addr,
+ mem_size: str,
+ update_limit: int,
+ ):
+ """
+ Helper function to create cores.
+ """
+ return [
+ GUPSGeneratorCore(
+ start_addr=start_addr,
+ mem_size=mem_size,
+ update_limit=update_limit / num_cores,
+ )
+ for i in range(num_cores)
+ ]
+
+ @overrides(AbstractProcessor)
+ def incorporate_processor(self, board: AbstractBoard) -> None:
+ board.set_mem_mode(MemMode.TIMING)
+
+ def start_traffic(self):
+ # This function should be implemented so that GUPSGeneratorPAR
could be
+ # used in the same scripts that use LinearGenerator,
RandomGenerator,
+ # and ComplexGenrator
+ pass
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/51613
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: I57fb327a1ddefb6735ee59a0d7b4609e50af3517
Gerrit-Change-Number: 51613
Gerrit-PatchSet: 11
Gerrit-Owner: Mahyar Samani <msam...@ucdavis.edu>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Mahyar Samani <msam...@ucdavis.edu>
Gerrit-Reviewer: kokoro <noreply+kok...@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
