[gem5-dev] Change in gem5/gem5[develop]: mem: Fix whitespace in mem/ruby/system/Sequencer.py.
Gabe Black has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/52108 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: mem: Fix whitespace in mem/ruby/system/Sequencer.py. .. mem: Fix whitespace in mem/ruby/system/Sequencer.py. Some aspects of the formatting in this file were questionable, like aligning =s between adjacent lines, although not technically against the style rules as far as I know. More strangely though, the whole file used three space indents instead of the typical four. Change-Id: I7b60f1978c5b2c60a15296b10d09d5701cf7fa5c Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/52108 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- M src/mem/ruby/system/Sequencer.py 1 file changed, 97 insertions(+), 77 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/src/mem/ruby/system/Sequencer.py b/src/mem/ruby/system/Sequencer.py index ee92308..50e8718 100644 --- a/src/mem/ruby/system/Sequencer.py +++ b/src/mem/ruby/system/Sequencer.py @@ -42,100 +42,100 @@ from m5.objects.ClockedObject import ClockedObject class RubyPort(ClockedObject): - type = 'RubyPort' - abstract = True - cxx_header = "mem/ruby/system/RubyPort.hh" - cxx_class = 'gem5::ruby::RubyPort' +type = 'RubyPort' +abstract = True +cxx_header = "mem/ruby/system/RubyPort.hh" +cxx_class = 'gem5::ruby::RubyPort' - version = Param.Int(0, "") +version = Param.Int(0, "") - in_ports = VectorResponsePort("CPU side of this RubyPort/Sequencer. " - "The CPU request ports should be connected to this. If a CPU " - "has multiple ports (e.g., I/D ports) all of the ports for a " - "single CPU can connect to one RubyPort.") - slave= DeprecatedParam(in_ports, -'`slave` is now called `in_ports`') +in_ports = VectorResponsePort("CPU side of this RubyPort/Sequencer. " +"The CPU request ports should be connected to this. If a CPU " +"has multiple ports (e.g., I/D ports) all of the ports for a " +"single CPU can connect to one RubyPort.") +slave = DeprecatedParam(in_ports, '`slave` is now called `in_ports`') - interrupt_out_port = VectorRequestPort("Port to connect to x86 interrupt " -"controller to send the CPU requests from outside.") - master = DeprecatedParam(interrupt_out_port, -'`master` is now called `interrupt_out_port`') +interrupt_out_port = VectorRequestPort("Port to connect to x86 interrupt " +"controller to send the CPU requests from outside.") +master = DeprecatedParam(interrupt_out_port, +'`master` is now called `interrupt_out_port`') - pio_request_port = RequestPort("Ruby pio request port") - pio_master_port = DeprecatedParam(pio_request_port, -'`pio_master_port` is now called `pio_request_port`') +pio_request_port = RequestPort("Ruby pio request port") +pio_master_port = DeprecatedParam(pio_request_port, +'`pio_master_port` is now called `pio_request_port`') - mem_request_port = RequestPort("Ruby mem request port") - mem_master_port = DeprecatedParam(mem_request_port, -'`mem_master_port` is now called `mem_request_port`') +mem_request_port = RequestPort("Ruby mem request port") +mem_master_port = DeprecatedParam(mem_request_port, +'`mem_master_port` is now called `mem_request_port`') - pio_response_port = ResponsePort("Ruby pio response port") - pio_slave_port= DeprecatedParam(pio_response_port, -'`pio_slave_port` is now called `pio_response_port`') +pio_response_port = ResponsePort("Ruby pio response port") +pio_slave_port = DeprecatedParam(pio_response_port, +'`pio_slave_port` is now called `pio_response_port`') - using_ruby_tester = Param.Bool(False, "") - no_retry_on_stall = Param.Bool(False, "") - ruby_system = Param.RubySystem(Parent.any, "") - system = Param.System(Parent.any, "system object") - support_data_reqs = Param.Bool(True, "data cache requests supported") - support_inst_reqs = Param.Bool(True, "inst cache requests supported") - is_cpu_sequencer = Param.Bool(True, "connected to a cpu") +using_ruby_tester = Param.Bool(False, "") +no_retry_on_stall = Param.Bool(False, "") +ruby_system = Param.RubySystem(Parent.any, "") +system = Param.System(Parent.any, "system object") +support_data_reqs = Param.Bool(True, "data cache requests supported") +support_inst_reqs = Param.Bool(True, "inst cache requests supported") +is_cpu_sequencer = Param.Bool(
[gem5-dev] Change in gem5/gem5[develop]: mem: Fix whitespace in mem/ruby/system/Sequencer.py.
Gabe Black has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/52108 ) Change subject: mem: Fix whitespace in mem/ruby/system/Sequencer.py. .. mem: Fix whitespace in mem/ruby/system/Sequencer.py. Some aspects of the formatting in this file were questionable, like aligning =s between adjacent lines, although not technically against the style rules as far as I know. More strangely though, the whole file used three space indents instead of the typical four. Change-Id: I7b60f1978c5b2c60a15296b10d09d5701cf7fa5c --- M src/mem/ruby/system/Sequencer.py 1 file changed, 93 insertions(+), 77 deletions(-) diff --git a/src/mem/ruby/system/Sequencer.py b/src/mem/ruby/system/Sequencer.py index ee92308..50e8718 100644 --- a/src/mem/ruby/system/Sequencer.py +++ b/src/mem/ruby/system/Sequencer.py @@ -42,100 +42,100 @@ from m5.objects.ClockedObject import ClockedObject class RubyPort(ClockedObject): - type = 'RubyPort' - abstract = True - cxx_header = "mem/ruby/system/RubyPort.hh" - cxx_class = 'gem5::ruby::RubyPort' +type = 'RubyPort' +abstract = True +cxx_header = "mem/ruby/system/RubyPort.hh" +cxx_class = 'gem5::ruby::RubyPort' - version = Param.Int(0, "") +version = Param.Int(0, "") - in_ports = VectorResponsePort("CPU side of this RubyPort/Sequencer. " - "The CPU request ports should be connected to this. If a CPU " - "has multiple ports (e.g., I/D ports) all of the ports for a " - "single CPU can connect to one RubyPort.") - slave= DeprecatedParam(in_ports, -'`slave` is now called `in_ports`') +in_ports = VectorResponsePort("CPU side of this RubyPort/Sequencer. " +"The CPU request ports should be connected to this. If a CPU " +"has multiple ports (e.g., I/D ports) all of the ports for a " +"single CPU can connect to one RubyPort.") +slave = DeprecatedParam(in_ports, '`slave` is now called `in_ports`') - interrupt_out_port = VectorRequestPort("Port to connect to x86 interrupt " -"controller to send the CPU requests from outside.") - master = DeprecatedParam(interrupt_out_port, -'`master` is now called `interrupt_out_port`') +interrupt_out_port = VectorRequestPort("Port to connect to x86 interrupt " +"controller to send the CPU requests from outside.") +master = DeprecatedParam(interrupt_out_port, +'`master` is now called `interrupt_out_port`') - pio_request_port = RequestPort("Ruby pio request port") - pio_master_port = DeprecatedParam(pio_request_port, -'`pio_master_port` is now called `pio_request_port`') +pio_request_port = RequestPort("Ruby pio request port") +pio_master_port = DeprecatedParam(pio_request_port, +'`pio_master_port` is now called `pio_request_port`') - mem_request_port = RequestPort("Ruby mem request port") - mem_master_port = DeprecatedParam(mem_request_port, -'`mem_master_port` is now called `mem_request_port`') +mem_request_port = RequestPort("Ruby mem request port") +mem_master_port = DeprecatedParam(mem_request_port, +'`mem_master_port` is now called `mem_request_port`') - pio_response_port = ResponsePort("Ruby pio response port") - pio_slave_port= DeprecatedParam(pio_response_port, -'`pio_slave_port` is now called `pio_response_port`') +pio_response_port = ResponsePort("Ruby pio response port") +pio_slave_port = DeprecatedParam(pio_response_port, +'`pio_slave_port` is now called `pio_response_port`') - using_ruby_tester = Param.Bool(False, "") - no_retry_on_stall = Param.Bool(False, "") - ruby_system = Param.RubySystem(Parent.any, "") - system = Param.System(Parent.any, "system object") - support_data_reqs = Param.Bool(True, "data cache requests supported") - support_inst_reqs = Param.Bool(True, "inst cache requests supported") - is_cpu_sequencer = Param.Bool(True, "connected to a cpu") +using_ruby_tester = Param.Bool(False, "") +no_retry_on_stall = Param.Bool(False, "") +ruby_system = Param.RubySystem(Parent.any, "") +system = Param.System(Parent.any, "system object") +support_data_reqs = Param.Bool(True, "data cache requests supported") +support_inst_reqs = Param.Bool(True, "inst cache requests supported") +is_cpu_sequencer = Param.Bool(True, "connected to a cpu") class RubyPortProxy(RubyPort): - type = 'RubyPortProxy' - cxx_header = "mem/ruby/system/RubyPortProxy.hh" - cxx_class = 'gem5::ruby::RubyPortProxy' +type = 'RubyPortProxy' +cxx_header = "mem/ruby/system/RubyPortProxy.hh" +cxx_class = 'gem5::ruby::RubyPortProxy' class RubySequencer(RubyPort): - type = 'RubySequencer' - cxx_class