45a46
> #include <fstream>
50,56d50
< #include "cpu/testers/traffic_gen/dram_gen.hh"
< #include "cpu/testers/traffic_gen/dram_rot_gen.hh"
< #include "cpu/testers/traffic_gen/exit_gen.hh"
< #include "cpu/testers/traffic_gen/idle_gen.hh"
< #include "cpu/testers/traffic_gen/linear_gen.hh"
< #include "cpu/testers/traffic_gen/random_gen.hh"
< #include "cpu/testers/traffic_gen/trace_gen.hh"
186,187c180
< states[id].reset(new TraceGen(name(), masterID, duration,
< traceFile, addrOffset));
---
> states[id] = createTrace(duration, traceFile, addrOffset);
190c183
< states[id].reset(new IdleGen(name(), masterID, duration));
---
> states[id] = createIdle(duration);
193c186
< states[id].reset(new ExitGen(name(), masterID, duration));
---
> states[id] = createExit(duration);
214,224d206
< if (blocksize > system->cacheLineSize())
< fatal("TrafficGen %s block size (%d) is larger than "
< "cache line size (%d)\n", name(),
< blocksize, system->cacheLineSize());
<
< if (read_percent > 100)
< fatal("%s cannot have more than 100% reads", name());
<
< if (min_period > max_period)
< fatal("%s cannot have min_period > max_period", name());
<
226,230c208,211
< states[id].reset(new LinearGen(name(), masterID,
< duration, start_addr,
< end_addr, blocksize,
< min_period, max_period,
< read_percent, data_limit));
---
> states[id] = createLinear(duration, start_addr,
> end_addr, blocksize,
> min_period, max_period,
> read_percent, data_limit);
233,237c214,217
< states[id].reset(new RandomGen(name(), masterID,
< duration, start_addr,
< end_addr, blocksize,
< min_period, max_period,
< read_percent, data_limit));
---
> states[id] = createRandom(duration, start_addr,
> end_addr, blocksize,
> min_period, max_period,
> read_percent, data_limit);
258,262d237
< if (nbr_of_banks_util > nbr_of_banks_DRAM)
< fatal("Attempting to use more banks (%d) than "
< "what is available (%d)\n",
< nbr_of_banks_util, nbr_of_banks_DRAM);
<
275,284c250,258
< states[id].reset(new DramGen(name(), masterID,
< duration, start_addr,
< end_addr, blocksize,
< min_period, max_period,
< read_percent, data_limit,
< num_seq_pkts, page_size,
< nbr_of_banks_DRAM,
< nbr_of_banks_util,
< addr_mapping,
< nbr_of_ranks));
---
> states[id] = createDram(duration, start_addr,
> end_addr, blocksize,
> min_period, max_period,
> read_percent, data_limit,
> num_seq_pkts, page_size,
> nbr_of_banks_DRAM,
> nbr_of_banks_util,
> addr_mapping,
> nbr_of_ranks);
295,305c269,279
< states[id].reset(new DramRotGen(name(), masterID,
< duration, start_addr,
< end_addr, blocksize,
< min_period, max_period,
< read_percent, data_limit,
< num_seq_pkts, page_size,
< nbr_of_banks_DRAM,
< nbr_of_banks_util,
< addr_mapping,
< nbr_of_ranks,
< max_seq_count_per_rank));
---
> states[id] = createDramRot(duration, start_addr,
> end_addr, blocksize,
> min_period, max_period,
> read_percent,
> data_limit,
> num_seq_pkts, page_size,
> nbr_of_banks_DRAM,
> nbr_of_banks_util,
> addr_mapping,
> nbr_of_ranks,
> max_seq_count_per_rank);