From cb412090950d83d12bcce462fefda60f7fbab523 Mon Sep 17 00:00:00 2001 From: Patrick Urban Date: Fri, 12 Nov 2021 08:47:15 +0100 Subject: [PATCH] synth_gatemate Revert cascade A/B port mixup --- techlibs/gatemate/brams_map.v | 8 ++++---- techlibs/gatemate/cells_sim.v | 8 -------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/techlibs/gatemate/brams_map.v b/techlibs/gatemate/brams_map.v index 2e5e1a5cc..f36f05212 100644 --- a/techlibs/gatemate/brams_map.v +++ b/techlibs/gatemate/brams_map.v @@ -450,7 +450,7 @@ module \$__CC_BRAM_CASCADE (CLK2, CLK3, A1ADDR, A1DATA, A1EN, B1ADDR, B1DATA, B1 `undef INIT_UPPER .LOC("UNPLACED"), .CAS("UPPER"), - .A_RD_WIDTH(CFG_DBITS), .B_RD_WIDTH(0), + .A_RD_WIDTH(0), .B_RD_WIDTH(CFG_DBITS), .A_WR_WIDTH(CFG_DBITS), .B_WR_WIDTH(0), .RAM_MODE("TDP"), .A_WR_MODE("NO_CHANGE"), .B_WR_MODE("NO_CHANGE"), @@ -462,8 +462,8 @@ module \$__CC_BRAM_CASCADE (CLK2, CLK3, A1ADDR, A1DATA, A1EN, B1ADDR, B1DATA, B1 ) upper_cell ( .A_CI(A_CAS), .B_CI(B_CAS), - .A_DO(B1DATA), - .B_DO(A_UP_DO), + .A_DO(A_UP_DO), + .B_DO(B1DATA), .A_ECC_1B_ERR(A_ECC_1B_ERR), .B_ECC_1B_ERR(B_ECC_1B_ERR), .A_ECC_2B_ERR(A_ECC_2B_ERR), @@ -488,7 +488,7 @@ module \$__CC_BRAM_CASCADE (CLK2, CLK3, A1ADDR, A1DATA, A1EN, B1ADDR, B1DATA, B1 `undef INIT_LOWER .LOC("UNPLACED"), .CAS("LOWER"), - .A_RD_WIDTH(CFG_DBITS), .B_RD_WIDTH(0), + .A_RD_WIDTH(0), .B_RD_WIDTH(CFG_DBITS), .A_WR_WIDTH(CFG_DBITS), .B_WR_WIDTH(0), .RAM_MODE("TDP"), .A_WR_MODE("NO_CHANGE"), .B_WR_MODE("NO_CHANGE"), diff --git a/techlibs/gatemate/cells_sim.v b/techlibs/gatemate/cells_sim.v index 1c7e40680..1de3d1c7a 100644 --- a/techlibs/gatemate/cells_sim.v +++ b/techlibs/gatemate/cells_sim.v @@ -1035,14 +1035,6 @@ module CC_BRAM_40K ( $display("ERROR: Port B width of 80 bits is only supported in SDP mode."); $finish(); end - if (((CAS == "UPPER") || (CAS == "LOWER")) && (WIDTH_MODE_A > 1)) begin - $display("ERROR: Port A cascade mode only supported in 1 bit mode."); - $finish(); - end - if (((CAS == "UPPER") || (CAS == "LOWER")) && (WIDTH_MODE_B > 1)) begin - $display("ERROR: Port B cascade mode only supported in 1 bit mode."); - $finish(); - end if ((WIDTH_MODE_A != 80) && (WIDTH_MODE_A != 40) && (WIDTH_MODE_A != 20) && (WIDTH_MODE_A != 10) && (WIDTH_MODE_A != 5) && (WIDTH_MODE_A != 2) && (WIDTH_MODE_A != 1) && (WIDTH_MODE_A != 0)) begin $display("ERROR: Illegal %s Port A width configuration %d.", RAM_MODE, WIDTH_MODE_A); -- 2.30.2