From 4f7bc1be48288f9cd894faa32375309de1347b9a Mon Sep 17 00:00:00 2001 From: Ross Thompson Date: Fri, 24 Sep 2021 12:31:51 -0500 Subject: [PATCH] Added either the sdModel or constant driver for the SDC ports in all test benches. --- wally-pipelined/testbench/testbench-arch.sv | 6 ++++++ wally-pipelined/testbench/testbench-coremark.sv | 6 ++++++ wally-pipelined/testbench/testbench-coremark_bare.sv | 8 ++++++++ wally-pipelined/testbench/testbench-fpga.sv | 9 +++++++++ wally-pipelined/testbench/testbench-imperas.sv | 4 ++++ wally-pipelined/testbench/testbench-linux.sv | 8 ++++++++ 6 files changed, 41 insertions(+) diff --git a/wally-pipelined/testbench/testbench-arch.sv b/wally-pipelined/testbench/testbench-arch.sv index 7f4233ff..b32cc4a4 100644 --- a/wally-pipelined/testbench/testbench-arch.sv +++ b/wally-pipelined/testbench/testbench-arch.sv @@ -467,6 +467,12 @@ string tests32f[] = '{ logic [31:0] GPIOPinsIn, GPIOPinsOut, GPIOPinsEn; logic UARTSin, UARTSout; + logic SDCCLK; + tri1 SDCCmd; + tri1 [3:0] SDCDat; + + assign SDCmd = 1'bz; + assign SDCDat = 4'bz; // instantiate device to be tested assign GPIOPinsIn = 0; diff --git a/wally-pipelined/testbench/testbench-coremark.sv b/wally-pipelined/testbench/testbench-coremark.sv index 82a41d83..2feccab5 100644 --- a/wally-pipelined/testbench/testbench-coremark.sv +++ b/wally-pipelined/testbench/testbench-coremark.sv @@ -52,6 +52,12 @@ module testbench(); string signame, memfilename; logic [31:0] GPIOPinsIn, GPIOPinsOut, GPIOPinsEn; logic UARTSin, UARTSout; + logic SDCCLK; + tri1 SDCCmd; + tri1 [3:0] SDCDat; + + assign SDCmd = 1'bz; + assign SDCDat = 4'bz; // instantiate device to be tested assign GPIOPinsIn = 0; assign UARTSin = 1; diff --git a/wally-pipelined/testbench/testbench-coremark_bare.sv b/wally-pipelined/testbench/testbench-coremark_bare.sv index 90003e98..71fb52be 100644 --- a/wally-pipelined/testbench/testbench-coremark_bare.sv +++ b/wally-pipelined/testbench/testbench-coremark_bare.sv @@ -52,6 +52,14 @@ module testbench(); string signame, memfilename; logic [31:0] GPIOPinsIn, GPIOPinsOut, GPIOPinsEn; logic UARTSin, UARTSout; + logic SDCCLK; + tri1 SDCCmd; + tri1 [3:0] SDCDat; + + assign SDCmd = 1'bz; + assign SDCDat = 4'bz; + + // instantiate device to be tested assign GPIOPinsIn = 0; assign UARTSin = 1; diff --git a/wally-pipelined/testbench/testbench-fpga.sv b/wally-pipelined/testbench/testbench-fpga.sv index fbe13cf4..3059eb65 100644 --- a/wally-pipelined/testbench/testbench-fpga.sv +++ b/wally-pipelined/testbench/testbench-fpga.sv @@ -569,6 +569,15 @@ string tests32f[] = '{ logic [31:0] GPIOPinsIn, GPIOPinsOut, GPIOPinsEn; logic UARTSin, UARTSout; + logic SDCCLK; + tri1 SDCCmd; + tri1 [3:0] SDCDat; + + sdModel sdcard + (.sdClk(SDCCLK), + .cmd(SDCCmd), + .dat(SDCDat)); + // instantiate device to be tested assign GPIOPinsIn = 0; assign UARTSin = 1; diff --git a/wally-pipelined/testbench/testbench-imperas.sv b/wally-pipelined/testbench/testbench-imperas.sv index 82aea268..c312ef0a 100644 --- a/wally-pipelined/testbench/testbench-imperas.sv +++ b/wally-pipelined/testbench/testbench-imperas.sv @@ -588,10 +588,14 @@ string tests32f[] = '{ // SD card model + assign SDCmd = 1'bz; + assign SDCDat = 4'bz; +/* -----\/----- EXCLUDED -----\/----- sdModel sdcard (.sdClk(SDCCLK), .cmd(SDCCmd), .dat(SDCDat)); + -----/\----- EXCLUDED -----/\----- */ // initialize tests diff --git a/wally-pipelined/testbench/testbench-linux.sv b/wally-pipelined/testbench/testbench-linux.sv index 64bd24e7..c090ad93 100644 --- a/wally-pipelined/testbench/testbench-linux.sv +++ b/wally-pipelined/testbench/testbench-linux.sv @@ -55,6 +55,14 @@ module testbench(); logic [31:0] GPIOPinsIn; logic [31:0] GPIOPinsOut, GPIOPinsEn; logic UARTSin, UARTSout; + + logic SDCCLK; + tri1 SDCCmd; + tri1 [3:0] SDCDat; + + assign SDCmd = 1'bz; + assign SDCDat = 4'bz; + assign GPIOPinsIn = 0; assign UARTSin = 1;