Add TCDS2 support

.gitlab-ci.yml

@@ -16,7 +16,7 @@ variables:
   PROJECT_ALGORITHM: top
 
 .vivado-job:
-  image: gitlab-registry.cern.ch/dmonk-emp-projects/docker-images/ipbb-c8:v0.5.2
+  image: gitlab-registry.cern.ch/dmonk-emp-projects/docker-images/ipbb-c8:dev-2020g
   tags:
     - docker
     - xilinx-tools
@@ -34,7 +34,7 @@ variables:
     paths:
         - ci/builds/work/var
         - ci/builds/work/src
-        - ci/builds/work/.ipbbwork
+        - ci/builds/work/.ipbb_work.yml
   # after_script:
   #   - |
   #     if [ -e success ]; then
@@ -47,14 +47,14 @@ variables:
 
 Check Dependencies:
   stage: Static Analysis
+  image: gitlab-registry.cern.ch/dmonk-emp-projects/docker-images/ipbb-c8:dev-2020g
   before_script:
-    - curl -L https://github.com/ipbus/ipbb/archive/v0.5.2.tar.gz | tar xvz
-    - source ipbb-0.5.2/env.sh
-    - python ci/setup_project.py
+    - python3 ci/setup_project.py
   script:
     - cd ci/builds/work
-    - ipbb proj create vivado test $CI_PROJECT_NAME:$PROJECT_ALGORITHM -t $PROJECT_DEPFILE
+    - ipbb proj create vivado test $CI_PROJECT_NAME:$PROJECT_ALGORITHM $PROJECT_DEPFILE
     - cd proj/test
+    - ipbb ipbus gendecoders -f
     - if [[ "$(ipbb dep report | grep Missing | wc -l)" -gt 0 ]]; then ipbb dep report; exit 1; else ipbb dep report; fi
   # only:
   #   changes:
@@ -63,7 +63,7 @@ Check Dependencies:
 
 Simulate Payload:
   stage: Simulation
-  image: gitlab-registry.cern.ch/dmonk-emp-projects/docker-images/ipbb-c8:v0.5.2
+  image: gitlab-registry.cern.ch/dmonk-emp-projects/docker-images/ipbb-c8:dev-2020g
   tags:
     - docker
     - modelsim-2019.2
@@ -75,7 +75,7 @@ Simulate Payload:
     - cp -r /opt/mentor/simlibs/$MODELSIM_VER /root/.xilinx_sim_libs/
   script:
     - cd ci/builds/work
-    - ipbb proj create sim test $CI_PROJECT_NAME:$PROJECT_ALGORITHM -t $SIM_DEPFILE
+    - ipbb proj create sim test $CI_PROJECT_NAME:$PROJECT_ALGORITHM $SIM_DEPFILE
     - cd proj/test
     - ipbb sim setup-simlib
     - cp -r /root/.xilinx_sim_libs/$MODELSIM_VER/modelsim_$MODELSIM_VER $CI_PROJECT_DIR/ci/builds/simlibs/
@@ -88,7 +88,7 @@ Make Project:
   stage: Make Project
   # only:
   #   - master
-  image: gitlab-registry.cern.ch/dmonk-emp-projects/docker-images/ipbb-c8:v0.5.2
+  image: gitlab-registry.cern.ch/dmonk-emp-projects/docker-images/ipbb-c8:dev-2020g
   tags:
     - docker
     - xilinx-tools
@@ -99,11 +99,16 @@ Make Project:
     - python3 ci/setup_project.py
   script:
     - cd ci/builds/work
-    - ipbb proj create vivado $CI_PROJECT_NAME-$PROJECT_ALGORITHM $CI_PROJECT_NAME:$PROJECT_ALGORITHM -t $PROJECT_DEPFILE
+    - ipbb proj create vivado $CI_PROJECT_NAME-$PROJECT_ALGORITHM $CI_PROJECT_NAME:$PROJECT_ALGORITHM $PROJECT_DEPFILE
     - cd proj/$CI_PROJECT_NAME-$PROJECT_ALGORITHM
-    - ipbb vivado project --single -c
+    - ipbb ipbus gendecoders -f
+    - ipbb vivado project --enable-ip-cache --single ""
     - cd ..
     - cp -r $CI_PROJECT_NAME-$PROJECT_ALGORITHM $CI_PROJECT_DIR/ci/builds/artifacts/
+    - cd ..
+    - ls -alFgh
+    - ls -alFgh proj
+    - ls -alFgh proj/$CI_PROJECT_NAME-$PROJECT_ALGORITHM
   artifacts:
     paths:
       - ci/builds/artifacts
@@ -112,7 +117,7 @@ Make Project:
     paths:
         - ci/builds/work/var
         - ci/builds/work/src
-        - ci/builds/work/.ipbbwork
+        - ci/builds/work/.ipbb_work.yml
 
 Check Syntax:
   extends: .vivado-job