derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc: Merge branch 'release-staging-v20.0.0.0' into develop

Browse Source
This commit is contained in:
Bobby R. Bruce
2020-05-28 01:04:16 -07:00
parent 14e349c729 e2abf6c157
commit e53de444f6
200 changed files with 1327 additions and 7863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configs/ruby/AMD_Base_Constructor.py
View File

@@ -34,7 +34,7 @@ import m5
from m5.objects import *
from m5.defines import buildEnv
from m5.util import addToPath, convert
from CntrlBase import *
from .CntrlBase import *
addToPath('../')

8
configs/ruby/GPU_RfO.py
View File

@@ -29,19 +29,23 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
import six
import math
import m5
from m5.objects import *
from m5.defines import buildEnv
from m5.util import addToPath
from Ruby import create_topology
from Ruby import send_evicts
from .Ruby import create_topology
from .Ruby import send_evicts
addToPath('../')
from topologies.Cluster import Cluster
from topologies.Crossbar import Crossbar
if six.PY3:
long = int
class CntrlBase:
_seqs = 0
@classmethod

16
configs/ruby/GPU_VIPER.py
View File

@@ -29,19 +29,23 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
import six
import math
import m5
from m5.objects import *
from m5.defines import buildEnv
from m5.util import addToPath
from Ruby import create_topology
from Ruby import send_evicts
from .Ruby import create_topology
from .Ruby import send_evicts
addToPath('../')
from topologies.Cluster import Cluster
from topologies.Crossbar import Crossbar
if six.PY3:
long = int
class CntrlBase:
_seqs = 0
@classmethod
@@ -516,16 +520,16 @@ def create_system(options, full_system, system, dma_devices, bootmem,
# Register CPUs and caches for each CorePair and directory (SE mode only)
if not full_system:
for i in xrange((options.num_cpus + 1) // 2):
for i in range((options.num_cpus + 1) // 2):
FileSystemConfig.register_cpu(physical_package_id = 0,
core_siblings = \
xrange(options.num_cpus),
range(options.num_cpus),
core_id = i*2,
thread_siblings = [])
FileSystemConfig.register_cpu(physical_package_id = 0,
core_siblings = \
xrange(options.num_cpus),
range(options.num_cpus),
core_id = i*2+1,
thread_siblings = [])
@@ -564,7 +568,7 @@ def create_system(options, full_system, system, dma_devices, bootmem,
line_size = options.cacheline_size,
assoc = options.l3_assoc,
cpus = [n for n in
xrange(options.num_cpus)])
range(options.num_cpus)])
gpuCluster = None
if hasattr(options, 'bw_scalor') and options.bw_scalor > 0:

8
configs/ruby/GPU_VIPER_Baseline.py
View File

@@ -29,19 +29,23 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
import six
import math
import m5
from m5.objects import *
from m5.defines import buildEnv
from m5.util import addToPath
from Ruby import create_topology
from Ruby import send_evicts
from .Ruby import create_topology
from .Ruby import send_evicts
addToPath('../')
from topologies.Cluster import Cluster
from topologies.Crossbar import Crossbar
if six.PY3:
long = int
class CntrlBase:
_seqs = 0
@classmethod

6
configs/ruby/GPU_VIPER_Region.py
View File

@@ -29,17 +29,21 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
import six
import math
import m5
from m5.objects import *
from m5.defines import buildEnv
from m5.util import addToPath
from Ruby import send_evicts
from .Ruby import send_evicts
addToPath('../')
from topologies.Cluster import Cluster
if six.PY3:
long = int
class CntrlBase:
_seqs = 0
@classmethod

2
configs/ruby/Garnet_standalone.py
View File

@@ -29,7 +29,7 @@ import m5
from m5.objects import *
from m5.defines import buildEnv
from m5.util import addToPath
from Ruby import create_topology, create_directories
from .Ruby import create_topology, create_directories
#
# Declare caches used by the protocol

14
configs/ruby/MESI_Three_Level.py
View File

@@ -31,8 +31,8 @@ import math
import m5
from m5.objects import *
from m5.defines import buildEnv
from Ruby import create_topology, create_directories
from Ruby import send_evicts
from .Ruby import create_topology, create_directories
from .Ruby import send_evicts
from common import FileSystemConfig
#
@@ -121,7 +121,7 @@ def create_system(options, full_system, system, dma_ports, bootmem,
clk_domain = system.cpu[i].clk_domain
# Ruby prefetcher
prefetcher = RubyPrefetcher.Prefetcher(
prefetcher = RubyPrefetcher(
num_streams=16,
unit_filter = 256,
nonunit_filter = 256,
@@ -294,10 +294,10 @@ def create_system(options, full_system, system, dma_ports, bootmem,
all_cntrls = all_cntrls + [io_controller]
# Register configuration with filesystem
else:
for i in xrange(options.num_clusters):
for j in xrange(num_cpus_per_cluster):
for i in range(options.num_clusters):
for j in range(num_cpus_per_cluster):
FileSystemConfig.register_cpu(physical_package_id = 0,
core_siblings = xrange(options.num_cpus),
core_siblings = range(options.num_cpus),
core_id = i*num_cpus_per_cluster+j,
thread_siblings = [])
@@ -329,7 +329,7 @@ def create_system(options, full_system, system, dma_ports, bootmem,
num_l2caches_per_cluster)+'B',
line_size = options.cacheline_size,
assoc = options.l2_assoc,
cpus = [n for n in xrange(i*num_cpus_per_cluster, \
cpus = [n for n in range(i*num_cpus_per_cluster, \
(i+1)*num_cpus_per_cluster)])
ruby_system.network.number_of_virtual_networks = 3

6
configs/ruby/MESI_Two_Level.py
View File

@@ -29,8 +29,8 @@ import math
import m5
from m5.objects import *
from m5.defines import buildEnv
from Ruby import create_topology, create_directories
from Ruby import send_evicts
from .Ruby import create_topology, create_directories
from .Ruby import send_evicts
#
# Declare caches used by the protocol
@@ -78,7 +78,7 @@ def create_system(options, full_system, system, dma_ports, bootmem,
start_index_bit = block_size_bits,
is_icache = False)
prefetcher = RubyPrefetcher.Prefetcher()
prefetcher = RubyPrefetcher()
# the ruby random tester reuses num_cpus to specify the
# number of cpu ports connected to the tester object, which

6
configs/ruby/MI_example.py
View File

@@ -29,8 +29,8 @@ import math
import m5
from m5.objects import *
from m5.defines import buildEnv
from Ruby import create_topology, create_directories
from Ruby import send_evicts
from .Ruby import create_topology, create_directories
from .Ruby import send_evicts
#
# Declare caches used by the protocol
@@ -113,7 +113,7 @@ def create_system(options, full_system, system, dma_ports, bootmem,
l1_cntrl.responseToCache = MessageBuffer(ordered = True)
l1_cntrl.responseToCache.slave = ruby_system.network.master
phys_mem_size = sum(map(lambda r: r.size(), system.mem_ranges))
phys_mem_size = sum([r.size() for r in system.mem_ranges])
assert(phys_mem_size % options.num_dirs == 0)
mem_module_size = phys_mem_size / options.num_dirs

12
configs/ruby/MOESI_AMD_Base.py
View File

@@ -34,8 +34,8 @@ import m5
from m5.objects import *
from m5.defines import buildEnv
from m5.util import addToPath
from Ruby import create_topology
from Ruby import send_evicts
from .Ruby import create_topology
from .Ruby import send_evicts
from common import FileSystemConfig
addToPath('../')
@@ -328,16 +328,16 @@ def create_system(options, full_system, system, dma_devices, bootmem,
# Register CPUs and caches for each CorePair and directory (SE mode only)
if not full_system:
for i in xrange((options.num_cpus + 1) // 2):
for i in range((options.num_cpus + 1) // 2):
FileSystemConfig.register_cpu(physical_package_id = 0,
core_siblings =
xrange(options.num_cpus),
range(options.num_cpus),
core_id = i*2,
thread_siblings = [])
FileSystemConfig.register_cpu(physical_package_id = 0,
core_siblings =
xrange(options.num_cpus),
range(options.num_cpus),
core_id = i*2+1,
thread_siblings = [])
@@ -376,7 +376,7 @@ def create_system(options, full_system, system, dma_devices, bootmem,
line_size = options.cacheline_size,
assoc = options.l3_assoc,
cpus = [n for n in
xrange(options.num_cpus)])
range(options.num_cpus)])
# Assuming no DMA devices
assert(len(dma_devices) == 0)

4
configs/ruby/MOESI_CMP_directory.py
View File

@@ -41,8 +41,8 @@ import math
import m5
from m5.objects import *
from m5.defines import buildEnv
from Ruby import create_topology, create_directories
from Ruby import send_evicts
from .Ruby import create_topology, create_directories
from .Ruby import send_evicts
#
# Declare caches used by the protocol

4
configs/ruby/MOESI_CMP_token.py
View File

@@ -29,8 +29,8 @@ import math
import m5
from m5.objects import *
from m5.defines import buildEnv
from Ruby import create_topology, create_directories
from Ruby import send_evicts
from .Ruby import create_topology, create_directories
from .Ruby import send_evicts
#
# Declare caches used by the protocol

6
configs/ruby/MOESI_hammer.py
View File

@@ -29,8 +29,8 @@ import math
import m5
from m5.objects import *
from m5.defines import buildEnv
from Ruby import create_topology, create_directories
from Ruby import send_evicts
from .Ruby import create_topology, create_directories
from .Ruby import send_evicts
from common import FileSystemConfig
#
@@ -257,7 +257,7 @@ def create_system(options, full_system, system, dma_ports, bootmem,
all_cntrls = all_cntrls + [io_controller]
# Register configuration with filesystem
else:
for i in xrange(options.num_cpus):
for i in range(options.num_cpus):
FileSystemConfig.register_cpu(physical_package_id = 0,
core_siblings = [],
core_id = i,