# HG changeset patch # User Brad Beckmann <brad.beckm...@amd.com> # Date 1260657437 28800 # Node ID 3c00a365603e5724aea9b87b4b730839ef78139a # Parent efe0dabd91852d85b6301852dd9737fa5e8ee2f1 ruby: Removed the passing of dma sequencer The dma sequencer doesn't need to be passed between ruby config files, so it is removed.
diff -r efe0dabd9185 -r 3c00a365603e configs/ruby/MOESI_hammer.py --- a/configs/ruby/MOESI_hammer.py Sat Dec 12 14:37:17 2009 -0800 +++ b/configs/ruby/MOESI_hammer.py Sat Dec 12 14:37:17 2009 -0800 @@ -47,8 +47,7 @@ if buildEnv['PROTOCOL'] != 'MOESI_hammer': panic("This script requires the MOESI_hammer protocol to be built.") - sequencers_map = {"cpu": [], - "dma": []} + cpu_sequencers = [] # # The ruby network creation expects the list of nodes in the system to be @@ -93,7 +92,7 @@ # # Add controllers and sequencers to the appropriate lists # - sequencers_map["cpu"].append(cpu_seq) + cpu_sequencers.append(cpu_seq) l1_cntrl_nodes.append(l1_cntrl) for i in xrange(options.num_dirs): @@ -122,8 +121,7 @@ dma_cntrl.dma_sequencer.port = dma_device.dma dma_cntrl_nodes.append(dma_cntrl) - sequencers_map["dma"].append(dma_seq) all_cntrls = l1_cntrl_nodes + dir_cntrl_nodes + dma_cntrl_nodes - return (sequencers_map, dir_cntrl_nodes, all_cntrls) + return (cpu_sequencers, dir_cntrl_nodes, all_cntrls) diff -r efe0dabd9185 -r 3c00a365603e configs/ruby/Ruby.py --- a/configs/ruby/Ruby.py Sat Dec 12 14:37:17 2009 -0800 +++ b/configs/ruby/Ruby.py Sat Dec 12 14:37:17 2009 -0800 @@ -34,13 +34,16 @@ import MOESI_hammer -def create_system(options, physmem): +def create_system(options, physmem, piobus = None, dma_devices = []): protocol = buildEnv['PROTOCOL'] if protocol == "MOESI_hammer": - (sequencers, dir_cntrls, all_cntrls) = MOESI_hammer.create_system( \ - options, physmem) + (cpu_sequencers, dir_cntrls, all_cntrls) = \ + MOESI_hammer.create_system(options, \ + physmem, \ + piobus, \ + dma_devices) else: print "Error: unsupported ruby protocol" sys.exit(1) @@ -77,6 +80,6 @@ protocol_trace = False), mem_size_mb = mem_size_mb) - ruby.cpu_ruby_ports = sequencers + ruby.cpu_ruby_ports = cpu_sequencers return ruby _______________________________________________ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev