mirror of
https://github.com/vortexgpgpu/vortex.git
synced 2025-04-24 22:07:41 -04:00
merge
This commit is contained in:
commit
24c81c4a3a
3 changed files with 4 additions and 5 deletions
|
@ -78,7 +78,7 @@ module VX_csr_data (
|
||||||
|
|
||||||
assign read_csr_data = read_cycle ? cycle[31:0] :
|
assign read_csr_data = read_cycle ? cycle[31:0] :
|
||||||
read_cycleh ? cycle[63:32] :
|
read_cycleh ? cycle[63:32] :
|
||||||
read_instret ? instret[31:0] :
|
read_instret ? instret[31:0] :
|
||||||
read_instreth ? instret[63:32] :
|
read_instreth ? instret[63:32] :
|
||||||
{{20{1'b0}}, csr[read_addr]};
|
{{20{1'b0}}, csr[read_addr]};
|
||||||
endmodule : VX_csr_data
|
endmodule : VX_csr_data
|
||||||
|
|
|
@ -50,7 +50,6 @@ module VX_scheduler (
|
||||||
integer i, w;
|
integer i, w;
|
||||||
|
|
||||||
always @(posedge clk) begin
|
always @(posedge clk) begin
|
||||||
|
|
||||||
if (reset) begin
|
if (reset) begin
|
||||||
for (w = 0; w < `NUM_WARPS; w=w+1) begin
|
for (w = 0; w < `NUM_WARPS; w=w+1) begin
|
||||||
for (i = 0; i < 32; i = i + 1) begin
|
for (i = 0; i < 32; i = i + 1) begin
|
||||||
|
|
2
hw/rtl/cache/VX_cache_req_queue.v
vendored
2
hw/rtl/cache/VX_cache_req_queue.v
vendored
|
@ -173,7 +173,7 @@ module VX_cache_req_queue #(
|
||||||
|
|
||||||
always @(posedge clk) begin
|
always @(posedge clk) begin
|
||||||
if (reset) begin
|
if (reset) begin
|
||||||
use_per_valids <= 0;
|
use_per_valids <= 0;
|
||||||
use_per_addr <= 0;
|
use_per_addr <= 0;
|
||||||
use_per_writedata <= 0;
|
use_per_writedata <= 0;
|
||||||
use_per_rd <= 0;
|
use_per_rd <= 0;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue