luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minitest mux: clean up naming 

Signed-off-by: John McMaster <JohnDMcMaster@gmail.com>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
This commit is contained in:
John McMaster 2017-12-04 18:05:38 -08:00 committed by Tim 'mithro' Ansell
parent b4e57e2ed5
commit 04ebcd7b36
12 changed files with 97 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
minitests/clb_bffmux/.gitignore → minitests/clb_nffmux/.gitignore vendored
View File

0
minitests/clb_bffmux/Makefile → minitests/clb_nffmux/Makefile
View File

0
minitests/clb_bffmux/README.txt → minitests/clb_nffmux/README.txt
View File

0
minitests/clb_bffmux/runme.sh → minitests/clb_nffmux/runme.sh
View File

0
minitests/clb_bffmux/runme.tcl → minitests/clb_nffmux/runme.tcl
View File

64
minitests/clb_bffmux/top.v → minitests/clb_nffmux/top.v
View File

@ -27,13 +27,20 @@ module top(input clk, stb, di, output do);
endmodule
module roi(input clk, input [255:0] din, output [255:0] dout);
//clb_BFFMUX_NO clb_BFFMUX_NO (.clk(clk), .din(din[ 0 +: 8]), .dout(dout[ 0 +: 8]));
clb_BFFMUX_BX clb_BFFMUX_BX (.clk(clk), .din(din[ 8 +: 8]), .dout(dout[ 8 +: 8]));
clb_BFFMUX_CY clb_BFFMUX_CY (.clk(clk), .din(din[ 16 +: 8]), .dout(dout[ 16 +: 8]));
clb_BFFMUX_F8 clb_BFFMUX_F8 (.clk(clk), .din(din[ 24 +: 8]), .dout(dout[ 24 +: 8]));
clb_BFFMUX_O5 clb_BFFMUX_O5 (.clk(clk), .din(din[ 32 +: 8]), .dout(dout[ 32 +: 8]));
clb_BFFMUX_O6 clb_BFFMUX_O6 (.clk(clk), .din(din[ 40 +: 8]), .dout(dout[ 40 +: 8]));
clb_BFFMUX_XOR clb_BFFMUX_XOR (.clk(clk), .din(din[ 48 +: 8]), .dout(dout[ 48 +: 8 ]));
parameter N=1;
clb_BFFMUX_BX #(.LOC("SLICE_X18Y100"), .N(N))
clb_BFFMUX_BX (.clk(clk), .din(din[ 8 +: 8]), .dout(dout[ 8 +: 8]));
clb_BFFMUX_CY #(.LOC("SLICE_X18Y101"), .N(N))
clb_BFFMUX_CY (.clk(clk), .din(din[ 16 +: 8]), .dout(dout[ 16 +: 8]));
clb_BFFMUX_F8 #(.LOC("SLICE_X18Y102"), .N(N))
clb_BFFMUX_F8 (.clk(clk), .din(din[ 24 +: 8]), .dout(dout[ 24 +: 8]));
clb_BFFMUX_O5 #(.LOC("SLICE_X18Y103"), .N(N))
clb_BFFMUX_O5 (.clk(clk), .din(din[ 32 +: 8]), .dout(dout[ 32 +: 8]));
clb_BFFMUX_O6 #(.LOC("SLICE_X18Y104"), .N(N))
clb_BFFMUX_O6 (.clk(clk), .din(din[ 40 +: 8]), .dout(dout[ 40 +: 8]));
clb_BFFMUX_XOR #(.LOC("SLICE_X18Y105"), .N(N))
clb_BFFMUX_XOR (.clk(clk), .din(din[ 48 +: 8]), .dout(dout[ 48 +: 8 ]));
endmodule
module myLUT8 (input clk, input [7:0] din,
@ -51,6 +58,7 @@ module myLUT8 (input clk, input [7:0] din,
assign caro = caro_all[N];
wire [3:0] carco_all;
assign carco = carco_all[N];
wire [3:0] lutno6;
wire [3:0] lutno5;
wire lut7bo, lut7ao;
@ -133,22 +141,11 @@ endmodule
//******************************************************************************
//BFFMUX tests
/*
module clb_BFFMUX_NO (input clk, input [7:0] din, output [7:0] dout);
parameter LOC="SLICE_X18Y100";
myLUT8 #(.LOC(LOC))
myLUT8(.clk(clk), .din(din),
.lut8o(),
.caro(), .carco(), .bo5(), .bo6(),
.n5ff_q());
endmodule
*/
module clb_BFFMUX_BX (input clk, input [7:0] din, output [7:0] dout);
parameter LOC="SLICE_X18Y101";
parameter LOC="SLICE_FIXME";
parameter N=1;
myLUT8 #(.LOC(LOC))
myLUT8 #(.LOC(LOC), .N(N))
myLUT8(.clk(clk), .din(din),
.lut8o(),
.caro(), .carco(),
@ -159,10 +156,11 @@ module clb_BFFMUX_BX (input clk, input [7:0] din, output [7:0] dout);
endmodule
module clb_BFFMUX_CY (input clk, input [7:0] din, output [7:0] dout);
parameter LOC="SLICE_X18Y102";
parameter LOC="SLICE_FIXME";
parameter N=1;
wire carco;
myLUT8 #(.LOC(LOC))
myLUT8 #(.LOC(LOC), .N(N))
myLUT8(.clk(clk), .din(din),
.lut8o(),
.caro(), .carco(carco),
@ -172,10 +170,11 @@ module clb_BFFMUX_CY (input clk, input [7:0] din, output [7:0] dout);
endmodule
module clb_BFFMUX_F8 (input clk, input [7:0] din, output [7:0] dout);
parameter LOC="SLICE_X18Y103";
parameter LOC="SLICE_FIXME";
parameter N=1;
wire lut8o;
myLUT8 #(.LOC(LOC))
myLUT8 #(.LOC(LOC), .N(N))
myLUT8(.clk(clk), .din(din),
.lut8o(lut8o),
.caro(), .carco(),
@ -185,10 +184,11 @@ module clb_BFFMUX_F8 (input clk, input [7:0] din, output [7:0] dout);
endmodule
module clb_BFFMUX_O5 (input clk, input [7:0] din, output [7:0] dout);
parameter LOC="SLICE_X18Y104";
parameter LOC="SLICE_FIXME";
parameter N=1;
wire bo5;
myLUT8 #(.LOC(LOC))
myLUT8 #(.LOC(LOC), .N(N))
myLUT8(.clk(clk), .din(din),
.lut8o(lut8o),
.caro(), .carco(),
@ -198,10 +198,11 @@ module clb_BFFMUX_O5 (input clk, input [7:0] din, output [7:0] dout);
endmodule
module clb_BFFMUX_O6 (input clk, input [7:0] din, output [7:0] dout);
parameter LOC="SLICE_X18Y105";
parameter LOC="SLICE_FIXME";
parameter N=1;
wire bo6;
myLUT8 #(.LOC(LOC))
myLUT8 #(.LOC(LOC), .N(N))
myLUT8(.clk(clk), .din(din),
.lut8o(lut8o),
.caro(), .carco(),
@ -211,10 +212,11 @@ module clb_BFFMUX_O6 (input clk, input [7:0] din, output [7:0] dout);
endmodule
module clb_BFFMUX_XOR (input clk, input [7:0] din, output [7:0] dout);
parameter LOC="SLICE_X18Y106";
parameter LOC="SLICE_FIXME";
parameter N=1;
wire caro;
myLUT8 #(.LOC(LOC))
myLUT8 #(.LOC(LOC), .N(N))
myLUT8(.clk(clk), .din(din),
.lut8o(),
.caro(caro), .carco(),

0
minitests/clb_boutmux/.gitignore → minitests/clb_noutmux/.gitignore vendored
View File

0
minitests/clb_boutmux/Makefile → minitests/clb_noutmux/Makefile
View File

0
minitests/clb_boutmux/README.txt → minitests/clb_noutmux/README.txt
View File

0
minitests/clb_boutmux/runme.sh → minitests/clb_noutmux/runme.sh
View File

0
minitests/clb_boutmux/runme.tcl → minitests/clb_noutmux/runme.tcl
View File

143
minitests/clb_boutmux/top.v → minitests/clb_noutmux/top.v
View File

@ -29,24 +29,40 @@ module top(input clk, stb, di, output do);
endmodule
module roi(input clk, input [255:0] din, output [255:0] dout);
//clb_BOUTMUX_NO clb_BOUTMUX_NO (.clk(clk), .din(din[ 0 +: 8]), .dout(dout[ 0 +: 8]));
clb_BOUTMUX_CY clb_BOUTMUX_CY (.clk(clk), .din(din[ 8 +: 8]), .dout(dout[ 8 +: 8]));
clb_BOUTMUX_F8 clb_BOUTMUX_F8 (.clk(clk), .din(din[ 16 +: 8]), .dout(dout[ 16 +: 8]));
//clb_BOUTMUX_O6 clb_BOUTMUX_O6 (.clk(clk), .din(din[ 24 +: 8]), .dout(dout[ 24 +: 8]));
clb_BOUTMUX_O5 clb_BOUTMUX_O5 (.clk(clk), .din(din[ 32 +: 8]), .dout(dout[ 32 +: 8]));
//clb_BOUTMUX_O56 clb_BOUTMUX_O56 (.clk(clk), .din(din[ 40 +: 8]), .dout(dout[ 40 +: 8]));
clb_BOUTMUX_B5Q clb_BOUTMUX_B5Q (.clk(clk), .din(din[ 48 +: 8]), .dout(dout[ 48 +: 8 ]));
clb_BOUTMUX_XOR clb_BOUTMUX_XOR (.clk(clk), .din(din[ 56 +: 8]), .dout(dout[ 56 +: 8 ]));
parameter N=1;
clb_BOUTMUX_CY #(.LOC("SLICE_X18Y100"), .N(N))
clb_BOUTMUX_CY (.clk(clk), .din(din[ 8 +: 8]), .dout(dout[ 8 +: 8]));
clb_BOUTMUX_F8 #(.LOC("SLICE_X18Y101"), .N(N))
clb_BOUTMUX_F8 (.clk(clk), .din(din[ 16 +: 8]), .dout(dout[ 16 +: 8]));
//clb_BOUTMUX_O6 #(.LOC("SLICE_X18Y102"), .N(N))
// clb_BOUTMUX_O6 (.clk(clk), .din(din[ 24 +: 8]), .dout(dout[ 24 +: 8]));
clb_BOUTMUX_O5 #(.LOC("SLICE_X18Y103"), .N(N))
clb_BOUTMUX_O5 (.clk(clk), .din(din[ 32 +: 8]), .dout(dout[ 32 +: 8]));
clb_BOUTMUX_B5Q #(.LOC("SLICE_X18Y104"), .N(N))
clb_BOUTMUX_B5Q (.clk(clk), .din(din[ 48 +: 8]), .dout(dout[ 48 +: 8 ]));
clb_BOUTMUX_XOR #(.LOC("SLICE_X18Y105"), .N(N))
clb_BOUTMUX_XOR (.clk(clk), .din(din[ 56 +: 8]), .dout(dout[ 56 +: 8 ]));
endmodule
module myLUT8 (input clk, input [7:0] din,
output lut8o,
output [3:0] co, output [3:0] cout, output bo5, output bo6,
output caro, output carco,
output bo5, output bo6,
//Note: b5ff_q requires the mux and will conflict with other wires
//Otherwise this FF drops out
output wire [3:0] n5ff_q);
output wire ff_q);
//output wire [3:0] n5ff_q);
parameter LOC="SLICE_FIXME";
wire [3:0] caro_all;
assign caro = caro_all[N];
wire [3:0] carco_all;
assign carco = carco_all[N];
wire [3:0] n5ff_q;
ff_q = n5ff_q[N];
wire [3:0] lutno6;
wire [3:0] lutno5;
wire lut7bo, lut7ao;
@ -124,7 +140,6 @@ module myLUT8 (input clk, input [7:0] din,
.CE(1'b1),
.PRE(1'b0),
.D(lutno5[3]));
(* LOC=LOC, BEL="C5FF", KEEP, DONT_TOUCH *)
FDPE c5ff (
.C(clk),
@ -132,32 +147,13 @@ module myLUT8 (input clk, input [7:0] din,
.CE(1'b1),
.PRE(1'b0),
.D(lutno5[2]));
/*
(* LOC=LOC, BEL="B5FF" *)
FDPE ff (
.C(clk),
.Q(n5ff_q[1]),
.CE(1'b1),
//SR options
//0 or dedicated SR
//.PRE(1'b0), //bypass mode
.PRE(din[0]),
//D options
//A: B6LUT:O5 (seems easiest)
//B: BX => MUX8:S
.D(lutno5[1]));
*/
(* LOC=LOC, BEL="B5FF", KEEP, DONT_TOUCH *)
FDPE b5ff (
.C(clk),
.Q(n5ff_q[1]),
.CE(1'b1),
.PRE(1'b0),
//causing routing congestion with MUX8
//.D(1'b0));
.D(lutno5[1]));
(* LOC=LOC, BEL="A5FF", KEEP, DONT_TOUCH *)
FDPE a5ff (
.C(clk),
@ -170,87 +166,76 @@ endmodule
//******************************************************************************
//BOUTMUX tests
/*
module clb_BOUTMUX_NO (input clk, input [7:0] din, output [7:0] dout);
parameter LOC="SLICE_X18Y100";
myLUT8 #(.LOC(LOC))
myLUT8(.clk(clk), .din(din),
.lut8o(),
.co(), .cout(), .bo5(), .bo6(),
.n5ff_q());
endmodule
*/
module clb_BOUTMUX_CY (input clk, input [7:0] din, output [7:0] dout);
parameter LOC="SLICE_X18Y101";
parameter LOC="SLICE_FIXME";
parameter N=1;
wire [3:0] cout;
assign dout[0] = cout[1];
myLUT8 #(.LOC(LOC))
myLUT8(.clk(clk), .din(din),
.lut8o(),
.co(), .cout(cout), .bo5(), .bo6(),
.n5ff_q());
myLUT8 #(.LOC(LOC), .N(N))
myLUT8(.clk(clk), .din(din), .lut8o(),
.caro(), .carco(dout[0]),
.bo5(), .bo6(),
.ff_q());
endmodule
//clb_BOUTMUX_F8: already have above as clb_LUT8
module clb_BOUTMUX_F8 (input clk, input [7:0] din, output [7:0] dout);
parameter LOC="SLICE_X18Y102";
parameter LOC="SLICE_FIXME";
parameter N=1;
myLUT8 #(.LOC(LOC))
myLUT8(.clk(clk), .din(din), .lut8o(dout[0]), .co(), .cout(), .bo5(), .bo6());
myLUT8 #(.LOC(LOC), .N(N))
myLUT8(.clk(clk), .din(din), .lut8o(dout[0]),
.caro(), .carco(),
.bo5(), .bo6(),
.ff_q());
endmodule
/*
//FIXME: need to force it to use both X and O6
module clb_BOUTMUX_O6 (input clk, input [7:0] din, output [7:0] dout);
parameter LOC="SLICE_X18Y103";
parameter LOC="SLICE_FIXME";
parameter N=1;
myLUT8 #(.LOC(LOC))
myLUT8(.clk(clk), .din(din), .lut8o(), .co(), .cout(), .bo5(), .bo6());
myLUT8 #(.LOC(LOC), .N(N))
myLUT8(.clk(clk), .din(din), .lut8o(), .co(), .carco(), .bo5(), .bo6());
endmodule
*/
module clb_BOUTMUX_O5 (input clk, input [7:0] din, output [7:0] dout);
parameter LOC="SLICE_X18Y104";
parameter LOC="SLICE_FIXME";
parameter N=1;
myLUT8 #(.LOC(LOC))
myLUT8(.clk(clk), .din(din), .lut8o(), .co(), .cout(), .bo5(dout[1]), .bo6());
myLUT8 #(.LOC(LOC), .N(N))
myLUT8(.clk(clk), .din(din), .lut8o(),
.caro(), .carco(),
.bo5(dout[1]), .bo6(),
.ff_q());
endmodule
/*
No observed difference to O5
The buffer doesn't give me any additional info
module clb_BOUTMUX_O56 (input clk, input [7:0] din, output [7:0] dout);
parameter LOC="SLICE_X18Y105";
myLUT8 #(.LOC(LOC))
myLUT8(.clk(clk), .din(din), .lut8o(), .co(), .cout(), .bo5(dout[1]), .bo6(dout[0]));
endmodule
*/
module clb_BOUTMUX_B5Q (input clk, input [7:0] din, output [7:0] dout);
parameter LOC="SLICE_X18Y106";
wire [3:0] n5ff_q;
assign dout[0] = n5ff_q[1];
parameter LOC="SLICE_FIXME";
parameter N=1;
myLUT8 #(.LOC(LOC))
myLUT8 #(.LOC(LOC), .N(N))
myLUT8(.clk(clk), .din(din),
.lut8o(),
.co(), .cout(), .bo5(), .bo6(),
.n5ff_q(n5ff_q));
.caro(), .carco(),
.bo5(), .bo6(),
.ff_q(dout[0]));
endmodule
module clb_BOUTMUX_XOR (input clk, input [7:0] din, output [7:0] dout);
parameter LOC="SLICE_X18Y107";
parameter LOC="SLICE_FIXME";
parameter N=1;
//Shady connections, just enough to keep it placed
wire [3:0] co;
assign dout = co[1];
myLUT8 #(.LOC(LOC))
myLUT8(.clk(clk), .din(din), .lut8o(), .co(co), .cout(), .bo5(), .bo6());
myLUT8 #(.LOC(LOC), .N(N))
myLUT8(.clk(clk), .din(din), .lut8o(),
.caro(co), .cout(),
.bo5(), .bo6(),
.ff_q());
endmodule