Deleted Added
sdiff udiff text old ( 7561:02a9a597fce4 ) new ( 7564:3559d47839a1 )
full compact
1# Copyright (c) 2006-2007 The Regents of The University of Michigan
2# Copyright (c) 2009 Advanced Micro Devices, Inc.
3# All rights reserved.
4#
5# Redistribution and use in source and binary forms, with or without
6# modification, are permitted provided that the following conditions are
7# met: redistributions of source code must retain the above copyright
8# notice, this list of conditions and the following disclaimer;

--- 67 unchanged lines hidden (view full) ---

76 l2_cntrl_nodes = []
77 dir_cntrl_nodes = []
78 dma_cntrl_nodes = []
79
80 #
81 # Must create the individual controllers before the network to ensure the
82 # controller constructors are called before the network constructor
83 #
84
85 for i in xrange(options.num_cpus):
86 #
87 # First create the Ruby objects associated with this cpu
88 #
89 l1i_cache = L1Cache(size = options.l1i_size,
90 assoc = options.l1i_assoc)
91 l1d_cache = L1Cache(size = options.l1d_size,

--- 7 unchanged lines hidden (view full) ---

99
100 if piobus != None:
101 cpu_seq.pio_port = piobus.port
102
103 l1_cntrl = L1Cache_Controller(version = i,
104 sequencer = cpu_seq,
105 L1IcacheMemory = l1i_cache,
106 L1DcacheMemory = l1d_cache,
107 l2_select_num_bits = \
108 math.log(options.num_l2caches,
109 2),
110 N_tokens = n_tokens,
111 retry_threshold = \
112 options.l1_retries,
113 fixed_timeout_latency = \
114 options.timeout_latency,
115 dynamic_timeout_enabled = \
116 not options.disable_dyn_timeouts,
117 no_mig_atomic = not \

--- 6 unchanged lines hidden (view full) ---

124 cpu_sequencers.append(cpu_seq)
125 l1_cntrl_nodes.append(l1_cntrl)
126
127 for i in xrange(options.num_l2caches):
128 #
129 # First create the Ruby objects associated with this cpu
130 #
131 l2_cache = L2Cache(size = options.l2_size,
132 assoc = options.l2_assoc)
133
134 l2_cntrl = L2Cache_Controller(version = i,
135 L2cacheMemory = l2_cache,
136 N_tokens = n_tokens)
137
138 exec("system.l2_cntrl%d = l2_cntrl" % i)
139 l2_cntrl_nodes.append(l2_cntrl)
140

--- 52 unchanged lines hidden ---