misc: many fixes to cospike #1450
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Tianrui Wei <tianrui@tianruiwei.com>
tianrui-wei
force-pushed
the
cospike-rebase
branch
from
17ab040
to
91ccc7b
Compare
jerryz123
reviewed
Apr 20, 2023
| @@ -87,7 +94,7 @@ extern "C" void cospike_cosim(long long int cycle, | |||
| nullptr, | |||
| info->isa.c_str(), | |||
| "MSU", | |||
| "vlen:128,elen:64", | |||
| "vlen:512,elen:64", | |||
There was a problem hiding this comment.
Remove this for now, we need a API to pass from thhe chisel the vlen (you can implement this in this PR if you want)
jerryz123
reviewed
Apr 20, 2023
| @@ -104,6 +111,27 @@ extern "C" void cospike_cosim(long long int cycle, | |||
| uint64_t default_boot_addr = 0x80000000; | |||
| boot_addr_reg->store(0, 8, (const uint8_t*)(&default_boot_addr)); | |||
|
|
|||
| for (auto& mem : mems) { | |||
| if (mem.first == info->mem0_base) { | |||
| std::string path_name = "chipyard-cosim-" + std::to_string(getpid()); | |||
There was a problem hiding this comment.
Remove the memory matching stuff, this needs the SimDRAM memory channel dupllication issue to be fixed.
jerryz123
reviewed
Apr 20, 2023
| } | ||
| printf("\n"); | ||
| } | ||
| if (valid || raise_interrupt || raise_exception) { | ||
| p->step(1); | ||
| #ifdef SPIKE_DEBUG |
jerryz123
reviewed
Apr 20, 2023
| printf("%d PC mismatch spike:%lx != dut:%lx\n", cycle, s_pc, iaddr); | ||
| printf("%d PC mismatch spike %llx != DUT %llx\n", cycle, s_pc, iaddr); | ||
| #ifdef SPIKE_DEBUG | ||
| printf("spike mstatus is %lx\n", s->mstatus->read()); |
There was a problem hiding this comment.
Use runtime flags, not compile-time
jerryz123
reviewed
Apr 20, 2023
| for (auto memwrite : mem_write) { | ||
| reg_t waddr = std::get<0>(memwrite); | ||
| uint64_t w_data = std::get<1>(memwrite); | ||
| if (waddr == CLINT_BASE && w_data == 0) { |
There was a problem hiding this comment.
I don't think CLINT_BASE is right, as it assumes hartid=0. Shouldn't it calculate the hartid based on address?
jerryz123
reviewed
Apr 20, 2023
|
|
||
| for (auto ®write : log) { | ||
|
|
||
| // if (regwrite.first == 0) continue; |
jerryz123
reviewed
Apr 20, 2023
| bool ignore_read = (!mem_read.empty() && | ||
| ((magic_addrs.count(mem_read_addr) || | ||
| (tohost_addr && mem_read_addr == tohost_addr) || | ||
| (fromhost_addr && mem_read_addr == fromhost_addr) || |
There was a problem hiding this comment.
Nit: fix the alignment here.
Signed-off-by: Tianrui Wei <tianrui@tianruiwei.com>
jerryz123
reviewed
Apr 20, 2023
|
|
||
|
|
||
| <<<<<<< HEAD | ||
| for (auto memwrite : mem_write) { |
jerryz123
reviewed
Apr 20, 2023
|
|
||
| <<<<<<< HEAD | ||
| if (scalar_wb ^ has_wdata) { |
jerryz123
reviewed
Apr 20, 2023
|
|
||
| auto& mem_write = s->log_mem_write; | ||
| auto& log = s->log_reg_write; | ||
| auto& mem_read = s->log_mem_read; |
tianrui-wei
force-pushed
the
cospike-rebase
branch
from
9a48dc9
to
bb73c9f
Compare
Signed-off-by: Tianrui Wei <tianrui@tianruiwei.com>
tianrui-wei
force-pushed
the
cospike-rebase
branch
from
bb73c9f
to
64e8f33
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related PRs / Issues:
Type of change:
Impact:
Contributor Checklist:
mainas the base branch?changelog:<topic>label?changelog:label?.conda-lock.ymlfile if you updated the conda requirements file?Please Backport?