github-mirrors/vortex
1
0
Fork 0
mirror of https://github.com/vortexgpgpu/vortex.git synced 2025-04-23 21:39:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor update

Browse source
This commit is contained in:
Blaise Tine 2024-05-09 03:37:03 -07:00
parent 4a2b984710
commit da65e964ed
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.travis.yml
View file

@ -45,16 +45,16 @@ jobs:
- cd $HOME/build32 && TOOLDIR=$TOOLDIR XLEN=32 $TRAVIS_BUILD_DIR/configure
- cd $HOME/build64 && TOOLDIR=$TOOLDIR XLEN=64 $TRAVIS_BUILD_DIR/configure
install:
- if [ ! -d "$TOOLDIR" ] || [ -z "$(ls -A $TOOLDIR)" ] || [ "$(cat "$TOOLDIR/version.txt")" != "v0.0" ]; then
- if [ ! -d "$TOOLDIR" ] || [ -z "$(ls -A $TOOLDIR)" ] || [ "$(cat "$TOOLDIR/version.txt")" != "v0.1" ]; then
rm -rf $TOOLDIR;
$HOME/build32/ci/toolchain_install.sh --all;
echo "v0.0" > "$TOOLDIR/version.txt";
echo "v0.1" > "$TOOLDIR/version.txt";
fi
- if [ ! -d "$HOME/third_party" ] || [ -z "$(ls -A $HOME/third_party)" ] || [ "$(cat "$HOME/third_party/version.txt")" != "v0.0" ]; then
- if [ ! -d "$HOME/third_party" ] || [ -z "$(ls -A $HOME/third_party)" ] || [ "$(cat "$HOME/third_party/version.txt")" != "v0.1" ]; then
cd $TRAVIS_BUILD_DIR;
make -C third_party > /dev/null;
cp -rf third_party $HOME;
echo "v0.0" > "$HOME/third_party/version.txt";
echo "v0.1" > "$HOME/third_party/version.txt";
else
cp -rf $HOME/third_party $TRAVIS_BUILD_DIR;
fi

22
hw/rtl/core/VX_csr_unit.sv
View file

@ -1,10 +1,10 @@
// Copyright © 2019-2023
//
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -26,7 +26,7 @@ module VX_csr_unit import VX_gpu_pkg::*; #(
VX_mem_perf_if.slave mem_perf_if,
VX_pipeline_perf_if.slave pipeline_perf_if,
`endif
`ifdef EXT_F_ENABLE
VX_fpu_csr_if.slave fpu_csr_if [`NUM_FPU_BLOCKS],
`endif
@ -42,7 +42,7 @@ module VX_csr_unit import VX_gpu_pkg::*; #(
localparam DATAW = `UUID_WIDTH + `NW_WIDTH + NUM_LANES + `XLEN + `NR_BITS + 1 + NUM_LANES * `XLEN + PID_WIDTH + 1 + 1;
`UNUSED_VAR (execute_if.data.rs3_data)
reg [NUM_LANES-1:0][`XLEN-1:0] csr_read_data;
reg [`XLEN-1:0] csr_write_data;
wire [`XLEN-1:0] csr_read_data_ro, csr_read_data_rw;
@ -51,10 +51,10 @@ module VX_csr_unit import VX_gpu_pkg::*; #(
wire csr_wr_enable;
wire csr_req_ready;
// wait for all pending instructions to complete
// wait for all pending instructions for current warp to complete
assign sched_csr_if.alm_empty_wid = execute_if.data.wid;
wire no_pending_instr = sched_csr_if.alm_empty;
wire csr_req_valid = execute_if.valid && no_pending_instr;
assign execute_if.ready = csr_req_ready && no_pending_instr;
@ -86,14 +86,14 @@ module VX_csr_unit import VX_gpu_pkg::*; #(
.cycles (sched_csr_if.cycles),
.active_warps (sched_csr_if.active_warps),
.thread_masks (sched_csr_if.thread_masks),
`ifdef EXT_F_ENABLE
.fpu_csr_if (fpu_csr_if),
`endif
.fpu_csr_if (fpu_csr_if),
`endif
.read_enable (csr_req_valid && csr_rd_enable),
.read_uuid (execute_if.data.uuid),
.read_wid (execute_if.data.wid),
.read_wid (execute_if.data.wid),
.read_addr (csr_addr),
.read_data_ro (csr_read_data_ro),
.read_data_rw (csr_read_data_rw),
@ -116,7 +116,7 @@ module VX_csr_unit import VX_gpu_pkg::*; #(
assign wtid[i] = `XLEN'(i);
end
assign gtid[i] = (`XLEN'(CORE_ID) << (`NW_BITS + `NT_BITS)) + (`XLEN'(execute_if.data.wid) << `NT_BITS) + wtid[i];
end
end
always @(*) begin
csr_rd_enable = 0;

2
third_party/softfloat vendored

@ -1 +1 @@
Subproject commit eb498c55bab0f49c3903f69524e2674abe71c26b
Subproject commit b51ef8f3201669b2288104c28546fc72532a1ea4