gem5-dev@gem5.org

The gem5 Developer List

View all threads

[S] Change in gem5/gem5[develop]: configs: Update Arm starter_se.py for new CpuCluster abstraction

RC
Richard Cooper (Gerrit)
Wed, Apr 12, 2023 7:41 AM

Richard Cooper has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/69679?usp=email )

Change subject: configs: Update Arm starter_se.py for new CpuCluster
abstraction
......................................................................

configs: Update Arm starter_se.py for new CpuCluster abstraction

Changeset [1] introduced a new CpuCluster abstraction. This requires
some changes to the Arm starter_se.py and devices.py
configurations to accommodate the new structure.

[1] https://gem5-review.googlesource.com/c/public/gem5/+/65891

Change-Id: I55fdd383c96286d179724e0f50771e2b5daaa6d7

M configs/example/arm/starter_se.py
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configs/example/arm/starter_se.py
b/configs/example/arm/starter_se.py
index ccdbe4f..6b4dce9 100644
--- a/configs/example/arm/starter_se.py
+++ b/configs/example/arm/starter_se.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 ARM Limited
+# Copyright (c) 2016-2017, 2023 ARM Limited

All rights reserved.

The license below extends only to copyright in the software and shall

@@ -95,7 +95,7 @@

      # Add CPUs to the system. A cluster of CPUs typically have
      # private L1 caches and a shared L2 cache.
  •    self.cpu_cluster = devices.CpuCluster(
    
  •    self.cpu_cluster = devices.ArmCpuCluster(
            self, args.num_cores, args.cpu_freq, "1.2V",  
    

*cpu_types[args.cpu]
)

@@ -114,11 +114,11 @@
def numCpuClusters(self):
return len(self._clusters)

  • def addCpuCluster(self, cpu_cluster, num_cpus):
  • def addCpuCluster(self, cpu_cluster):
    assert cpu_cluster not in self._clusters
  •    assert num_cpus > 0
    
  •    assert len(cpu_cluster) > 0
        self._clusters.append(cpu_cluster)
    
  •    self._num_cpus += num_cpus
    
  •    self._num_cpus += len(cpu_cluster)
    
    def numCpus(self):
        return self._num_cpus
    

--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/69679?usp=email
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: I55fdd383c96286d179724e0f50771e2b5daaa6d7
Gerrit-Change-Number: 69679
Gerrit-PatchSet: 1
Gerrit-Owner: Richard Cooper richard.cooper@arm.com
Gerrit-MessageType: newchange

Richard Cooper has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/69679?usp=email ) Change subject: configs: Update Arm starter_se.py for new CpuCluster abstraction ...................................................................... configs: Update Arm starter_se.py for new CpuCluster abstraction Changeset [1] introduced a new CpuCluster abstraction. This requires some changes to the Arm `starter_se.py` and `devices.py` configurations to accommodate the new structure. [1] https://gem5-review.googlesource.com/c/public/gem5/+/65891 Change-Id: I55fdd383c96286d179724e0f50771e2b5daaa6d7 --- M configs/example/arm/starter_se.py 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/example/arm/starter_se.py b/configs/example/arm/starter_se.py index ccdbe4f..6b4dce9 100644 --- a/configs/example/arm/starter_se.py +++ b/configs/example/arm/starter_se.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2017 ARM Limited +# Copyright (c) 2016-2017, 2023 ARM Limited # All rights reserved. # # The license below extends only to copyright in the software and shall @@ -95,7 +95,7 @@ # Add CPUs to the system. A cluster of CPUs typically have # private L1 caches and a shared L2 cache. - self.cpu_cluster = devices.CpuCluster( + self.cpu_cluster = devices.ArmCpuCluster( self, args.num_cores, args.cpu_freq, "1.2V", *cpu_types[args.cpu] ) @@ -114,11 +114,11 @@ def numCpuClusters(self): return len(self._clusters) - def addCpuCluster(self, cpu_cluster, num_cpus): + def addCpuCluster(self, cpu_cluster): assert cpu_cluster not in self._clusters - assert num_cpus > 0 + assert len(cpu_cluster) > 0 self._clusters.append(cpu_cluster) - self._num_cpus += num_cpus + self._num_cpus += len(cpu_cluster) def numCpus(self): return self._num_cpus -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/69679?usp=email 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: I55fdd383c96286d179724e0f50771e2b5daaa6d7 Gerrit-Change-Number: 69679 Gerrit-PatchSet: 1 Gerrit-Owner: Richard Cooper <richard.cooper@arm.com> Gerrit-MessageType: newchange