Merge pull request #363 from Xilinx/feature/syncooc_updates

 Updates to out-of-context synth

.github/workflows/docker-image.yml

@@ -9,7 +9,7 @@ jobs:
   docker:
     runs-on: ubuntu-18.04
     steps:
-      - 
+      -
         name: checkout
         uses: actions/checkout@v2
       -

docker/Dockerfile.finn

@@ -63,34 +63,63 @@ RUN wget https://www.xilinx.com/bin/public/openDownload?filename=$XRT_DEB_VERSIO
 RUN apt install -y /tmp/$XRT_DEB_VERSION.deb
 RUN rm /tmp/$XRT_DEB_VERSION.deb
 
-# git-based dependencies for Python
+# versioned Python package requirements for FINN compiler
+# these are given in requirements.txt
+COPY requirements.txt .
+RUN pip install -r requirements.txt
+RUN rm requirements.txt
+# extra Python package dependencies (for testing and interaction)
+RUN pip install pygments==2.4.1
+RUN pip install ipykernel==5.5.5
+RUN pip install jupyter==1.0.0
+RUN pip install matplotlib==3.3.1 --ignore-installed
+RUN pip install pytest-dependency==0.5.1
+RUN pip install sphinx==3.1.2
+RUN pip install sphinx_rtd_theme==0.5.0
+RUN pip install pytest-xdist==2.0.0
+RUN pip install pytest-parallel==0.1.0
+RUN pip install netron==5.0.0
+RUN pip install pandas==1.1.5
+RUN pip install scikit-learn==0.24.1
+RUN pip install tqdm==4.31.1
+RUN pip install -e git+https://github.com/fbcotter/dataset_loading.git@0.0.4#egg=dataset_loading
+
+# git-based Python repo dependencies
 # these are installed in editable mode for easier co-development
+ARG FINN_BASE_COMMIT="ac0b86a63eb937b869bfa453a996a8a8b8506546"
+ARG FINN_EXP_COMMIT="f82c0d9868bb88ea045dfadb28508d327d287221"
+ARG BREVITAS_COMMIT="462f86cdc60f9915baf13afd1676fb21da44c2ee"
+ARG PYVERILATOR_COMMIT="e2ff74030de3992dcac54bf1b6aad2915946e8cb"
+ARG CNPY_COMMIT="4e8810b1a8637695171ed346ce68f6984e585ef4"
+ARG HLSLIB_COMMIT="4d74baefa79df48b5a0348d63f39a26df075de51"
+ARG OMX_COMMIT="1dfc4aa2f2895632742cd5751520c6b472feb74e"
+ARG AVNET_BDF_COMMIT="2d49cfc25766f07792c0b314489f21fe916b639b"
 # finn-base
 RUN git clone https://github.com/Xilinx/finn-base.git /workspace/finn-base
-RUN git -C /workspace/finn-base checkout ac0b86a63eb937b869bfa453a996a8a8b8506546
+RUN git -C /workspace/finn-base checkout $FINN_BASE_COMMIT
 RUN pip install -e /workspace/finn-base
 # finn-experimental
 RUN git clone https://github.com/Xilinx/finn-experimental.git /workspace/finn-experimental
-RUN git -C /workspace/finn-experimental checkout f82c0d9868bb88ea045dfadb28508d327d287221
+RUN git -C /workspace/finn-experimental checkout $FINN_EXP_COMMIT
 RUN pip install -e /workspace/finn-experimental
 # brevitas
 RUN git clone https://github.com/Xilinx/brevitas.git /workspace/brevitas
-RUN git -C /workspace/brevitas checkout 462f86cdc60f9915baf13afd1676fb21da44c2ee
+RUN git -C /workspace/brevitas checkout $BREVITAS_COMMIT
 RUN pip install -e /workspace/brevitas
 # pyverilator
 RUN git clone https://github.com/maltanar/pyverilator.git /workspace/pyverilator
-RUN git -C /workspace/pyverilator checkout e2ff74030de3992dcac54bf1b6aad2915946e8cb
+RUN git -C /workspace/pyverilator checkout $PYVERILATOR_COMMIT
 RUN pip install -e /workspace/pyverilator
 # other git-based dependencies (non-Python)
 # cnpy
 RUN git clone https://github.com/rogersce/cnpy.git /workspace/cnpy
-RUN git -C /workspace/cnpy checkout 4e8810b1a8637695171ed346ce68f6984e585ef4
+RUN git -C /workspace/cnpy checkout $CNPY_COMMIT
 # finn-hlslib
 RUN git clone https://github.com/Xilinx/finn-hlslib.git /workspace/finn-hlslib
-RUN git -C /workspace/finn-hlslib checkout 4d74baefa79df48b5a0348d63f39a26df075de51
+RUN git -C /workspace/finn-hlslib checkout $HLSLIB_COMMIT
 # oh-my-xilinx
 RUN git clone https://bitbucket.org/maltanar/oh-my-xilinx.git /workspace/oh-my-xilinx
-RUN git -C /workspace/oh-my-xilinx checkout 1bae737669901e762f581af73348332b5c4b2ada
+RUN git -C /workspace/oh-my-xilinx checkout $OMX_COMMIT
 # board files
 RUN cd /tmp; \
     wget -q https://github.com/cathalmccabe/pynq-z1_board_files/raw/master/pynq-z1.zip; \
@@ -103,30 +132,10 @@ RUN cd /tmp; \
     rm pynq-z1.zip; \
     rm pynq-z2.zip; \
     git clone https://github.com/Avnet/bdf.git /workspace/avnet-bdf; \
-    git -C /workspace/avnet-bdf checkout 2d49cfc25766f07792c0b314489f21fe916b639b; \
+    git -C /workspace/avnet-bdf checkout  $AVNET_BDF_COMMIT; \
     mv /workspace/avnet-bdf/* /workspace/board_files/;
 
 
-# versioned Python package requirements for FINN compiler
-# these are given in requirements.txt
-COPY requirements.txt .
-RUN pip install -r requirements.txt
-RUN rm requirements.txt
-# extra Python package dependencies (for testing and interaction)
-RUN pip install pygments==2.4.1
-RUN pip install jupyter==1.0.0
-RUN pip install matplotlib==3.3.1 --ignore-installed
-RUN pip install pytest-dependency==0.5.1
-RUN pip install sphinx==3.1.2
-RUN pip install sphinx_rtd_theme==0.5.0
-RUN pip install pytest-xdist==2.0.0
-RUN pip install pytest-parallel==0.1.0
-RUN pip install netron==5.0.0
-RUN pip install pandas==1.1.5
-RUN pip install scikit-learn==0.24.1
-RUN pip install tqdm==4.31.1
-RUN pip install -e git+https://github.com/fbcotter/dataset_loading.git@0.0.4#egg=dataset_loading
-
 # extra environment variables for FINN compiler
 ENV VIVADO_IP_CACHE "/tmp/vivado_ip_cache"
 ENV PATH "${PATH}:/workspace/oh-my-xilinx"

src/finn/transformation/fpgadataflow/synth_ooc.py

@@ -52,10 +52,11 @@ class SynthOutOfContext(Transformation):
         top_module_name = model.get_metadata_prop("wrapper_filename")
         top_module_name = file_to_basename(top_module_name).strip(".v")
         build_dir = make_build_dir("synth_out_of_context_")
+        verilog_extensions = [".v", ".vh"]
         with open(vivado_stitch_proj_dir + "/all_verilog_srcs.txt", "r") as f:
             all_verilog_srcs = f.read().split()
         for file in all_verilog_srcs:
-            if file.endswith(".v"):
+            if any([file.endswith(x) for x in verilog_extensions]):
                 copy2(file, build_dir)
         ret = out_of_context_synth(
             build_dir, top_module_name, self.part, self.clk_name, self.clk_period_ns