Merge branch 'main' into minor-doc-change

Author: Fi50

.github/scripts/build-zephyr.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# turn echo on and error on earliest command
+set -ex
+
+# get shared variables
+SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
+source $SCRIPT_DIR/defaults.sh
+
+# install Zephyr dependencies
+git submodule update --init $LOCAL_CHIPYARD_DIR/software/zephyrproject/zephyr
+cd $LOCAL_CHIPYARD_DIR/software/zephyrproject/zephyr/
+west init -l .
+west config manifest.file west-riscv.yml
+west update
+
+# set environment variables for Zephyr
+export ZEPHYR_BASE=$LOCAL_CHIPYARD_DIR/software/zephyrproject/zephyr
+export ZEPHYR_TOOLCHAIN_VARIANT=cross-compile
+export CROSS_COMPILE=$RISCV/bin/riscv64-unknown-elf-
+
+
+# Build hello world
+west build -p -b chipyard_riscv64 samples/chipyard/hello_world/

.github/scripts/check-commit.sh

@@ -78,7 +78,7 @@ branches=("main")
 search
 
 
-submodules=("coremark" "firemarshal" "nvdla-workload" "spec2017")
+submodules=("coremark" "firemarshal" "nvdla-workload" "spec2017" "zephyrproject/zephyr")
 dir="software"
 branches=("master" "dev")
 search

.github/scripts/run-tests.sh

@@ -173,6 +173,9 @@ case $1 in
     chipyard-tacit-rocket)
         run_binary LOADMEM=1 BINARY=$RISCV/riscv64-unknown-elf/share/riscv-tests/benchmarks/dhrystone.riscv
         ;;
+    chipyard-zephyr)
+        run_binary LOADMEM=1 BINARY=$LOCAL_CHIPYARD_DIR/software/zephyrproject/zephyr/build/zephyr/zephyr.elf
+        ;;
     chipyard-radiance)
         # Verilator fails to build sim binary, just generate verilog
         ;;

.github/workflows/chipyard-run-tests.yml

@@ -581,6 +581,34 @@ jobs:
           group-key: "group-cores"
           project-key: "chipyard-tacit-rocket"
 
+  chipyard-rocket-zephyr-run-tests:
+    name: chipyard-rocket-zephyr-run-tests
+    needs: prepare-chipyard-cores
+    runs-on: as4
+    steps:
+      - name: Delete old checkout
+        run: |
+            ls -alh .
+            rm -rf ${{ github.workspace }}/* || true
+            rm -rf ${{ github.workspace }}/.* || true
+            ls -alh .
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
+      - name: Build zephyr hello world
+        run: |
+            conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)
+            .github/scripts/build-zephyr.sh
+      - name: Run tests
+        uses: ./.github/actions/run-tests
+        with:
+          group-key: "group-cores"
+          project-key: "chipyard-zephyr"
+
+
   chipyard-cva6-run-tests:
     name: chipyard-cva6-run-tests
     needs: prepare-chipyard-cores
@@ -1280,6 +1308,7 @@ jobs:
             chipyard-shuttle-run-tests,
             chipyard-shuttle3-run-tests,
             chipyard-tacit-rocket-run-tests,
+            chipyard-rocket-zephyr-run-tests,
             chipyard-cva6-run-tests,
             chipyard-ibex-run-tests,
             chipyard-vexiiriscv-run-tests,

.gitmodules

@@ -151,6 +151,9 @@
 [submodule "generators/vexiiriscv"]
 	path = generators/vexiiriscv
 	url = https://github.com/ucb-bar/vexiiriscv-tile.git
+[submodule "software/zephyrproject/zephyr"]
+	path = software/zephyrproject/zephyr
+	url = https://github.com/ucb-bar/zephyr.git
 [submodule "software/tacit_decoder"]
 	path = software/tacit_decoder
 	url = https://github.com/ucb-bar/tacit_decoder.git

build.sbt

@@ -194,7 +194,7 @@ lazy val constellation = (project in file("generators/constellation"))
   .settings(commonSettings)
 
 lazy val fft_generator = (project in file("generators/fft-generator"))
-  .dependsOn(rocketchip, rocket_dsp_utils)
+  .dependsOn(rocketchip, rocket_dsp_utils, testchipip)
   .settings(libraryDependencies ++= rocketLibDeps.value)
   .settings(commonSettings)
 
@@ -244,7 +244,7 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
   .settings(commonSettings)
 
 lazy val radiance = (project in file("generators/radiance"))
-  .dependsOn(rocketchip, gemmini)
+  .dependsOn(rocketchip, gemmini, testchipip)
   .settings(libraryDependencies ++= rocketLibDeps.value)
   .settings(libraryDependencies ++= Seq(
       "edu.berkeley.cs" %% "chiseltest" % chiselTestVersion,
@@ -260,12 +260,12 @@ lazy val gemmini = freshProject("gemmini", file("generators/gemmini"))
   .settings(commonSettings)
 
 lazy val nvdla = (project in file("generators/nvdla"))
-  .dependsOn(rocketchip)
+  .dependsOn(rocketchip, testchipip)
   .settings(libraryDependencies ++= rocketLibDeps.value)
   .settings(commonSettings)
 
 lazy val tacit = (project in file("generators/tacit"))
-  .dependsOn(rocketchip, shuttle)
+  .dependsOn(rocketchip, shuttle, testchipip)
   .settings(libraryDependencies ++= rocketLibDeps.value)
   .settings(commonSettings)
 

conda-reqs/chipyard-extended.yaml

@@ -63,6 +63,14 @@ dependencies:
     - graphviz
     - expect
 
+    # zephyr deps
+    - ninja
+    - gperf
+    - ccache
+    - dtc
+    - west
+    - pyelftools
+
     # clang-format for driver coding style enforcement.
     - clang-format
     - clang-tools