Merge branch 'graphics' of github.com:vortexgpgpu/vortex-dev into graphics

This commit is contained in:
Blaise Tine 2023-03-28 04:46:44 -04:00
commit 1d1a778dc0
4 changed files with 9 additions and 6 deletions

View file

@ -142,7 +142,7 @@ module VX_raster_te #(
VX_pipe_register #(
.DATAW (1 + 1 + 4 * (2 * `RASTER_DIM_BITS + 3 * `RASTER_DATA_BITS) + LEVEL_BITS + 2 * `RASTER_DIM_BITS + 3 * `RASTER_DATA_BITS + LEVEL_BITS),
.RESETW (1)
) te_pipe_reg_1 (
) pipe_reg (
.clk (clk),
.reset (reset),
.enable (~stall),

View file

@ -92,5 +92,8 @@ tar -cvjf trace.vcd.tar.bz2 build_arria10_ase_1c/work/run.log build_arria10_ase_
tar -zxvf vortex.vcd.tar.gz
tar -xvf vortex.vcd.tar.bz2
# running graphics benchmarks
TARGET=fpga ./ci/blackbox.sh --driver=opae --app=draw3d --args="-w512 -h512 -tvase.cgltrace"
# quick off synthesis
make core
make core

View file

@ -376,7 +376,7 @@ private:
// check console output
if (base_addr >= IO_COUT_ADDR
&& base_addr < (IO_COUT_ADDR + IO_COUT_SIZE)) {
&& base_addr < (uint64_t(IO_COUT_ADDR) + IO_COUT_SIZE)) {
for (int i = 0; i < MEM_BLOCK_SIZE; i++) {
if ((byteen >> i) & 0x1) {
auto& ss_buf = print_bufs_[i];
@ -501,7 +501,7 @@ private:
// check console output
if (byte_addr >= IO_COUT_ADDR
&& byte_addr < (IO_COUT_ADDR + IO_COUT_SIZE)) {
&& byte_addr < (uint64_t(IO_COUT_ADDR) + IO_COUT_SIZE)) {
for (int i = 0; i < IO_COUT_SIZE; i++) {
if ((byteen >> i) & 0x1) {
auto& ss_buf = print_bufs_[i];
@ -534,7 +534,7 @@ private:
0
);
dram_queue_.push(dram_req);
}
}
} else {
// process reads
auto mem_req = new mem_req_t();

View file

@ -390,7 +390,7 @@ void Core::dcache_read(void *data, uint64_t addr, uint32_t size) {
void Core::dcache_write(const void* data, uint64_t addr, uint32_t size) {
auto type = this->get_addr_type(addr);
if (addr >= IO_COUT_ADDR
&& addr <= (IO_COUT_ADDR + IO_COUT_SIZE - 1)) {
&& addr < (uint64_t(IO_COUT_ADDR) + IO_COUT_SIZE)) {
this->writeToStdOut(data, addr, size);
} else {
if (type == AddrType::Shared) {