From ba3deac1de165f3bbbc660666d9fddc40521ca4e Mon Sep 17 00:00:00 2001
From: Jerry Zhao <jerryz123@berkeley.edu>
Date: Mon, 26 Aug 2019 14:50:46 -0700
Subject: [PATCH] Update CI with new config names

---
 .circleci/config.yml  | 62 -------------------------------------------
 .circleci/defaults.sh |  7 +++--
 2 files changed, 3 insertions(+), 66 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1ae4a000..107749e5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -117,35 +117,6 @@ jobs:
                 key: example-{{ .Branch }}-{{ .Revision }}
                 paths:
                     - "/home/riscvuser/project"
-    prepare-boomexample:
-        docker:
-            - image: riscvboom/riscvboom-images:0.0.10
-        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-v1-{{ checksum "../riscv-tools.hash" }}
-            - restore_cache:
-                keys:
-                    - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
-            - run:
-                name: Building the boomexample subproject using Verilator
-                command: .circleci/do-rtl-build.sh boomexample
-                no_output_timeout: 120m
-            - save_cache:
-                key: boomexample-{{ .Branch }}-{{ .Revision }}
-                paths:
-                    - "/home/riscvuser/project"
     prepare-boomrocketexample:
         docker:
             - image: riscvboom/riscvboom-images:0.0.10
@@ -315,30 +286,6 @@ jobs:
             - run:
                 name: Run example tests
                 command: .circleci/run-tests.sh example
-    boomexample-run-tests:
-        docker:
-            - image: riscvboom/riscvboom-images:0.0.10
-        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-v1-{{ checksum "../riscv-tools.hash" }}
-            - restore_cache:
-                keys:
-                    - boomexample-{{ .Branch }}-{{ .Revision }}
-            - restore_cache:
-                keys:
-                    - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
-            - run:
-                name: Run boomexample tests
-                command: .circleci/run-tests.sh boomexample
     boomrocketexample-run-tests:
         docker:
             - image: riscvboom/riscvboom-images:0.0.10
@@ -468,11 +415,6 @@ workflows:
                     - install-riscv-toolchain
                     - install-verilator
 
-            - prepare-boomexample:
-                requires:
-                    - install-riscv-toolchain
-                    - install-verilator
-
             - prepare-boomrocketexample:
                 requires:
                     - install-riscv-toolchain
@@ -505,10 +447,6 @@ workflows:
                 requires:
                     - prepare-example
 
-            - boomexample-run-tests:
-                requires:
-                    - prepare-boomexample
-
             - boomrocketexample-run-tests:
                 requires:
                     - prepare-boomrocketexample
diff --git a/.circleci/defaults.sh b/.circleci/defaults.sh
index 439c4177..fb7a3571 100755
--- a/.circleci/defaults.sh
+++ b/.circleci/defaults.sh
@@ -36,9 +36,8 @@ LOCAL_SIM_DIR=$LOCAL_CHIPYARD_DIR/sims/verilator
 # key value store to get the build strings
 declare -A mapping
 mapping["example"]="SUB_PROJECT=example"
-mapping["boomexample"]="SUB_PROJECT=example CONFIG=DefaultBoomConfig"
-mapping["boomrocketexample"]="SUB_PROJECT=example CONFIG=DefaultBoomAndRocketConfig"
+mapping["boomrocketexample"]="SUB_PROJECT=example CONFIG=LargeBoomAndRocketConfig"
 mapping["boom"]="SUB_PROJECT=example CONFIG=SmallBoomConfig"
 mapping["rocketchip"]="SUB_PROJECT=rocketchip"
-mapping["blockdevrocketchip"]="SUB_PROJECT=example CONFIG=SimBlockDeviceRocketConfig TOP=BoomRocketTopWithBlockDevice"
-mapping["hwacha"]="SUB_PROJECT=example CONFIG=HwachaL2Config GENERATOR_PACKAGE=hwacha"
+mapping["blockdevrocketchip"]="SUB_PROJECT=example CONFIG=SimBlockDeviceRocketConfig TOP=TopWithBlockDevice"
+mapping["hwacha"]="SUB_PROJECT=example CONFIG=HwachaRocketConfig GENERATOR_PACKAGE=hwacha"