github-mirrors/vortex
1
0
Fork 0
mirror of https://github.com/vortexgpgpu/vortex.git synced 2025-06-27 08:50:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Change STARTUP_ADDR to use the same 0x80000000 address

Browse source 
- Fix environment variable for vortex kernel directories
This commit is contained in:
jaewon-lee-github 2024-10-03 15:19:39 -04:00
parent bbc02cc013
commit 5cf6797bd3
7 changed files with 21 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

29
.github/workflows/ci.yml vendored
View file

@ -21,13 +21,13 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v2
with:
submodules: recursive
- name: Cache Toolchain Directory
id: cache-toolchain
uses: actions/cache@v4
uses: actions/cache@v2
with:
path: tools
key: ${{ runner.os }}-toolchain-v0.1
@ -36,7 +36,7 @@ jobs:
- name: Cache Third Party Directory
id: cache-thirdparty
uses: actions/cache@v4
uses: actions/cache@v2
with:
path: third_party
key: ${{ runner.os }}-thirdparty-v0.1
@ -71,7 +71,7 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v2
- name: Install Dependencies
run: |
@ -79,7 +79,7 @@ jobs:
- name: Cache Toolchain Directory
id: cache-toolchain
uses: actions/cache@v4
uses: actions/cache@v2
with:
path: tools
key: ${{ runner.os }}-toolchain-v0.1
@ -88,7 +88,7 @@ jobs:
- name: Cache Third Party Directory
id: cache-thirdparty
uses: actions/cache@v4
uses: actions/cache@v2
with:
path: third_party
key: ${{ runner.os }}-thirdparty-v0.1
@ -106,23 +106,23 @@ jobs:
make tests -s > /dev/null
- name: Upload Build Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: build-${{ matrix.xlen }}
path: build${{ matrix.xlen }}
test:
tests:
runs-on: ubuntu-20.04
needs: build
strategy:
fail-fast: false
matrix:
name: [regression, opencl, cache, config1, config2, debug, scope, stress, synthesis, vm ]
name: [regression, opencl, cache, config1, config2, debug, scope, stress, synthesis, vm]
xlen: [32, 64]
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v2
- name: Install Dependencies
run: |
@ -130,7 +130,7 @@ jobs:
- name: Cache Toolchain Directory
id: cache-toolchain
uses: actions/cache@v4
uses: actions/cache@v2
with:
path: tools
key: ${{ runner.os }}-toolchain-v0.1
@ -139,7 +139,7 @@ jobs:
- name: Cache Third Party Directory
id: cache-thirdparty
uses: actions/cache@v4
uses: actions/cache@v2
with:
path: third_party
key: ${{ runner.os }}-thirdparty-v0.1
@ -147,10 +147,11 @@ jobs:
${{ runner.os }}-thirdparty-
- name: Download Build Artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: build-${{ matrix.xlen }}
path: build${{ matrix.xlen }}
- name: Run tests
run: |
cd build${{ matrix.xlen }}
@ -167,7 +168,7 @@ jobs:
complete:
runs-on: ubuntu-20.04
needs: test
needs: tests
steps:
- name: Check Completion

6
ci/regression.sh.in
View file

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

3
config.mk.in
View file

@ -31,7 +31,4 @@ RISCV_TOOLCHAIN_PATH ?= $(TOOLDIR)/riscv$(XLEN)-gnu-toolchain
RISCV_PREFIX ?= riscv$(XLEN)-unknown-elf
RISCV_SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/$(RISCV_PREFIX)
VORTEX_RT_PATH ?= $(VORTEX_HOME)/runtime
VORTEX_KN_PATH ?= $(VORTEX_HOME)/kernel
THIRD_PARTY_DIR ?= $(VORTEX_HOME)/third_party

4
hw/rtl/VX_config.vh
View file

@ -177,7 +177,7 @@
`endif
`ifndef STARTUP_ADDR
`define STARTUP_ADDR 64'h180000000
`define STARTUP_ADDR 64'h080000000
`endif
`ifndef USER_BASE_ADDR
@ -190,7 +190,7 @@
`ifdef VM_ENABLE
`ifndef PAGE_TABLE_BASE_ADDR
`define PAGE_TABLE_BASE_ADDR 64'h1F0000000
`define PAGE_TABLE_BASE_ADDR 64'h0F0000000
`endif
`endif

3
tests/kernel/common.mk
View file

@ -2,11 +2,10 @@ ROOT_DIR := $(realpath ../../..)
ifeq ($(XLEN),64)
CFLAGS += -march=rv64imafd -mabi=lp64d
STARTUP_ADDR ?= 0x180000000
else
CFLAGS += -march=rv32imaf -mabi=ilp32f
STARTUP_ADDR ?= 0x80000000
endif
STARTUP_ADDR ?= 0x80000000
VORTEX_KN_PATH ?= $(ROOT_DIR)/kernel

3
tests/opencl/common.mk
View file

@ -5,13 +5,12 @@ TARGET ?= opaesim
XRT_SYN_DIR ?= $(VORTEX_HOME)/hw/syn/xilinx/xrt
XRT_DEVICE_INDEX ?= 0
STARTUP_ADDR ?= 0x80000000
ifeq ($(XLEN),64)
VX_CFLAGS += -march=rv64imafd -mabi=lp64d
STARTUP_ADDR ?= 0x180000000
POCL_CC_FLAGS += POCL_VORTEX_XLEN=64
else
VX_CFLAGS += -march=rv32imaf -mabi=ilp32f
STARTUP_ADDR ?= 0x80000000
POCL_CC_FLAGS += POCL_VORTEX_XLEN=32
endif

3
tests/regression/common.mk
View file

@ -8,12 +8,11 @@ XRT_DEVICE_INDEX ?= 0
VORTEX_RT_PATH ?= $(ROOT_DIR)/runtime
VORTEX_KN_PATH ?= $(ROOT_DIR)/kernel
STARTUP_ADDR ?= 0x80000000
ifeq ($(XLEN),64)
VX_CFLAGS += -march=rv64imafd -mabi=lp64d
STARTUP_ADDR ?= 0x180000000
else
VX_CFLAGS += -march=rv32imaf -mabi=ilp32f
STARTUP_ADDR ?= 0x80000000
endif
LLVM_CFLAGS += --sysroot=$(RISCV_SYSROOT)