From 9a48dc9a50a129456f1091a2d3b92aa4fefc7061 Mon Sep 17 00:00:00 2001 From: Tianrui Wei Date: Thu, 20 Apr 2023 16:15:28 -0700 Subject: [PATCH] fix: address comments Signed-off-by: Tianrui Wei --- .../src/main/resources/csrc/cospike.cc | 44 +------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/generators/chipyard/src/main/resources/csrc/cospike.cc b/generators/chipyard/src/main/resources/csrc/cospike.cc index fdd3978f16..246b07cdef 100644 --- a/generators/chipyard/src/main/resources/csrc/cospike.cc +++ b/generators/chipyard/src/main/resources/csrc/cospike.cc @@ -295,25 +295,6 @@ extern "C" void cospike_cosim(long long int cycle, auto& mem_read = s->log_mem_read; -<<<<<<< HEAD - 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) { - s->mip->backdoor_write_with_mask(MIP_MSIP, 0); -||||||| constructed merge base - 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) { - s->mip->backdoor_write_with_mask(MIP_MSIP, 0); - } - // Try to remember magic_mem addrs, and ignore these in the future - if ( waddr == tohost_addr && w_data >= info->mem0_base && w_data < (info->mem0_base + info->mem0_size)) { - printf("Probable magic mem %lx\n", w_data); - magic_addrs.insert(w_data); - } -======= for (auto memwrite : mem_write) { reg_t waddr = std::get<0>(memwrite); uint64_t w_data = std::get<1>(memwrite); @@ -325,7 +306,6 @@ extern "C" void cospike_cosim(long long int cycle, printf("Probable magic mem %lx\n", w_data); magic_addrs.insert(w_data); } ->>>>>>> fix: address comments } // Try to remember magic_mem addrs, and ignore these in the future if ( waddr == tohost_addr && w_data >= info->mem0_base && w_data < (info->mem0_base + info->mem0_size)) { @@ -399,29 +379,9 @@ extern "C" void cospike_cosim(long long int cycle, } } - } - } - -<<<<<<< HEAD - if (scalar_wb ^ has_wdata) { - printf("Scalar behavior divergence between spike and DUT\n"); - exit(-1); -||||||| constructed merge base - if (vector_wb ^ has_vwdata) { - printf("vector behavior divergence between spike and DUT\n"); - exit(-1); - } -#ifdef SPIKE_DEBUG - if (vector_wb) { - printf("vector_cnt = %x\n", vector_cnt); - printf("vector_pre = %x\n", vector_pre); - } -#endif -======= - if (vector_wb ^ has_vwdata) { - printf("vector behavior divergence between spike and DUT\n"); + if (scalar_wb ^ has_wdata) { + printf("Scalar behavior divergence between spike and DUT\n"); exit(-1); } ->>>>>>> fix: address comments } }