Merge branch 'main' of github.com:davidharrishmc/riscv-wally into main

pipelined/regression/regression-wally

@@ -110,6 +110,15 @@ for test in tests32e:
         grepstr="All tests ran without failures")
   configs.append(tc)
 
+ahbTests = [("0", "0"), ("0", "1"), ("1", "0"), ("1", "1"), ("2", "0"), ("2", "1")] 
+for test in ahbTests:
+  tc = TestCase(
+        name="ram_latency_" + test[0] + "_burst_en_" + test[1],
+        variant="ahb",
+        cmd="vsim > {} -c <<!\ndo wally-pipelined-batch.do rv64gc ahb "+test[0]+" "+test[1]+"\n!",
+        grepstr="All tests ran without failures")
+  configs.append(tc)
+  
 
 import os
 from multiprocessing import Pool, TimeoutError

pipelined/regression/wally-pipelined-batch.do

@@ -20,11 +20,17 @@
 onbreak {resume}
 
 # create library
-if [file exists wkdir/work_${1}_${2}] {
-    vdel -lib wkdir/work_${1}_${2} -all
+if {$2 eq "ahb"} {
+    if [file exists wkdir/work_${1}_${2}_${3}_${4}] {
+        vdel -lib wkdir/work_${1}_${2}_${3}_${4} -all
+    }
+    vlib wkdir/work_${1}_${2}_${3}_${4}
+} else {
+    if [file exists wkdir/work_${1}_${2}] {
+        vdel -lib wkdir/work_${1}_${2} -all
+    }
+    vlib wkdir/work_${1}_${2}
 }
-vlib wkdir/work_${1}_${2}
-
 # compile source files
 # suppress spurious warnngs about 
 # "Extra checking for conflicts with always_comb done at vopt time"
@@ -55,6 +61,20 @@ if {$2 eq "buildroot" || $2 eq "buildroot-checkpoint"} {
     run -all
     exec ./slack-notifier/slack-notifier.py
 
+} elseif {$2 eq "ahb"} {
+    vlog -lint -work wkdir/work_${1}_${2}_${3}_${4} +incdir+../config/$1 +incdir+../config/shared ../testbench/testbench.sv ../testbench/common/*.sv   ../src/*/*.sv ../src/*/*/*.sv -suppress 2583 -suppress 7063,2596  +define+RAM_LATENCY=$3 +define+BURST_EN=$4
+    # start and run simulation
+    # remove +acc flag for faster sim during regressions if there is no need to access internal signals
+    vopt wkdir/work_${1}_${2}_${3}_${4}.testbench -work wkdir/work_${1}_${2}_${3}_${4} -G TEST=$2 -o testbenchopt
+    vsim -lib wkdir/work_${1}_${2}_${3}_${4} testbenchopt  -fatal 7
+    # Adding coverage increases runtime from 2:00 to 4:29.  Can't run it all the time
+    #vopt work_$2.testbench -work work_$2 -o workopt_$2 +cover=sbectf
+    #vsim -coverage -lib work_$2 workopt_$2
+
+    # power add generates the logging necessary for said generation.
+    # power add -r /dut/core/*
+    run -all
+    # power off -r /dut/core/*
 } else {
     vlog -lint -work wkdir/work_${1}_${2} +incdir+../config/$1 +incdir+../config/shared ../testbench/testbench.sv ../testbench/common/*.sv   ../src/*/*.sv ../src/*/*/*.sv -suppress 2583 -suppress 7063,2596
     # start and run simulation

pipelined/regression/wally-pipelined.do

@@ -76,7 +76,11 @@ if {$2 eq "buildroot" || $2 eq "buildroot-checkpoint"} {
     run 20 ms
 
 } else {
-    vlog +incdir+../config/$1 +incdir+../config/shared ../testbench/testbench.sv ../testbench/common/*.sv   ../src/*/*.sv ../src/*/*/*.sv -suppress 2583 -suppress 7063
+    if {$2 eq "ahb"} {
+        vlog +incdir+../config/$1 +incdir+../config/shared ../testbench/testbench.sv ../testbench/common/*.sv   ../src/*/*.sv ../src/*/*/*.sv -suppress 2583 -suppress 7063 +define+RAM_LATENCY=$3 +define+BURST_EN=$4
+    } else {
+        vlog +incdir+../config/$1 +incdir+../config/shared ../testbench/testbench.sv ../testbench/common/*.sv   ../src/*/*.sv ../src/*/*/*.sv -suppress 2583 -suppress 7063
+    }
     vopt +acc work.testbench -G TEST=$2 -G DEBUG=1 -o workopt 
 
     vsim workopt +nowarn3829  -fatal 7

pipelined/testbench/testbench.sv

@@ -104,6 +104,7 @@ logic [3:0] dummy;
         "wally64periph":                  tests = wally64periph;
         "coremark":                       tests = coremark;
         "fpga":                           tests = fpga;
+        "ahb" :                           tests = ahb;
       endcase 
     end else begin // RV32
       case (TEST)

pipelined/testbench/tests.vh

@@ -1917,3 +1917,8 @@ string imperas32f[] = '{
     `WALLYTEST,
     "NULL"
  };
+
+ string ahb[] = '{
+    `RISCVARCHTEST,
+    "rv64i_m/F/src/fadd_b11-01.S"
+ };