diff options
| -rw-r--r-- | configs/example/ruby_direct_test.py | 18 | ||||
| -rw-r--r-- | src/cpu/testers/directedtest/RubyDirectedTester.py | 4 | ||||
| -rw-r--r-- | src/cpu/testers/directedtest/SeriesRequestGenerator.cc | 10 | ||||
| -rw-r--r-- | src/cpu/testers/directedtest/SeriesRequestGenerator.hh | 2 |
4 files changed, 21 insertions, 13 deletions
diff --git a/configs/example/ruby_direct_test.py b/configs/example/ruby_direct_test.py index 1fcad30a9..170e774dc 100644 --- a/configs/example/ruby_direct_test.py +++ b/configs/example/ruby_direct_test.py @@ -52,16 +52,17 @@ parser.add_option("-l", "--requests", metavar="N", default=100, help="Stop after N requests") parser.add_option("-f", "--wakeup_freq", metavar="N", default=10, help="Wakeup every N cycles") -parser.add_option("--test-type", type="string", default="SeriesGetx", - help="SeriesGetx|SeriesGets|Invalidate") +parser.add_option("--test-type", type="choice", default="SeriesGetx", + choices = ["SeriesGetx", "SeriesGets", "SeriesGetMixed", + "Invalidate"], + help = "Type of test") +parser.add_option("--percent-writes", type="int", default=100, + help="percentage of accesses that should be writes") # # Add the ruby specific and protocol specific options # Ruby.define_options(parser) - -execfile(os.path.join(config_root, "common", "Options.py")) - (options, args) = parser.parse_args() if args: @@ -73,10 +74,13 @@ if args: # if options.test_type == "SeriesGetx": generator = SeriesRequestGenerator(num_cpus = options.num_cpus, - issue_writes = True) + percent_writes = 100) elif options.test_type == "SeriesGets": generator = SeriesRequestGenerator(num_cpus = options.num_cpus, - issue_writes = False) + percent_writes = 0) +elif options.test_type == "SeriesGetMixed": + generator = SeriesRequestGenerator(num_cpus = options.num_cpus, + percent_writes = options.percent_writes) elif options.test_type == "Invalidate": generator = InvalidateGenerator(num_cpus = options.num_cpus) else: diff --git a/src/cpu/testers/directedtest/RubyDirectedTester.py b/src/cpu/testers/directedtest/RubyDirectedTester.py index f6a625735..df1205659 100644 --- a/src/cpu/testers/directedtest/RubyDirectedTester.py +++ b/src/cpu/testers/directedtest/RubyDirectedTester.py @@ -42,7 +42,9 @@ class SeriesRequestGenerator(DirectedGenerator): type = 'SeriesRequestGenerator' cxx_header = "cpu/testers/directedtest/SeriesRequestGenerator.hh" addr_increment_size = Param.Int(64, "address increment size") - issue_writes = Param.Bool(True, "issue writes if true, otherwise reads") + num_series = Param.UInt32(1, + "number of different address streams to generate") + percent_writes = Param.Percent(50, "percent of access that are writes") class InvalidateGenerator(DirectedGenerator): type = 'InvalidateGenerator' diff --git a/src/cpu/testers/directedtest/SeriesRequestGenerator.cc b/src/cpu/testers/directedtest/SeriesRequestGenerator.cc index abcb0278f..f4bb578e3 100644 --- a/src/cpu/testers/directedtest/SeriesRequestGenerator.cc +++ b/src/cpu/testers/directedtest/SeriesRequestGenerator.cc @@ -33,13 +33,13 @@ #include "debug/DirectedTest.hh" SeriesRequestGenerator::SeriesRequestGenerator(const Params *p) - : DirectedGenerator(p) + : DirectedGenerator(p), + m_addr_increment_size(p->addr_increment_size), + m_percent_writes(p->percent_writes) { m_status = SeriesRequestGeneratorStatus_Thinking; m_active_node = 0; m_address = 0x0; - m_addr_increment_size = p->addr_increment_size; - m_issue_writes = p->issue_writes; } SeriesRequestGenerator::~SeriesRequestGenerator() @@ -60,11 +60,13 @@ SeriesRequestGenerator::initiate() Request *req = new Request(m_address, 1, flags, masterId); Packet::Command cmd; - if (m_issue_writes) { + bool do_write = ((random() % 100) < m_percent_writes); + if (do_write) { cmd = MemCmd::WriteReq; } else { cmd = MemCmd::ReadReq; } + PacketPtr pkt = new Packet(req, cmd); uint8_t* dummyData = new uint8_t; *dummyData = 0; diff --git a/src/cpu/testers/directedtest/SeriesRequestGenerator.hh b/src/cpu/testers/directedtest/SeriesRequestGenerator.hh index 9b1c3e8ba..944a179cb 100644 --- a/src/cpu/testers/directedtest/SeriesRequestGenerator.hh +++ b/src/cpu/testers/directedtest/SeriesRequestGenerator.hh @@ -56,7 +56,7 @@ class SeriesRequestGenerator : public DirectedGenerator Addr m_address; uint32_t m_active_node; uint32_t m_addr_increment_size; - bool m_issue_writes; + uint32_t m_percent_writes; }; #endif //__CPU_DIRECTEDTEST_SERIESREQUESTGENERATOR_HH__ |