From 5e659a631e3eb83a46d23cbfb48451aec3a1132b Mon Sep 17 00:00:00 2001 From: John McMaster Date: Mon, 8 Oct 2018 12:15:55 -0700 Subject: [PATCH] bram: clean up old minitests Signed-off-by: John McMaster --- minitests/bram/README.md | 7 ------- minitests/{bram => bram_basic}/.gitignore | 0 minitests/{bram => bram_basic}/Makefile | 0 minitests/bram_basic/README.md | 8 ++++++++ minitests/{bram => bram_basic}/env.sh | 0 minitests/{bram => bram_basic}/top.v | 10 +++++++--- minitests/{bram_fixed => bram_diff}/.gitignore | 0 minitests/{bram_fixed => bram_diff}/Makefile | 0 .../{bram_fixed/README.txt => bram_diff/README.md} | 0 minitests/{bram_fixed => bram_diff}/env.sh | 0 minitests/{bram_fixed => bram_diff}/runme.sh | 0 minitests/{bram_fixed => bram_diff}/runme.tcl | 0 .../{bram_fixed => bram_diff}/top_CLKARDCLK_INV.v | 0 .../{bram_fixed => bram_diff}/top_CLKBWRCLK_INV.v | 0 minitests/{bram_fixed => bram_diff}/top_ENARDEN_INV.v | 0 minitests/{bram_fixed => bram_diff}/top_ENBWREN_INV.v | 0 minitests/{bram_fixed => bram_diff}/top_RAM_MODE_SDP.v | 0 .../{bram_fixed => bram_diff}/top_RSTRAMARSTRAM_INV.v | 0 minitests/{bram_fixed => bram_diff}/top_RSTRAMB_INV.v | 0 .../{bram_fixed => bram_diff}/top_RSTREGARSTREG_INV.v | 0 minitests/{bram_fixed => bram_diff}/top_RSTREGB_INV.v | 0 .../{bram_fixed => bram_diff}/top_WRITE_MODE_A_NC.v | 0 .../{bram_fixed => bram_diff}/top_WRITE_MODE_A_RF.v | 0 minitests/{bram_fixed => bram_diff}/top_ref.v | 0 24 files changed, 15 insertions(+), 10 deletions(-) delete mode 100644 minitests/bram/README.md rename minitests/{bram => bram_basic}/.gitignore (100%) rename minitests/{bram => bram_basic}/Makefile (100%) create mode 100644 minitests/bram_basic/README.md rename minitests/{bram => bram_basic}/env.sh (100%) rename minitests/{bram => bram_basic}/top.v (98%) rename minitests/{bram_fixed => bram_diff}/.gitignore (100%) rename minitests/{bram_fixed => bram_diff}/Makefile (100%) rename minitests/{bram_fixed/README.txt => bram_diff/README.md} (100%) rename minitests/{bram_fixed => bram_diff}/env.sh (100%) rename minitests/{bram_fixed => bram_diff}/runme.sh (100%) rename minitests/{bram_fixed => bram_diff}/runme.tcl (100%) rename minitests/{bram_fixed => bram_diff}/top_CLKARDCLK_INV.v (100%) rename minitests/{bram_fixed => bram_diff}/top_CLKBWRCLK_INV.v (100%) rename minitests/{bram_fixed => bram_diff}/top_ENARDEN_INV.v (100%) rename minitests/{bram_fixed => bram_diff}/top_ENBWREN_INV.v (100%) rename minitests/{bram_fixed => bram_diff}/top_RAM_MODE_SDP.v (100%) rename minitests/{bram_fixed => bram_diff}/top_RSTRAMARSTRAM_INV.v (100%) rename minitests/{bram_fixed => bram_diff}/top_RSTRAMB_INV.v (100%) rename minitests/{bram_fixed => bram_diff}/top_RSTREGARSTREG_INV.v (100%) rename minitests/{bram_fixed => bram_diff}/top_RSTREGB_INV.v (100%) rename minitests/{bram_fixed => bram_diff}/top_WRITE_MODE_A_NC.v (100%) rename minitests/{bram_fixed => bram_diff}/top_WRITE_MODE_A_RF.v (100%) rename minitests/{bram_fixed => bram_diff}/top_ref.v (100%) diff --git a/minitests/bram/README.md b/minitests/bram/README.md deleted file mode 100644 index 13bc497a..00000000 --- a/minitests/bram/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# BRAM Minitest - -## Purpose -Test to verify that all the ROM* primitives are just regular LUTs and not BRAMs with init values - -## Result -Confirmed: floorplan shows as LUTs and no unknown bits observed \ No newline at end of file diff --git a/minitests/bram/.gitignore b/minitests/bram_basic/.gitignore similarity index 100% rename from minitests/bram/.gitignore rename to minitests/bram_basic/.gitignore diff --git a/minitests/bram/Makefile b/minitests/bram_basic/Makefile similarity index 100% rename from minitests/bram/Makefile rename to minitests/bram_basic/Makefile diff --git a/minitests/bram_basic/README.md b/minitests/bram_basic/README.md new file mode 100644 index 00000000..2a99f236 --- /dev/null +++ b/minitests/bram_basic/README.md @@ -0,0 +1,8 @@ +# BRAM Minitest + +## Purpose +Test basic BRAM instantiation and observe bitstream effects + +## Result +BRAM configuration and data are in two very different areas of the bitstream + diff --git a/minitests/bram/env.sh b/minitests/bram_basic/env.sh similarity index 100% rename from minitests/bram/env.sh rename to minitests/bram_basic/env.sh diff --git a/minitests/bram/top.v b/minitests/bram_basic/top.v similarity index 98% rename from minitests/bram/top.v rename to minitests/bram_basic/top.v index 2a6f8ad0..a06002bf 100644 --- a/minitests/bram/top.v +++ b/minitests/bram_basic/top.v @@ -26,7 +26,10 @@ module top(input clk, stb, di, output do); assign do = dout_shr[DOUT_N-1]; - roi roi ( + //roi_hck + roi_brams + //roi_invalid + roi ( .clk(clk), .din(din), .dout(dout) @@ -34,7 +37,8 @@ module top(input clk, stb, di, output do); endmodule //HCK test -module roi_(input clk, input [255:0] din, output [255:0] dout); +//XXX: what specifically was this testing? +module roi_hck(input clk, input [255:0] din, output [255:0] dout); ram_RAMB36E1 #(.LOC("RAMB36_X0Y24"), .INIT({256{1'b1}})) r0(.clk(clk), .din(din[ 0 +: 8]), .dout(dout[ 0 +: 8])); ram_RAMB36E1 #(.LOC("RAMB36_X0Y25"), .INIT({256{1'b1}})) @@ -49,7 +53,7 @@ endmodule /* One BRAM per tile */ -module roi(input clk, input [255:0] din, output [255:0] dout); +module roi_brams(input clk, input [255:0] din, output [255:0] dout); ram_RAMB18E1 #(.LOC("RAMB18_X0Y40"), .INIT0(1'b1), .INIT({256{1'b0}})) r0(.clk(clk), .din(din[ 0 +: 8]), .dout(dout[ 0 +: 8])); ram_RAMB18E1 #(.LOC("RAMB18_X0Y42"), .INIT0(1'b1), .INIT({256{1'b0}})) diff --git a/minitests/bram_fixed/.gitignore b/minitests/bram_diff/.gitignore similarity index 100% rename from minitests/bram_fixed/.gitignore rename to minitests/bram_diff/.gitignore diff --git a/minitests/bram_fixed/Makefile b/minitests/bram_diff/Makefile similarity index 100% rename from minitests/bram_fixed/Makefile rename to minitests/bram_diff/Makefile diff --git a/minitests/bram_fixed/README.txt b/minitests/bram_diff/README.md similarity index 100% rename from minitests/bram_fixed/README.txt rename to minitests/bram_diff/README.md diff --git a/minitests/bram_fixed/env.sh b/minitests/bram_diff/env.sh similarity index 100% rename from minitests/bram_fixed/env.sh rename to minitests/bram_diff/env.sh diff --git a/minitests/bram_fixed/runme.sh b/minitests/bram_diff/runme.sh similarity index 100% rename from minitests/bram_fixed/runme.sh rename to minitests/bram_diff/runme.sh diff --git a/minitests/bram_fixed/runme.tcl b/minitests/bram_diff/runme.tcl similarity index 100% rename from minitests/bram_fixed/runme.tcl rename to minitests/bram_diff/runme.tcl diff --git a/minitests/bram_fixed/top_CLKARDCLK_INV.v b/minitests/bram_diff/top_CLKARDCLK_INV.v similarity index 100% rename from minitests/bram_fixed/top_CLKARDCLK_INV.v rename to minitests/bram_diff/top_CLKARDCLK_INV.v diff --git a/minitests/bram_fixed/top_CLKBWRCLK_INV.v b/minitests/bram_diff/top_CLKBWRCLK_INV.v similarity index 100% rename from minitests/bram_fixed/top_CLKBWRCLK_INV.v rename to minitests/bram_diff/top_CLKBWRCLK_INV.v diff --git a/minitests/bram_fixed/top_ENARDEN_INV.v b/minitests/bram_diff/top_ENARDEN_INV.v similarity index 100% rename from minitests/bram_fixed/top_ENARDEN_INV.v rename to minitests/bram_diff/top_ENARDEN_INV.v diff --git a/minitests/bram_fixed/top_ENBWREN_INV.v b/minitests/bram_diff/top_ENBWREN_INV.v similarity index 100% rename from minitests/bram_fixed/top_ENBWREN_INV.v rename to minitests/bram_diff/top_ENBWREN_INV.v diff --git a/minitests/bram_fixed/top_RAM_MODE_SDP.v b/minitests/bram_diff/top_RAM_MODE_SDP.v similarity index 100% rename from minitests/bram_fixed/top_RAM_MODE_SDP.v rename to minitests/bram_diff/top_RAM_MODE_SDP.v diff --git a/minitests/bram_fixed/top_RSTRAMARSTRAM_INV.v b/minitests/bram_diff/top_RSTRAMARSTRAM_INV.v similarity index 100% rename from minitests/bram_fixed/top_RSTRAMARSTRAM_INV.v rename to minitests/bram_diff/top_RSTRAMARSTRAM_INV.v diff --git a/minitests/bram_fixed/top_RSTRAMB_INV.v b/minitests/bram_diff/top_RSTRAMB_INV.v similarity index 100% rename from minitests/bram_fixed/top_RSTRAMB_INV.v rename to minitests/bram_diff/top_RSTRAMB_INV.v diff --git a/minitests/bram_fixed/top_RSTREGARSTREG_INV.v b/minitests/bram_diff/top_RSTREGARSTREG_INV.v similarity index 100% rename from minitests/bram_fixed/top_RSTREGARSTREG_INV.v rename to minitests/bram_diff/top_RSTREGARSTREG_INV.v diff --git a/minitests/bram_fixed/top_RSTREGB_INV.v b/minitests/bram_diff/top_RSTREGB_INV.v similarity index 100% rename from minitests/bram_fixed/top_RSTREGB_INV.v rename to minitests/bram_diff/top_RSTREGB_INV.v diff --git a/minitests/bram_fixed/top_WRITE_MODE_A_NC.v b/minitests/bram_diff/top_WRITE_MODE_A_NC.v similarity index 100% rename from minitests/bram_fixed/top_WRITE_MODE_A_NC.v rename to minitests/bram_diff/top_WRITE_MODE_A_NC.v diff --git a/minitests/bram_fixed/top_WRITE_MODE_A_RF.v b/minitests/bram_diff/top_WRITE_MODE_A_RF.v similarity index 100% rename from minitests/bram_fixed/top_WRITE_MODE_A_RF.v rename to minitests/bram_diff/top_WRITE_MODE_A_RF.v diff --git a/minitests/bram_fixed/top_ref.v b/minitests/bram_diff/top_ref.v similarity index 100% rename from minitests/bram_fixed/top_ref.v rename to minitests/bram_diff/top_ref.v