Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
help
This commit is contained in:
slmnemo 2021-12-08 14:09:58 -08:00
commit e39f94b645
8 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
benchmarks/riscv-coremark/Makefile
View File

@ -14,10 +14,11 @@ work/coremark.bare.riscv.objdump: work/coremark.bare.riscv
work/coremark.bare.riscv: $(sources) work/coremark.bare.riscv: $(sources)
# make -C $(cmbase) PORT_DIR=/home/harris/riscv-wally/benchmarks/riscv-coremark/riscv64-baremetal compile RISCV=/courses/e190ax/riscvcompiler XCFLAGS="-march=rv64g" # make -C $(cmbase) PORT_DIR=/home/harris/riscv-wally/benchmarks/riscv-coremark/riscv64-baremetal compile RISCV=/courses/e190ax/riscvcompiler XCFLAGS="-march=rv64g"
make -C $(cmbase) PORT_DIR=$(PORT_DIR) compile RISCV=/courses/e190ax/riscvcompiler XCFLAGS="-march=rv64im" make -C $(cmbase) PORT_DIR=$(PORT_DIR) compile RISCV=/opt/riscv XCFLAGS="-march=rv64imd"
mv $(cmbase)/coremark.bare.riscv work mkdir -p work/
mv $(cmbase)/coremark.bare.riscv work/
.PHONY: clean .PHONY: clean
clean: clean:
rm -f work/* rm -f work/*

2
wally-pipelined/regression/regression-wally.py
View File

@ -34,7 +34,7 @@ configs = [
] ]
def getBuildrootTC(short): def getBuildrootTC(short):
INSTR_LIMIT = 100000 # multiple of 100000 INSTR_LIMIT = 100000 # multiple of 100000
MAX_EXPECTED = 182000000 MAX_EXPECTED = 246000000
if short: if short:
BRcmd="vsim > {} -c <<!\ndo wally-buildroot-batch.do "+str(INSTR_LIMIT)+" 1 0\n!" BRcmd="vsim > {} -c <<!\ndo wally-buildroot-batch.do "+str(INSTR_LIMIT)+" 1 0\n!"
BRgrepstr=str(INSTR_LIMIT)+" instructions" BRgrepstr=str(INSTR_LIMIT)+" instructions"

2
wally-pipelined/regression/wally-coremark.do
View File

@ -35,7 +35,7 @@ vlog +incdir+../config/coremark_bare +incdir+../config/shared ../testbench/testb
vopt +acc work.testbench -o workopt vopt +acc work.testbench -o workopt
vsim workopt vsim workopt
mem load -startaddress 268435456 -endaddress 268566527 -filltype value -fillradix hex -filldata 0 /testbench/dut/uncore/dtim/RAM mem load -startaddress 268435456 -endaddress 268566527 -filltype value -fillradix hex -filldata 0 /testbench/dut/uncore/dtim/dtim/RAM
view wave view wave

7
wally-pipelined/src/fpu/fcmp.sv
View File

@ -76,7 +76,12 @@ module fcmp (
// Determine final values based on output of magnitude comparison, // Determine final values based on output of magnitude comparison,
// sign bits, and special case testing. // sign bits, and special case testing.
exception_cmp_2 exc2 (.invalid(Invalid), .fcc(FCC), .LT_mag(LT), .EQ_mag(EQ), .ANaN(XNaNE), .BNaN(YNaNE), .Azero(XZeroE), .Bzero(YZeroE), .FOpCtrlE(FOpCtrlE), .A(op1), .B(op2), .FSrcXE, .FSrcYE, .*); exception_cmp_2 exc2 (
.invalid(Invalid), .fcc(FCC), .LT_mag(LT), .EQ_mag(EQ),
.ANaN(XNaNE), .BNaN(YNaNE), .Azero(XZeroE), .Bzero(YZeroE),
.FOpCtrlE, .A(op1), .B(op2), .FSrcXE, .FSrcYE,
.FmtE, .CmpResE
);
endmodule // fpcomp endmodule // fpcomp

0
wally-pipelined/src/sdc/counter.sv → wally-pipelined/src/sdc/SDCcounter.sv
View File

2
wally-pipelined/src/uncore/dtim.sv
View File

@ -25,7 +25,7 @@
`include "wally-config.vh" `include "wally-config.vh"
module dtim #(parameter BASE=0, RANGE = 65535, string PRELOAD="") ( module dtim #(parameter BASE=0, RANGE = 65535) (
input logic HCLK, HRESETn, input logic HCLK, HRESETn,
input logic HSELTim, input logic HSELTim,
input logic [31:0] HADDR, input logic [31:0] HADDR,

2
wally-pipelined/src/uncore/uncore.sv
View File

@ -103,7 +103,7 @@ module uncore (
end end
if (`BOOTTIM_SUPPORTED) begin : bootdtim if (`BOOTTIM_SUPPORTED) begin : bootdtim
dtim #(.BASE(`BOOTTIM_BASE), .RANGE(`BOOTTIM_RANGE), .PRELOAD("blink-led.mem")) dtim #(.BASE(`BOOTTIM_BASE), .RANGE(`BOOTTIM_RANGE))
bootdtim( bootdtim(
.HCLK, .HRESETn, .HCLK, .HRESETn,
.HSELTim(HSELBootTim), .HADDR, .HSELTim(HSELBootTim), .HADDR,

11
wally-pipelined/testbench/testbench-coremark_bare.sv
View File

@ -54,8 +54,13 @@ module testbench();
logic [31:0] GPIOPinsIn, GPIOPinsOut, GPIOPinsEn; logic [31:0] GPIOPinsIn, GPIOPinsOut, GPIOPinsEn;
logic UARTSin, UARTSout; logic UARTSin, UARTSout;
logic SDCCLK; logic SDCCLK;
tri1 SDCCmd; logic SDCCmdIn;
tri1 [3:0] SDCDat; logic SDCCmdOut;
logic SDCCmdOE;
logic [3:0] SDCDatIn;
logic HREADY;
logic HSELEXT;
assign SDCmd = 1'bz; assign SDCmd = 1'bz;
assign SDCDat = 4'bz; assign SDCDat = 4'bz;
@ -95,7 +100,7 @@ module testbench();
totalerrors = 0; totalerrors = 0;
// read test vectors into memory // read test vectors into memory
memfilename = tests[0]; memfilename = tests[0];
$readmemh(memfilename, dut.uncore.dtim.RAM); $readmemh(memfilename, dut.uncore.dtim.dtim.RAM);
//for(j=268437955; j < 268566528; j = j+1) //for(j=268437955; j < 268566528; j = j+1)
//dut.uncore.dtim.RAM[j] = 64'b0; //dut.uncore.dtim.RAM[j] = 64'b0;
// ProgramAddrMapFile = "../../imperas-riscv-tests/riscv-ovpsim-plus/examples/CoreMark/coremark.RV64IM.bare.elf.objdump.addr"; // ProgramAddrMapFile = "../../imperas-riscv-tests/riscv-ovpsim-plus/examples/CoreMark/coremark.RV64IM.bare.elf.objdump.addr";