Rename top-level example package to chipyard

* FireChip now directly uses the Chipyard Top
2020-01-22 12:38:38 -08:00
parent 7bcedfa7ad
commit 49dbe8daba
26 changed files with 82 additions and 151 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -188,105 +188,76 @@ jobs:
                key: extra-tests-{{ .Branch }}-{{ .Revision }}
                paths:
                    - "/home/riscvuser/project/tests"
-    prepare-example:
+    prepare-chipyard-rocket:
        executor: main-env
        steps:
            - prepare-rtl:
-                project-key: "example"
-    prepare-boomrocketexample:
+                project-key: "chipyard-rocket"
+    prepare-chipyard-hetero:
        executor: main-env
        steps:
            - prepare-rtl:
-                project-key: "boomrocketexample"
+                project-key: "chipyard-hetero"
                timeout: "240m"
-    prepare-boom:
+    prepare-chipyard-boom:
        executor: main-env
        steps:
            - prepare-rtl:
-                project-key: "boom"
+                project-key: "chipyard-boom"
    prepare-rocketchip:
        executor: main-env
        steps:
            - prepare-rtl:
                project-key: "rocketchip"
-    prepare-blockdevrocketchip:
+    prepare-chipyard-blkdev:
        executor: main-env
        steps:
            - prepare-rtl:
-                project-key: "blockdevrocketchip"
-    prepare-hwacha:
+                project-key: "chipyard-blkdev"
+    prepare-chipyard-hwacha:
        executor: main-env
        steps:
            - prepare-rtl:
                tools-version: "esp-tools"
-                project-key: "hwacha"
-    prepare-gemmini:
+                project-key: "chipyard-hwacha"
+    prepare-chipyard-gemmini:
        executor: main-env
        steps:
            - prepare-rtl:
                tools-version: "esp-tools"
-                project-key: "gemmini"
-    prepare-tracegen:
-        executor: main-env
-        steps:
-            - prepare-rtl:
-                project-key: "tracegen"
-    prepare-tracegen-boom:
-        executor: main-env
-        steps:
-            - prepare-rtl:
-                project-key: "tracegen-boom"
-    prepare-firesim:
-        executor: main-env
-        steps:
-            - prepare-rtl:
-                project-key: "firesim"
-                build-script: "do-firesim-build.sh"
-    prepare-fireboom:
-        executor: main-env
-        steps:
-            - prepare-rtl:
-                project-key: "fireboom"
-                build-script: "do-firesim-build.sh"
-    midasexamples-run-tests:
-        executor: main-env
-        steps:
-            - setup-tools-verilator
-            - run:
-                name: Run midasexamples tests
-                command: .circleci/run-midasexamples-tests.sh
-    example-run-tests:
+                project-key: "chipyard-gemmini"
+    chipyard-rocket-run-tests:
        executor: main-env
        steps:
            - run-tests:
-                project-key: "example"
-    boomrocketexample-run-tests:
+                project-key: "chipyard-rocket"
+    chipyard-hetero-run-tests:
        executor: main-env
        steps:
            - run-tests:
-                project-key: "boomrocketexample"
-    boom-run-tests:
+                project-key: "chipyard-hetero"
+    chipyard-boom-run-tests:
        executor: main-env
        steps:
            - run-tests:
-                project-key: "boom"
+                project-key: "chipyard-boom"
    rocketchip-run-tests:
        executor: main-env
        steps:
            - run-tests:
                project-key: "rocketchip"
-    hwacha-run-tests:
+    chipyard-hwacha-run-tests:
        executor: main-env
        steps:
            - run-tests:
                tools-version: "esp-tools"
-                project-key: "hwacha"
-    gemmini-run-tests:
+                project-key: "chipyard-hwacha"
+    chipyard-gemmini-run-tests:
        executor: main-env
        steps:
            - run-tests:
                tools-version: "esp-tools"
-                project-key: "gemmini"
+                project-key: "chipyard-gemmini"
    tracegen-run-tests:
        executor: main-env
        steps:
@@ -346,17 +317,17 @@ workflows:
                    - install-riscv-toolchain

            # Prepare the verilator builds
-            - prepare-example:
+            - prepare-chipyard-rocket:
                requires:
                    - install-riscv-toolchain
                    - install-verilator

-            - prepare-boomrocketexample:
+            - prepare-chipyard-hetero:
                requires:
                    - install-riscv-toolchain
                    - install-verilator

-            - prepare-boom:
+            - prepare-chipyard-boom:
                requires:
                    - install-riscv-toolchain
                    - install-verilator
@@ -366,17 +337,17 @@ workflows:
                    - install-riscv-toolchain
                    - install-verilator

-            - prepare-blockdevrocketchip:
+            - prepare-chipyard-blkdev:
                requires:
                    - install-riscv-toolchain
                    - install-verilator

-            - prepare-hwacha:
+            - prepare-chipyard-hwacha:
                requires:
                    - install-esp-toolchain
                    - install-verilator

-            - prepare-gemmini:
+            - prepare-chipyard-gemmini:
                requires:
                    - install-esp-toolchain
                    - install-verilator
@@ -410,29 +381,29 @@ workflows:
                    - install-verilator

            # Run the example tests
-            - example-run-tests:
+            - chipyard-rocket-run-tests:
                requires:
-                    - prepare-example
+                    - prepare-chipyard-rocket

-            - boomrocketexample-run-tests:
+            - chipyard-hetero-run-tests:
                requires:
-                    - prepare-boomrocketexample
+                    - prepare-chipyard-hetero

-            - boom-run-tests:
+            - chipyard-boom-run-tests:
                requires:
-                    - prepare-boom
+                    - prepare-chipyard-boom

            - rocketchip-run-tests:
                requires:
                    - prepare-rocketchip

-            - hwacha-run-tests:
+            - chipyard-hwacha-run-tests:
                requires:
-                    - prepare-hwacha
+                    - prepare-chipyard-hwacha

-            - gemmini-run-tests:
+            - chipyard-gemmini-run-tests:
                requires:
-                    - prepare-gemmini
+                    - prepare-chipyard-gemmini

            - tracegen-run-tests:
                requires:
--- a/.circleci/defaults.sh
+++ b/.circleci/defaults.sh
@@ -41,13 +41,13 @@ LOCAL_FIRESIM_DIR=$LOCAL_CHIPYARD_DIR/sims/firesim/sim

 # key value store to get the build strings
 declare -A mapping
-mapping["example"]="SUB_PROJECT=example"
-mapping["boomrocketexample"]="SUB_PROJECT=example CONFIG=LargeBoomAndRocketConfig"
-mapping["boom"]="SUB_PROJECT=example CONFIG=SmallBoomConfig"
+mapping["chipyard-rocket"]="SUB_PROJECT=chipyard"
+mapping["chipyard-hetero"]="SUB_PROJECT=chipyard CONFIG=LargeBoomAndRocketConfig"
+mapping["chipyard-boom"]="SUB_PROJECT=chipyard CONFIG=SmallBoomConfig"
 mapping["rocketchip"]="SUB_PROJECT=rocketchip"
-mapping["blockdevrocketchip"]="SUB_PROJECT=example CONFIG=SimBlockDeviceRocketConfig"
-mapping["hwacha"]="SUB_PROJECT=example CONFIG=HwachaRocketConfig"
-mapping["gemmini"]="SUB_PROJECT=example CONFIG=GemminiRocketConfig"
+mapping["chipyard-blkdev"]="SUB_PROJECT=chipyard CONFIG=SimBlockDeviceRocketConfig"
+mapping["chipyard-hwacha"]="SUB_PROJECT=chipyard CONFIG=HwachaRocketConfig"
+mapping["chipyard-gemmini"]="SUB_PROJECT=chipyard CONFIG=GemminiRocketConfig"
 mapping["tracegen"]="SUB_PROJECT=tracegen CONFIG=NonBlockingTraceGenL2Config"
 mapping["tracegen-boom"]="SUB_PROJECT=tracegen CONFIG=BoomTraceGenConfig"
 mapping["firesim"]="DESIGN=FireSim TARGET_CONFIG=DDR3FRFCFSLLC4MB_FireSimRocketChipConfig PLATFORM_CONFIG=BaseF1Config"
--- a/.circleci/do-rtl-build.sh
+++ b/.circleci/do-rtl-build.sh
@@ -32,7 +32,7 @@ run "cp -r ~/.sbt  $REMOTE_WORK_DIR"

 TOOLS_DIR=$REMOTE_RISCV_DIR
 LD_LIB_DIR=$REMOTE_RISCV_DIR/lib
-if [ $1 = "hwacha" ] || [ $1 = "gemmini" ]; then
+if [ $1 = "chipyard-hwacha" ] || [ $1 = "chipyard-gemmini" ]; then
    TOOLS_DIR=$REMOTE_ESP_DIR
    LD_LIB_DIR=$REMOTE_ESP_DIR/lib
    run "mkdir -p $REMOTE_ESP_DIR"
--- a/.circleci/run-tests.sh
+++ b/.circleci/run-tests.sh
@@ -29,28 +29,25 @@ run_tracegen () {
 }

 case $1 in
-    example)
+    chipyard-rocket)
        run_bmark ${mapping[$1]}
        ;;
-    boomexample)
+    chipyard-boom)
        run_bmark ${mapping[$1]}
        ;;
-    boomrocketexample)
-        run_bmark ${mapping[$1]}
-        ;;
-    boom)
+    chipyard-hetero)
        run_bmark ${mapping[$1]}
        ;;
    rocketchip)
        run_bmark ${mapping[$1]}
        ;;
-    hwacha)
+    chipyard-hwacha)
        export RISCV=$LOCAL_ESP_DIR
        export LD_LIBRARY_PATH=$LOCAL_ESP_DIR/lib
        export PATH=$RISCV/bin:$PATH
        make run-rv64uv-p-asm-tests -j$NPROC -C $LOCAL_SIM_DIR VERILATOR_INSTALL_DIR=$LOCAL_VERILATOR_DIR ${mapping[$1]}
        ;;
-    gemmini)
+    chipyard-gemmini)
        export RISCV=$LOCAL_ESP_DIR
        export LD_LIBRARY_PATH=$LOCAL_ESP_DIR/lib
        export PATH=$RISCV/bin:$PATH
@@ -58,9 +55,9 @@ case $1 in
        cd $GEMMINI_SOFTWARE_DIR
        ./build.sh
        cd $LOCAL_SIM_DIR
-        $LOCAL_SIM_DIR/simulator-example-GemminiRocketConfig $GEMMINI_SOFTWARE_DIR/build/bareMetalC/aligned-baremetal
-        $LOCAL_SIM_DIR/simulator-example-GemminiRocketConfig $GEMMINI_SOFTWARE_DIR/build/bareMetalC/raw_hazard-baremetal
-        $LOCAL_SIM_DIR/simulator-example-GemminiRocketConfig $GEMMINI_SOFTWARE_DIR/build/bareMetalC/mvin_mvout-baremetal
+        make run-binary ${mapping[$1]} BINARY=$GEMMINI_SOFTWARE_DIR/build/bareMetalC/aligned-baremetal
+        make run-binary ${mapping[$1]} BINARY=$GEMMINI_SOFTWARE_DIR/build/bareMetalC/raw_hazard-baremetal
+        make run-binary ${mapping[$1]} BINARY=$GEMMINI_SOFTWARE_DIR/build/bareMetalC/mvin_mvout-baremetal
        ;;
    tracegen)
        run_tracegen ${mapping[$1]}