riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

randomize coreid mapping

Browse Source
This commit is contained in:
Andrew Waterman 2013-01-26 16:13:14 -08:00
parent 4077b22929
commit dbb61306f0
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
csrc/emulator.cc
View File

@ -29,7 +29,6 @@ int main(int argc, char** argv)
const char* failure = NULL; const char* failure = NULL;
disassembler disasm; disassembler disasm;
bool dramsim2 = false; bool dramsim2 = false;
std::vector<std::string> target_args;
for (int i = 1; i < argc; i++) for (int i = 1; i < argc; i++)
{ {
@ -46,19 +45,6 @@ int main(int argc, char** argv)
max_cycles = atoll(argv[i]+12); max_cycles = atoll(argv[i]+12);
else if (arg.substr(0, 9) == "+loadmem=") else if (arg.substr(0, 9) == "+loadmem=")
loadmem = argv[i]+9; loadmem = argv[i]+9;
else if (arg.substr(0, 1) != "-" || arg.substr(0, 1) != "+")
target_args = std::vector<std::string>(argv + i, argv + argc);
else
{
fprintf(stderr, "unknown option: %s\n", argv[i]);
exit(1);
}
}
if (target_args.empty())
{
fprintf(stderr, "usage: %s [host options] <target program> [target args]\n", argv[0]);
exit(1);
} }
const int disasm_len = 24; const int disasm_len = 24;
@ -85,7 +71,7 @@ int main(int argc, char** argv)
tile.init(random_seed != 0); tile.init(random_seed != 0);
// Instantiate HTIF // Instantiate HTIF
htif = new htif_emulator_t(target_args); htif = new htif_emulator_t(std::vector<std::string>(argv + 1, argv + argc));
int htif_bits = tile.Top__io_host_in_bits.width(); int htif_bits = tile.Top__io_host_in_bits.width();
assert(htif_bits % 8 == 0 && htif_bits <= val_n_bits()); assert(htif_bits % 8 == 0 && htif_bits <= val_n_bits());

6
emulator/Makefile
View File

@ -69,13 +69,13 @@ output:
mkdir -p $@ mkdir -p $@
output/%.run: output/%.hex emulator output/%.run: output/%.hex emulator
./emulator +dramsim +max-cycles=3000000 +loadmem=$< none 2> /dev/null ./emulator +dramsim +max-cycles=3000000 +coremap-random +loadmem=$< none 2> /dev/null
output/%.out: output/%.hex emulator output/%.out: output/%.hex emulator
./emulator +dramsim +max-cycles=3000000 +verbose +loadmem=$< none 2> $@ ./emulator +dramsim +max-cycles=3000000 +verbose +coremap-random +loadmem=$< none 2> $@
output/%.vpd: output/%.hex emulator-debug output/%.vpd: output/%.hex emulator-debug
./emulator-debug +dramsim +max-cycles=3000000 +verbose -v- +loadmem=$< none 2> $(patsubst %.vpd,%.out,$@) | vcd2vpd - $@ > /dev/null && [ $$PIPESTATUS -eq 0 ] ./emulator-debug +dramsim +max-cycles=3000000 +verbose -v- +coremap-random +loadmem=$< none 2> $(patsubst %.vpd,%.out,$@) | vcd2vpd - $@ > /dev/null && [ $$PIPESTATUS -eq 0 ]
run-asm-tests: $(addprefix output/, $(addsuffix .out, $(global_asm_tests) $(global_asm_vm_tests))) run-asm-tests: $(addprefix output/, $(addsuffix .out, $(global_asm_tests) $(global_asm_vm_tests)))
@echo; perl -ne 'print " [$$1] $$ARGV \t$$2\n" if /\*{3}(.{8})\*{3}(.*)/' $^; echo; @echo; perl -ne 'print " [$$1] $$ARGV \t$$2\n" if /\*{3}(.{8})\*{3}(.*)/' $^; echo;