github.com/olofk.serv
1
0
Fork 0
mirror of https://github.com/olofk/serv.git synced 2026-05-02 06:35:15 +00:00
Code Issues Releases Wiki Activity

Change to wb interface

Browse Source
This commit is contained in:
Olof Kindgren
2018-11-09 21:26:13 +01:00
parent cbbdaed112
commit 3c98d35766
30 changed files with 238 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtl/serv_ctrl.v
View File

@@ -9,9 +9,9 @@ module serv_ctrl
input i_jalr,
input i_auipc,
output o_rd,
output [31:0] o_i_ca_adr,
output reg o_i_ca_vld = 1'b0,
input i_i_ca_rdy);
output [31:0] o_ibus_adr,
output reg o_ibus_cyc = 1'b0,
input i_ibus_ack);
parameter RESET_PC = 32'd8;
@@ -28,7 +28,7 @@ module serv_ctrl
assign plus_4 = en_2r & !en_3r;
assign o_i_ca_adr[0] = pc;
assign o_ibus_adr[0] = pc;
ser_add ser_add_pc_plus_4
(
@@ -49,7 +49,7 @@ module serv_ctrl
.i_en (i_en),
.i_d (new_pc),
.o_q (pc),
.o_par (o_i_ca_adr[31:1])
.o_par (o_ibus_adr[31:1])
);
assign new_pc = i_jump ? pc_plus_offset : pc_plus_4;
@@ -76,9 +76,9 @@ module serv_ctrl
en_3r <= en_2r;
if (en_r & !i_en)
o_i_ca_vld <= 1'b1;
else if (o_i_ca_vld & i_i_ca_rdy)
o_i_ca_vld <= 1'b0;
o_ibus_cyc <= 1'b1;
else if (o_ibus_cyc & i_ibus_ack)
o_ibus_cyc <= 1'b0;
end
endmodule

90
rtl/serv_decode.v
View File

@@ -1,18 +1,18 @@
module serv_decode
(
input clk,
input [31:0] i_i_rd_dat,
input i_i_rd_vld,
output reg o_i_rd_rdy = 1'b1,
input [31:0] i_wb_rdt,
input i_wb_en,
output o_ibus_active,
output o_ctrl_en,
output o_ctrl_jump,
output o_ctrl_jalr,
output o_ctrl_auipc,
output o_rf_rd_en,
output [4:0] o_rf_rd_addr,
output reg [4:0] o_rf_rd_addr,
output o_rf_rs_en,
output [4:0] o_rf_rs1_addr,
output [4:0] o_rf_rs2_addr,
output reg [4:0] o_rf_rs1_addr,
output reg [4:0] o_rf_rs2_addr,
output o_alu_en,
output o_alu_init,
output o_alu_sub,
@@ -29,7 +29,7 @@ module serv_decode
output o_mem_init,
output reg o_mem_dat_valid,
input i_mem_busy,
output [2:0] o_funct3,
output reg [2:0] o_funct3,
output reg o_imm,
output o_offset_source,
output o_op_b_source,
@@ -56,13 +56,17 @@ module serv_decode
OP_JALR = 5'b11001,
OP_JAL = 5'b11011;
reg [2:0] state = 3'd0;
reg [2:0] state = IDLE;
reg [4:0] cnt = 5'd0;
wire running;
wire mem_op;
wire shift_op;
reg signbit;
assign o_ibus_active = (state == IDLE);
assign mem_op = (opcode == OP_LOAD) | (opcode == OP_STORE);
assign shift_op = ((opcode == OP_OPIMM) & (o_funct3[1:0] == 2'b01)) |
@@ -91,7 +95,7 @@ module serv_decode
assign o_alu_init = (state == COMPARE) |
(state == SH_INIT);
assign o_alu_sub = (opcode == OP_OP) ? i_i_rd_dat[30] /* ? 1'b1*/ :
assign o_alu_sub = (opcode == OP_OP) ? signbit /* ? 1'b1*/ :
((opcode == OP_BRANCH) & (o_funct3 == 3'b100)) ? 1'b1 :
((opcode == OP_BRANCH) & (o_funct3 == 3'b101)) ? 1'b1 :
((opcode == OP_BRANCH) & (o_funct3 == 3'b110)) ? 1'b1 :
@@ -129,7 +133,7 @@ module serv_decode
endcase
end
assign o_alu_shamt_en = (state == SH_INIT) & (cnt < 5);
assign o_alu_sh_signed = i_i_rd_dat[30];
assign o_alu_sh_signed = signbit;
assign o_alu_sh_right = o_funct3[2];
assign o_mem_en = mem_op & cnt_en;
@@ -137,10 +141,22 @@ module serv_decode
assign o_mem_init = (state == MEM_INIT);
assign o_rf_rd_addr = i_i_rd_dat[11:7];
assign o_funct3 = i_i_rd_dat[14:12];
assign o_rf_rs1_addr = i_i_rd_dat[19:15];
assign o_rf_rs2_addr = i_i_rd_dat[24:20];
reg [4:0] opcode;
reg [31:0] imm;
always @(posedge clk) begin
if (i_wb_en) begin
o_rf_rd_addr <= i_wb_rdt[11:7];
o_rf_rs1_addr <= i_wb_rdt[19:15];
o_rf_rs2_addr <= i_wb_rdt[24:20];
o_funct3 <= i_wb_rdt[14:12];
signbit <= i_wb_rdt[30];
opcode <= i_wb_rdt[6:2];
imm <= i_wb_rdt;
end
end
assign o_offset_source = (opcode == OP_JAL) ? OFFSET_SOURCE_IMM :
(opcode == OP_AUIPC) ? OFFSET_SOURCE_IMM :
(opcode == OP_BRANCH) ? OFFSET_SOURCE_IMM :
@@ -152,7 +168,7 @@ module serv_decode
(opcode == OP_OP) ? OP_B_SOURCE_RS2 :
1'bx;
always @(o_funct3, cnt)
always @(o_funct3, cnt, o_mem_init)
if (o_mem_init)
o_mem_dat_valid = 1'bx;
else
@@ -163,7 +179,6 @@ module serv_decode
default: o_mem_dat_valid = 1'bx;
endcase
wire [4:0] opcode = i_i_rd_dat[6:2];
assign o_rd_source = (opcode == OP_JAL) ? RD_SOURCE_CTRL :
@@ -174,36 +189,38 @@ module serv_decode
(opcode == OP_JALR) ? RD_SOURCE_CTRL :
(opcode == OP_LOAD) ? RD_SOURCE_MEM : 2'bxx;
always @(cnt, opcode, i_i_rd_dat) begin
always @(cnt, opcode, imm) begin
o_imm = 1'bx;
if (opcode == OP_JAL)
if (cnt > 19) o_imm = i_i_rd_dat[31];
else if (cnt > 11) o_imm = i_i_rd_dat[cnt];
else if (cnt > 10) o_imm = i_i_rd_dat[20];
else if (cnt > 0) o_imm = i_i_rd_dat[cnt+20];
if (cnt > 19) o_imm = imm[31];
else if (cnt > 11) o_imm = imm[cnt];
else if (cnt > 10) o_imm = imm[20];
else if (cnt > 0) o_imm = imm[cnt+20];
else o_imm = 1'b0;
else if ((opcode == OP_OPIMM) | (opcode == OP_JALR))
if (cnt > 10) o_imm = i_i_rd_dat[31];
else o_imm = i_i_rd_dat[cnt+20];
if (cnt > 10) o_imm = imm[31];
else o_imm = imm[cnt+20];
else if ((opcode == OP_LUI) | (opcode == OP_AUIPC))
if (cnt > 11) o_imm = i_i_rd_dat[cnt];
if (cnt > 11) o_imm = imm[cnt];
else o_imm = 1'b0;
else if (opcode == OP_LOAD)
if (cnt > 10) o_imm = i_i_rd_dat[31];
else o_imm = i_i_rd_dat[cnt+20];
if (cnt > 10) o_imm = imm[31];
else o_imm = imm[cnt+20];
else if (opcode == OP_BRANCH)
if (cnt > 11) o_imm = i_i_rd_dat[31];
else if (cnt > 10) o_imm = i_i_rd_dat[7];
else if (cnt > 4) o_imm = i_i_rd_dat[cnt+20];
else if (cnt > 0) o_imm = i_i_rd_dat[cnt+7];
if (cnt > 11) o_imm = imm[31];
else if (cnt > 10) o_imm = imm[7];
else if (cnt > 4) o_imm = imm[cnt+20];
else if (cnt > 0) o_imm = imm[cnt+7];
else o_imm = 1'b0;
else if (opcode == OP_STORE)
if (cnt > 10) o_imm = i_i_rd_dat[31];
else if (cnt > 4) o_imm = i_i_rd_dat[cnt+20];
else o_imm = i_i_rd_dat[cnt+7];
if (cnt > 10) o_imm = imm[31];
else if (cnt > 4) o_imm = imm[cnt+20];
else o_imm = imm[cnt+7];
end
wire go = i_i_rd_vld & o_i_rd_rdy;
reg go = 1'b0;
always @(posedge clk)
go <= i_wb_en;
wire cnt_en =
(state == RUN) |
@@ -247,11 +264,6 @@ module serv_decode
cnt <= cnt + {4'd0,cnt_en};
if (go) begin
o_i_rd_rdy <= 1'b0;
end else if (cnt_done & (state == RUN)) begin
o_i_rd_rdy <= 1'b1;
end
end
endmodule

75
rtl/serv_mem_if.v
View File

@@ -13,22 +13,17 @@ module serv_mem_if
output o_rd,
output reg o_busy = 1'b0,
//External interface
output o_d_ca_cmd,
output [31:0] o_d_ca_adr,
output reg o_d_ca_vld = 1'b0,
input i_d_ca_rdy,
output [31:0] o_d_dm_dat,
output [3:0] o_d_dm_msk,
output reg o_d_dm_vld = 1'b0,
input i_d_dm_rdy,
input [31:0] i_d_rd_dat,
input i_d_rd_vld,
output o_d_rd_rdy);
output [31:0] o_wb_adr,
output [31:0] o_wb_dat,
output [3:0] o_wb_sel,
output o_wb_we ,
output reg o_wb_cyc = 1'b0,
output o_wb_stb,
input [31:0] i_wb_rdt,
input i_wb_ack);
wire ca_en = o_d_ca_vld & i_d_ca_rdy;
wire dm_en = o_d_dm_vld & i_d_dm_rdy;
wire rd_en = i_d_rd_vld & o_d_rd_rdy;
wire wb_en = o_wb_cyc & i_wb_ack;
assign o_wb_stb = o_wb_cyc;
reg init_r;
reg en_r;
reg en_2r;
@@ -50,27 +45,24 @@ module serv_mem_if
.clk (i_clk),
.i_en (i_init),
.i_d (adr),
.o_q (o_d_ca_adr[0]),
.o_par (o_d_ca_adr[31:1])
.o_q (o_wb_adr[0]),
.o_par (o_wb_adr[31:1])
);
assign o_d_ca_cmd = i_cmd;
wire is_signed = ~i_funct3[2];
assign o_rd = i_dat_valid ? dat[0] : signbit & is_signed;
assign o_d_rd_rdy = !i_en; //Likely bug, but probably doesn't matter
wire is_word = i_funct3[1];
wire is_half = i_funct3[0];
wire is_byte = !(|i_funct3[1:0]);
wire upper_half = bytepos[1];
assign o_d_dm_dat = dat;
assign o_d_dm_msk = is_word ? 4'b1111 :
is_half ? {{2{upper_half}}, ~{2{upper_half}}} :
4'd1 << bytepos;
assign o_wb_dat = dat;
assign o_wb_sel = (is_word ? 4'b1111 :
is_half ? {{2{upper_half}}, ~{2{upper_half}}} :
4'd1 << bytepos);
assign o_wb_we = i_cmd;
reg [1:0] bytepos;
reg [4:0] cnt = 5'd0;
reg dat_en;
@@ -78,14 +70,14 @@ module serv_mem_if
always @(i_funct3, cnt, bytepos)
casez(i_funct3[1:0])
2'b1? : dat_en = 1'b1;
2'b?1 : dat_en = bytepos[1] ? (cnt<16) : 1'b1;
2'b01 : dat_en = bytepos[1] ? (cnt<16) : 1'b1;
2'b00 : dat_en = (bytepos == 2'd3) ? (cnt <8) :
(bytepos == 2'd2) ? (cnt < 16) :
(bytepos == 2'd1) ? (cnt < 24) : 1'b1;
endcase
always @(posedge i_clk) begin
cnt <= cnt + i_init;
cnt <= cnt + {4'd0,i_init};
if (i_en & !en_r)
bytepos[0] <= adr;
@@ -97,33 +89,28 @@ module serv_mem_if
if (i_en & i_init)
o_busy <= 1'b1;
else if (rd_en | dm_en)
else if (wb_en)
o_busy <= 1'b0;
if (rd_en) begin
dat[31:16] <= i_d_rd_dat[31:16];
dat[15:8] <= (is_half & upper_half) ? i_d_rd_dat[31:24] : i_d_rd_dat[15:8];
dat[7:0] <= (is_byte & (bytepos == 2'b11)) ? i_d_rd_dat[31:24] :
(is_byte & (bytepos == 2'b10)) ? i_d_rd_dat[23:16] :
(is_half & upper_half) ? i_d_rd_dat[23:16] :
(is_byte & (bytepos == 2'b01)) ? i_d_rd_dat[15:8] :
i_d_rd_dat[7:0];
if (wb_en & !o_wb_we) begin
dat[31:16] <= i_wb_rdt[31:16];
dat[15:8] <= (is_half & upper_half) ? i_wb_rdt[31:24] : i_wb_rdt[15:8];
dat[7:0] <= (is_byte & (bytepos == 2'b11)) ? i_wb_rdt[31:24] :
(is_byte & (bytepos == 2'b10)) ? i_wb_rdt[23:16] :
(is_half & upper_half) ? i_wb_rdt[23:16] :
(is_byte & (bytepos == 2'b01)) ? i_wb_rdt[15:8] :
i_wb_rdt[7:0];
end
en_r <= i_en;
en_2r <= en_r;
init_r <= i_init;
if (ca_en)
o_d_ca_vld <= 1'b0;
if (wb_en)
o_wb_cyc <= 1'b0;
else if (init_r & !i_init) begin //Optimize?
o_d_ca_vld <= 1'b1;
o_wb_cyc <= 1'b1;
end
if (dm_en)
o_d_dm_vld <= 1'b0;
else if (init_r & !i_init)
o_d_dm_vld <= i_cmd;
if (i_en & dat_en)
dat <= {i_rs2,dat[31:1]};
end

99
rtl/serv_top.v
View File

@@ -30,25 +30,23 @@ module serv_top
output reg [3:0] rvfi_mem_wmask,
output reg [31:0] rvfi_mem_rdata,
output reg [31:0] rvfi_mem_wdata,
`endif
output [31:0] o_i_ca_adr,
output o_i_ca_vld,
input i_i_ca_rdy,
input [31:0] i_i_rd_dat,
input i_i_rd_vld,
output o_i_rd_rdy,
output o_d_ca_cmd,
output [31:0] o_d_ca_adr,
output o_d_ca_vld,
input i_d_ca_rdy,
output [31:0] o_d_dm_dat,
output [3:0] o_d_dm_msk,
output o_d_dm_vld,
input i_d_dm_rdy,
input [31:0] i_d_rd_dat,
input i_d_rd_vld,
output o_d_rd_rdy);
`endif
output [31:0] o_ibus_adr,
output o_ibus_cyc,
output o_ibus_stb,
input [31:0] i_ibus_rdt,
input i_ibus_ack,
output [31:0] o_dbus_adr,
output [31:0] o_dbus_dat,
output [3:0] o_dbus_sel,
output o_dbus_we ,
output o_dbus_cyc,
output o_dbus_stb,
input [31:0] i_dbus_rdt,
input i_dbus_ack);
assign o_ibus_stb = o_ibus_cyc;
`include "serv_params.vh"
wire [4:0] rd_addr;
@@ -98,15 +96,16 @@ module serv_top
wire mem_init;
wire mem_busy;
parameter RESET_PC = 32'd8;
serv_decode decode
(
.clk (clk),
.i_i_rd_dat (i_i_rd_dat),
.i_i_rd_vld (i_i_rd_vld),
.o_i_rd_rdy (o_i_rd_rdy),
.i_wb_rdt (i_ibus_rdt),
.i_wb_en (o_ibus_cyc & i_ibus_ack),
.o_ibus_active (),
.o_ctrl_en (ctrl_en),
.o_ctrl_jump (jump),
.o_ctrl_jalr (jalr),
@@ -150,9 +149,9 @@ module serv_top
.i_jalr (jalr),
.i_auipc (auipc),
.o_rd (ctrl_rd),
.o_i_ca_adr (o_i_ca_adr),
.o_i_ca_vld (o_i_ca_vld),
.i_i_ca_rdy (i_i_ca_rdy));
.o_ibus_adr (o_ibus_adr),
.o_ibus_cyc (o_ibus_cyc),
.i_ibus_ack (i_ibus_ack));
assign offset = (offset_source == OFFSET_SOURCE_IMM) ? imm :
(offset_source == OFFSET_SOURCE_RS1) ? rs1 : 1'bx;
@@ -161,12 +160,11 @@ module serv_top
(rd_source == RD_SOURCE_ALU) ? alu_rd :
(rd_source == RD_SOURCE_IMM) ? imm :
(rd_source == RD_SOURCE_MEM) ? mem_rd : 1'bx;
assign op_b = (op_b_source == OP_B_SOURCE_IMM) ? imm :
(op_b_source == OP_B_SOURCE_RS2) ? rs2 :
1'bx;
serv_alu alu
(
.clk (clk),
@@ -196,14 +194,14 @@ module serv_top
.i_rs_en (rs_en),
.o_rs1 (rs1),
.o_rs2 (rs2));
serv_mem_if mem_if
(
.i_clk (clk),
.i_en (mem_en),
.i_init (mem_init),
.i_clk (clk),
.i_en (mem_en),
.i_init (mem_init),
.i_dat_valid (mem_dat_valid),
.i_cmd (mem_cmd),
.i_cmd (mem_cmd),
.i_funct3 (funct3),
.i_rs1 (rs1),
.i_rs2 (rs2),
@@ -211,23 +209,20 @@ module serv_top
.o_rd (mem_rd),
.o_busy (mem_busy),
//External interface
.o_d_ca_cmd (o_d_ca_cmd),
.o_d_ca_adr (o_d_ca_adr),
.o_d_ca_vld (o_d_ca_vld),
.i_d_ca_rdy (i_d_ca_rdy),
.o_d_dm_dat (o_d_dm_dat),
.o_d_dm_msk (o_d_dm_msk),
.o_d_dm_vld (o_d_dm_vld),
.i_d_dm_rdy (i_d_dm_rdy),
.i_d_rd_dat (i_d_rd_dat),
.i_d_rd_vld (i_d_rd_vld),
.o_d_rd_rdy (o_d_rd_rdy));
.o_wb_adr (o_dbus_adr),
.o_wb_dat (o_dbus_dat),
.o_wb_sel (o_dbus_sel),
.o_wb_we (o_dbus_we ),
.o_wb_cyc (o_dbus_cyc),
.o_wb_stb (o_dbus_stb),
.i_wb_rdt (i_dbus_rdt),
.i_wb_ack (i_dbus_ack));
`ifdef RISCV_FORMAL
reg [31:0] rs1_fv, rs2_fv, rd_fv;
reg [31:0] pc = RESET_PC;
reg ctrl_en_r = 1'b0;
always @(posedge clk) begin
ctrl_en_r <= ctrl_en;
if (rs_en) begin
@@ -239,10 +234,10 @@ module serv_top
end
rvfi_valid <= 1'b0;
if (ctrl_en_r & !ctrl_en) begin
pc <= o_i_ca_adr;
pc <= o_ibus_adr;
rvfi_valid <= 1'b1;
rvfi_order <= rvfi_order + 1;
rvfi_insn <= i_i_rd_dat;
rvfi_insn <= i_ibus_rdt;
rvfi_trap <= 1'b0;
rvfi_halt <= 1'b0;
rvfi_intr <= 1'b0;
@@ -254,14 +249,14 @@ module serv_top
rvfi_rd_addr <= rd_addr;
rvfi_rd_wdata <= rd_fv;
rvfi_pc_rdata <= pc;
rvfi_pc_wdata <= o_i_ca_adr;
rvfi_mem_addr <= o_d_ca_adr;
rvfi_pc_wdata <= o_ibus_adr;
rvfi_mem_addr <= o_dbus_adr;
rvfi_mem_rmask <= 4'bxxxx;
rvfi_mem_wmask <= o_d_dm_msk;
rvfi_mem_rdata <= i_d_rd_dat;
rvfi_mem_wdata <= o_d_dm_dat;
rvfi_mem_wmask <= o_dbus_sel;
rvfi_mem_rdata <= i_dbus_rdt;
rvfi_mem_wdata <= o_dbus_dat;
end
end
`endif
`endif
endmodule