From 9f7f94b6f979ecb9f39a5e796516c95c359ec0b9 Mon Sep 17 00:00:00 2001
From: Abraham Gonzalez <abe.j.gonza@gmail.com>
Date: Sat, 11 May 2019 18:35:34 -0700
Subject: [PATCH] parallelize toolchain builds with verilator

---
 .circleci/build-toolchains.sh | 13 +++-------
 .circleci/config.yml          | 47 ++++++++++++++++++++++++++---------
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/.circleci/build-toolchains.sh b/.circleci/build-toolchains.sh
index a2e37381..28b87caa 100755
--- a/.circleci/build-toolchains.sh
+++ b/.circleci/build-toolchains.sh
@@ -1,22 +1,15 @@
 #!/bin/bash
 
 # create the riscv tools/esp tools binaries
+# passed in as <riscv-tools or esp-tools>
 
 # turn echo on and error on earliest command
 set -ex
 
-if [ ! -d "$HOME/esp-tools-install" ]; then
+if [ ! -d "$HOME/$1-install" ]; then
 
     cd $HOME/
 
     # init all submodules including the tools
-    REBAR_DIR=$HOME/project ./project/scripts/build-toolchains.sh esp-tools
-fi
-
-if [ ! -d "$HOME/riscv-tools-install" ]; then
-
-    cd $HOME/
-
-    # init all submodules including the tools
-    REBAR_DIR=$HOME/project ./project/scripts/build-toolchains.sh riscv-tools
+    REBAR_DIR=$HOME/project ./project/scripts/build-toolchains.sh $1
 fi
diff --git a/.circleci/config.yml b/.circleci/config.yml
index e0274023..26a162e0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ version: 2
 
 # set of jobs to run
 jobs:
-    install-toolchains:
+    install-riscv-toolchain:
         docker:
             - image: riscvboom/riscvboom-images:0.0.5
         environment:
@@ -25,14 +25,10 @@ jobs:
                 keys:
                     - riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }}
 
-            - restore_cache:
-                keys:
-                    - esp-tools-installed-v1-{{ checksum "../esp-tools.hash" }}
-
             - run:
-                name: Building toolchains
+                name: Building riscv-tools toolchain
                 command: |
-                    .circleci/build-toolchains.sh
+                    .circleci/build-toolchains.sh riscv-tools
                 no_output_timeout: 120m
 
             - save_cache:
@@ -40,6 +36,32 @@ jobs:
                 paths:
                     - "/home/riscvuser/riscv-tools-install"
 
+    install-esp-toolchain:
+        docker:
+            - image: riscvboom/riscvboom-images:0.0.5
+        environment:
+            JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
+            TERM: dumb
+
+        steps:
+            # Checkout the code
+            - checkout
+
+            - run:
+                name: Create hash of toolchains
+                command: |
+                    .circleci/create-hash.sh
+
+            - restore_cache:
+                keys:
+                    - esp-tools-installed-v1-{{ checksum "../esp-tools.hash" }}
+
+            - run:
+                name: Building esp-tools toolchain
+                command: |
+                    .circleci/build-toolchains.sh esp-tools
+                no_output_timeout: 120m
+
             - save_cache:
                 key: esp-tools-installed-v1-{{ checksum "../esp-tools.hash" }}
                 paths:
@@ -133,13 +155,13 @@ workflows:
     version: 2
     build-and-test-rebar-integration:
         jobs:
-            # Make the toolchain
-            - install-toolchains
+            # Make the toolchains
+            - install-riscv-toolchain
+
+            - install-esp-toolchain
 
             # Build verilator
-            - install-verilator:
-                requires:
-                    - install-toolchains
+            - install-verilator
 
             # Prepare the verilator builds
             - prepare-example:
@@ -152,3 +174,4 @@ workflows:
             - example-run-benchmark-tests:
                 requires:
                     - prepare-example
+                    - install-riscv-toolchain