Implement stages and HLS

.gitlab-ci.yml

@@ -21,35 +21,71 @@ before_script:
   # Log the sbt version and TaPaSCo version
   - sbt sbtVersion version
 
+stages:
+  - toolchain-test
+  - hls
+  - compose
+  - dse
+
 scala-test:
+  stage: toolchain-test
   script:
     # Execute your project's tests
     - source setup.sh
     - sbt clean test
 
-.vivado-template: &vivado-definition
+.hls-template: &hls-definition
+  stage: hls
+  script:
+    - source setup.sh
+    - source /opt/cad/xilinx/vivado/Vivado/$VIVADO_VERSION/settings64.sh
+    - sbt assembly
+    - tapasco hls arraysum, arrayupdate
+
+hls-2017.4:
+  variables:
+    VIVADO_VERSION: "2017.4"
+  <<: *hls-definition
+
+hls-2017.3:
+  variables:
+    VIVADO_VERSION: "2017.3"
+  <<: *hls-definition
+
+hls-2017.2:
+  variables:
+    VIVADO_VERSION: "2017.2"
+  <<: *hls-definition
+
+hls-2017.1:
+  variables:
+    VIVADO_VERSION: "2017.1"
+  <<: *hls-definition
+
+.compose-template: &compose-definition
+  stage: compose
   script:
     - source setup.sh
     - source /opt/cad/xilinx/vivado/Vivado/$VIVADO_VERSION/settings64.sh
     - sbt assembly
-    - tapasco -v compose [arraysum x 1, arrayupdate x 1, precision_counter x 1] @ 100 MHz
+    - tapasco compose [arraysum x 1, arrayupdate x 1] @ 100 MHz
 
-vivado-2017.4:
+compose-2017.4:
   variables:
     VIVADO_VERSION: "2017.4"
-  <<: *vivado-definition
+  <<: *compose-definition
 
-vivado-2017.3:
+compose-2017.3:
   variables:
     VIVADO_VERSION: "2017.3"
-  <<: *vivado-definition
+  <<: *compose-definition
 
-vivado-2017.2:
+compose-2017.2:
   variables:
     VIVADO_VERSION: "2017.2"
-  <<: *vivado-definition
+  <<: *compose-definition
 
-vivado-2017.1:
+compose-2017.1:
   variables:
     VIVADO_VERSION: "2017.1"
-  <<: *vivado-definition
+  <<: *compose-definition