wu-arch/vortex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly determine core finish

Browse Source
This commit is contained in:
Hansung Kim
2024-01-26 14:23:52 -08:00
parent c9d1275f0e
commit 4643edf3e9
1 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
hw/rtl/VX_core_wrapper.sv
View File

@@ -113,7 +113,7 @@ module Vortex import VX_gpu_pkg::*; #(
// output fpu_killm, // output fpu_killm,
// output fpu_keep_clock_enabled, // output fpu_keep_clock_enabled,
output cease, output finished,
input traceStall, input traceStall,
output wfi output wfi
@@ -122,21 +122,39 @@ module Vortex import VX_gpu_pkg::*; #(
logic [3:0] intr_counter; logic [3:0] intr_counter;
logic msip_1d, intr_reset; logic msip_1d, intr_reset;
logic busy; logic busy;
reg busy_prev;
reg finished_reg;
assign intr_reset = |intr_counter; assign intr_reset = |intr_counter;
/* interrupts */ /* busy and interrupts */
always @(posedge clock) begin always @(posedge clock) begin
msip_1d <= interrupts_msip; msip_1d <= interrupts_msip;
if (reset) begin if (reset) begin
intr_counter <= 4'h0; busy_prev <= 1'b0;
end else if (~msip_1d && interrupts_msip) begin finished_reg <= 1'b0;
// rising edge intr_counter <= 4'h0;
intr_counter <= 4'h6; end else begin
end else begin // Vortex core's busy signal goes up some cycles after the reset,
intr_counter <= intr_counter > 0 ? intr_counter - 4'h1 : 4'h0; // so we can't simply use ~busy as finished because of the initial
// ephemeral state. Instead detect the *negedge* of the busy
// signal and use that to indicate finish.
busy_prev <= busy;
if (busy_prev && !busy) begin
finished_reg <= 1'b1;
end end
if (~msip_1d && interrupts_msip) begin
// rising edge
intr_counter <= 4'h6;
end else begin
intr_counter <= intr_counter > 0 ? intr_counter - 4'h1 : 4'h0;
end
end
end end
assign finished = finished_reg;
assign wfi = 1'b0; // FIXME: unused
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// TL <-> Vortex core-cache interface adapter // TL <-> Vortex core-cache interface adapter
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@@ -387,9 +405,6 @@ module Vortex import VX_gpu_pkg::*; #(
// assign {fpu_hartid, fpu_time, fpu_inst, fpu_fromint_data, fpu_fcsr_rm, fpu_dmem_resp_val, fpu_dmem_resp_type, // assign {fpu_hartid, fpu_time, fpu_inst, fpu_fromint_data, fpu_fcsr_rm, fpu_dmem_resp_val, fpu_dmem_resp_type,
// fpu_dmem_resp_tag, fpu_valid, fpu_killx, fpu_killm, fpu_keep_clock_enabled} = '0; // fpu_dmem_resp_tag, fpu_valid, fpu_killx, fpu_killm, fpu_keep_clock_enabled} = '0;
assign cease = ~busy;
assign wfi = 1'b0; // FIXME: unused
genvar i; genvar i;
generate for (i = 0; i < 4; i++) begin generate for (i = 0; i < 4; i++) begin
always @(posedge clock) begin always @(posedge clock) begin