From 720e6aac7a426377f49bce34ebaac7291cb48dac Mon Sep 17 00:00:00 2001 From: Joe Gross Date: Fri, 27 Apr 2018 19:50:44 -0400 Subject: [PATCH] configs: add option to set the timeouts for the TCPs and SQCs Change-Id: Icff2bd0237ddcc0d21db17208df8e53ff6f43e86 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28129 Reviewed-by: Matt Sinclair Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- configs/ruby/GPU_RfO.py | 15 +++++++++++++++ configs/ruby/GPU_VIPER.py | 16 ++++++++++++++++ configs/ruby/GPU_VIPER_Baseline.py | 17 +++++++++++++++++ configs/ruby/GPU_VIPER_Region.py | 15 +++++++++++++++ 4 files changed, 63 insertions(+) diff --git a/configs/ruby/GPU_RfO.py b/configs/ruby/GPU_RfO.py index cf2fdbd82..26bea0c8f 100644 --- a/configs/ruby/GPU_RfO.py +++ b/configs/ruby/GPU_RfO.py @@ -168,6 +168,11 @@ class TCPCntrl(TCP_Controller, CntrlBase): self.coalescer.max_outstanding_requests = options.simds_per_cu * \ options.wfs_per_simd * \ options.wf_size + if options.tcp_deadlock_threshold: + self.coalescer.deadlock_threshold = \ + options.tcp_deadlock_threshold + self.coalescer.max_coalesces_per_cycle = \ + options.max_coalesces_per_cycle self.sequencer = RubySequencer() self.sequencer.version = self.seqCount() @@ -240,6 +245,10 @@ class SQCCntrl(SQC_Controller, CntrlBase): self.sequencer.support_data_reqs = False self.sequencer.is_cpu_sequencer = False + if options.sqc_deadlock_threshold: + self.sequencer.deadlock_threshold = \ + options.sqc_deadlock_threshold + self.ruby_system = ruby_system if options.recycle_latency: @@ -416,6 +425,8 @@ def define_options(parser): help="number of TCC directories and banks in the GPU") parser.add_option("--TCP_latency", type="int", default=4, help="TCP latency") + parser.add_option("--tcp-deadlock-threshold", type='int', + help="Set the TCP deadlock threshold to some value") parser.add_option("--TCC_latency", type="int", default=16, help="TCC latency") parser.add_option("--tcc-size", type='string', default='256kB', @@ -424,6 +435,10 @@ def define_options(parser): help="tcp size") parser.add_option("--tcc-dir-factor", type='int', default=4, help="TCCdir size = factor *(TCPs + TCC)") + parser.add_option("--sqc-deadlock-threshold", type='int', + help="Set the SQC deadlock threshold to some value") + parser.add_option("--max-coalesces-per-cycle", type="int", default=1, + help="Maximum insts that may coalesce in a cycle"); def create_system(options, full_system, system, dma_devices, bootmem, ruby_system): diff --git a/configs/ruby/GPU_VIPER.py b/configs/ruby/GPU_VIPER.py index 71238ae6a..f4ecc414d 100644 --- a/configs/ruby/GPU_VIPER.py +++ b/configs/ruby/GPU_VIPER.py @@ -153,6 +153,11 @@ class TCPCntrl(TCP_Controller, CntrlBase): self.coalescer.ruby_system = ruby_system self.coalescer.support_inst_reqs = False self.coalescer.is_cpu_sequencer = False + if options.tcp_deadlock_threshold: + self.coalescer.deadlock_threshold = \ + options.tcp_deadlock_threshold + self.coalescer.max_coalesces_per_cycle = \ + options.max_coalesces_per_cycle self.sequencer = RubySequencer() self.sequencer.version = self.seqCount() @@ -227,6 +232,9 @@ class SQCCntrl(SQC_Controller, CntrlBase): self.sequencer.ruby_system = ruby_system self.sequencer.support_data_reqs = False self.sequencer.is_cpu_sequencer = False + if options.sqc_deadlock_threshold: + self.sequencer.deadlock_threshold = \ + options.sqc_deadlock_threshold self.ruby_system = ruby_system @@ -370,6 +378,9 @@ def define_options(parser): help = "SQC cache size") parser.add_option("--sqc-assoc", type = 'int', default = 8, help = "SQC cache assoc") + parser.add_option("--sqc-deadlock-threshold", type='int', + help="Set the SQC deadlock threshold to some value") + parser.add_option("--WB_L1", action = "store_true", default = False, help = "writeback L1") parser.add_option("--WB_L2", action = "store_true", default = False, @@ -386,6 +397,11 @@ def define_options(parser): help = "tcp size") parser.add_option("--tcp-assoc", type = 'int', default = 16, help = "tcp assoc") + parser.add_option("--tcp-deadlock-threshold", type='int', + help="Set the TCP deadlock threshold to some value") + parser.add_option("--max-coalesces-per-cycle", type="int", default=1, + help="Maximum insts that may coalesce in a cycle"); + parser.add_option("--noL1", action = "store_true", default = False, help = "bypassL1") diff --git a/configs/ruby/GPU_VIPER_Baseline.py b/configs/ruby/GPU_VIPER_Baseline.py index 5f3199021..46fdec9a3 100644 --- a/configs/ruby/GPU_VIPER_Baseline.py +++ b/configs/ruby/GPU_VIPER_Baseline.py @@ -153,6 +153,11 @@ class TCPCntrl(TCP_Controller, CntrlBase): self.coalescer.ruby_system = ruby_system self.coalescer.support_inst_reqs = False self.coalescer.is_cpu_sequencer = False + if options.tcp_deadlock_threshold: + self.coalescer.deadlock_threshold = \ + options.tcp_deadlock_threshold + self.coalescer.max_coalesces_per_cycle = \ + options.max_coalesces_per_cycle self.sequencer = RubySequencer() self.sequencer.version = self.seqCount() @@ -192,6 +197,10 @@ class SQCCntrl(SQC_Controller, CntrlBase): self.sequencer.ruby_system = ruby_system self.sequencer.support_data_reqs = False self.sequencer.is_cpu_sequencer = False + if options.sqc_deadlock_threshold: + self.sequencer.deadlock_threshold = \ + options.sqc_deadlock_threshold + self.ruby_system = ruby_system if options.recycle_latency: self.recycle_latency = options.recycle_latency @@ -343,6 +352,9 @@ def define_options(parser): help = "SQC cache size") parser.add_option("--sqc-assoc", type = 'int', default = 8, help = "SQC cache assoc") + parser.add_option("--sqc-deadlock-threshold", type='int', + help="Set the SQC deadlock threshold to some value") + parser.add_option("--region-dir-entries", type = "int", default = 8192) parser.add_option("--dir-tag-latency", type = "int", default = 8) parser.add_option("--dir-tag-banks", type = "int", default = 4) @@ -364,6 +376,11 @@ def define_options(parser): help = "tcc assoc") parser.add_option("--tcp-size", type = 'string', default = '16kB', help = "tcp size") + parser.add_option("--tcp-deadlock-threshold", type='int', + help="Set the TCP deadlock threshold to some value") + parser.add_option("--max-coalesces-per-cycle", type="int", default=1, + help="Maximum insts that may coalesce in a cycle"); + parser.add_option("--sampler-sets", type = "int", default = 1024) parser.add_option("--sampler-assoc", type = "int", default = 16) parser.add_option("--sampler-counter", type = "int", default = 512) diff --git a/configs/ruby/GPU_VIPER_Region.py b/configs/ruby/GPU_VIPER_Region.py index 47517a19e..7b1540314 100644 --- a/configs/ruby/GPU_VIPER_Region.py +++ b/configs/ruby/GPU_VIPER_Region.py @@ -154,6 +154,11 @@ class TCPCntrl(TCP_Controller, CntrlBase): self.coalescer.ruby_system = ruby_system self.coalescer.support_inst_reqs = False self.coalescer.is_cpu_sequencer = False + if options.tcp_deadlock_threshold: + self.coalescer.deadlock_threshold = \ + options.tcp_deadlock_threshold + self.coalescer.max_coalesces_per_cycle = \ + options.max_coalesces_per_cycle self.sequencer = RubySequencer() self.sequencer.version = self.seqCount() @@ -193,6 +198,10 @@ class SQCCntrl(SQC_Controller, CntrlBase): self.sequencer.ruby_system = ruby_system self.sequencer.support_data_reqs = False self.sequencer.is_cpu_sequencer = False + if options.sqc_deadlock_threshold: + self.sequencer.deadlock_threshold = \ + options.sqc_deadlock_threshold + self.ruby_system = ruby_system if options.recycle_latency: self.recycle_latency = options.recycle_latency @@ -405,6 +414,8 @@ def define_options(parser): help="SQC cache size") parser.add_option("--sqc-assoc", type='int', default=8, help="SQC cache assoc") + parser.add_option("--sqc-deadlock-threshold", type='int', + help="Set the SQC deadlock threshold to some value") parser.add_option("--WB_L1", action="store_true", default=False, help="L2 Writeback Cache") @@ -420,6 +431,10 @@ def define_options(parser): help="tcc assoc") parser.add_option("--tcp-size", type='string', default='16kB', help="tcp size") + parser.add_option("--tcp-deadlock-threshold", type='int', + help="Set the TCP deadlock threshold to some value") + parser.add_option("--max-coalesces-per-cycle", type="int", default=1, + help="Maximum insts that may coalesce in a cycle"); parser.add_option("--dir-tag-latency", type="int", default=4) parser.add_option("--dir-tag-banks", type="int", default=4) -- 2.30.2