| cluster.py (12564:2778478ca882) | cluster.py (13731:67cd980cb20f) |
|---|---|
| 1# Copyright (c) 2006-2007 The Regents of The University of Michigan 2# All rights reserved. 3# 4# Redistribution and use in source and binary forms, with or without 5# modification, are permitted provided that the following conditions are 6# met: redistributions of source code must retain the above copyright 7# notice, this list of conditions and the following disclaimer; 8# redistributions in binary form must reproduce the above copyright --- 153 unchanged lines hidden (view full) --- 162 163busFrequency = Frequency(options.frequency) 164busFrequency *= cpusPerCluster 165 166all_cpus = [] 167all_l1s = [] 168all_l1buses = [] 169if options.timing: | 1# Copyright (c) 2006-2007 The Regents of The University of Michigan 2# All rights reserved. 3# 4# Redistribution and use in source and binary forms, with or without 5# modification, are permitted provided that the following conditions are 6# met: redistributions of source code must retain the above copyright 7# notice, this list of conditions and the following disclaimer; 8# redistributions in binary form must reproduce the above copyright --- 153 unchanged lines hidden (view full) --- 162 163busFrequency = Frequency(options.frequency) 164busFrequency *= cpusPerCluster 165 166all_cpus = [] 167all_l1s = [] 168all_l1buses = [] 169if options.timing: |
| 170 clusters = [ Cluster() for i in xrange(options.numclusters)] 171 for j in xrange(options.numclusters): | 170 clusters = [ Cluster() for i in range(options.numclusters)] 171 for j in range(options.numclusters): |
| 172 clusters[j].id = j 173 for cluster in clusters: 174 cluster.clusterbus = L2XBar(clock=busFrequency) 175 all_l1buses += [cluster.clusterbus] 176 cluster.cpus = [TimingSimpleCPU(cpu_id = i + cluster.id, 177 clock=options.frequency) | 172 clusters[j].id = j 173 for cluster in clusters: 174 cluster.clusterbus = L2XBar(clock=busFrequency) 175 all_l1buses += [cluster.clusterbus] 176 cluster.cpus = [TimingSimpleCPU(cpu_id = i + cluster.id, 177 clock=options.frequency) |
| 178 for i in xrange(cpusPerCluster)] | 178 for i in range(cpusPerCluster)] |
| 179 all_cpus += cluster.cpus 180 cluster.l1 = L1(size=options.l1size, assoc = 4) 181 all_l1s += [cluster.l1] 182elif options.detailed: | 179 all_cpus += cluster.cpus 180 cluster.l1 = L1(size=options.l1size, assoc = 4) 181 all_l1s += [cluster.l1] 182elif options.detailed: |
| 183 clusters = [ Cluster() for i in xrange(options.numclusters)] 184 for j in xrange(options.numclusters): | 183 clusters = [ Cluster() for i in range(options.numclusters)] 184 for j in range(options.numclusters): |
| 185 clusters[j].id = j 186 for cluster in clusters: 187 cluster.clusterbus = L2XBar(clock=busFrequency) 188 all_l1buses += [cluster.clusterbus] 189 cluster.cpus = [DerivO3CPU(cpu_id = i + cluster.id, 190 clock=options.frequency) | 185 clusters[j].id = j 186 for cluster in clusters: 187 cluster.clusterbus = L2XBar(clock=busFrequency) 188 all_l1buses += [cluster.clusterbus] 189 cluster.cpus = [DerivO3CPU(cpu_id = i + cluster.id, 190 clock=options.frequency) |
| 191 for i in xrange(cpusPerCluster)] | 191 for i in range(cpusPerCluster)] |
| 192 all_cpus += cluster.cpus 193 cluster.l1 = L1(size=options.l1size, assoc = 4) 194 all_l1s += [cluster.l1] 195else: | 192 all_cpus += cluster.cpus 193 cluster.l1 = L1(size=options.l1size, assoc = 4) 194 all_l1s += [cluster.l1] 195else: |
| 196 clusters = [ Cluster() for i in xrange(options.numclusters)] 197 for j in xrange(options.numclusters): | 196 clusters = [ Cluster() for i in range(options.numclusters)] 197 for j in range(options.numclusters): |
| 198 clusters[j].id = j 199 for cluster in clusters: 200 cluster.clusterbus = L2XBar(clock=busFrequency) 201 all_l1buses += [cluster.clusterbus] 202 cluster.cpus = [AtomicSimpleCPU(cpu_id = i + cluster.id, 203 clock=options.frequency) | 198 clusters[j].id = j 199 for cluster in clusters: 200 cluster.clusterbus = L2XBar(clock=busFrequency) 201 all_l1buses += [cluster.clusterbus] 202 cluster.cpus = [AtomicSimpleCPU(cpu_id = i + cluster.id, 203 clock=options.frequency) |
| 204 for i in xrange(cpusPerCluster)] | 204 for i in range(cpusPerCluster)] |
| 205 all_cpus += cluster.cpus 206 cluster.l1 = L1(size=options.l1size, assoc = 4) 207 all_l1s += [cluster.l1] 208 209# ---------------------- 210# Create a system, and add system wide objects 211# ---------------------- 212system = System(cpu = all_cpus, l1_ = all_l1s, l1bus_ = all_l1buses, --- 91 unchanged lines hidden --- | 205 all_cpus += cluster.cpus 206 cluster.l1 = L1(size=options.l1size, assoc = 4) 207 all_l1s += [cluster.l1] 208 209# ---------------------- 210# Create a system, and add system wide objects 211# ---------------------- 212system = System(cpu = all_cpus, l1_ = all_l1s, l1bus_ = all_l1buses, --- 91 unchanged lines hidden --- |