fixed reset fan-out

driver/opae/vlsim/opae_sim.cpp

@@ -8,7 +8,7 @@
 #define CCI_RQ_SIZE 16
 #define CCI_WQ_SIZE 16
 
-#define RESET_DELAY 1
+#define RESET_DELAY 2
 
 #define ENABLE_DRAM_STALLS
 #define DRAM_LATENCY 24
@@ -38,8 +38,10 @@ opae_sim::opae_sim() {
   trace_->open("trace.vcd");
 #endif
 
+  // reset the device
   this->reset();
 
+  // launch execution thread
   stop_ = false;
   future_ = std::async(std::launch::async, [&]{                   
       while (!stop_) {
@@ -140,7 +142,15 @@ void opae_sim::reset() {
 
   vortex_afu_->reset = 0;
 
-  reset_time_ = timestamp; 
+  for (int i = 0; i < RESET_DELAY; ++i) {
+    vortex_afu_->clk = 0;
+    this->eval();
+    vortex_afu_->clk = 1;
+    this->eval();
+  }  
+  
+  // Turn on assertion after reset
+  Verilated::assertOn(true);
 }
 
 void opae_sim::step() {
@@ -154,11 +164,6 @@ void opae_sim::step() {
   vortex_afu_->clk = 1;
   this->eval();
 
-  if ((timestamp - reset_time_) == (RESET_DELAY*2)) {
-    // Turn on assertion after reset
-    Verilated::assertOn(true);
-  }
-
 #ifndef NDEBUG
   fflush(stdout);
 #endif

driver/opae/vlsim/opae_sim.h

@@ -85,8 +85,6 @@ private:
 
   std::mutex mutex_;
 
-  uint64_t reset_time_;
-
   RAM ram_;
   Vvortex_afu_shim *vortex_afu_;
 #ifdef VCD_OUTPUT

driver/tests/dogfood/Makefile

@@ -8,7 +8,7 @@ VX_CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++
 VX_DP  = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-objdump
 VX_CP  = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-objcopy
 
-VX_CFLAGS += -march=rv32imf -mabi=ilp32f -O3 -Wl,-Bstatic,-T,$(VORTEX_RT_PATH)/linker/vx_link.ld -nostartfiles -Wl,--gc-sections
+VX_CFLAGS += -march=rv32imf -mabi=ilp32f -O3 -Wstack-usage=1024 -Wl,-Bstatic,-T,$(VORTEX_RT_PATH)/linker/vx_link.ld -nostartfiles -Wl,--gc-sections,-Map,kernel.map
 VX_CFLAGS += -I$(VORTEX_RT_PATH)/include
 
 VX_LDFLAGS += $(VORTEX_RT_PATH)/libvortexrt.a
@@ -28,7 +28,7 @@ SRCS = dogfood.cpp
 all: $(PROJECT) kernel.bin kernel.dump
  
 kernel.dump: kernel.elf
-	$(VX_DP) -D kernel.elf > kernel.dump
+	$(VX_DP) -d -r -t kernel.elf > kernel.dump
 
 kernel.bin: kernel.elf
 	$(VX_CP) -O binary kernel.elf kernel.bin