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

minor update

Browse source
This commit is contained in:
Blaise Tine 2023-03-26 04:25:49 -04:00
parent 4c1a790b0b
commit 5c018dcfe9
4 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/rtl/core/VX_decode.sv
View file

@ -53,7 +53,7 @@ module VX_decode #(
wire [4:0] rs3 = instr[31:27];
wire [19:0] upper_imm = {func7, rs2, rs1, func3};
wire [11:0] alu_imm = (func3[0] && ~func3[1]) ? {{7{1'b0}}, rs2} : u_12;
wire [11:0] alu_imm = (func3[0] && ~func3[1]) ? {7'b0, rs2} : u_12;
wire [11:0] s_imm = {func7, rd};
wire [12:0] b_imm = {instr[31], instr[7], instr[30:25], instr[11:8], 1'b0};
wire [20:0] jal_imm = {instr[31], instr[19:12], instr[20], instr[30:21], 1'b0};

6
hw/rtl/raster_unit/VX_raster_extents.sv
View file

@ -7,8 +7,10 @@ module VX_raster_extents #(
output wire [2:0][`RASTER_DATA_BITS-1:0] extents
);
for (genvar i = 0; i < 3; ++i) begin
assign extents[i] = ({`RASTER_DATA_BITS{~edges[i][0][`RASTER_DATA_BITS-1]}} & (edges[i][0] << TILE_LOGSIZE))
+ ({`RASTER_DATA_BITS{~edges[i][1][`RASTER_DATA_BITS-1]}} & (edges[i][1] << TILE_LOGSIZE));
wire [`RASTER_DATA_BITS-1:0] edge_x_m = {`RASTER_DATA_BITS{~edges[i][0][`RASTER_DATA_BITS-1]}};
wire [`RASTER_DATA_BITS-1:0] edge_y_m = {`RASTER_DATA_BITS{~edges[i][1][`RASTER_DATA_BITS-1]}};
assign extents[i] = (edge_x_m & (edges[i][0] << TILE_LOGSIZE))
+ (edge_y_m & (edges[i][1] << TILE_LOGSIZE));
end
endmodule

2
hw/rtl/rop_unit/VX_rop_logic_op.sv
View file

@ -21,7 +21,7 @@ module VX_rop_logic_op #(
always @(*) begin
case (op)
`ROP_LOGIC_OP_CLEAR: tmp_color = 32'b0;
`ROP_LOGIC_OP_CLEAR: tmp_color = {32{1'b0}};
`ROP_LOGIC_OP_AND: tmp_color = src_color & dst_color;
`ROP_LOGIC_OP_AND_REVERSE: tmp_color = src_color & (~dst_color);
`ROP_LOGIC_OP_COPY: tmp_color = src_color;

22
hw/syn/xilinx/xrt/Makefile
View file

@ -11,6 +11,7 @@ endif
TARGET ?= hw
PLATFORM ?=
NUM_CORES ?= 1
PREFIX ?= build
@ -58,12 +59,6 @@ ROP_INCLUDE = -I$(RTL_DIR)/rop_unit
RTL_INCLUDE = -I$(RTL_DIR) -I$(RTL_DIR)/libs -I$(RTL_DIR)/interfaces -I$(RTL_DIR)/core -I$(RTL_DIR)/cache -I$(AFU_DIR)
RTL_INCLUDE += $(FPU_INCLUDE) $(TEX_INCLUDE) $(RASTER_INCLUDE) $(ROP_INCLUDE)
#CONFIGS += -DEXT_GFX_ENABLE
#CONFIGS += -DNUM_WARPS=2 -DNUM_THREADS=2 -DEXT_F_DISABLE -DL1_DISABLE
#CONFIGS += -DNUM_WARPS=2 -DNUM_THREADS=2 -DEXT_F_DISABLE
#CONFIGS += -DNUM_WARPS=2 -DNUM_THREADS=2
#CONFIGS += -DNUM_CORES=4
CONFIGS += -DSYNTHESIS -DVIVADO
VIVADO = $(XILINX_VIVADO)/bin/vivado
@ -129,15 +124,24 @@ ifneq ($(TARGET),$(findstring $(TARGET), hw hw_emu))
$(warning WARNING:Application supports only hw hw_emu TARGET. Please use the target for running the application)
endif
CONFIGS_1 := -DNUM_CLUSTERS=1 -DNUM_CORES=1 $(CONFIGS)
CONFIGS_2 := -DNUM_CLUSTERS=1 -DNUM_CORES=2 $(CONFIGS)
CONFIGS_4 := -DNUM_CLUSTERS=1 -DNUM_CORES=4 -DL2_ENABLE $(CONFIGS)
CONFIGS_8 := -DNUM_CLUSTERS=1 -DNUM_CORES=8 -DL2_ENABLE $(CONFIGS)
CONFIGS_16 := -DNUM_CLUSTERS=1 -DNUM_CORES=16 -DL2_ENABLE $(CONFIGS)
CONFIGS_32 := -DNUM_CLUSTERS=2 -DNUM_CORES=16 -DL2_ENABLE $(CONFIGS)
CONFIGS_64 := -DNUM_CLUSTERS=4 -DNUM_CORES=16 -DL2_ENABLE $(CONFIGS)
CONFIGS_SEL := $(CONFIGS_$(NUM_CORES))
.PHONY: all clean gen-sources emconfig check-devices
all: check-devices emconfig $(XCLBIN_CONTAINER)
gen-sources: $(BUILD_DIR)/sources.txt
$(BUILD_DIR)/sources.txt:
mkdir -p $(BUILD_DIR); cd $(BUILD_DIR); $(SCRIPT_DIR)/gen_sources.sh $(RTL_INCLUDE) $(CONFIGS) -EVX_fpu_fpnew.sv -Evortex_afu.v -EVX_afu_wrap.sv -Osources.txt
cd $(BUILD_DIR); verilator -E -DNOGLOBALS $(RTL_INCLUDE) $(CONFIGS) $(AFU_DIR)/VX_afu_wrap.sv | sed '/^`line /d' > VX_afu_wrap.sv
cd $(BUILD_DIR); verilator -E -DNOGLOBALS $(RTL_INCLUDE) $(CONFIGS) $(AFU_DIR)/vortex_afu.v | sed '/^`line /d' > vortex_afu.v
mkdir -p $(BUILD_DIR); cd $(BUILD_DIR); $(SCRIPT_DIR)/gen_sources.sh $(RTL_INCLUDE) $(CONFIGS_SEL) -EVX_fpu_fpnew.sv -Evortex_afu.v -EVX_afu_wrap.sv -Osources.txt
cd $(BUILD_DIR); verilator -E -DNOGLOBALS $(RTL_INCLUDE) $(CONFIGS_SEL) $(AFU_DIR)/VX_afu_wrap.sv | sed '/^`line /d' > VX_afu_wrap.sv
cd $(BUILD_DIR); verilator -E -DNOGLOBALS $(RTL_INCLUDE) $(CONFIGS_SEL) $(AFU_DIR)/vortex_afu.v | sed '/^`line /d' > vortex_afu.v
echo "$(PWD)/$(BUILD_DIR)/VX_afu_wrap.sv" >> $(BUILD_DIR)/sources.txt
echo "$(PWD)/$(BUILD_DIR)/vortex_afu.v" >> $(BUILD_DIR)/sources.txt