Merge pull request #4 from efabless/gl_fix

open power domain to fix GL sim issue
efabless · Jul 16, 2024 · 1a9245e · 1a9245e
2 parents a4de873 + 770d6d4
commit 1a9245e
Show file tree

Hide file tree

Showing 20 changed files with 1,728 additions and 10,945 deletions.
diff --git a/gds/EF_SRAM_1024x32_wrapper.gds → gds/EF_SRAM_1024x32.gds b/gds/EF_SRAM_1024x32_wrapper.gds → gds/EF_SRAM_1024x32.gds
diff --git a/gds/EF_SRAM_1024x32_macro.gds b/gds/EF_SRAM_1024x32_macro.gds
diff --git a/hdl/EF_SRAM_1024x32_wrapper.v → hdl/EF_SRAM_1024x32.v b/hdl/EF_SRAM_1024x32_wrapper.v → hdl/EF_SRAM_1024x32.v
@@ -32,7 +32,7 @@
     `define USE_PG_PIN
 `endif
 
-module EF_SRAM_1024x32_wrapper (DO, ScanOutCC, AD, BEN, CLKin, DI, EN, R_WB, ScanInCC, ScanInDL, ScanInDR, SM, TM, WLBI, WLOFF,
+module EF_SRAM_1024x32 (DO, ScanOutCC, AD, BEN, CLKin, DI, EN, R_WB, ScanInCC, ScanInDL, ScanInDR, SM, TM, WLBI, WLOFF,
 `ifdef USE_PG_PIN
 vgnd, vnb, vpb, vpwra,
 `endif
@@ -64,8 +64,8 @@ vpwrpc
     input ScanInCC;
     input ScanInDL;
     input ScanInDR;
-    inout vpwrac;
-    inout vpwrpc;
+    input vpwrac;
+    input vpwrpc;
 
 `ifdef USE_PG_PIN
     input vgnd;

diff --git a/hdl/EF_SRAM_1024x32_wrapper_LVS.v → hdl/EF_SRAM_1024x32_LVS.v b/hdl/EF_SRAM_1024x32_wrapper_LVS.v → hdl/EF_SRAM_1024x32_LVS.v
@@ -32,7 +32,7 @@
     `define USE_PG_PIN
 `endif
 
-module EF_SRAM_1024x32_wrapper (DO, ScanOutCC, AD, BEN, CLKin, DI, EN, R_WB, ScanInCC, ScanInDL, ScanInDR, SM, TM, WLBI, WLOFF,
+module EF_SRAM_1024x32 (DO, ScanOutCC, AD, BEN, CLKin, DI, EN, R_WB, ScanInCC, ScanInDL, ScanInDR, SM, TM, WLBI, WLOFF,
 `ifdef USE_PG_PIN
 vgnd, vnb, vpb, vpwra,
 `endif

diff --git a/hdl/EF_SRAM_1024x32_stub.v b/hdl/EF_SRAM_1024x32_stub.v
@@ -25,7 +25,7 @@
 //  If you have a separate agreement with Efabless pertaining to the use of this software
 //  then that agreement shall control.
 
-module EF_SRAM_1024x32 (DO, ScanOutCC, AD, BEN, CLKin, DI, EN, R_WB, ScanInCC, ScanInDL, ScanInDR, SM, TM, WLBI, WLOFF, vgnd, vnb, vpb, vpwra, vpwrac, vpwrm, vpwrp, vpwrpc);
+module EF_SRAM_1024x32_macro (DO, ScanOutCC, AD, BEN, CLKin, DI, EN, R_WB, ScanInCC, ScanInDL, ScanInDR, SM, TM, WLBI, WLOFF, vgnd, vnb, vpb, vpwra, vpwrac, vpwrm, vpwrp, vpwrpc);
     output [31:0] DO;
     output ScanOutCC;
     input [31:0] DI;

diff --git a/hdl/beh_models/EF_SRAM_1024x32.ff_160V_150C.v b/hdl/beh_models/EF_SRAM_1024x32.ff_160V_150C.v
@@ -29,7 +29,7 @@
 
 `celldefine
 
-module EF_SRAM_1024x32
+module EF_SRAM_1024x32_macro
 (DO, ScanOutCC, AD, BEN, CLKin, DI, EN, R_WB, ScanInCC, ScanInDL, ScanInDR, SM, TM, WLBI, WLOFF,
 `ifdef USE_PG_PIN
 vgnd, vnb, vpb, vpwra,
@@ -1360,7 +1360,7 @@ always @ (normal_mode or DIreg or R_WBreg or WL_Enable or ADreg or BENreg or WLO
     end 
     else if (is_AD_within_range(getAD(ADreg)) == 0) begin
       if (!dis_err_msgs) begin
-		    $display("===ERROR=== (efsram) : Write AD=%h OutOfRange in memory EF_SRAM_1024x32 in instance %m at time=%t\n", ADreg, $time);
+		    $display("===ERROR=== (efsram) : Write AD=%h OutOfRange in memory EF_SRAM_1024x32_macro in instance %m at time=%t\n", ADreg, $time);
       end  
     end
     else if (inputs_x_reg === 1'b1) begin
@@ -1420,7 +1420,7 @@ begin: read_data_block
     end 
     else if (is_AD_within_range(getAD(ADreg)) == 0) begin
       if (!dis_err_msgs) begin
-        $display("===ERROR=== (efsram) : Read AD=%h Out Of Range in memory EF_SRAM_1024x32 in instance %m at time=%t\n", ADreg, $time);
+        $display("===ERROR=== (efsram) : Read AD=%h Out Of Range in memory EF_SRAM_1024x32_macro in instance %m at time=%t\n", ADreg, $time);
       end  
 
     end

diff --git a/hdl/beh_models/EF_SRAM_1024x32.ff_195V_n40C.v b/hdl/beh_models/EF_SRAM_1024x32.ff_195V_n40C.v
@@ -29,7 +29,7 @@
 
 `celldefine
 
-module EF_SRAM_1024x32
+module EF_SRAM_1024x32_macro
 (DO, ScanOutCC, AD, BEN, CLKin, DI, EN, R_WB, ScanInCC, ScanInDL, ScanInDR, SM, TM, WLBI, WLOFF,
 `ifdef USE_PG_PIN
 vgnd, vnb, vpb, vpwra,
@@ -1360,7 +1360,7 @@ always @ (normal_mode or DIreg or R_WBreg or WL_Enable or ADreg or BENreg or WLO
     end 
     else if (is_AD_within_range(getAD(ADreg)) == 0) begin
       if (!dis_err_msgs) begin
-		    $display("===ERROR=== (efsram) : Write AD=%h OutOfRange in memory EF_SRAM_1024x32 in instance %m at time=%t\n", ADreg, $time);
+		    $display("===ERROR=== (efsram) : Write AD=%h OutOfRange in memory EF_SRAM_1024x32_macro in instance %m at time=%t\n", ADreg, $time);
       end  
     end
     else if (inputs_x_reg === 1'b1) begin
@@ -1420,7 +1420,7 @@ begin: read_data_block
     end 
     else if (is_AD_within_range(getAD(ADreg)) == 0) begin
       if (!dis_err_msgs) begin
-        $display("===ERROR=== (efsram) : Read AD=%h Out Of Range in memory EF_SRAM_1024x32 in instance %m at time=%t\n", ADreg, $time);
+        $display("===ERROR=== (efsram) : Read AD=%h Out Of Range in memory EF_SRAM_1024x32_macro in instance %m at time=%t\n", ADreg, $time);
       end  
 
     end

diff --git a/hdl/beh_models/EF_SRAM_1024x32.ss_160V_150C.v b/hdl/beh_models/EF_SRAM_1024x32.ss_160V_150C.v
@@ -29,7 +29,7 @@
 
 `celldefine
 
-module EF_SRAM_1024x32
+module EF_SRAM_1024x32_macro
 (DO, ScanOutCC, AD, BEN, CLKin, DI, EN, R_WB, ScanInCC, ScanInDL, ScanInDR, SM, TM, WLBI, WLOFF,
 `ifdef USE_PG_PIN
 vgnd, vnb, vpb, vpwra,
@@ -1360,7 +1360,7 @@ always @ (normal_mode or DIreg or R_WBreg or WL_Enable or ADreg or BENreg or WLO
     end 
     else if (is_AD_within_range(getAD(ADreg)) == 0) begin
       if (!dis_err_msgs) begin
-		    $display("===ERROR=== (efsram) : Write AD=%h OutOfRange in memory EF_SRAM_1024x32 in instance %m at time=%t\n", ADreg, $time);
+		    $display("===ERROR=== (efsram) : Write AD=%h OutOfRange in memory EF_SRAM_1024x32_macro in instance %m at time=%t\n", ADreg, $time);
       end  
     end
     else if (inputs_x_reg === 1'b1) begin
@@ -1420,7 +1420,7 @@ begin: read_data_block
     end 
     else if (is_AD_within_range(getAD(ADreg)) == 0) begin
       if (!dis_err_msgs) begin
-        $display("===ERROR=== (efsram) : Read AD=%h Out Of Range in memory EF_SRAM_1024x32 in instance %m at time=%t\n", ADreg, $time);
+        $display("===ERROR=== (efsram) : Read AD=%h Out Of Range in memory EF_SRAM_1024x32_macro in instance %m at time=%t\n", ADreg, $time);
       end  
 
     end

diff --git a/hdl/beh_models/EF_SRAM_1024x32.ss_160V_n40C.v b/hdl/beh_models/EF_SRAM_1024x32.ss_160V_n40C.v
@@ -29,7 +29,7 @@
 
 `celldefine
 
-module EF_SRAM_1024x32
+module EF_SRAM_1024x32_macro
 (DO, ScanOutCC, AD, BEN, CLKin, DI, EN, R_WB, ScanInCC, ScanInDL, ScanInDR, SM, TM, WLBI, WLOFF,
 `ifdef USE_PG_PIN
 vgnd, vnb, vpb, vpwra,
@@ -1360,7 +1360,7 @@ always @ (normal_mode or DIreg or R_WBreg or WL_Enable or ADreg or BENreg or WLO
     end 
     else if (is_AD_within_range(getAD(ADreg)) == 0) begin
       if (!dis_err_msgs) begin
-		    $display("===ERROR=== (efsram) : Write AD=%h OutOfRange in memory EF_SRAM_1024x32 in instance %m at time=%t\n", ADreg, $time);
+		    $display("===ERROR=== (efsram) : Write AD=%h OutOfRange in memory EF_SRAM_1024x32_macro in instance %m at time=%t\n", ADreg, $time);
       end  
     end
     else if (inputs_x_reg === 1'b1) begin
@@ -1420,7 +1420,7 @@ begin: read_data_block
     end 
     else if (is_AD_within_range(getAD(ADreg)) == 0) begin
       if (!dis_err_msgs) begin
-        $display("===ERROR=== (efsram) : Read AD=%h Out Of Range in memory EF_SRAM_1024x32 in instance %m at time=%t\n", ADreg, $time);
+        $display("===ERROR=== (efsram) : Read AD=%h Out Of Range in memory EF_SRAM_1024x32_macro in instance %m at time=%t\n", ADreg, $time);
       end  
 
     end

diff --git a/hdl/beh_models/EF_SRAM_1024x32.tt_180V_25C.v b/hdl/beh_models/EF_SRAM_1024x32.tt_180V_25C.v
@@ -29,7 +29,7 @@
 
 `celldefine
 
-module EF_SRAM_1024x32
+module EF_SRAM_1024x32_macro
 (DO, ScanOutCC, AD, BEN, CLKin, DI, EN, R_WB, ScanInCC, ScanInDL, ScanInDR, SM, TM, WLBI, WLOFF,
 `ifdef USE_PG_PIN
 vgnd, vnb, vpb, vpwra,
@@ -1360,7 +1360,7 @@ always @ (normal_mode or DIreg or R_WBreg or WL_Enable or ADreg or BENreg or WLO
     end 
     else if (is_AD_within_range(getAD(ADreg)) == 0) begin
       if (!dis_err_msgs) begin
-		    $display("===ERROR=== (efsram) : Write AD=%h OutOfRange in memory EF_SRAM_1024x32 in instance %m at time=%t\n", ADreg, $time);
+		    $display("===ERROR=== (efsram) : Write AD=%h OutOfRange in memory EF_SRAM_1024x32_macro in instance %m at time=%t\n", ADreg, $time);
       end  
     end
     else if (inputs_x_reg === 1'b1) begin
@@ -1420,7 +1420,7 @@ begin: read_data_block
     end 
     else if (is_AD_within_range(getAD(ADreg)) == 0) begin
       if (!dis_err_msgs) begin
-        $display("===ERROR=== (efsram) : Read AD=%h Out Of Range in memory EF_SRAM_1024x32 in instance %m at time=%t\n", ADreg, $time);
+        $display("===ERROR=== (efsram) : Read AD=%h Out Of Range in memory EF_SRAM_1024x32_macro in instance %m at time=%t\n", ADreg, $time);
       end  
 
     end

diff --git a/hdl/beh_models/EF_SRAM_1024x32_tmax_ff_160V_150C.v b/hdl/beh_models/EF_SRAM_1024x32_tmax_ff_160V_150C.v
@@ -52,7 +52,7 @@ module EF_SRAM_1024x32_tmx
 
 `else
 
-module EF_SRAM_1024x32
+module EF_SRAM_1024x32_macro
  (DO, ScanOutCC, AD, BEN, CLKin, DI, EN, R_WB, ScanInCC, ScanInDL, ScanInDR, SM, TM, WLBI, WLOFF 
 `ifdef USE_PG_PIN
 , vgnd, vnb, vpb, vpwra

diff --git a/hdl/beh_models/EF_SRAM_1024x32_tmax_ff_195V_n40C.v b/hdl/beh_models/EF_SRAM_1024x32_tmax_ff_195V_n40C.v
@@ -52,7 +52,7 @@ module EF_SRAM_1024x32_tmx
 
 `else
 
-module EF_SRAM_1024x32
+module EF_SRAM_1024x32_macro
  (DO, ScanOutCC, AD, BEN, CLKin, DI, EN, R_WB, ScanInCC, ScanInDL, ScanInDR, SM, TM, WLBI, WLOFF 
 `ifdef USE_PG_PIN
 , vgnd, vnb, vpb, vpwra

diff --git a/hdl/beh_models/EF_SRAM_1024x32_tmax_ss_160V_150C.v b/hdl/beh_models/EF_SRAM_1024x32_tmax_ss_160V_150C.v
@@ -52,7 +52,7 @@ module EF_SRAM_1024x32_tmx
 
 `else
 
-module EF_SRAM_1024x32
+module EF_SRAM_1024x32_macro
  (DO, ScanOutCC, AD, BEN, CLKin, DI, EN, R_WB, ScanInCC, ScanInDL, ScanInDR, SM, TM, WLBI, WLOFF 
 `ifdef USE_PG_PIN
 , vgnd, vnb, vpb, vpwra

diff --git a/hdl/beh_models/EF_SRAM_1024x32_tmax_ss_160V_n40C.v b/hdl/beh_models/EF_SRAM_1024x32_tmax_ss_160V_n40C.v
@@ -52,7 +52,7 @@ module EF_SRAM_1024x32_tmx
 
 `else
 
-module EF_SRAM_1024x32
+module EF_SRAM_1024x32_macro
  (DO, ScanOutCC, AD, BEN, CLKin, DI, EN, R_WB, ScanInCC, ScanInDL, ScanInDR, SM, TM, WLBI, WLOFF 
 `ifdef USE_PG_PIN
 , vgnd, vnb, vpb, vpwra

diff --git a/hdl/beh_models/EF_SRAM_1024x32_tmax_tt_180V_25C.v b/hdl/beh_models/EF_SRAM_1024x32_tmax_tt_180V_25C.v
@@ -52,7 +52,7 @@ module EF_SRAM_1024x32_tmx
 
 `else
 
-module EF_SRAM_1024x32
+module EF_SRAM_1024x32_macro
  (DO, ScanOutCC, AD, BEN, CLKin, DI, EN, R_WB, ScanInCC, ScanInDL, ScanInDR, SM, TM, WLBI, WLOFF 
 `ifdef USE_PG_PIN
 , vgnd, vnb, vpb, vpwra

diff --git a/hdl/SRAM_1024x32.v → hdl/bus_wrapper/SRAM_1024x32_wb_wrapper.v b/hdl/SRAM_1024x32.v → hdl/bus_wrapper/SRAM_1024x32_wb_wrapper.v
@@ -29,7 +29,7 @@
     `define USE_PG_PIN
 `endif
 
-module SRAM_1024x32 (
+module SRAM_1024x32_wb_wrapper (
 `ifdef USE_POWER_PINS
     inout VPWR,
     inout VGND,
@@ -57,7 +57,7 @@ wire EN;
 wire R_WB;
 wire CLKin;
 
-ram_controller #(.AW(10)) ram_controller(
+ram_wb_controller #(.AW(10)) ram_controller(
     .wb_clk_i(wb_clk_i),
     .wb_rst_i(wb_rst_i),
     .wbs_stb_i(wbs_stb_i),
@@ -77,13 +77,13 @@ ram_controller #(.AW(10)) ram_controller(
     .CLKin(CLKin)
 );
 
-EF_SRAM_1024x32_wrapper SRAM_0 (
+EF_SRAM_1024x32 SRAM_0 (
 `ifdef USE_POWER_PINS
     .vgnd(VGND),
     .vnb(VGND),
     .vpb(VPWR),
     .vpwra(VPWR),
-    .vpwrm(VPWR),
+    .vpwrm(),
     .vpwrp(VPWR),
 `endif
     .vpwrac(1'b1),

diff --git a/hdl/ram_controller.v → hdl/bus_wrapper/ram_wb_controller.v b/hdl/ram_controller.v → hdl/bus_wrapper/ram_wb_controller.v
@@ -25,7 +25,7 @@
 //  If you have a separate agreement with Efabless pertaining to the use of this software
 //  then that agreement shall control.
 
-module ram_controller #(parameter AW = 10) (
+module ram_wb_controller #(parameter AW = 10) (
     // wishbone
     input wb_clk_i,
     input wb_rst_i,