Skip to content

Commit

Permalink
Merge branch 'main' into tacit-pr-decoder
Browse files Browse the repository at this point in the history
  • Loading branch information
iansseijelly committed Feb 6, 2025
2 parents bc555a4 + 320c1b9 commit 8a26474
Show file tree
Hide file tree
Showing 27 changed files with 1,667 additions and 1,489 deletions.
4 changes: 2 additions & 2 deletions .github/scripts/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ case $1 in
run_binary BINARY=$LOCAL_CHIPYARD_DIR/tests/hello.riscv LOADMEM=1
;;
chipyard-rerocc)
make -C $LOCAL_CHIPYARD_DIR/generators/rerocc/tests
run_binary BINARY=$LOCAL_CHIPYARD_DIR/generators/rerocc/tests/rerocc.riscv LOADMEM=1
make -C $LOCAL_CHIPYARD_DIR/generators/rerocc/software
run_binary BINARY=$LOCAL_CHIPYARD_DIR/generators/rerocc/software/test.riscv LOADMEM=1
;;
chipyard-rocketvector|chipyard-shuttlevector)
run_binary BINARY=$RISCV/riscv64-unknown-elf/share/riscv-tests/benchmarks/vec-sgemm.riscv LOADMEM=1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
run: echo "$CHANGELOG" >> $GITHUB_STEP_SUMMARY
- name: Upload Release Notes (on release)
if: github.event_name == 'release'
uses: softprops/action-gh-release@v2.0.8
uses: softprops/action-gh-release@v2.2.1
with:
body: ${{ steps.release-notes.outputs.changelog }}
- name: Error on uncategorized PRs
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,6 @@
[submodule "tools/torture"]
path = tools/torture
url = https://github.com/ucb-bar/riscv-torture.git
[submodule "vlsi/hammer-mentor-plugins"]
path = vlsi/hammer-mentor-plugins
url = https://github.com/ucb-bar/hammer-mentor-plugins.git
[submodule "tools/dsptools"]
path = tools/dsptools
url = https://github.com/ucb-bar/dsptools.git
Expand Down
2 changes: 1 addition & 1 deletion conda-reqs/chipyard-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
# documentation on package_spec syntax for constraining versions
- gcc=13.2
- gxx=13.2
- sysroot_linux-64=2.17 # needed to match pre-built CI XRT glibc version
- sysroot_linux-64=2.34 # need to be close to system glibc for VCS compatibility
- conda-gcc-specs
- binutils

Expand Down
Loading

0 comments on commit 8a26474

Please sign in to comment.