Modified prjxray import to add tiles tags #653

acomodi · 2019-04-26T15:44:11Z

This PR is still a WIP and addresses #582. It aims at creating the tiles tag into the arch xml description.

For now there is only the possibility to add the tiles, without any reference to the possible equivalent ones. Once also the equivalent tiles are added to the tile tag I will remove the WIP.

For now I left the top level-only tags (e.g. fc, pinlocations, etc.) also in the top level pb_types in the complexblocklist to let CI go green.

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

acomodi · 2019-04-29T13:53:49Z

With the most recent updates tiles are added to the arch.xml file. I have added make targets to produce a <tile_name>.tile.xml file that will be expanded when merging the whole architecture.

The only problem is that the tile tag creation depends on the generated pb_types.xml files to extract the pins of the equivalent tiles and add the corresponding mapping (this applies only to the tiles that allow other equivalent tiles). This prevents to have two equivalent tiles of the same type (e.g. CLBLM_L cannot have CLBLM_R as equivalent tile and vice-versa) as CMake will cause an error because the pb_type.xml target of CLBLM_R is not yet created.

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

litghost

Can you explain what the purpose of the new script xc7/utils/prjxray_tile_type_import.py does versus xc7/utils/prjxray_tile_import.py? I'm not sure how they work together. Either expand the relevant docstrings, or add a .md document explaining why both are needed.

acomodi · 2019-05-01T12:09:04Z

Can you explain what the purpose of the new script xc7/utils/prjxray_tile_type_import.py does versus xc7/utils/prjxray_tile_import.py? I'm not sure how they work together. Either expand the relevant docstrings, or add a .md document explaining why both are needed.

@litghost Sure, I will add a generic README.md and fill it with the tile import. Maybe it could be filled and completed in the future with the other scripts.

Anyway, the main reason for having a separate tile_import script for the tiles tag is that all the pb_types.xml have to be created first as they contain the IO pin names that are needed to fill the equivalent_tiles pin mapping. Therefore the creation of the tile.xml files depends on (possibly) all the top level pb_types.xml.

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

xc7/make/project_xray.cmake

xc7/utils/README.md

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

litghost · 2019-05-02T22:41:41Z

xc7/make/project_xray.cmake

+  # TILE name of the tile that has to be generated (e.g. CLBLM_R, BRAM_L, etc.)
+  # SITE_TYPES list of sites contained in the considered tile (e.g. CLBLM_R contains a SLICEM and SLICEL sites)
+  # EQUIVALENT_TILES list of tiles equivalent to the considered one (e.g. CLBLL_R is equivalent to CLBLM_R and CLBLM_L)
+  # PIN_PREFIX translation pattern between prefixes of two equivalent tiles. This is needed as CLBLLs and CLBLMs have different


When the tile split is done, no prefix translation will be required. How will that be expressed?

I have deleted the PIN_PREFIX, given that the prefix translation is not required anymore as you correctly said. I need to delete it from the

xc7/make/project_xray.cmake

xc7/utils/prjxray_tile_type_import.py

acomodi · 2019-05-06T11:03:06Z

Equivalent tiles seem to work as expected. Better placement solutions are selected as shown in the following figures (the test is the buttons one):

Without equivalent tiles:

With equivalent tiles:

The placer places the blocks closer to the synthetic IOs.

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

…biflow-arch-defs into prjxray-import-add-tile-tag Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

…tile-tag

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

…t-add-tile-tag Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

litghost · 2019-05-06T17:45:21Z

Please merge with master, and I'll review again.

…tile-tag

acomodi · 2019-05-06T17:54:38Z

Please merge with master, and I'll review again.

@litghost Done

litghost

Looking good, let's fix up the merge and I think this is ready.

xc7/make/project_xray.cmake

litghost · 2019-05-06T18:02:16Z

xc7/utils/prjxray_physical_tile_import.py

+PORT_TAGS = ['input', 'output', 'clock']
+
+
+def prefix_name(tile):


Rather than c/p, can you import these functions from prjxray_tile_import?

litghost · 2019-05-06T18:02:56Z

xc7/utils/prjxray_physical_tile_import.py

+
+        return ports
+
+    def add_pinlocations(xml, fc_xml, pin_assignments, tile):


Can we de-dup these functions from prjxray_tile_import?

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

litghost

LGTM, wait for green CI then merge.

acomodi added 2 commits April 26, 2019 17:36

equivalent tiles: modified arch import to generate tiles tags

0e73950

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

equivalent tiles: run format_python

af46b1e

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

probot-autolabeler bot added lang-python Issue uses (or requires) Python language. type-utils Issues is related to the scripts inside the repo. labels Apr 26, 2019

acomodi requested review from mithro, litghost and elms April 26, 2019 15:45

probot-autolabeler bot added the arch-artix7 label Apr 29, 2019

acomodi added 3 commits April 29, 2019 15:42

equivalent tiles: adding script to generate the tile tag

7335c26

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

equivalent tiles: modified cmake to have tile.xml file generation

9fe5d81

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

equivalent tiles: run format_python

0974f28

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

acomodi force-pushed the prjxray-import-add-tile-tag branch from 8c39df9 to 0974f28 Compare April 29, 2019 13:43

equivalent tiles: corrected dependency issue

100f2ed

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

acomodi changed the title ~~WIP: Modified prjxray import to add tiles tags~~ Modified prjxray import to add tiles tags Apr 29, 2019

acomodi requested a review from mkurc-ant April 30, 2019 12:37

litghost suggested changes Apr 30, 2019

View reviewed changes

xc7/utils: added README.md

72109da

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

probot-autolabeler bot added the type-docs Issue is related to documentation. label May 1, 2019

litghost reviewed May 1, 2019

View reviewed changes

xc7/make/project_xray.cmake Outdated Show resolved Hide resolved

litghost reviewed May 1, 2019

View reviewed changes

xc7/make/project_xray.cmake Outdated Show resolved Hide resolved

litghost reviewed May 1, 2019

View reviewed changes

xc7/utils/README.md Show resolved Hide resolved

acomodi added 2 commits May 2, 2019 18:13

equivalent tiles: expanded comments

48de603

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

equivalent tiles: corrected typo in prjxray cmake

a0a0ee3

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

litghost reviewed May 2, 2019

View reviewed changes

litghost suggested changes May 2, 2019

View reviewed changes

xc7/make/project_xray.cmake Outdated Show resolved Hide resolved

xc7/utils/prjxray_tile_type_import.py Outdated Show resolved Hide resolved

acomodi added 2 commits May 6, 2019 15:30

equivalent tiles: refactored tile tag script

0ac832d

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

equivalent tiles: disabled equivalent tiles for CLBLs

c78881f

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

acomodi added 3 commits May 6, 2019 15:34

Merge branch 'prjxray-import-add-tile-tag' of github.com:antmicro/sym…

678be16

…biflow-arch-defs into prjxray-import-add-tile-tag Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

Merge remote-tracking branch 'origin/master' into prjxray-import-add-…

fadd5b1

…tile-tag

equivalent tiles: run format_python

982a3bb

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

acomodi requested a review from litghost May 6, 2019 14:10

acomodi added 2 commits May 6, 2019 16:43

Merge remote-tracking branch 'litghost/tile_split' into prjxray-impor…

3f1744f

…t-add-tile-tag Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

equivalent tiles: added SLICEL equivalent tile

3adf5d7

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

acomodi force-pushed the prjxray-import-add-tile-tag branch from be517ea to 3adf5d7 Compare May 6, 2019 14:49

acomodi added the kokoro:force-run label May 6, 2019

kokoro-team removed the kokoro:force-run label May 6, 2019

dram: fixed assert usage in dram_8_32x1s

47a4d82

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

acomodi requested review from litghost and removed request for litghost May 6, 2019 16:01

Merge remote-tracking branch 'origin/master' into prjxray-import-add-…

72e5c9d

…tile-tag

litghost suggested changes May 6, 2019

View reviewed changes

acomodi added 2 commits May 6, 2019 23:25

equivalent tiles: imported tile_import functions

a255b6b

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

equivalent tiles: corrected merge error

1d17938

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

acomodi requested a review from litghost May 6, 2019 21:27

equivalent tiles: run format_python

aca62c9

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

litghost approved these changes May 6, 2019

View reviewed changes

acomodi merged commit 38d7f79 into f4pga:master May 7, 2019

acomodi mentioned this pull request May 7, 2019

Add tiles tag to XML architecture file #582

Closed

acomodi deleted the prjxray-import-add-tile-tag branch June 19, 2019 10:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Modified prjxray import to add tiles tags #653

Modified prjxray import to add tiles tags #653

acomodi commented Apr 26, 2019

acomodi commented Apr 29, 2019

litghost left a comment

acomodi commented May 1, 2019 •

edited

litghost May 2, 2019

acomodi May 6, 2019

acomodi commented May 6, 2019

litghost commented May 6, 2019

acomodi commented May 6, 2019 •

edited

litghost left a comment

litghost May 6, 2019

acomodi May 6, 2019

litghost May 6, 2019

acomodi May 6, 2019

litghost left a comment

		PORT_TAGS = ['input', 'output', 'clock']


		def prefix_name(tile):


		return ports

		def add_pinlocations(xml, fc_xml, pin_assignments, tile):

Modified prjxray import to add tiles tags #653

Modified prjxray import to add tiles tags #653

Conversation

acomodi commented Apr 26, 2019

acomodi commented Apr 29, 2019

litghost left a comment

Choose a reason for hiding this comment

acomodi commented May 1, 2019 • edited

litghost May 2, 2019

Choose a reason for hiding this comment

acomodi May 6, 2019

Choose a reason for hiding this comment

acomodi commented May 6, 2019

litghost commented May 6, 2019

acomodi commented May 6, 2019 • edited

litghost left a comment

Choose a reason for hiding this comment

litghost May 6, 2019

Choose a reason for hiding this comment

acomodi May 6, 2019

Choose a reason for hiding this comment

litghost May 6, 2019

Choose a reason for hiding this comment

acomodi May 6, 2019

Choose a reason for hiding this comment

litghost left a comment

Choose a reason for hiding this comment

acomodi commented May 1, 2019 •

edited

acomodi commented May 6, 2019 •

edited