wu-arch/kernels
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toolchain update

Browse Source
This commit is contained in:
Blaise Tine
2023-05-15 18:53:24 -04:00
parent 88ed687557
commit dce5e79f65
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ci/prebuilt.sh
View File

@@ -23,17 +23,17 @@ riscv()
llvm() llvm()
{ {
echo "prebuilt llvm-riscv..." echo "prebuilt llvm-riscv..."
tar -C $SRCDIR -cvjf llvm-riscv.tar.bz2 llvm-riscv tar -C $SRCDIR -cvjf llvm-vortex1.tar.bz2 llvm-riscv
split -b 50M llvm-riscv.tar.bz2 "llvm-riscv.tar.bz2.part" split -b 50M llvm-vortex1.tar.bz2 "llvm-vortex1.tar.bz2.part"
mv llvm-riscv.tar.bz2.part* $DESTDIR/llvm-riscv/$OS_DIR mv llvm-vortex1.tar.bz2.part* $DESTDIR/llvm-vortex/$OS_DIR
rm llvm-riscv.tar.bz2 rm llvm-vortex1.tar.bz2
} }
pocl() pocl()
{ {
echo "prebuilt pocl..." echo "prebuilt pocl..."
tar -C $SRCDIR -cvjf pocl.tar.bz2 pocl tar -C $SRCDIR -cvjf pocl1.tar.bz2 pocl
mv pocl.tar.bz2 $DESTDIR/pocl/$OS_DIR mv pocl1.tar.bz2 $DESTDIR/pocl/$OS_DIR
} }
verilator() verilator()

14
ci/toolchain_install.sh
View File

@@ -37,20 +37,20 @@ llvm()
{ {
for x in {a..b} for x in {a..b}
do do
wget $REPOSITORY/llvm-riscv/ubuntu/bionic/llvm-riscv.tar.bz2.parta$x wget $REPOSITORY/llvm-vortex/ubuntu/bionic/llvm-vortex1.tar.bz2.parta$x
done done
cat llvm-riscv.tar.bz2.parta* > llvm-riscv.tar.bz2 cat llvm-vortex1.tar.bz2.parta* > llvm-vortex1.tar.bz2
tar -xvf llvm-riscv.tar.bz2 tar -xvf llvm-vortex1.tar.bz2
rm -f llvm-riscv.tar.bz2* rm -f llvm-vortex1.tar.bz2*
cp -r llvm-riscv $DESTDIR cp -r llvm-riscv $DESTDIR
rm -rf llvm-riscv rm -rf llvm-riscv
} }
pocl() pocl()
{ {
wget $REPOSITORY/pocl/ubuntu/bionic/pocl.tar.bz2 wget $REPOSITORY/pocl/ubuntu/bionic/pocl1.tar.bz2
tar -xvf pocl.tar.bz2 tar -xvf pocl1.tar.bz2
rm -f pocl.tar.bz2 rm -f pocl1.tar.bz2
cp -r pocl $DESTDIR cp -r pocl $DESTDIR
rm -rf pocl rm -rf pocl
} }

2
sim/rtlsim/Makefile
View File

@@ -44,7 +44,7 @@ endif
VL_FLAGS = --exe --cc $(TOP) --top-module $(TOP) VL_FLAGS = --exe --cc $(TOP) --top-module $(TOP)
VL_FLAGS += -O2 --language 1800-2009 --assert -Wall -Wpedantic VL_FLAGS += -O2 --language 1800-2009 --assert -Wall -Wpedantic
VL_FLAGS += -Wno-DECLFILENAME -Wno-REDEFMACRO VL_FLAGS += -Wno-DECLFILENAME -Wno-REDEFMACRO -Wno-EOFNEWLINE
VL_FLAGS += --x-initial unique --x-assign unique VL_FLAGS += --x-initial unique --x-assign unique
VL_FLAGS += verilator.vlt VL_FLAGS += verilator.vlt
VL_FLAGS += $(RTL_INCLUDE) VL_FLAGS += $(RTL_INCLUDE)

4
sim/rtlsim/processor.cpp
View File

@@ -462,7 +462,7 @@ private:
} }
printf("\n"); printf("\n");
*/ */
memcpy((uint8_t*)device_->mem_rsp_data, mem_req->block.data(), MEM_BLOCK_SIZE); memcpy(device_->mem_rsp_data.data(), mem_req->block.data(), MEM_BLOCK_SIZE);
device_->mem_rsp_tag = mem_req->tag; device_->mem_rsp_tag = mem_req->tag;
pending_mem_reqs_.erase(mem_rsp_it); pending_mem_reqs_.erase(mem_rsp_it);
mem_rd_rsp_active_ = true; mem_rd_rsp_active_ = true;
@@ -478,7 +478,7 @@ private:
if (device_->mem_req_rw) { if (device_->mem_req_rw) {
// process writes // process writes
uint64_t byteen = device_->mem_req_byteen; uint64_t byteen = device_->mem_req_byteen;
uint8_t* data = (uint8_t*)(device_->mem_req_data); uint8_t* data = (uint8_t*)device_->mem_req_data.data();
// check console output // check console output
if (byte_addr >= IO_COUT_ADDR if (byte_addr >= IO_COUT_ADDR

2
sim/vlsim/Makefile
View File

@@ -41,7 +41,7 @@ TOP = vortex_afu_shim
VL_FLAGS = --exe --cc $(TOP) --top-module $(TOP) VL_FLAGS = --exe --cc $(TOP) --top-module $(TOP)
VL_FLAGS += -O2 --language 1800-2009 --assert -Wall -Wpedantic VL_FLAGS += -O2 --language 1800-2009 --assert -Wall -Wpedantic
VL_FLAGS += -Wno-DECLFILENAME -Wno-REDEFMACRO VL_FLAGS += -Wno-DECLFILENAME -Wno-REDEFMACRO -Wno-EOFNEWLINE
VL_FLAGS += --x-initial unique --x-assign unique VL_FLAGS += --x-initial unique --x-assign unique
VL_FLAGS += verilator.vlt VL_FLAGS += verilator.vlt
VL_FLAGS += $(RTL_INCLUDE) VL_FLAGS += $(RTL_INCLUDE)

2
sim/vlsim/opae_sim.cpp
View File

@@ -399,7 +399,7 @@ private:
unsigned byte_addr = device_->avs_address[b] * MEM_BLOCK_SIZE; unsigned byte_addr = device_->avs_address[b] * MEM_BLOCK_SIZE;
if (device_->avs_write[b]) { if (device_->avs_write[b]) {
uint64_t byteen = device_->avs_byteenable[b]; uint64_t byteen = device_->avs_byteenable[b];
uint8_t* data = (uint8_t*)(device_->avs_writedata[b]); uint8_t* data = (uint8_t*)device_->avs_writedata[b].data();
for (int i = 0; i < MEM_BLOCK_SIZE; i++) { for (int i = 0; i < MEM_BLOCK_SIZE; i++) {
if ((byteen >> i) & 0x1) { if ((byteen >> i) & 0x1) {
(*ram_)[byte_addr + i] = data[i]; (*ram_)[byte_addr + i] = data[i];