Merge branch 'main' of https://github.com/openhwgroup/cvw into dev

bin/CModelBTBAccuracy.sh

@@ -52,6 +52,6 @@ do
     # with such long precision bc outputs onto multiple lines
     # must remove \n and \ from string
     Product=`echo "$Product" | tr -d '\n' | tr -d '\\\'`
-    GeoMean=`perl -E "say $Product**(1/$Count)"`
+    GeoMean=`perl -E "say $Product**(1/$Count) * 100"`
     echo "$Pred$Size $GeoMean"
 done

bin/SeparateBranch.sh

@@ -43,7 +43,8 @@ TrainLineNumberArray=($TrainLineNumbers)
 BeginLineNumberArray=($BeginLineNumbers)
 EndLineNumberArray=($EndLineNumbers)
 
-mkdir -p branch
+OutputPath=${File%%.*}
+mkdir -p $OutputPath
 Length=${#EndLineNumberArray[@]}
 for i in $(seq 0 1 $((Length-1)))
 do
@@ -51,5 +52,5 @@ do
     CurrTrain=$((${TrainLineNumberArray[$i]}+1))
     CurrEnd=$((${EndLineNumberArray[$i]}-1))
     echo $CurrName, $CurrTrain, $CurrEnd
-    sed -n "${CurrTrain},${CurrEnd}p" $File > branch/${CurrName}_branch.log
+    sed -n "${CurrTrain},${CurrEnd}p" $File > $OutputPath/${CurrName}_${File}
 done

bin/parseHPMC.py

@@ -32,10 +32,12 @@ import math
 import numpy as np
 import argparse
 
-RefData = [('twobitCModel6', 'twobitCModel', 64, 9.65280765420711), ('twobitCModel8', 'twobitCModel', 256, 8.75120245829945), ('twobitCModel10', 'twobitCModel', 1024, 8.1318382397263),
+RefDataBP = [('twobitCModel6', 'twobitCModel', 64, 9.65280765420711), ('twobitCModel8', 'twobitCModel', 256, 8.75120245829945), ('twobitCModel10', 'twobitCModel', 1024, 8.1318382397263),
            ('twobitCModel12', 'twobitCModel', 4096, 7.53026646633342), ('twobitCModel14', 'twobitCModel', 16384, 6.07679338544009), ('twobitCModel16', 'twobitCModel', 65536, 6.07679338544009),
            ('gshareCModel6', 'gshareCModel', 64, 10.6602835418646), ('gshareCModel8', 'gshareCModel', 256, 8.38384710559667), ('gshareCModel10', 'gshareCModel', 1024, 6.36847432155534),
            ('gshareCModel12', 'gshareCModel', 4096, 3.91108491151983), ('gshareCModel14', 'gshareCModel', 16384, 2.83926519215395), ('gshareCModel16', 'gshareCModel', 65536, .60213659066941)]
+RefDataBTB = [('BTBCModel6', 'BTBCModel', 64, 1.11806778745097), ('BTBCModel8', 'BTBCModel', 256, 0.183833943219956), ('BTBCModel10', 'BTBCModel', 1024, 0.0109271020749376),
+              ('BTBCModel12', 'BTBCModel', 4096, 0.00437600802791213), ('BTBCModel14', 'BTBCModel', 16384, 0.00188756234204305), ('BTBCModel16', 'BTBCModel', 65536, 0.00188756234204305)]
 
 def ParseBranchListFile(path):
     '''Take the path to the list of Questa Sim log files containing the performance counters outputs.  File
@@ -178,9 +180,11 @@ def ExtractSelectedData(benchmarkFirstList):
     benchmarkDict = { }
     for benchmark in benchmarkFirstList:
         (name, opt, config, prefixName, entries, dataDict) = benchmark
-        if opt == 'bd_speedopt_speed': NewName = name+'Sp'
+        # use this code to distinguish speed opt and size opt.
-        elif opt == 'bd_sizeopt_speed': NewName = name+'Sz'
+        #if opt == 'bd_speedopt_speed': NewName = name+'Sp'
-        else: NewName = name
+        #elif opt == 'bd_sizeopt_speed': NewName = name+'Sz'
+        #else: NewName = name
+        NewName = name
         #print(NewName)
         #NewName = name+'_'+opt
         if NewName in benchmarkDict:
@@ -240,7 +244,7 @@ def ReportAsText(benchmarkDict):
 def Inversion(lst):
     return [x if not args.invert else 100 - x for x in lst]
 
-def BarGraph(seriesDict, xlabelList, BenchPerRow, FileName):
+def BarGraph(seriesDict, xlabelList, BenchPerRow, FileName, IncludeLegend):
     index = 0
     NumberInGroup = len(seriesDict)
     # Figure out width of bars.  NumberInGroup bars + want 2 bar space
@@ -258,8 +262,8 @@ def BarGraph(seriesDict, xlabelList, BenchPerRow, FileName):
     plt.xticks([r + barWidth*(NumberInGroup/2-0.5) for r in range(0, BenchPerRow)], xlabelList)
     plt.xlabel('Benchmark')
     if(not args.invert): plt.ylabel('Misprediction Rate (%)')
-    else:  plt.ylabel('Prediction Accuracy (%)') 
+    else:  plt.ylabel('Prediction Accuracy (%)')
-    plt.legend(loc='upper left', ncol=2)
+    if(IncludeLegend): plt.legend(loc='upper right', ncol=2)
     plt.savefig(FileName)
 
 def SelectPartition(xlabelListBig, seriesDictBig, group, BenchPerRow):
@@ -348,13 +352,13 @@ def ReportAsGraph(benchmarkDict, bar):
     #         index += 1
 
     if(not args.summary):
-        size = len(benchmarkDict)
+        NumBenchmarks = len(benchmarkDict)
-        sizeSqrt = math.sqrt(size)
+        NumBenchmarksSqrt = math.sqrt(NumBenchmarks)
-        isSquare = math.isclose(sizeSqrt, round(sizeSqrt))
+        isSquare = math.isclose(NumBenchmarksSqrt, round(NumBenchmarksSqrt))
-        numCol = math.floor(sizeSqrt)
+        numCol = math.floor(NumBenchmarksSqrt)
         numRow = numCol + (0 if isSquare else 1)
         index = 1
-        BenchPerRow = 7
+        BenchPerRow = 5
 
         xlabelList = []
         seriesDict = {}
@@ -383,11 +387,11 @@ def ReportAsGraph(benchmarkDict, bar):
 
         #The next step will be to split the benchmarkDict into length BenchPerRow pieces then repeat the following code
         # on each piece.
-        for row in range(0, math.ceil(39 / BenchPerRow)):
+        for row in range(0, math.ceil(NumBenchmarks / BenchPerRow)):
             (xlabelListTrunk, seriesDictTrunk) = SelectPartition(xlabelListBig, seriesDictBig, row, BenchPerRow)
             FileName = 'barSegment%d.png' % row
             groupLen = len(xlabelListTrunk)
-            BarGraph(seriesDictTrunk, xlabelListTrunk, groupLen, FileName)
+            BarGraph(seriesDictTrunk, xlabelListTrunk, groupLen, FileName, (row == 0))
 
 
 # main
@@ -436,7 +440,8 @@ performanceCounterList = BuildDataBase(predictorLogs)         # builds a databas
 benchmarkFirstList = ReorderDataBase(performanceCounterList)  # reorder first by benchmark then trace
 benchmarkDict = ExtractSelectedData(benchmarkFirstList)       # filters to just the desired performance counter metric
 
-if(args.reference): benchmarkDict['Mean'].extend(RefData)
+if(args.reference and args.direction): benchmarkDict['Mean'].extend(RefDataBP)
+if(args.reference and args.target): benchmarkDict['Mean'].extend(RefDataBTB)
 #print(benchmarkDict['Mean'])
 #print(benchmarkDict['aha-mont64Speed'])
 #print(benchmarkDict)

linux/devicetree/wally-artya7.dts

@@ -31,6 +31,7 @@
 			status = "okay";
 			compatible = "riscv";
 			riscv,isa = "rv64imafdcsu";
+                        riscv,isa-extensions = "imafdc", "sstc", "svinval", "svnapot", "svpbmt", "zba", "zbb", "zbc", "zbs", "zicbom", "zicbop", "zicbopz", "zicntr", "zicsr", "zifencei", "zihpm";
 			mmu-type = "riscv,sv48";
 
 			interrupt-controller {

linux/devicetree/wally-virt.dts

@@ -31,6 +31,7 @@
 			status = "okay";
 			compatible = "riscv";
 			riscv,isa = "rv64imafdcsu";
+                        riscv,isa-extensions = "svadu";
 			mmu-type = "riscv,sv48";
 
 			interrupt-controller {

sim/bpred-sim.py

@@ -102,7 +102,8 @@ def main():
     if(args.direction):
         # for direction predictor size sweep
         bpdSize = [6, 8, 10, 12, 14, 16]
-        bpdType = ['twobit', 'gshare', 'global', 'gshare_basic', 'global_basic', 'local_basic']
+        #bpdType = ['twobit', 'gshare', 'global', 'gshare_basic', 'global_basic', 'local_basic']
+        bpdType = ['twobit', 'gshare']
         for CurrBPType in bpdType:
             for CurrBPSize in bpdSize:
                 name = CurrBPType+str(CurrBPSize)
@@ -114,7 +115,20 @@ def main():
                     grepstr="")
                 configs.append(tc)
 
-    if(args.target or args.iclass):
+    if(args.target):
+        # BTB and class size sweep
+        bpdSize = [6, 8, 10, 12, 14, 16]
+        for CurrBPSize in bpdSize:
+            name = 'BTB'+str(CurrBPSize)
+            configOptions = "+define+INSTR_CLASS_PRED=0 +define+BPRED_OVERRIDE +define+BPRED_TYPE=\`BP_GSHARE" + "+define+BPRED_SIZE=16" + "+define+RAS_SIZE=16+define+BTB_SIZE=" + str(CurrBPSize) + "+define+BTB_OVERRIDE" 
+            tc = TestCase(
+                name=name,
+                variant="rv32gc",
+                cmd="vsim > {} -c <<!\ndo wally-batch.do  rv32gc configOptions " + name + " embench " + configOptions,
+                grepstr="")
+            configs.append(tc)
+
+    if(args.iclass):
         # BTB and class size sweep
         bpdSize = [6, 8, 10, 12, 14, 16]
         for CurrBPSize in bpdSize:

sim/wally-linux-imperas.do

@@ -55,11 +55,13 @@ if {$2 eq "buildroot" || $2 eq "buildroot-checkpoint"} {
       +incdir+$env(IMPERAS_HOME)/ImpProprietary/include/host \
       $env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvviApiPkg.sv    \
       $env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvviTrace.sv      \
+      $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/idvApiPkg.sv  \
       $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/idvPkg.sv   \
       $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/idvApiPkg.sv \
       $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/trace2api.sv  \
       $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/trace2log.sv  \
       $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/trace2cov.sv  \
+      $env(IMPERAS_HOME)/ImpProprietary/source/host/idv/trace2bin.sv  \
       ../src/cvw.sv \
        ../testbench/testbench-linux-imperas.sv \
        ../testbench/common/*.sv ../src/*/*.sv \

testbench/common/loggers.sv

@@ -45,7 +45,7 @@ module loggers import cvw::*; #(parameter cvw_t P,
   // performance counter logging 
   logic        BeginSample;
   logic StartSample, EndSample;
-  if(PrintHPMCounters & P.ZICNTR_SUPPORTED) begin : HPMCSample
+  if((PrintHPMCounters | BPRED_LOGGER) & P.ZICNTR_SUPPORTED) begin : HPMCSample
     integer           HPMCindex;
     logic             StartSampleFirst;
     logic             StartSampleDelayed, BeginDelayed;
@@ -213,26 +213,41 @@ module loggers import cvw::*; #(parameter cvw_t P,
   if (P.BPRED_SUPPORTED) begin : BranchLogger
     if (BPRED_LOGGER) begin
       string direction;
-      int    file;
+      int    file, CFIfile;
       logic  PCSrcM;
-      string LogFile;
+      string LogFile, CFILogFile;
       logic  resetD, resetEdge;
       flopenrc #(1) PCSrcMReg(clk, reset, dut.core.FlushM, ~dut.core.StallM, dut.core.ifu.PCSrcE, PCSrcM);
       flop #(1) ResetDReg(clk, reset, resetD);
       assign resetEdge = ~reset & resetD;
       initial begin
         LogFile = "branch.log"; // will break some of Ross's research analysis scripts
+        CFILogFile = "cfi.log"; // will break some of Ross's research analysis scripts
         //LogFile = $psprintf("branch_%s%0d.log", P.BPRED_TYPE, P.BPRED_SIZE);
         file = $fopen(LogFile, "w");
+        CFIfile = $fopen(CFILogFile, "w");
       end
       always @(posedge clk) begin
-        if(resetEdge) $fwrite(file, "TRAIN\n");
+        if(resetEdge) begin 
-        if(StartSample) $fwrite(file, "BEGIN %s\n", memfilename);
+          $fwrite(file, "TRAIN\n");
+          $fwrite(CFIfile, "TRAIN\n");
+        end
+        if(StartSample) begin
+          $fwrite(file, "BEGIN %s\n", memfilename);
+          $fwrite(CFIfile, "BEGIN %s\n", memfilename);
+        end
         if(dut.core.ifu.InstrClassM[0] & ~dut.core.StallW & ~dut.core.FlushW & dut.core.InstrValidM) begin
           direction = PCSrcM ? "t" : "n";
           $fwrite(file, "%h %s\n", dut.core.PCM, direction);
         end
-        if(EndSample) $fwrite(file, "END %s\n", memfilename);
+        if((|dut.core.ifu.InstrClassM) & ~dut.core.StallW & ~dut.core.FlushW & dut.core.InstrValidM) begin
+          direction = PCSrcM ? "t" : "n";
+          $fwrite(CFIfile, "%h %s\n", dut.core.PCM, direction);
+        end
+        if(EndSample) begin
+          $fwrite(file, "END %s\n", memfilename);
+          $fwrite(CFIfile, "END %s\n", memfilename);
+        end
       end
     end
   end

testbench/testbench-linux-imperas.sv

@@ -226,21 +226,6 @@ module testbench;
 
 
 
-  ///////////////////////////////////////////////////////////////////////////////
-  /////////////////////////////// Cache Issue ///////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////////
- 
-   // Duplicate copy of pipeline registers that are optimized out of some configurations
-  logic [31:0] NextInstrE, InstrM;
-  mux2    #(32)     FlushInstrMMux(dut.core.ifu.InstrE, dut.core.ifu.nop, dut.core.ifu.FlushM, NextInstrE);
-  flopenr #(32)     InstrMReg(clk, reset, ~dut.core.ifu.StallM, NextInstrE, InstrM);
-
-  logic       probe;
-  if (NO_SPOOFING)
-    assign probe = testbench.dut.core.PCM == 64'hffffffff80200c8c
-                   & InstrM != 32'h14021273
-                   & testbench.dut.core.InstrValidM;
-
 
 
 
@@ -261,19 +246,20 @@ module testbench;
   logic             HREADYEXT, HRESPEXT;
   logic             HCLK, HRESETn;
   logic             HREADY;
-  logic 	    HSELEXT;
+  logic             HSELEXT;
+  logic             HSELEXTSDC;
   logic [P.PA_BITS-1:0] HADDR;
-  logic [P.AHBW-1:0] HWDATA;
+  logic [P.AHBW-1:0]    HWDATA;
-  logic [P.XLEN/8-1:0] HWSTRB;
+  logic [P.XLEN/8-1:0]  HWSTRB;
-  logic             HWRITE;
+  logic                 HWRITE;
-  logic [2:0]       HSIZE;
+  logic [2:0]           HSIZE;
-  logic [2:0]       HBURST;
+  logic [2:0]           HBURST;
-  logic [3:0]       HPROT;
+  logic [3:0]           HPROT;
-  logic [1:0]       HTRANS;
+  logic [1:0]           HTRANS;
-  logic             HMASTLOCK;
+  logic                 HMASTLOCK;
-  logic [31:0]      GPIOIN;
+  logic [31:0]          GPIOIN;
-  logic [31:0]      GPIOOUT, GPIOEN;
+  logic [31:0]          GPIOOUT, GPIOEN;
-  logic             UARTSin, UARTSout;
+  logic                 UARTSin, UARTSout;
 
   // FPGA-specific Stuff
   logic SDCCLK;
@@ -292,6 +278,21 @@ module testbench;
   assign SDCIntr = 0;
 
   
+  ///////////////////////////////////////////////////////////////////////////////
+  /////////////////////////////// Cache Issue ///////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////////
+ 
+   // Duplicate copy of pipeline registers that are optimized out of some configurations
+  logic [31:0] NextInstrE, InstrM;
+  mux2    #(32)     FlushInstrMMux(dut.core.ifu.InstrE, dut.core.ifu.nop, dut.core.ifu.FlushM, NextInstrE);
+  flopenr #(32)     InstrMReg(clk, reset, ~dut.core.ifu.StallM, NextInstrE, InstrM);
+
+  logic       probe;
+  if (NO_SPOOFING)
+    assign probe = testbench.dut.core.PCM == 64'hffffffff80200c8c
+                   & InstrM != 32'h14021273
+                   & testbench.dut.core.InstrValidM;
+
   
   `ifdef USE_IMPERAS_DV
 
@@ -442,10 +443,10 @@ module testbench;
   
 
   // Wally
-  wallypipelinedsoc #(P) dut(.clk, .reset_ext, .reset, .HRDATAEXT, .HREADYEXT, .HRESPEXT, .HSELEXT, .HSELEXTSDC,
+  wallypipelinedsoc  #(P) dut(.clk, .reset_ext, .reset, .HRDATAEXT, .HREADYEXT, .HRESPEXT, .HSELEXT, .HSELEXTSDC,
-                        .HCLK, .HRESETn, .HADDR, .HWDATA, .HWSTRB, .HWRITE, .HSIZE, .HBURST, .HPROT,
+    .HCLK, .HRESETn, .HADDR, .HWDATA, .HWSTRB, .HWRITE, .HSIZE, .HBURST, .HPROT,
-                        .HTRANS, .HMASTLOCK, .HREADY, .TIMECLK(1'b0), .GPIOIN, .GPIOOUT, .GPIOEN,
+    .HTRANS, .HMASTLOCK, .HREADY, .TIMECLK(1'b0), .GPIOIN, .GPIOOUT, .GPIOEN,
-                        .UARTSin, .UARTSout, .SDCIntr, .SPICS, .SPIOut, .SPIIn); 
+    .UARTSin, .UARTSout, .SDCIntr, .SPIIn, .SPIOut, .SPICS); 
 
   // W-stage hardware not needed by Wally itself 
   parameter nop = 'h13;

testbench/testbench.sv

@@ -37,7 +37,7 @@ module testbench;
   parameter DEBUG=0;
   parameter TEST="none";
   parameter PrintHPMCounters=0;
-  parameter BPRED_LOGGER=0;
+  parameter BPRED_LOGGER=1;
   parameter I_CACHE_ADDR_LOGGER=0;
   parameter D_CACHE_ADDR_LOGGER=0;
  
@@ -434,7 +434,7 @@ module testbench;
   loggers (clk, reset, DCacheFlushStart, DCacheFlushDone, memfilename);
 
   // track the current function or global label
-  if (DEBUG == 1 | (PrintHPMCounters & P.ZICNTR_SUPPORTED)) begin : FunctionName
+  if (DEBUG == 1 | ((PrintHPMCounters | BPRED_LOGGER) & P.ZICNTR_SUPPORTED)) begin : FunctionName
     FunctionName #(P) FunctionName(.reset(reset_ext | TestBenchReset),
 			      .clk(clk), .ProgramAddrMapFile(ProgramAddrMapFile), .ProgramLabelMapFile(ProgramLabelMapFile));
   end