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

Change STARTUP_ADDR from 0x40000000 to 0x80000000(32b) and 0x180000000(64b)

Browse source
This commit is contained in:
Jaewon Lee 2024-06-30 03:10:36 -04:00
parent ccbb2243cc
commit c13e02b19f
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ci/regression.sh.in
View file

@ -240,7 +240,11 @@ config()
# custom program startup address
make -C tests/regression/dogfood clean-kernel
STARTUP_ADDR=0x40000000 make -C tests/regression/dogfood
if [ "$XLEN" == "64" ]; then
STARTUP_ADDR=0x180000000 make -C tests/regression/dogfood
else
STARTUP_ADDR=0x80000000 make -C tests/regression/dogfood
fi
./ci/blackbox.sh --driver=simx --app=dogfood
./ci/blackbox.sh --driver=rtlsim --app=dogfood

6
runtime/simx/vortex.cpp
View file

@ -144,7 +144,6 @@ public:
uint64_t phy_to_virt_map(uint64_t size, uint64_t *dev_pAddr, uint32_t flags)
{
// DBGPRINT("====%s====\n", __PRETTY_FUNCTION__);
DBGPRINT(" [RT:PTV_MAP] size = 0x%lx, dev_pAddr= 0x%lx, flags = 0x%x\n", size, *dev_pAddr, flags);
DBGPRINT(" [RT:PTV_MAP] bit mode: %d\n", XLEN);
@ -178,10 +177,8 @@ public:
}
DBGPRINT(" [RT:PTV_MAP] Mapped virtual addr: 0x%lx to physical addr: 0x%lx\n", init_vAddr, init_pAddr);
// Sanity check
uint64_t pAddr = page_table_walk(init_vAddr);
DBGPRINT(" [RT:PTV_MAP] physical addr from PTW: 0x%lx\n", pAddr);
assert(page_table_walk(init_vAddr) == init_pAddr && "ERROR: translated virtual Addresses are not the same with physical Address\n");
assert(pAddr == init_pAddr && "ERROR: translated virtual Addresses are not the same with physical Address\n");
*dev_pAddr = init_vAddr; // commit vpn to be returned to host
DBGPRINT(" [RT:PTV_MAP] Translated device virtual addr: 0x%lx\n", *dev_pAddr);
@ -255,7 +252,6 @@ public:
int upload(uint64_t dest_addr, const void *src, uint64_t size)
{
// DBGPRINT("====%s====\n", __PRETTY_FUNCTION__);
uint64_t asize = aligned_size(size, CACHE_BLOCK_SIZE);
if (dest_addr + asize > GLOBAL_MEM_SIZE)
return -1;

8
sim/common/mem.cpp
View file

@ -23,11 +23,11 @@
using namespace vortex;
#ifdef VM_ENABLE
#ifndef NDEBUG
#define DBGPRINT(format, ...) do { printf("[VXDRV] " format "", ##__VA_ARGS__); } while (0)
#else
// #ifndef NDEBUG
// #define DBGPRINT(format, ...) do { printf("[VXDRV] " format "", ##__VA_ARGS__); } while (0)
// #else
#define DBGPRINT(format, ...) ((void)0)
#endif
// #endif
#endif