Reset to Generic Register

This commit is contained in:
felsabbagh3
2019-10-21 11:21:13 -04:00
parent bab1852a99
commit 121a985d12
3 changed files with 102 additions and 100 deletions

View File

@@ -59,6 +59,7 @@ VX_csr_wb_inter VX_csr_wb();
VX_gpr_stage VX_gpr_stage( VX_gpr_stage VX_gpr_stage(
.clk (clk), .clk (clk),
.reset (reset),
.schedule_delay (schedule_delay), .schedule_delay (schedule_delay),
.VX_writeback_inter(VX_writeback_temp), .VX_writeback_inter(VX_writeback_temp),
.VX_bckE_req (VX_bckE_req), .VX_bckE_req (VX_bckE_req),

View File

@@ -15,112 +15,112 @@ module VX_gpr (
assign write_enable = valid_write_request && ((VX_writeback_inter.wb != 0) && (VX_writeback_inter.rd != 5'h0)); assign write_enable = valid_write_request && ((VX_writeback_inter.wb != 0) && (VX_writeback_inter.rd != 5'h0));
byte_enabled_simple_dual_port_ram first_ram( // byte_enabled_simple_dual_port_ram first_ram(
.we (write_enable), // .we (write_enable),
.clk (clk), // .clk (clk),
.waddr (VX_writeback_inter.rd), // .waddr (VX_writeback_inter.rd),
.raddr1(VX_gpr_read.rs1), // .raddr1(VX_gpr_read.rs1),
.raddr2(VX_gpr_read.rs2), // .raddr2(VX_gpr_read.rs2),
.be (VX_writeback_inter.wb_valid), // .be (VX_writeback_inter.wb_valid),
.wdata (VX_writeback_inter.write_data), // .wdata (VX_writeback_inter.write_data),
.q1 (out_a_reg_data), // .q1 (out_a_reg_data),
.q2 (out_b_reg_data) // .q2 (out_b_reg_data)
// );
wire[`NT_M1:0][31:0] write_bit_mask;
genvar curr_t;
for (curr_t = 0; curr_t < `NT; curr_t=curr_t+1) begin
wire local_write = write_enable & VX_writeback_inter.wb_valid[curr_t];
assign write_bit_mask[curr_t] = {32{~local_write}};
end
wire going_to_write = write_enable & (|VX_writeback_inter.wb_valid);
wire cenb = !going_to_write;
wire cena_1 = (VX_gpr_read.rs1 == 0);
wire cena_2 = (VX_gpr_read.rs2 == 0);
// wire[127:0] write_bit_mask = {{32{~(VX_writeback_inter.wb_valid[3])}}, {32{~(VX_writeback_inter.wb_valid[2])}}, {32{~(VX_writeback_inter.wb_valid[1])}}, {32{~(VX_writeback_inter.wb_valid[0])}}};
/* verilator lint_off PINCONNECTEMPTY */
rf2_32x128_wm1 first_ram (
.CENYA(),
.AYA(),
.CENYB(),
.WENYB(),
.AYB(),
.QA(out_a_reg_data),
.SOA(),
.SOB(),
.CLKA(clk),
.CENA(cena_1),
.AA(VX_gpr_read.rs1),
.CLKB(clk),
.CENB(cenb),
.WENB(write_bit_mask),
.AB(VX_writeback_inter.rd),
.DB(VX_writeback_inter.write_data),
.EMAA(3'b011),
.EMASA(1'b0),
.EMAB(3'b011),
.TENA(1'b1),
.TCENA(1'b0),
.TAA(5'b0),
.TENB(1'b1),
.TCENB(1'b0),
.TWENB(128'b0),
.TAB(5'b0),
.TDB(128'b0),
.RET1N(1'b1),
.SIA(2'b0),
.SEA(1'b0),
.DFTRAMBYP(1'b0),
.SIB(2'b0),
.SEB(1'b0),
.COLLDISN(1'b1)
); );
/* verilator lint_on PINCONNECTEMPTY */
/* verilator lint_off PINCONNECTEMPTY */
// wire[`NT_M1:0][31:0] write_bit_mask; rf2_32x128_wm1 second_ram (
.CENYA(),
// genvar curr_t; .AYA(),
// for (curr_t = 0; curr_t < `NT; curr_t=curr_t+1) begin .CENYB(),
// wire local_write = write_enable & VX_writeback_inter.wb_valid[curr_t]; .WENYB(),
// assign write_bit_mask[curr_t] = {32{~local_write}}; .AYB(),
// end .QA(out_b_reg_data),
.SOA(),
// wire going_to_write = write_enable & (|VX_writeback_inter.wb_valid); .SOB(),
.CLKA(clk),
.CENA(cena_2),
// wire cenb = !going_to_write; .AA(VX_gpr_read.rs2),
.CLKB(clk),
// wire cena_1 = (VX_gpr_read.rs1 == 0); .CENB(cenb),
// wire cena_2 = (VX_gpr_read.rs2 == 0); .WENB(write_bit_mask),
.AB(VX_writeback_inter.rd),
// // wire[127:0] write_bit_mask = {{32{~(VX_writeback_inter.wb_valid[3])}}, {32{~(VX_writeback_inter.wb_valid[2])}}, {32{~(VX_writeback_inter.wb_valid[1])}}, {32{~(VX_writeback_inter.wb_valid[0])}}}; .DB(VX_writeback_inter.write_data),
// /* verilator lint_off PINCONNECTEMPTY */ .EMAA(3'b011),
// rf2_32x128_wm1 first_ram ( .EMASA(1'b0),
// .CENYA(), .EMAB(3'b011),
// .AYA(), .TENA(1'b1),
// .CENYB(), .TCENA(1'b0),
// .WENYB(), .TAA(5'b0),
// .AYB(), .TENB(1'b1),
// .QA(out_a_reg_data), .TCENB(1'b0),
// .SOA(), .TWENB(128'b0),
// .SOB(), .TAB(5'b0),
// .CLKA(clk), .TDB(128'b0),
// .CENA(cena_1), .RET1N(1'b1),
// .AA(VX_gpr_read.rs1), .SIA(2'b0),
// .CLKB(clk), .SEA(1'b0),
// .CENB(cenb), .DFTRAMBYP(1'b0),
// .WENB(write_bit_mask), .SIB(2'b0),
// .AB(VX_writeback_inter.rd), .SEB(1'b0),
// .DB(VX_writeback_inter.write_data), .COLLDISN(1'b1)
// .EMAA(3'b011), );
// .EMASA(1'b0), /* verilator lint_on PINCONNECTEMPTY */
// .EMAB(3'b011),
// .TENA(1'b1),
// .TCENA(1'b0),
// .TAA(5'b0),
// .TENB(1'b1),
// .TCENB(1'b0),
// .TWENB(128'b0),
// .TAB(5'b0),
// .TDB(128'b0),
// .RET1N(1'b1),
// .SIA(2'b0),
// .SEA(1'b0),
// .DFTRAMBYP(1'b0),
// .SIB(2'b0),
// .SEB(1'b0),
// .COLLDISN(1'b1)
// );
// /* verilator lint_on PINCONNECTEMPTY */
// /* verilator lint_off PINCONNECTEMPTY */
// rf2_32x128_wm1 second_ram (
// .CENYA(),
// .AYA(),
// .CENYB(),
// .WENYB(),
// .AYB(),
// .QA(out_b_reg_data),
// .SOA(),
// .SOB(),
// .CLKA(clk),
// .CENA(cena_2),
// .AA(VX_gpr_read.rs2),
// .CLKB(clk),
// .CENB(cenb),
// .WENB(write_bit_mask),
// .AB(VX_writeback_inter.rd),
// .DB(VX_writeback_inter.write_data),
// .EMAA(3'b011),
// .EMASA(1'b0),
// .EMAB(3'b011),
// .TENA(1'b1),
// .TCENA(1'b0),
// .TAA(5'b0),
// .TENB(1'b1),
// .TCENB(1'b0),
// .TWENB(128'b0),
// .TAB(5'b0),
// .TDB(128'b0),
// .RET1N(1'b1),
// .SIA(2'b0),
// .SEA(1'b0),
// .DFTRAMBYP(1'b0),
// .SIB(2'b0),
// .SEB(1'b0),
// .COLLDISN(1'b1)
// );
// /* verilator lint_on PINCONNECTEMPTY */
endmodule endmodule

View File

@@ -1,5 +1,6 @@
module VX_gpr_stage ( module VX_gpr_stage (
input wire clk, input wire clk,
input wire reset,
input wire schedule_delay, input wire schedule_delay,
// inputs // inputs
// Instruction Information // Instruction Information
@@ -54,7 +55,7 @@ module VX_gpr_stage (
VX_generic_register #(.N(256)) reg_data VX_generic_register #(.N(256)) reg_data
( (
.clk (clk), .clk (clk),
.reset(zero_temp), .reset(reset),
.stall(zero_temp), .stall(zero_temp),
.flush(zero_temp), .flush(zero_temp),
.in ({VX_gpr_datf.a_reg_data, VX_gpr_datf.b_reg_data}), .in ({VX_gpr_datf.a_reg_data, VX_gpr_datf.b_reg_data}),
@@ -66,7 +67,7 @@ module VX_gpr_stage (
VX_d_e_reg gpr_stage_reg( VX_d_e_reg gpr_stage_reg(
.clk (clk), .clk (clk),
.reset (zero_temp), .reset (reset),
.in_branch_stall (stall), .in_branch_stall (stall),
.in_freeze (zero_temp), .in_freeze (zero_temp),
.VX_frE_to_bckE_req(VX_bckE_req), .VX_frE_to_bckE_req(VX_bckE_req),