diff --git a/docker/Dockerfile.finn_dev b/docker/Dockerfile.finn_dev index 7b7d1ac6992cb97e09ce8973e80d5f3628bc4b12..a84cd7be48578d72cd931672298d5695a5fc8268 100644 --- a/docker/Dockerfile.finn_dev +++ b/docker/Dockerfile.finn_dev @@ -50,13 +50,13 @@ COPY requirements.txt . RUN pip install -r requirements.txt RUN rm requirements.txt RUN pip install jupyter==1.0.0 -RUN pip install matplotlib==3.3.1 --ignore-installed certifi +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==4.4.7 +RUN pip install netron # switch user RUN groupadd -g $GID $GNAME diff --git a/finn-rtllib/memstream/component.xml b/finn-rtllib/memstream/component.xml index 3daf36628178766fb440987d2ac2f4c1b37353de..14af1610385a735ad987fd1055ff9f90f76e4a23 100644 --- a/finn-rtllib/memstream/component.xml +++ b/finn-rtllib/memstream/component.xml @@ -260,7 +260,7 @@ <spirit:parameters> <spirit:parameter> <spirit:name>viewChecksum</spirit:name> - <spirit:value>083f6ff3</spirit:value> + <spirit:value>3c30c4ac</spirit:value> </spirit:parameter> </spirit:parameters> </spirit:view> @@ -276,7 +276,7 @@ <spirit:parameters> <spirit:parameter> <spirit:name>viewChecksum</spirit:name> - <spirit:value>7f67dadd</spirit:value> + <spirit:value>00b5320e</spirit:value> </spirit:parameter> </spirit:parameters> </spirit:view> @@ -920,7 +920,7 @@ <spirit:file> <spirit:name>hdl/ramb18_sdp.v</spirit:name> <spirit:fileType>verilogSource</spirit:fileType> - <spirit:userFileType>CHECKSUM_9e2eda76</spirit:userFileType> + <spirit:userFileType>CHECKSUM_9f7c64bf</spirit:userFileType> <spirit:logicalName>xil_defaultlib</spirit:logicalName> </spirit:file> </spirit:fileSet> @@ -930,6 +930,36 @@ <spirit:name>sim/tb_memstream.v</spirit:name> <spirit:fileType>verilogSource</spirit:fileType> </spirit:file> + <spirit:file> + <spirit:name>hdl/memstream.v</spirit:name> + <spirit:fileType>verilogSource</spirit:fileType> + <spirit:userFileType>USED_IN_ipstatic</spirit:userFileType> + </spirit:file> + <spirit:file> + <spirit:name>hdl/mux.v</spirit:name> + <spirit:fileType>verilogSource</spirit:fileType> + <spirit:userFileType>USED_IN_ipstatic</spirit:userFileType> + </spirit:file> + <spirit:file> + <spirit:name>hdl/memstream_singleblock.v</spirit:name> + <spirit:fileType>verilogSource</spirit:fileType> + <spirit:userFileType>USED_IN_ipstatic</spirit:userFileType> + </spirit:file> + <spirit:file> + <spirit:name>hdl/memstream_multiblock.v</spirit:name> + <spirit:fileType>verilogSource</spirit:fileType> + <spirit:userFileType>USED_IN_ipstatic</spirit:userFileType> + </spirit:file> + <spirit:file> + <spirit:name>hdl/ramb18_wf_dualport.v</spirit:name> + <spirit:fileType>verilogSource</spirit:fileType> + <spirit:userFileType>USED_IN_ipstatic</spirit:userFileType> + </spirit:file> + <spirit:file> + <spirit:name>hdl/ramb18_sdp.v</spirit:name> + <spirit:fileType>verilogSource</spirit:fileType> + <spirit:userFileType>USED_IN_ipstatic</spirit:userFileType> + </spirit:file> </spirit:fileSet> <spirit:fileSet> <spirit:name>xilinx_xpgui_view_fileset</spirit:name> @@ -1074,7 +1104,7 @@ <xilinx:family xilinx:lifeCycle="Production">zynq</xilinx:family> <xilinx:family xilinx:lifeCycle="Production">zynquplus</xilinx:family> <xilinx:family xilinx:lifeCycle="Production">virtexuplus</xilinx:family> - <xilinx:family xilinx:lifeCycle="Production">virtexuplusHBM</xilinx:family> + <xilinx:family xilinx:lifeCycle="Beta">virtexuplusHBM</xilinx:family> </xilinx:supportedFamilies> <xilinx:taxonomies> <xilinx:taxonomy>/UserIP</xilinx:taxonomy> @@ -1082,13 +1112,13 @@ <xilinx:displayName>memstream_v1_0</xilinx:displayName> <xilinx:autoFamilySupportLevel>level_0</xilinx:autoFamilySupportLevel> <xilinx:definitionSource>package_project</xilinx:definitionSource> - <xilinx:coreRevision>9</xilinx:coreRevision> - <xilinx:coreCreationDateTime>2020-08-21T11:26:48Z</xilinx:coreCreationDateTime> + <xilinx:coreRevision>10</xilinx:coreRevision> + <xilinx:coreCreationDateTime>2020-09-17T18:04:10Z</xilinx:coreCreationDateTime> </xilinx:coreExtensions> <xilinx:packagingInfo> <xilinx:xilinxVersion>2020.1</xilinx:xilinxVersion> <xilinx:checksum xilinx:scope="busInterfaces" xilinx:value="6d8b2551"/> - <xilinx:checksum xilinx:scope="fileGroups" xilinx:value="fe9e02ac"/> + <xilinx:checksum xilinx:scope="fileGroups" xilinx:value="629ffc9d"/> <xilinx:checksum xilinx:scope="ports" xilinx:value="cabd7433"/> <xilinx:checksum xilinx:scope="hdlParameters" xilinx:value="29c70cc4"/> <xilinx:checksum xilinx:scope="parameters" xilinx:value="858b58f8"/>