From ee628e388ab354e9a32c87cfb437941480b10572 Mon Sep 17 00:00:00 2001 From: Noah Boorstin Date: Mon, 26 Apr 2021 13:24:39 -0400 Subject: [PATCH] minor busybear fixes --- wally-pipelined/regression/wally-busybear.do | 3 ++- wally-pipelined/testbench/testbench-busybear.sv | 14 -------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/wally-pipelined/regression/wally-busybear.do b/wally-pipelined/regression/wally-busybear.do index d54b817bf..a1c81617c 100644 --- a/wally-pipelined/regression/wally-busybear.do +++ b/wally-pipelined/regression/wally-busybear.do @@ -35,7 +35,8 @@ vopt +acc work.testbench -o workopt vsim workopt -suppress 8852,12070 -do ./wave-dos/peripheral-waves.do +#do ./wave-dos/peripheral-waves.do +do ./wave-dos/busybear-waves.do #-- Run the Simulation run -all diff --git a/wally-pipelined/testbench/testbench-busybear.sv b/wally-pipelined/testbench/testbench-busybear.sv index a474fc052..93ebbdd19 100644 --- a/wally-pipelined/testbench/testbench-busybear.sv +++ b/wally-pipelined/testbench/testbench-busybear.sv @@ -1,21 +1,7 @@ `include "wally-config.vh" -// *** Noah please check which way you need to fix the merge conflict. -// Ross was not sure. -// merge conflict main module testbench(); - -/* -----\/----- EXCLUDED -----\/----- - // merge conflict icache-almost-ready -package ahbliteState; - typedef enum {IDLE, MEMREAD, MEMWRITE, INSTRREAD, INSTRREADC, ATOMICREAD, ATOMICWRITE, MMUTRANSLATE} statetype; -endpackage - -module testbench_busybear(); - -----/\----- EXCLUDED -----/\----- */ - - logic clk, reset; logic [31:0] GPIOPinsIn; logic [31:0] GPIOPinsOut, GPIOPinsEn;