clean up and set up verilog simulation
diff --git a/verilog/dv/Makefile b/verilog/dv/Makefile index a9c2027..cac229a 100644 --- a/verilog/dv/Makefile +++ b/verilog/dv/Makefile
@@ -19,7 +19,7 @@ .SUFFIXES: .SILENT: clean all -PATTERNS = mprj_por +PATTERNS = comparator all: ${PATTERNS} for i in ${PATTERNS}; do \
diff --git a/verilog/dv/README.md b/verilog/dv/README.md index 6be9cd3..06a6dbb 100644 --- a/verilog/dv/README.md +++ b/verilog/dv/README.md
@@ -88,7 +88,7 @@ Then, run the following command to start the docker container : ``` -docker run -it -v $CARAVEL_ROOT:$CARAVEL_ROOT -v $PDK_PATH:$PDK_PATH -v $UPRJ_ROOT:$UPRJ_ROOT -e CARAVEL_ROOT=$CARAVEL_ROOT -e PDK_PATH=$PDK_PATH -e UPRJ_ROOT=$UPRJ_ROOT -u $(id -u $USER):$(id -g $USER) efabless/dv_setup:latest +docker run -it -v $CARAVEL_ROOT:$CARAVEL_ROOT -v $PDK_ROOT:$PDK_ROOT -v $UPRJ_ROOT:$UPRJ_ROOT -e CARAVEL_ROOT=$CARAVEL_ROOT -e PDK_ROOT=$PDK_ROOT -e UPRJ_ROOT=$UPRJ_ROOT -u $(id -u $USER):$(id -g $USER) efabless/dv_setup:latest ``` Then, navigate to the directory where the DV tests reside :
diff --git a/verilog/dv/comparator/Makefile b/verilog/dv/comparator/Makefile index 5d0825f..9f8b824 100644 --- a/verilog/dv/comparator/Makefile +++ b/verilog/dv/comparator/Makefile
@@ -40,7 +40,7 @@ .SUFFIXES: -PATTERN = mprj_por +PATTERN = comparator all: ${PATTERN:=.vcd}
diff --git a/verilog/dv/comparator/mprj_por.hex b/verilog/dv/comparator/comparator.hex similarity index 100% rename from verilog/dv/comparator/mprj_por.hex rename to verilog/dv/comparator/comparator.hex
diff --git a/verilog/dv/comparator/comparator.v b/verilog/dv/comparator/comparator_tb.v similarity index 100% rename from verilog/dv/comparator/comparator.v rename to verilog/dv/comparator/comparator_tb.v
diff --git a/verilog/rtl/example_por.v b/verilog/rtl/example_por.v deleted file mode 100644 index d318fba..0000000 --- a/verilog/rtl/example_por.v +++ /dev/null
@@ -1,95 +0,0 @@ -// SPDX-FileCopyrightText: 2020 Efabless Corporation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// SPDX-License-Identifier: Apache-2.0 - -`default_nettype none -`timescale 1 ns / 1 ps - -// This is just a copy of simple_por.v from the Caravel project, used -// as an analog user project example. - -module example_por( -`ifdef USE_POWER_PINS - inout vdd3v3, - inout vdd1v8, - inout vss, -`endif - output porb_h, - output porb_l, - output por_l -); - - wire mid, porb_h; - reg inode; - - // This is a behavioral model! Actual circuit is a resitor dumping - // current (slowly) from vdd3v3 onto a capacitor, and this fed into - // two schmitt triggers for strong hysteresis/glitch tolerance. - - initial begin - inode <= 1'b0; - end - - // Emulate current source on capacitor as a 500ns delay either up or - // down. Note that this is sped way up for verilog simulation; the - // actual circuit is set to a 15ms delay. - - always @(posedge vdd3v3) begin - #500 inode <= 1'b1; - end - always @(negedge vdd3v3) begin - #500 inode <= 1'b0; - end - - // Instantiate two shmitt trigger buffers in series - - sky130_fd_sc_hvl__schmittbuf_1 hystbuf1 ( -`ifdef USE_POWER_PINS - .VPWR(vdd3v3), - .VGND(vss), - .VPB(vdd3v3), - .VNB(vss), -`endif - .A(inode), - .X(mid) - ); - - sky130_fd_sc_hvl__schmittbuf_1 hystbuf2 ( -`ifdef USE_POWER_PINS - .VPWR(vdd3v3), - .VGND(vss), - .VPB(vdd3v3), - .VNB(vss), -`endif - .A(mid), - .X(porb_h) - ); - - sky130_fd_sc_hvl__lsbufhv2lv_1 porb_level ( -`ifdef USE_POWER_PINS - .VPWR(vdd3v3), - .VPB(vdd3v3), - .LVPWR(vdd1v8), - .VNB(vss), - .VGND(vss), -`endif - .A(porb_h), - .X(porb_l) - ); - - // since this is behavioral anyway, but this should be - // replaced by a proper inverter - assign por_l = ~porb_l; -endmodule -`default_nettype wire
diff --git a/verilog/rtl/uprj_analog_netlists.v b/verilog/rtl/uprj_analog_netlists.v index 062a873..4bff04a 100644 --- a/verilog/rtl/uprj_analog_netlists.v +++ b/verilog/rtl/uprj_analog_netlists.v
@@ -31,8 +31,6 @@ `default_nettype wire // Use behavorial model with gate-level simulation `include "rtl/user_analog_project_wrapper.v" - `include "rtl/user_analog_proj_example.v" `else `include "user_analog_project_wrapper.v" - `include "user_analog_proj_example.v" `endif
diff --git a/verilog/rtl/user_analog_proj_example.v b/verilog/rtl/user_analog_proj_example.v deleted file mode 100644 index 94412da..0000000 --- a/verilog/rtl/user_analog_proj_example.v +++ /dev/null
@@ -1,221 +0,0 @@ -// SPDX-FileCopyrightText: 2020 Efabless Corporation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// SPDX-License-Identifier: Apache-2.0 - -`default_nettype none - -`include "example_por.v" - -/* - * I/O mapping for analog - * - * mprj_io[37] io_in/out/oeb/in_3v3[26] --- --- - * mprj_io[36] io_in/out/oeb/in_3v3[25] --- --- - * mprj_io[35] io_in/out/oeb/in_3v3[24] gpio_analog/noesd[17] --- - * mprj_io[34] io_in/out/oeb/in_3v3[23] gpio_analog/noesd[16] --- - * mprj_io[33] io_in/out/oeb/in_3v3[22] gpio_analog/noesd[15] --- - * mprj_io[32] io_in/out/oeb/in_3v3[21] gpio_analog/noesd[14] --- - * mprj_io[31] io_in/out/oeb/in_3v3[20] gpio_analog/noesd[13] --- - * mprj_io[30] io_in/out/oeb/in_3v3[19] gpio_analog/noesd[12] --- - * mprj_io[29] io_in/out/oeb/in_3v3[18] gpio_analog/noesd[11] --- - * mprj_io[28] io_in/out/oeb/in_3v3[17] gpio_analog/noesd[10] --- - * mprj_io[27] io_in/out/oeb/in_3v3[16] gpio_analog/noesd[9] --- - * mprj_io[26] io_in/out/oeb/in_3v3[15] gpio_analog/noesd[8] --- - * mprj_io[25] io_in/out/oeb/in_3v3[14] gpio_analog/noesd[7] --- - * mprj_io[24] --- --- user_analog[10] - * mprj_io[23] --- --- user_analog[9] - * mprj_io[22] --- --- user_analog[8] - * mprj_io[21] --- --- user_analog[7] - * mprj_io[20] --- --- user_analog[6] clamp[2] - * mprj_io[19] --- --- user_analog[5] clamp[1] - * mprj_io[18] --- --- user_analog[4] clamp[0] - * mprj_io[17] --- --- user_analog[3] - * mprj_io[16] --- --- user_analog[2] - * mprj_io[15] --- --- user_analog[1] - * mprj_io[14] --- --- user_analog[0] - * mprj_io[13] io_in/out/oeb/in_3v3[13] gpio_analog/noesd[6] --- - * mprj_io[12] io_in/out/oeb/in_3v3[12] gpio_analog/noesd[5] --- - * mprj_io[11] io_in/out/oeb/in_3v3[11] gpio_analog/noesd[4] --- - * mprj_io[10] io_in/out/oeb/in_3v3[10] gpio_analog/noesd[3] --- - * mprj_io[9] io_in/out/oeb/in_3v3[9] gpio_analog/noesd[2] --- - * mprj_io[8] io_in/out/oeb/in_3v3[8] gpio_analog/noesd[1] --- - * mprj_io[7] io_in/out/oeb/in_3v3[7] gpio_analog/noesd[0] --- - * mprj_io[6] io_in/out/oeb/in_3v3[6] --- --- - * mprj_io[5] io_in/out/oeb/in_3v3[5] --- --- - * mprj_io[4] io_in/out/oeb/in_3v3[4] --- --- - * mprj_io[3] io_in/out/oeb/in_3v3[3] --- --- - * mprj_io[2] io_in/out/oeb/in_3v3[2] --- --- - * mprj_io[1] io_in/out/oeb/in_3v3[1] --- --- - * mprj_io[0] io_in/out/oeb/in_3v3[0] --- --- - * - */ - -/* - *---------------------------------------------------------------- - * - * user_analog_proj_example - * - * This is an example of a (trivially simple) analog user project, - * showing how the user project can connect to the I/O pads, both - * the digital pads, the analog connection on the digital pads, - * and the dedicated analog pins used as an additional power supply - * input, with a connected ESD clamp. - * - * See the testbench in directory "mprj_por" for the example - * program that drives this user project. - * - *---------------------------------------------------------------- - */ - -module user_analog_proj_example ( -`ifdef USE_POWER_PINS - inout vdda1, // User area 1 3.3V supply - inout vdda2, // User area 2 3.3V supply - inout vssa1, // User area 1 analog ground - inout vssa2, // User area 2 analog ground - inout vccd1, // User area 1 1.8V supply - inout vccd2, // User area 2 1.8v supply - inout vssd1, // User area 1 digital ground - inout vssd2, // User area 2 digital ground -`endif - - // Wishbone Slave ports (WB MI A) - input wb_clk_i, - input wb_rst_i, - input wbs_stb_i, - input wbs_cyc_i, - input wbs_we_i, - input [3:0] wbs_sel_i, - input [31:0] wbs_dat_i, - input [31:0] wbs_adr_i, - output wbs_ack_o, - output [31:0] wbs_dat_o, - - // Logic Analyzer Signals - input [127:0] la_data_in, - output [127:0] la_data_out, - input [127:0] la_oenb, - - // IOs - input [`MPRJ_IO_PADS-`ANALOG_PADS-1:0] io_in, - input [`MPRJ_IO_PADS-`ANALOG_PADS-1:0] io_in_3v3, - output [`MPRJ_IO_PADS-`ANALOG_PADS-1:0] io_out, - output [`MPRJ_IO_PADS-`ANALOG_PADS-1:0] io_oeb, - - // GPIO-analog - inout [`MPRJ_IO_PADS-`ANALOG_PADS-10:0] gpio_analog, - inout [`MPRJ_IO_PADS-`ANALOG_PADS-10:0] gpio_noesd, - - // Dedicated analog - inout [`ANALOG_PADS-1:0] io_analog, - inout [2:0] io_clamp_high, - inout [2:0] io_clamp_low, - - // Clock - input user_clock2, - - // IRQ - output [2:0] irq -); - wire [`MPRJ_IO_PADS-`ANALOG_PADS-1:0] io_in; - wire [`MPRJ_IO_PADS-`ANALOG_PADS-1:0] io_in_3v3; - wire [`MPRJ_IO_PADS-`ANALOG_PADS-1:0] io_out; - wire [`MPRJ_IO_PADS-`ANALOG_PADS-1:0] io_oeb; - wire [`ANALOG_PADS-1:0] io_analog; - - // wire [31:0] rdata; - // wire [31:0] wdata; - - // wire valid; - // wire [3:0] wstrb; - - wire isupply; // Independent 3.3V supply - wire io16, io15, io12, io11; - - // WB MI A - // assign valid = wbs_cyc_i && wbs_stb_i; - // assign wstrb = wbs_sel_i & {4{wbs_we_i}}; - // assign wbs_dat_o = rdata; - // assign wdata = wbs_dat_i; - - // IO --- unused (no need to connect to anything) - // assign io_out[`MPRJ_IO_PADS-`ANALOG_PADS-1:17] = 0; - // assign io_out[14:13] = 11'b0; - // assign io_out[10:0] = 11'b0; - - // assign io_oeb[`MPRJ_IO_PADS-`ANALOG_PADS-1:17] = -1; - // assign io_oeb[14:13] = 11'b1; - // assign io_oeb[10:0] = 11'b1; - - // IO --- enable outputs on 11, 12, 15, and 16 - assign io_out[12:11] = {io12, io11}; - assign io_oeb[12:11] = {vssd1, vssd1}; - - assign io_out[16:15] = {io16, io15}; - assign io_oeb[16:15] = {vssd1, vssd1}; - - // IRQ - assign irq = 3'b000; // Unused - - // LA --- unused (no need to connect to anything) - // assign la_data_out = {128{1'b0}}; // Unused - - // Instantiate the POR. Connect the digital power to user area 1 - // VCCD, and connect the analog power to user area 1 VDDA. - - // Monitor the 3.3V output with mprj_io[10] = gpio_analog[3] - // Monitor the 1.8V outputs with mprj_io[11,12] = io_out[11,12] - - example_por por1 ( - `ifdef USE_POWER_PINS - .vdd3v3(vdda1), - .vdd1v8(vccd1), - .vss(vssa1), - `endif - .porb_h(gpio_analog[3]), // 3.3V domain output - .porb_l(io11), // 1.8V domain output - .por_l(io12) // 1.8V domain output - ); - - // Instantiate 2nd POR with the analog power supply on one of the - // analog pins. NOTE: io_analog[4] = mproj_io[18] and is the same - // pad with io_clamp_high/low[0]. - - `ifdef USE_POWER_PINS - assign isupply = io_analog[4]; - assign io_clamp_high[0] = isupply; - assign io_clamp_low[0] = vssa1; - - // Tie off remaining clamps - assign io_clamp_high[2:1] = vssa1; - assign io_clamp_low[2:1] = vssa1; - `endif - - // Monitor the 3.3V output with mprj_io[25] = gpio_analog[7] - // Monitor the 1.8V outputs with mprj_io[26,27] = io_out[15,16] - - example_por por2 ( - `ifdef USE_POWER_PINS - .vdd3v3(isupply), - .vdd1v8(vccd1), - .vss(vssa1), - `endif - .porb_h(gpio_analog[7]), // 3.3V domain output - .porb_l(io15), // 1.8V domain output - .por_l(io16) // 1.8V domain output - ); - -endmodule - -`default_nettype wire
diff --git a/verilog/rtl/user_analog_project_wrapper.v b/verilog/rtl/user_analog_project_wrapper.v index e3065b6..698872d 100644 --- a/verilog/rtl/user_analog_project_wrapper.v +++ b/verilog/rtl/user_analog_project_wrapper.v
@@ -24,6 +24,7 @@ * *------------------------------------------------------------- */ + `include "comparator.v" module user_analog_project_wrapper ( `ifdef USE_POWER_PINS @@ -125,7 +126,7 @@ wire vout; assign gpio_analog[17] = vout; -assign io_out[24] = vout +assign io_out[24] = vout; comparator comp_0 ( `ifdef USE_POWER_PINS