Skip to content

Commit

Permalink
Merge pull request #470 from riscv-boom/rc-retile
Browse files Browse the repository at this point in the history
Update Tile instantiation for RC bump
  • Loading branch information
jerryz123 committed Jun 24, 2020
2 parents 9640901 + 1df83c2 commit 1fa9c3f
Show file tree
Hide file tree
Showing 8 changed files with 397 additions and 376 deletions.
2 changes: 1 addition & 1 deletion .circleci/build-toolchains.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ if [ ! -d "$HOME/$1-install" ]; then
cd $HOME

# init all submodules including the tools (doesn't use CI_MAKE_PROC due to mem. constraints)
CHIPYARD_DIR="$LOCAL_CHIPYARD_DIR" NPROC=$CI_MAKE_PROC $LOCAL_CHIPYARD_DIR/scripts/build-toolchains.sh $1
CHIPYARD_DIR="$LOCAL_CHIPYARD_DIR" NPROC=4 $LOCAL_CHIPYARD_DIR/scripts/build-toolchains.sh $1
fi
2 changes: 1 addition & 1 deletion .circleci/do-rtl-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ else
fi

# enter the verilator directory and build the specific config on remote server
run "make -C $REMOTE_SIM_DIR clean"
run "export RISCV=\"$TOOLS_DIR\"; \
export LD_LIBRARY_PATH=\"$LD_LIB_DIR\"; \
export PATH=\"$REMOTE_VERILATOR_DIR/bin:\$PATH\"; \
export VERILATOR_ROOT=\"$REMOTE_VERILATOR_DIR\"; \
export COURSIER_CACHE=\"$REMOTE_WORK_DIR/.coursier-cache\"; \
make -C $REMOTE_SIM_DIR clean; \
make -j$REMOTE_MAKE_NPROC -C $REMOTE_SIM_DIR JAVA_ARGS=\"$REMOTE_JAVA_ARGS\" ${mapping[$1]}"
run "rm -rf $REMOTE_CHIPYARD_DIR/project"

Expand Down
2 changes: 1 addition & 1 deletion CHIPYARD.hash
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6f1a53a2f3e43c8444a308e002a611fcfb995bcc
a1cc62b85aa4a53c5c69c1e9114ab0aafed8446f

0 comments on commit 1fa9c3f

Please sign in to comment.