Merge pull request #444 from riscv-boom/no_renumber

Move WithRenumberHarts to chipyard
riscv-boom · Mar 6, 2020 · fb248eb · fb248eb
2 parents b3bf6d9 + 1b88b41
commit fb248eb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 103 deletions.
diff --git a/.circleci/build-run-csmith-tests.sh b/.circleci/build-run-csmith-tests.sh
@@ -9,7 +9,7 @@ set -ex
 SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 source $SCRIPT_DIR/defaults.sh
 
-SIM_BASE=simulator-example-
+SIM_BASE=simulator-chipyard-
 CONFIG=$(echo ${mapping[$1]} | sed -n -e 's/^.*CONFIG=\([a-zA-Z0-9]*\).*/\1/p')
 SIM=${SIM_BASE}${CONFIG}
 AMT_RUNS=$2

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -222,38 +222,6 @@ jobs:
                 key: megaboomconfig-{{ .Branch }}-{{ .Revision }}
                 paths:
                     - "/home/riscvuser/chipyard"
-    prepare-smallboomandrocketconfig:
-        docker:
-            - image: riscvboom/riscvboom-images:0.0.12
-        environment:
-            JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-            TERM: dumb
-        steps:
-            - add_ssh_keys:
-                fingerprints:
-                    - "3e:c3:02:5b:ed:64:8c:b7:b0:04:43:bc:83:43:73:1e"
-            - checkout
-            - run:
-                name: Create hash of toolchains
-                command: |
-                    .circleci/create-hash.sh
-            - restore_cache:
-                keys:
-                    - riscv-tools-installed-v4-{{ checksum "../riscv-tools.hash" }}
-            - restore_cache:
-                keys:
-                    - chipyard-v13-{{ checksum "CHIPYARD.hash" }}
-            - restore_cache:
-                keys:
-                    - verilator-v13-{{ checksum "CHIPYARD.hash" }}
-            - run:
-                name: Building SmallBoomAndRocketConfig using Verilator
-                command: .circleci/do-rtl-build.sh boomandrocket
-                no_output_timeout: 120m
-            - save_cache:
-                key: smallboomandrocketconfig-{{ .Branch }}-{{ .Revision }}
-                paths:
-                    - "/home/riscvuser/chipyard"
     prepare-smallrv32boomconfig:
         docker:
             - image: riscvboom/riscvboom-images:0.0.12
@@ -515,55 +483,6 @@ jobs:
                 name: Run MegaBoomConfig riscv tests
                 command: .circleci/run-tests.sh megaboom
                 no_output_timeout: 30m
-    smallboomandrocketconfig-run-csmith-tests:
-        docker:
-            - image: riscvboom/riscvboom-images:0.0.12
-        environment:
-            JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-            TERM: dumb
-        steps:
-            - checkout
-            - run:
-                name: Create hash of toolchains
-                command: |
-                    .circleci/create-hash.sh
-            - restore_cache:
-                keys:
-                    - riscv-tools-installed-v4-{{ checksum "../riscv-tools.hash" }}
-            - restore_cache:
-                keys:
-                    - smallboomandrocketconfig-{{ .Branch }}-{{ .Revision }}
-            - restore_cache:
-                keys:
-                    - verilator-v13-{{ checksum "CHIPYARD.hash" }}
-            - run:
-                name: Run SmallBoomAndRocketConfig csmith tests
-                command: .circleci/build-run-csmith-tests.sh boomandrocket 50
-                no_output_timeout: 30m
-    smallboomandrocketconfig-run-riscv-tests:
-        docker:
-            - image: riscvboom/riscvboom-images:0.0.12
-        environment:
-            JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-            TERM: dumb
-        steps:
-            - checkout
-            - run:
-                name: Create hash of toolchains
-                command: |
-                    .circleci/create-hash.sh
-            - restore_cache:
-                keys:
-                    - riscv-tools-installed-v4-{{ checksum "../riscv-tools.hash" }}
-            - restore_cache:
-                keys:
-                    - smallboomandrocketconfig-{{ .Branch }}-{{ .Revision }}
-            - restore_cache:
-                keys:
-                    - verilator-v13-{{ checksum "CHIPYARD.hash" }}
-            - run:
-                name: Run SmallBoomAndRocketConfig riscv tests
-                command: .circleci/run-tests.sh boomandrocket
     smallrv32boomconfig-run-csmith-tests:
         docker:
             - image: riscvboom/riscvboom-images:0.0.12
@@ -670,14 +589,10 @@ workflows:
                 requires:
                     - prepare-build-environment
                     - install-riscv-toolchain
-            - prepare-smallboomandrocketconfig:
-                requires:
-                    - prepare-build-environment
-                    - install-riscv-toolchain
-            - prepare-smallrv32boomconfig:
-                requires:
-                    - prepare-build-environment
-                    - install-riscv-toolchain
+            # - prepare-smallrv32boomconfig:
+            #     requires:
+            #         - prepare-build-environment
+            #         - install-riscv-toolchain
             - prepare-hwachaboomconfig:
                 requires:
                     - prepare-build-environment
@@ -715,18 +630,10 @@ workflows:
                 requires:
                     - prepare-megaboomconfig
 
-            # Run the SmallBoomAndRocketConfig tests
-            - smallboomandrocketconfig-run-csmith-tests:
-                requires:
-                    - prepare-smallboomandrocketconfig
-            - smallboomandrocketconfig-run-riscv-tests:
-                requires:
-                    - prepare-smallboomandrocketconfig
-
             # Run the SmallRV32BoomConfig tests
-            - smallrv32boomconfig-run-riscv-tests:
-                requires:
-                    - prepare-smallrv32boomconfig
+            # - smallrv32boomconfig-run-riscv-tests:
+            #     requires:
+            #         - prepare-smallrv32boomconfig
 
             # Run the HwachaBoomConfig tests
             - hwachaboomconfig-run-riscv-tests:

diff --git a/CHIPYARD.hash b/CHIPYARD.hash
@@ -1 +1 @@
-86a473dbf6e596d092d57e9c199bca053020f326
+854e71a205d1b16aed615f6943771fee0d71dfdc
diff --git a/src/main/scala/common/config-mixins.scala b/src/main/scala/common/config-mixins.scala
@@ -120,6 +120,7 @@ class WithRenumberHarts(rocketFirst: Boolean = false) extends Config((site, here
   case MaxHartIdBits => log2Up(up(BoomTilesKey, site).size + up(RocketTilesKey, site).size)
 })
 
+
 /**
  * Add a synchronous clock crossing to the tile boundary
  */

diff --git a/util/csmith/run-csmith.sh b/util/csmith/run-csmith.sh
@@ -99,7 +99,7 @@ run_once () {
         return 0
     fi
 
-    cmp -s $BASE_NAME.sim.out $BASE_NAME.spike.out
+    cmp -s <(grep checksum $BASE_NAME.sim.out) $BASE_NAME.spike.out
     RV=$?
     if [ $RV -ne 0 ]; then
         echo "[$1] Simulator produced wrong result."