diff --git a/CHANGELOG.md b/CHANGELOG.md index 452b7bc9..75468810 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- Resolved an issue where IP Core node names in the GUI were parsed from the yaml description file name. - Resolved an issue with YAML files produced by `topwrap parse`, where unnecessary double hyphens (`--`) appeared in signal definitions ## [0.1.0] - 2024-09-27 diff --git a/examples/hdmi/ipcores/axi_dispctrl.yaml b/examples/hdmi/ipcores/axi_dispctrl.yaml index a51b442f..e66dae37 100644 --- a/examples/hdmi/ipcores/axi_dispctrl.yaml +++ b/examples/hdmi/ipcores/axi_dispctrl.yaml @@ -1,7 +1,7 @@ # Copyright (c) 2021-2024 Antmicro # SPDX-License-Identifier: Apache-2.0 -name: axi_dispctrl_v1_0 +name: axi_dispctrl interfaces: S00_AXI: diff --git a/examples/hdmi/ipcores/clock_crossing.yaml b/examples/hdmi/ipcores/clock_crossing.yaml index 8d6ef73f..e6d52857 100644 --- a/examples/hdmi/ipcores/clock_crossing.yaml +++ b/examples/hdmi/ipcores/clock_crossing.yaml @@ -1,7 +1,7 @@ # Copyright (c) 2021-2024 Antmicro # SPDX-License-Identifier: Apache-2.0 -name: cdc_flag +name: clock_crossing signals: in: diff --git a/examples/hdmi/ipcores/dma_axi_in_axis_out.yaml b/examples/hdmi/ipcores/dma_axi_in_axis_out.yaml index e001a702..15bbaf91 100644 --- a/examples/hdmi/ipcores/dma_axi_in_axis_out.yaml +++ b/examples/hdmi/ipcores/dma_axi_in_axis_out.yaml @@ -1,7 +1,7 @@ # Copyright (c) 2021-2024 Antmicro # SPDX-License-Identifier: Apache-2.0 -name: DMATop +name: dma_axi_in_axis_out interfaces: m_axis: diff --git a/examples/hdmi/ipcores/hdmi_tx.yaml b/examples/hdmi/ipcores/hdmi_tx.yaml index 41c58c2d..cdefa113 100644 --- a/examples/hdmi/ipcores/hdmi_tx.yaml +++ b/examples/hdmi/ipcores/hdmi_tx.yaml @@ -1,7 +1,7 @@ # Copyright (c) 2021-2024 Antmicro # SPDX-License-Identifier: Apache-2.0 -name: HDMI_Tx_v1_0 +name: hdmi_tx signals: in: diff --git a/examples/hdmi/ipcores/litex_mmcm.yaml b/examples/hdmi/ipcores/litex_mmcm.yaml index 7d983323..128156c0 100644 --- a/examples/hdmi/ipcores/litex_mmcm.yaml +++ b/examples/hdmi/ipcores/litex_mmcm.yaml @@ -1,7 +1,7 @@ # Copyright (c) 2021-2024 Antmicro # SPDX-License-Identifier: Apache-2.0 -name: top +name: litex_mmcm interfaces: axi: diff --git a/examples/hdmi/ipcores/proc_sys_reset.yaml b/examples/hdmi/ipcores/proc_sys_reset.yaml index 85e072a9..7b7211e3 100644 --- a/examples/hdmi/ipcores/proc_sys_reset.yaml +++ b/examples/hdmi/ipcores/proc_sys_reset.yaml @@ -1,7 +1,7 @@ # Copyright (c) 2021-2024 Antmicro # SPDX-License-Identifier: Apache-2.0 -name: proc_sys_reset_0 +name: proc_sys_reset signals: in: diff --git a/examples/hdmi/ipcores/ps7.yaml b/examples/hdmi/ipcores/ps7.yaml index b8dde203..2cd42825 100644 --- a/examples/hdmi/ipcores/ps7.yaml +++ b/examples/hdmi/ipcores/ps7.yaml @@ -1,7 +1,7 @@ # Copyright (c) 2021-2024 Antmicro # SPDX-License-Identifier: Apache-2.0 -name: ps7_inst +name: ps7 signals: in: diff --git a/examples/pwm/ipcores/ps7.yaml b/examples/pwm/ipcores/ps7.yaml index 903f302c..a76488a7 100644 --- a/examples/pwm/ipcores/ps7.yaml +++ b/examples/pwm/ipcores/ps7.yaml @@ -1,7 +1,7 @@ # Copyright (c) 2021-2024 Antmicro # SPDX-License-Identifier: Apache-2.0 -name: ps7_inst +name: ps7 signals: in: diff --git a/examples/user_repository/project.yml b/examples/user_repository/project.yml index 30b86bc3..c452d4b7 100644 --- a/examples/user_repository/project.yml +++ b/examples/user_repository/project.yml @@ -24,6 +24,6 @@ external: - ex_out_1 ips: core1: - file: examples/user_repository/repo/cores/example_core1/core1.yaml + file: repo/cores/example_core1/core1.yaml core2: - file: examples/user_repository/repo/cores/example_core2/core2.yaml + file: repo/cores/example_core2/core2.yaml diff --git a/tests/data/data_kpm/conversions/complex/specification_complex.json b/tests/data/data_kpm/conversions/complex/specification_complex.json index 6784e288..569c2f68 100644 --- a/tests/data/data_kpm/conversions/complex/specification_complex.json +++ b/tests/data/data_kpm/conversions/complex/specification_complex.json @@ -11,6 +11,26 @@ "interfaceConnectionPattern": "solid" } }, + "layers": [ + { + "name": "IP Cores", + "nodeLayers": [ + "IP Cores" + ] + }, + { + "name": "Externals", + "nodeLayers": [ + "Externals" + ] + }, + { + "name": "Constants", + "nodeLayers": [ + "Constants" + ] + } + ], "layout": "CytoscapeEngine - grid", "movementStep": 15, "navbarItems": [ @@ -44,23 +64,23 @@ "category": "IPcore", "interfaces": [ { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "c_mod_in_1", + "name": "c_int_out_1", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "c_int_out_1", + "name": "c_mod_in_1", "type": [ "port" ] } ], - "layer": "c_mod_1", + "layer": "IP Cores", "name": "c_mod_1", "properties": [ { @@ -76,23 +96,23 @@ "category": "IPcore", "interfaces": [ { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "c_int_out_2", + "name": "c_mod_in_2", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "c_mod_in_2", + "name": "c_int_out_2", "type": [ "port" ] } ], - "layer": "c_mod_2", + "layer": "IP Cores", "name": "c_mod_2" }, { @@ -101,17 +121,17 @@ "category": "IPcore", "interfaces": [ { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "c_mod_out_1", + "name": "c_int_const_in", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "c_int_in_1", + "name": "c_mod_out_1", "type": [ "port" ] @@ -119,7 +139,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "c_int_const_in", + "name": "c_int_in_2", "type": [ "port" ] @@ -127,13 +147,13 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "c_int_in_2", + "name": "c_int_in_1", "type": [ "port" ] } ], - "layer": "c_mod_3", + "layer": "IP Cores", "name": "c_mod_3" }, { @@ -149,14 +169,6 @@ "port" ] }, - { - "direction": "output", - "maxConnectionsCount": -1, - "name": "cs_s1_mint_out_1", - "type": [ - "port" - ] - }, { "direction": "input", "maxConnectionsCount": -1, @@ -166,15 +178,15 @@ ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "cs_s1_f_ext_const_in", + "name": "cs_s1_mint_out_1", "type": [ "port" ] } ], - "layer": "s1_mod_1", + "layer": "IP Cores", "name": "s1_mod_1" }, { @@ -199,7 +211,7 @@ ] } ], - "layer": "s1_mod_2", + "layer": "IP Cores", "name": "s1_mod_2" }, { @@ -224,7 +236,7 @@ ] } ], - "layer": "s1_mod_3", + "layer": "IP Cores", "name": "s1_mod_3", "properties": [ { @@ -240,39 +252,39 @@ "category": "IPcore", "interfaces": [ { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "cs_s2_f_int_in_2", + "name": "cs_s2_mint_out_1", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "cs_s2_mint_out_2", + "name": "cs_s2_f_int_in_1", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "cs_s2_mint_out_1", + "name": "cs_s2_f_int_in_2", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "cs_s2_f_int_in_1", + "name": "cs_s2_mint_out_2", "type": [ "port" ] } ], - "layer": "s2_mod_1", + "layer": "IP Cores", "name": "s2_mod_1" }, { @@ -291,7 +303,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "cs_s2_mint_in_2", + "name": "cs_s2_mint_in_1", "type": [ "port" ] @@ -299,13 +311,13 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "cs_s2_mint_in_1", + "name": "cs_s2_mint_in_2", "type": [ "port" ] } ], - "layer": "s2_mod_2", + "layer": "IP Cores", "name": "s2_mod_2" }, { @@ -321,7 +333,7 @@ ] } ], - "layer": "External Output", + "layer": "Externals", "name": "External Output", "properties": [ { @@ -344,7 +356,7 @@ ] } ], - "layer": "External Input", + "layer": "Externals", "name": "External Input", "properties": [ { @@ -367,7 +379,7 @@ ] } ], - "layer": "External Inout", + "layer": "Externals", "name": "External Inout", "properties": [ { @@ -390,7 +402,7 @@ ] } ], - "layer": "Constant", + "layer": "Constants", "name": "Constant", "properties": [ { @@ -421,7 +433,7 @@ ] } ], - "layer": "Subgraph port", + "layer": "Externals", "name": "Subgraph port" } ] diff --git a/tests/data/data_kpm/examples/hdmi/dataflow_hdmi.json b/tests/data/data_kpm/examples/hdmi/dataflow_hdmi.json index cc6e1ba2..b609421e 100644 --- a/tests/data/data_kpm/examples/hdmi/dataflow_hdmi.json +++ b/tests/data/data_kpm/examples/hdmi/dataflow_hdmi.json @@ -1,517 +1,517 @@ { "version": "20240723.13", - "entryGraph": "1725358330676653", + "entryGraph": "1728900283846597", "graphs": [ { "connections": [ { - "from": "ni_1725358330675226", - "id": "1725358330675557", - "to": "ni_172535833067563" + "from": "ni_1728900283845161", + "id": "1728900283846501", + "to": "ni_17289002838456" }, { - "from": "ni_1725358330675242", - "id": "1725358330675558", - "to": "ni_172535833067562" + "from": "ni_1728900283845191", + "id": "1728900283846502", + "to": "ni_17289002838457" }, { - "from": "ni_1725358330675226", - "id": "1725358330675559", - "to": "ni_172535833067574" + "from": "ni_1728900283845161", + "id": "1728900283846503", + "to": "ni_172890028384517" }, { - "from": "ni_1725358330675242", - "id": "1725358330675560", - "to": "ni_172535833067573" + "from": "ni_1728900283845191", + "id": "1728900283846504", + "to": "ni_172890028384518" }, { - "from": "ni_1725358330675226", - "id": "1725358330675561", - "to": "ni_172535833067585" + "from": "ni_1728900283845161", + "id": "1728900283846505", + "to": "ni_172890028384528" }, { - "from": "ni_1725358330675242", - "id": "1725358330675562", - "to": "ni_172535833067584" + "from": "ni_1728900283845191", + "id": "1728900283846506", + "to": "ni_172890028384529" }, { - "from": "ni_1725358330675226", - "id": "1725358330675563", - "to": "ni_1725358330675103" + "from": "ni_1728900283845161", + "id": "1728900283846507", + "to": "ni_172890028384546" }, { - "from": "ni_1725358330675242", - "id": "1725358330675564", - "to": "ni_1725358330675102" + "from": "ni_1728900283845191", + "id": "1728900283846508", + "to": "ni_172890028384547" }, { - "from": "ni_1725358330675226", - "id": "1725358330675565", - "to": "ni_1725358330675110" + "from": "ni_1728900283845161", + "id": "1728900283846509", + "to": "ni_172890028384553" }, { - "from": "ni_1725358330675246", - "id": "1725358330675566", - "to": "ni_1725358330675109" + "from": "ni_1728900283845184", + "id": "1728900283846510", + "to": "ni_172890028384554" }, { - "from": "ni_1725358330675242", - "id": "1725358330675567", - "to": "ni_1725358330675121" + "from": "ni_1728900283845191", + "id": "1728900283846511", + "to": "ni_172890028384567" }, { - "from": "ni_1725358330675197", - "id": "1725358330675568", - "to": "ni_1725358330675127" + "from": "ni_1728900283845142", + "id": "1728900283846512", + "to": "ni_172890028384568" }, { - "from": "ni_1725358330675226", - "id": "1725358330675569", - "to": "ni_1725358330675129" + "from": "ni_1728900283845161", + "id": "1728900283846513", + "to": "ni_172890028384572" }, { - "from": "ni_1725358330675197", - "id": "1725358330675570", - "to": "ni_1725358330675136" + "from": "ni_1728900283845142", + "id": "1728900283846514", + "to": "ni_172890028384579" }, { - "from": "ni_1725358330675257", - "id": "1725358330675571", - "to": "ni_1725358330675135" + "from": "ni_1728900283845195", + "id": "1728900283846515", + "to": "ni_172890028384580" }, { - "from": "ni_1725358330675156", - "id": "1725358330675572", - "to": "ni_1725358330675142" + "from": "ni_1728900283845101", + "id": "1728900283846516", + "to": "ni_172890028384584" }, { - "from": "ni_1725358330675197", - "id": "1725358330675573", - "to": "ni_1725358330675143" + "from": "ni_1728900283845142", + "id": "1728900283846517", + "to": "ni_172890028384586" }, { - "from": "ni_1725358330675226", - "id": "1725358330675574", - "to": "ni_1725358330675140" + "from": "ni_1728900283845161", + "id": "1728900283846518", + "to": "ni_172890028384585" }, { - "from": "ni_1725358330675194", - "id": "1725358330675575", - "to": "ni_1725358330675154" + "from": "ni_1728900283845138", + "id": "1728900283846519", + "to": "ni_1728900283845100" }, { - "from": "ni_1725358330675197", - "id": "1725358330675576", - "to": "ni_1725358330675147" + "from": "ni_1728900283845142", + "id": "1728900283846520", + "to": "ni_172890028384591" }, { - "from": "ni_1725358330675226", - "id": "1725358330675577", - "to": "ni_1725358330675151" + "from": "ni_1728900283845161", + "id": "1728900283846521", + "to": "ni_172890028384589" }, { - "from": "ni_1725358330675239", - "id": "1725358330675578", - "to": "ni_1725358330675145" + "from": "ni_1728900283845188", + "id": "1728900283846522", + "to": "ni_1728900283845102" }, { - "from": "ni_1725358330675226", - "id": "1725358330675579", - "to": "ni_1725358330675164" + "from": "ni_1728900283845161", + "id": "1728900283846523", + "to": "ni_1728900283845109" }, { - "from": "ni_1725358330675141", - "id": "1725358330675580", - "to": "ni_1725358330675163" + "from": "ni_172890028384587", + "id": "1728900283846524", + "to": "ni_1728900283845106" }, { - "from": "ni_1725358330675141", - "id": "1725358330675581", - "to": "ni_1725358330675166" + "from": "ni_172890028384587", + "id": "1728900283846525", + "to": "ni_1728900283845108" }, { - "from": "ni_1725358330675247", - "id": "1725358330675582", - "to": "ni_1725358330675167" + "from": "ni_1728900283845187", + "id": "1728900283846526", + "to": "ni_1728900283845111" }, { - "from": "ni_1725358330675152", - "id": "1725358330675583", - "to": "ni_1725358330675172" + "from": "ni_172890028384599", + "id": "1728900283846527", + "to": "ni_1728900283845134" }, { - "from": "ni_1725358330675146", - "id": "1725358330675584", - "to": "ni_1725358330675174" + "from": "ni_172890028384592", + "id": "1728900283846528", + "to": "ni_1728900283845126" }, { - "from": "ni_1725358330675150", - "id": "1725358330675585", - "to": "ni_1725358330675190" + "from": "ni_172890028384590", + "id": "1728900283846529", + "to": "ni_1728900283845116" }, { - "from": "ni_1725358330675149", - "id": "1725358330675586", - "to": "ni_1725358330675187" + "from": "ni_172890028384593", + "id": "1728900283846530", + "to": "ni_1728900283845122" }, { - "from": "ni_1725358330675158", - "id": "1725358330675587", - "to": "ni_1725358330675189" + "from": "ni_172890028384598", + "id": "1728900283846531", + "to": "ni_1728900283845121" }, { - "from": "ni_1725358330675194", - "id": "1725358330675588", - "to": "ni_1725358330675184" + "from": "ni_1728900283845138", + "id": "1728900283846532", + "to": "ni_1728900283845119" }, { - "from": "ni_1725358330675198", - "id": "1725358330675589", - "to": "ni_1725358330675191" + "from": "ni_1728900283845137", + "id": "1728900283846533", + "to": "ni_1728900283845118" }, { - "from": "ni_1725358330675197", - "id": "1725358330675590", - "to": "ni_1725358330675182" + "from": "ni_1728900283845142", + "id": "1728900283846534", + "to": "ni_1728900283845130" }, { - "from": "ni_1725358330675153", - "id": "1725358330675591", - "to": "ni_1725358330675186" + "from": "ni_172890028384594", + "id": "1728900283846535", + "to": "ni_1728900283845131" }, { - "from": "ni_1725358330675148", - "id": "1725358330675592", - "to": "ni_1725358330675178" + "from": "ni_172890028384596", + "id": "1728900283846536", + "to": "ni_1728900283845124" }, { - "from": "ni_1725358330675157", - "id": "1725358330675593", - "to": "ni_1725358330675185" + "from": "ni_172890028384597", + "id": "1728900283846537", + "to": "ni_1728900283845128" }, { - "from": "ni_1725358330675155", - "id": "1725358330675594", - "to": "ni_1725358330675188" + "from": "ni_172890028384595", + "id": "1728900283846538", + "to": "ni_1728900283845127" }, { - "from": "ni_1725358330675224", - "id": "1725358330675595", - "to": "ni_1725358330675195" + "from": "ni_1728900283845174", + "id": "1728900283846539", + "to": "ni_1728900283845140" }, { - "from": "ni_1725358330675226", - "id": "1725358330675596", - "to": "ni_1725358330675196" + "from": "ni_1728900283845161", + "id": "1728900283846540", + "to": "ni_1728900283845139" }, { - "from": "ni_1725358330675247", - "id": "1725358330675597", - "to": "ni_1725358330675193" + "from": "ni_1728900283845187", + "id": "1728900283846541", + "to": "ni_1728900283845141" }, { - "from": "ni_1725358330675162", - "id": "1725358330675598", - "to": "ni_1725358330675220" + "from": "ni_1728900283845110", + "id": "1728900283846542", + "to": "ni_1728900283845171" }, { - "from": "ni_1725358330675165", - "id": "1725358330675599", - "to": "ni_1725358330675206" + "from": "ni_1728900283845107", + "id": "1728900283846543", + "to": "ni_1728900283845155" }, { - "from": "ni_1725358330675226", - "id": "1725358330675600", - "to": "ni_1725358330675211" + "from": "ni_1728900283845161", + "id": "1728900283846544", + "to": "ni_1728900283845149" }, { - "from": "ni_1725358330675226", - "id": "1725358330675601", - "to": "ni_1725358330675221" + "from": "ni_1728900283845161", + "id": "1728900283846545", + "to": "ni_1728900283845162" }, { - "from": "ni_1725358330675226", - "id": "1725358330675602", - "to": "ni_1725358330675241" + "from": "ni_1728900283845161", + "id": "1728900283846546", + "to": "ni_1728900283845190" }, { - "from": "ni_1725358330675197", - "id": "1725358330675603", - "to": "ni_1725358330675252" + "from": "ni_1728900283845142", + "id": "1728900283846547", + "to": "ni_1728900283845201" }, { - "from": "ni_1725358330675107", - "id": "1725358330675604", - "to": "ni_172535833067564" + "from": "ni_172890028384551", + "id": "1728900283846548", + "to": "ni_17289002838458" }, { - "from": "ni_1725358330675106", - "id": "1725358330675605", - "to": "ni_172535833067575" + "from": "ni_172890028384550", + "id": "1728900283846549", + "to": "ni_172890028384519" }, { - "from": "ni_1725358330675105", - "id": "1725358330675606", - "to": "ni_172535833067586" + "from": "ni_172890028384549", + "id": "1728900283846550", + "to": "ni_172890028384530" }, { - "from": "ni_1725358330675235", - "id": "1725358330675607", - "to": "ni_1725358330675104" + "from": "ni_1728900283845179", + "id": "1728900283846551", + "to": "ni_172890028384548" }, { - "from": "ni_1725358330675170", - "id": "1725358330675608", - "to": "ni_1725358330675111" + "from": "ni_1728900283845114", + "id": "1728900283846552", + "to": "ni_172890028384555" }, { - "from": "ni_1725358330675168", - "id": "1725358330675609", - "to": "ni_1725358330675130" + "from": "ni_1728900283845112", + "id": "1728900283846553", + "to": "ni_172890028384574" }, { - "from": "ni_1725358330675131", - "id": "1725358330675610", - "to": "ni_1725358330675137" + "from": "ni_172890028384575", + "id": "1728900283846554", + "to": "ni_172890028384581" }, { - "from": "ni_172535833067565", - "id": "1725358330675611", - "to": "ni_1725358330675159" + "from": "ni_17289002838459", + "id": "1728900283846555", + "to": "ni_1728900283845103" }, { - "from": "ni_1725358330675138", - "id": "1725358330675612", - "to": "ni_1725358330675160" + "from": "ni_172890028384582", + "id": "1728900283846556", + "to": "ni_1728900283845104" }, { - "from": "ni_172535833067576", - "id": "1725358330675613", - "to": "ni_1725358330675169" + "from": "ni_172890028384520", + "id": "1728900283846557", + "to": "ni_1728900283845113" }, { - "from": "ni_172535833067587", - "id": "1725358330675614", - "to": "ni_1725358330675199" + "from": "ni_172890028384531", + "id": "1728900283846558", + "to": "ni_1728900283845143" }, { - "from": "ni_1725358330675112", - "id": "1725358330675615", - "to": "ni_1725358330675236" + "from": "ni_172890028384556", + "id": "1728900283846559", + "to": "ni_1728900283845180" }, { - "from": "ni_1725358330675173", - "id": "1725358330675616", - "to": "ni_1725358330675264" + "from": "ni_1728900283845123", + "id": "1728900283846560", + "to": "ni_1728900283845208" }, { - "from": "ni_1725358330675179", - "id": "1725358330675617", - "to": "ni_1725358330675261" + "from": "ni_1728900283845117", + "id": "1728900283846561", + "to": "ni_1728900283845205" }, { - "from": "ni_1725358330675183", - "id": "1725358330675618", - "to": "ni_1725358330675270" + "from": "ni_1728900283845135", + "id": "1728900283846562", + "to": "ni_1728900283845214" }, { - "from": "ni_1725358330675175", - "id": "1725358330675619", - "to": "ni_1725358330675267" + "from": "ni_1728900283845120", + "id": "1728900283846563", + "to": "ni_1728900283845211" }, { - "from": "ni_1725358330675176", - "id": "1725358330675620", - "to": "ni_1725358330675276" + "from": "ni_1728900283845125", + "id": "1728900283846564", + "to": "ni_1728900283845220" }, { - "from": "ni_1725358330675180", - "id": "1725358330675621", - "to": "ni_1725358330675273" + "from": "ni_1728900283845132", + "id": "1728900283846565", + "to": "ni_1728900283845217" }, { - "from": "ni_1725358330675177", - "id": "1725358330675622", - "to": "ni_1725358330675282" + "from": "ni_1728900283845133", + "id": "1728900283846566", + "to": "ni_1728900283845226" }, { - "from": "ni_1725358330675181", - "id": "1725358330675623", - "to": "ni_1725358330675279" + "from": "ni_1728900283845129", + "id": "1728900283846567", + "to": "ni_1728900283845223" }, { - "from": "ni_1725358330675552", - "id": "1725358330675624", - "to": "ni_1725358330675244" + "from": "ni_1728900283846496", + "id": "1728900283846568", + "to": "ni_1728900283845185" }, { - "from": "ni_1725358330675555", - "id": "1725358330675625", - "to": "ni_1725358330675245" + "from": "ni_1728900283846499", + "id": "1728900283846569", + "to": "ni_1728900283845186" }, { - "from": "ni_1725358330675552", - "id": "1725358330675626", - "to": "ni_1725358330675243" + "from": "ni_1728900283846496", + "id": "1728900283846570", + "to": "ni_1728900283845182" }, { - "from": "ni_1725358330675552", - "id": "1725358330675627", - "to": "ni_1725358330675238" + "from": "ni_1728900283846496", + "id": "1728900283846571", + "to": "ni_1728900283845189" }, { - "from": "ni_1725358330675552", - "id": "1725358330675628", - "to": "ni_1725358330675255" + "from": "ni_1728900283846496", + "id": "1728900283846572", + "to": "ni_1728900283845196" }, { - "from": "ni_1725358330675555", - "id": "1725358330675629", - "to": "ni_1725358330675256" + "from": "ni_1728900283846499", + "id": "1728900283846573", + "to": "ni_1728900283845197" }, { - "from": "ni_1725358330675552", - "id": "1725358330675630", - "to": "ni_1725358330675254" + "from": "ni_1728900283846496", + "id": "1728900283846574", + "to": "ni_1728900283845193" }, { - "from": "ni_1725358330675552", - "id": "1725358330675631", - "to": "ni_1725358330675249" + "from": "ni_1728900283846496", + "id": "1728900283846575", + "to": "ni_1728900283845200" }, { - "from": "ni_1725358330675285", - "id": "1725358330675632", - "to": "ni_1725358330675217" + "from": "ni_1728900283845229", + "id": "1728900283846576", + "to": "ni_1728900283845167" }, { - "from": "ni_1725358330675288", - "id": "1725358330675633", - "to": "ni_1725358330675216" + "from": "ni_1728900283845232", + "id": "1728900283846577", + "to": "ni_1728900283845146" }, { - "from": "ni_1725358330675291", - "id": "1725358330675634", - "to": "ni_1725358330675215" + "from": "ni_1728900283845235", + "id": "1728900283846578", + "to": "ni_1728900283845150" }, { - "from": "ni_1725358330675294", - "id": "1725358330675635", - "to": "ni_1725358330675213" + "from": "ni_1728900283845238", + "id": "1728900283846579", + "to": "ni_1728900283845170" }, { - "from": "ni_1725358330675297", - "id": "1725358330675636", - "to": "ni_1725358330675210" + "from": "ni_1728900283845241", + "id": "1728900283846580", + "to": "ni_1728900283845148" }, { - "from": "ni_1725358330675300", - "id": "1725358330675637", - "to": "ni_1725358330675208" + "from": "ni_1728900283845244", + "id": "1728900283846581", + "to": "ni_1728900283845176" }, { - "from": "ni_1725358330675303", - "id": "1725358330675638", - "to": "ni_1725358330675202" + "from": "ni_1728900283845247", + "id": "1728900283846582", + "to": "ni_1728900283845154" }, { - "from": "ni_1725358330675306", - "id": "1725358330675639", - "to": "ni_1725358330675219" + "from": "ni_1728900283845250", + "id": "1728900283846583", + "to": "ni_1728900283845165" }, { - "from": "ni_1725358330675309", - "id": "1725358330675640", - "to": "ni_1725358330675234" + "from": "ni_1728900283845253", + "id": "1728900283846584", + "to": "ni_1728900283845175" }, { - "from": "ni_1725358330675312", - "id": "1725358330675641", - "to": "ni_1725358330675203" + "from": "ni_1728900283845256", + "id": "1728900283846585", + "to": "ni_1728900283845160" }, { - "from": "ni_1725358330675315", - "id": "1725358330675642", - "to": "ni_1725358330675230" + "from": "ni_1728900283845259", + "id": "1728900283846586", + "to": "ni_1728900283845168" }, { - "from": "ni_1725358330675318", - "id": "1725358330676643", - "to": "ni_1725358330675225" + "from": "ni_1728900283845262", + "id": "1728900283846587", + "to": "ni_1728900283845151" }, { - "from": "ni_1725358330675321", - "id": "1725358330676644", - "to": "ni_1725358330675232" + "from": "ni_1728900283845265", + "id": "1728900283846588", + "to": "ni_1728900283845153" }, { - "from": "ni_1725358330675324", - "id": "1725358330676645", - "to": "ni_1725358330675214" + "from": "ni_1728900283845268", + "id": "1728900283846589", + "to": "ni_1728900283845156" }, { - "from": "ni_1725358330675327", - "id": "1725358330676646", - "to": "ni_1725358330675212" + "from": "ni_1728900283845271", + "id": "1728900283846590", + "to": "ni_1728900283845173" }, { - "from": "ni_1725358330675330", - "id": "1725358330676647", - "to": "ni_1725358330675204" + "from": "ni_1728900283845274", + "id": "1728900283846591", + "to": "ni_1728900283845177" }, { - "from": "ni_1725358330675333", - "id": "1725358330676648", - "to": "ni_1725358330675218" + "from": "ni_1728900283845277", + "id": "1728900283846592", + "to": "ni_1728900283845159" }, { - "from": "ni_1725358330675336", - "id": "1725358330676649", - "to": "ni_1725358330675209" + "from": "ni_1728900283845280", + "id": "1728900283846593", + "to": "ni_1728900283845157" }, { - "from": "ni_1725358330675339", - "id": "1725358330676650", - "to": "ni_1725358330675229" + "from": "ni_1728900283845283", + "id": "1728900283846594", + "to": "ni_1728900283845147" }, { - "from": "ni_1725358330675342", - "id": "1725358330676651", - "to": "ni_1725358330675228" + "from": "ni_1728900283845286", + "id": "1728900283846595", + "to": "ni_1728900283845169" }, { - "from": "ni_1725358330675345", - "id": "1725358330676652", - "to": "ni_1725358330675222" + "from": "ni_1728900283845289", + "id": "1728900283846596", + "to": "ni_1728900283845158" } ], - "id": "1725358330676653", + "id": "1728900283846597", "nodes": [ { - "id": "node_172535833067566", + "id": "node_172890028384510", "instanceName": "axi_bridge_disp", "interfaces": [ { "direction": "input", - "id": "ni_172535833067562", - "name": "rst", + "id": "ni_17289002838456", + "name": "clk", "side": "left" }, { "direction": "input", - "id": "ni_172535833067563", - "name": "clk", + "id": "ni_17289002838457", + "name": "rst", "side": "left" }, { "direction": "input", - "id": "ni_172535833067564", + "id": "ni_17289002838458", "name": "s_axi", "side": "left" }, { "direction": "output", - "id": "ni_172535833067565", + "id": "ni_17289002838459", "name": "m_axi", "side": "right" } @@ -519,32 +519,32 @@ "name": "axi_axil_adapter", "properties": [ { - "id": "172535833067556", + "id": "17289002838450", "name": "ADDR_WIDTH", "value": "32" }, { - "id": "172535833067557", + "id": "17289002838451", "name": "AXI_DATA_WIDTH", "value": "32" }, { - "id": "172535833067558", + "id": "17289002838452", "name": "AXI_ID_WIDTH", "value": "12" }, { - "id": "172535833067559", + "id": "17289002838453", "name": "AXI_STRB_WIDTH", "value": "AXI_DATA_WIDTH/8" }, { - "id": "172535833067560", + "id": "17289002838454", "name": "AXIL_DATA_WIDTH", "value": "32" }, { - "id": "172535833067561", + "id": "17289002838455", "name": "AXIL_STRB_WIDTH", "value": "AXIL_DATA_WIDTH/8" } @@ -552,30 +552,30 @@ "twoColumn": true }, { - "id": "node_172535833067577", + "id": "node_172890028384521", "instanceName": "axi_bridge_dma", "interfaces": [ { "direction": "input", - "id": "ni_172535833067573", - "name": "rst", + "id": "ni_172890028384517", + "name": "clk", "side": "left" }, { "direction": "input", - "id": "ni_172535833067574", - "name": "clk", + "id": "ni_172890028384518", + "name": "rst", "side": "left" }, { "direction": "input", - "id": "ni_172535833067575", + "id": "ni_172890028384519", "name": "s_axi", "side": "left" }, { "direction": "output", - "id": "ni_172535833067576", + "id": "ni_172890028384520", "name": "m_axi", "side": "right" } @@ -583,32 +583,32 @@ "name": "axi_axil_adapter", "properties": [ { - "id": "172535833067567", + "id": "172890028384511", "name": "ADDR_WIDTH", "value": "32" }, { - "id": "172535833067568", + "id": "172890028384512", "name": "AXI_DATA_WIDTH", "value": "32" }, { - "id": "172535833067569", + "id": "172890028384513", "name": "AXI_ID_WIDTH", "value": "12" }, { - "id": "172535833067570", + "id": "172890028384514", "name": "AXI_STRB_WIDTH", "value": "AXI_DATA_WIDTH/8" }, { - "id": "172535833067571", + "id": "172890028384515", "name": "AXIL_DATA_WIDTH", "value": "32" }, { - "id": "172535833067572", + "id": "172890028384516", "name": "AXIL_STRB_WIDTH", "value": "AXIL_DATA_WIDTH/8" } @@ -616,30 +616,30 @@ "twoColumn": true }, { - "id": "node_172535833067588", + "id": "node_172890028384532", "instanceName": "axi_bridge_mmcm", "interfaces": [ { "direction": "input", - "id": "ni_172535833067584", - "name": "rst", + "id": "ni_172890028384528", + "name": "clk", "side": "left" }, { "direction": "input", - "id": "ni_172535833067585", - "name": "clk", + "id": "ni_172890028384529", + "name": "rst", "side": "left" }, { "direction": "input", - "id": "ni_172535833067586", + "id": "ni_172890028384530", "name": "s_axi", "side": "left" }, { "direction": "output", - "id": "ni_172535833067587", + "id": "ni_172890028384531", "name": "m_axi", "side": "right" } @@ -647,32 +647,32 @@ "name": "axi_axil_adapter", "properties": [ { - "id": "172535833067578", + "id": "172890028384522", "name": "ADDR_WIDTH", "value": "32" }, { - "id": "172535833067579", + "id": "172890028384523", "name": "AXI_DATA_WIDTH", "value": "32" }, { - "id": "172535833067580", + "id": "172890028384524", "name": "AXI_ID_WIDTH", "value": "12" }, { - "id": "172535833067581", + "id": "172890028384525", "name": "AXI_STRB_WIDTH", "value": "AXI_DATA_WIDTH/8" }, { - "id": "172535833067582", + "id": "172890028384526", "name": "AXIL_DATA_WIDTH", "value": "32" }, { - "id": "172535833067583", + "id": "172890028384527", "name": "AXIL_STRB_WIDTH", "value": "AXIL_DATA_WIDTH/8" } @@ -680,42 +680,42 @@ "twoColumn": true }, { - "id": "node_1725358330675108", + "id": "node_172890028384552", "instanceName": "axi_interconnect0", "interfaces": [ { "direction": "input", - "id": "ni_1725358330675102", - "name": "rst", + "id": "ni_172890028384546", + "name": "clk", "side": "left" }, { "direction": "input", - "id": "ni_1725358330675103", - "name": "clk", + "id": "ni_172890028384547", + "name": "rst", "side": "left" }, { "direction": "input", - "id": "ni_1725358330675104", + "id": "ni_172890028384548", "name": "s_axi_0", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675105", + "id": "ni_172890028384549", "name": "m_axi_0", "side": "right" }, { "direction": "output", - "id": "ni_1725358330675106", + "id": "ni_172890028384550", "name": "m_axi_1", "side": "right" }, { "direction": "output", - "id": "ni_1725358330675107", + "id": "ni_172890028384551", "name": "m_axi_2", "side": "right" } @@ -723,67 +723,67 @@ "name": "axi_interconnect", "properties": [ { - "id": "172535833067589", + "id": "172890028384533", "name": "S_COUNT", "value": "1" }, { - "id": "172535833067590", + "id": "172890028384534", "name": "M_COUNT", "value": "3" }, { - "id": "172535833067591", + "id": "172890028384535", "name": "DATA_WIDTH", "value": "32" }, { - "id": "172535833067592", + "id": "172890028384536", "name": "ADDR_WIDTH", "value": "32" }, { - "id": "172535833067593", + "id": "172890028384537", "name": "ID_WIDTH", "value": "12" }, { - "id": "172535833067594", + "id": "172890028384538", "name": "M_BASE_ADDR", "value": "118'h43c2000043c1000043c00000" }, { - "id": "172535833067595", + "id": "172890028384539", "name": "M_ADDR_WIDTH", "value": "96'h100000001000000010" }, { - "id": "172535833067596", + "id": "172890028384540", "name": "AWUSER_WIDTH", "value": "1" }, { - "id": "172535833067597", + "id": "172890028384541", "name": "WUSER_WIDTH", "value": "1" }, { - "id": "172535833067598", + "id": "172890028384542", "name": "ARUSER_WIDTH", "value": "1" }, { - "id": "172535833067599", + "id": "172890028384543", "name": "BUSER_WIDTH", "value": "1" }, { - "id": "1725358330675100", + "id": "172890028384544", "name": "RUSER_WIDTH", "value": "1" }, { - "id": "1725358330675101", + "id": "172890028384545", "name": "STRB_WIDTH", "value": "DATA_WIDTH/8" } @@ -791,30 +791,30 @@ "twoColumn": true }, { - "id": "node_1725358330675113", + "id": "node_172890028384557", "instanceName": "axi_protocol_converter0", "interfaces": [ { "direction": "input", - "id": "ni_1725358330675109", - "name": "aresetn", + "id": "ni_172890028384553", + "name": "aclk", "side": "left" }, { "direction": "input", - "id": "ni_1725358330675110", - "name": "aclk", + "id": "ni_172890028384554", + "name": "aresetn", "side": "left" }, { "direction": "input", - "id": "ni_1725358330675111", + "id": "ni_172890028384555", "name": "S_AXI", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675112", + "id": "ni_172890028384556", "name": "M_AXI", "side": "right" } @@ -824,72 +824,72 @@ "twoColumn": true }, { - "id": "node_1725358330675132", + "id": "node_172890028384576", "instanceName": "axis_clock_converter", "interfaces": [ { - "direction": "input", - "id": "ni_1725358330675121", - "name": "async_rst", - "side": "left" + "direction": "output", + "id": "ni_172890028384565", + "name": "s_status_bad_frame", + "side": "right" }, { "direction": "output", - "id": "ni_1725358330675122", + "id": "ni_172890028384566", "name": "s_status_good_frame", "side": "right" }, { - "direction": "output", - "id": "ni_1725358330675123", - "name": "m_status_bad_frame", - "side": "right" + "direction": "input", + "id": "ni_172890028384567", + "name": "async_rst", + "side": "left" + }, + { + "direction": "input", + "id": "ni_172890028384568", + "name": "m_clk", + "side": "left" }, { "direction": "output", - "id": "ni_1725358330675124", + "id": "ni_172890028384569", "name": "m_status_overflow", "side": "right" }, { "direction": "output", - "id": "ni_1725358330675125", - "name": "m_status_good_frame", + "id": "ni_172890028384570", + "name": "m_status_bad_frame", "side": "right" }, { "direction": "output", - "id": "ni_1725358330675126", - "name": "s_status_bad_frame", + "id": "ni_172890028384571", + "name": "s_status_overflow", "side": "right" }, { "direction": "input", - "id": "ni_1725358330675127", - "name": "m_clk", + "id": "ni_172890028384572", + "name": "s_clk", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675128", - "name": "s_status_overflow", + "id": "ni_172890028384573", + "name": "m_status_good_frame", "side": "right" }, { "direction": "input", - "id": "ni_1725358330675129", - "name": "s_clk", - "side": "left" - }, - { - "direction": "input", - "id": "ni_1725358330675130", + "id": "ni_172890028384574", "name": "s_axis", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675131", + "id": "ni_172890028384575", "name": "m_axis", "side": "right" } @@ -897,37 +897,37 @@ "name": "axis_async_fifo", "properties": [ { - "id": "1725358330675114", + "id": "172890028384558", "name": "DATA_WIDTH", "value": "64" }, { - "id": "1725358330675115", + "id": "172890028384559", "name": "KEEP_WIDTH", "value": "(DATA_WIDTH+7)/8" }, { - "id": "1725358330675116", + "id": "172890028384560", "name": "ID_WIDTH", "value": "8" }, { - "id": "1725358330675117", + "id": "172890028384561", "name": "DEST_WIDTH", "value": "8" }, { - "id": "1725358330675118", + "id": "172890028384562", "name": "USER_WIDTH", "value": "1" }, { - "id": "1725358330675119", + "id": "172890028384563", "name": "ID_ENABLE", "value": "0" }, { - "id": "1725358330675120", + "id": "172890028384564", "name": "USER_ENABLE", "value": "0" } @@ -935,30 +935,30 @@ "twoColumn": true }, { - "id": "node_1725358330675139", + "id": "node_172890028384583", "instanceName": "axis_dwidth_converter", "interfaces": [ { "direction": "input", - "id": "ni_1725358330675135", - "name": "aresetn", + "id": "ni_172890028384579", + "name": "aclk", "side": "left" }, { "direction": "input", - "id": "ni_1725358330675136", - "name": "aclk", + "id": "ni_172890028384580", + "name": "aresetn", "side": "left" }, { "direction": "input", - "id": "ni_1725358330675137", + "id": "ni_172890028384581", "name": "s_axis", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675138", + "id": "ni_172890028384582", "name": "m_axis", "side": "right" } @@ -966,12 +966,12 @@ "name": "axis_dwidth_converter", "properties": [ { - "id": "1725358330675133", + "id": "172890028384577", "name": "IN_DATA_WIDTH", "value": "64" }, { - "id": "1725358330675134", + "id": "172890028384578", "name": "OUT_DATA_WIDTH", "value": "32" } @@ -979,32 +979,32 @@ "twoColumn": true }, { - "id": "node_1725358330675144", + "id": "node_172890028384588", "instanceName": "clock_crossing", "interfaces": [ { "direction": "input", - "id": "ni_1725358330675140", - "name": "clkB", + "id": "ni_172890028384584", + "name": "A", "side": "left" }, - { - "direction": "output", - "id": "ni_1725358330675141", - "name": "B", - "side": "right" - }, { "direction": "input", - "id": "ni_1725358330675142", - "name": "A", + "id": "ni_172890028384585", + "name": "clkB", "side": "left" }, { "direction": "input", - "id": "ni_1725358330675143", + "id": "ni_172890028384586", "name": "clkA", "side": "left" + }, + { + "direction": "output", + "id": "ni_172890028384587", + "name": "B", + "side": "right" } ], "name": "clock_crossing", @@ -1012,102 +1012,102 @@ "twoColumn": true }, { - "id": "node_1725358330675161", + "id": "node_1728900283845105", "instanceName": "disp", "interfaces": [ { "direction": "input", - "id": "ni_1725358330675145", - "name": "s00_axi_aresetn", + "id": "ni_172890028384589", + "name": "s00_axi_aclk", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675146", - "name": "DATA_O", + "id": "ni_172890028384590", + "name": "DGUARD_O", "side": "right" }, { "direction": "input", - "id": "ni_1725358330675147", + "id": "ni_172890028384591", "name": "S_AXIS_ACLK", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675148", - "name": "HSYNC_O", + "id": "ni_172890028384592", + "name": "DATA_O", "side": "right" }, { "direction": "output", - "id": "ni_1725358330675149", + "id": "ni_172890028384593", "name": "DIEN_O", "side": "right" }, { "direction": "output", - "id": "ni_1725358330675150", - "name": "DGUARD_O", + "id": "ni_172890028384594", + "name": "DE_O", "side": "right" }, - { - "direction": "input", - "id": "ni_1725358330675151", - "name": "s00_axi_aclk", - "side": "left" - }, { "direction": "output", - "id": "ni_1725358330675152", - "name": "CTL_O", + "id": "ni_172890028384595", + "name": "VGUARD_O", "side": "right" }, { "direction": "output", - "id": "ni_1725358330675153", - "name": "DE_O", + "id": "ni_172890028384596", + "name": "HSYNC_O", "side": "right" }, - { - "direction": "input", - "id": "ni_1725358330675154", - "name": "LOCKED_I", - "side": "left" - }, { "direction": "output", - "id": "ni_1725358330675155", - "name": "VGUARD_O", + "id": "ni_172890028384597", + "name": "VSYNC_O", "side": "right" }, { "direction": "output", - "id": "ni_1725358330675156", - "name": "FSYNC_O", + "id": "ni_172890028384598", + "name": "DIH_O", "side": "right" }, { "direction": "output", - "id": "ni_1725358330675157", - "name": "VSYNC_O", + "id": "ni_172890028384599", + "name": "CTL_O", "side": "right" }, + { + "direction": "input", + "id": "ni_1728900283845100", + "name": "LOCKED_I", + "side": "left" + }, { "direction": "output", - "id": "ni_1725358330675158", - "name": "DIH_O", + "id": "ni_1728900283845101", + "name": "FSYNC_O", "side": "right" }, { "direction": "input", - "id": "ni_1725358330675159", + "id": "ni_1728900283845102", + "name": "s00_axi_aresetn", + "side": "left" + }, + { + "direction": "input", + "id": "ni_1728900283845103", "name": "S00_AXI", "side": "left" }, { "direction": "input", - "id": "ni_1725358330675160", + "id": "ni_1728900283845104", "name": "S_AXIS", "side": "left" } @@ -1117,60 +1117,60 @@ "twoColumn": true }, { - "id": "node_1725358330675171", + "id": "node_1728900283845115", "instanceName": "dma", "interfaces": [ + { + "direction": "input", + "id": "ni_1728900283845106", + "name": "io_sync_readerSync", + "side": "left" + }, { "direction": "output", - "id": "ni_1725358330675162", - "name": "io_irq_readerDone", + "id": "ni_1728900283845107", + "name": "io_irq_writerDone", "side": "right" }, { "direction": "input", - "id": "ni_1725358330675163", - "name": "io_sync_readerSync", + "id": "ni_1728900283845108", + "name": "io_sync_writerSync", "side": "left" }, { "direction": "input", - "id": "ni_1725358330675164", + "id": "ni_1728900283845109", "name": "clock", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675165", - "name": "io_irq_writerDone", + "id": "ni_1728900283845110", + "name": "io_irq_readerDone", "side": "right" }, { "direction": "input", - "id": "ni_1725358330675166", - "name": "io_sync_writerSync", - "side": "left" - }, - { - "direction": "input", - "id": "ni_1725358330675167", + "id": "ni_1728900283845111", "name": "reset", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675168", + "id": "ni_1728900283845112", "name": "m_axis", "side": "right" }, { "direction": "input", - "id": "ni_1725358330675169", + "id": "ni_1728900283845113", "name": "s_axi", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675170", + "id": "ni_1728900283845114", "name": "m_axi", "side": "right" } @@ -1180,128 +1180,128 @@ "twoColumn": true }, { - "id": "node_1725358330675192", + "id": "node_1728900283845136", "instanceName": "hdmi", "interfaces": [ { "direction": "input", - "id": "ni_1725358330675172", - "name": "CTL", + "id": "ni_1728900283845116", + "name": "DGUARD", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675173", - "name": "HDMI_CLK_N", + "id": "ni_1728900283845117", + "name": "HDMI_CLK_P", "side": "right" }, { "direction": "input", - "id": "ni_1725358330675174", - "name": "DATA_I", + "id": "ni_1728900283845118", + "name": "PXLCLK_5X_I", "side": "left" }, { - "direction": "output", - "id": "ni_1725358330675175", - "name": "HDMI_D0_P", - "side": "right" + "direction": "input", + "id": "ni_1728900283845119", + "name": "LOCKED_I", + "side": "left" }, { "direction": "output", - "id": "ni_1725358330675176", - "name": "HDMI_D1_N", + "id": "ni_1728900283845120", + "name": "HDMI_D0_P", "side": "right" }, { - "direction": "output", - "id": "ni_1725358330675177", - "name": "HDMI_D2_N", - "side": "right" + "direction": "input", + "id": "ni_1728900283845121", + "name": "DIH", + "side": "left" }, { "direction": "input", - "id": "ni_1725358330675178", - "name": "VGA_HS", + "id": "ni_1728900283845122", + "name": "DIEN", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675179", - "name": "HDMI_CLK_P", + "id": "ni_1728900283845123", + "name": "HDMI_CLK_N", "side": "right" }, { - "direction": "output", - "id": "ni_1725358330675180", - "name": "HDMI_D1_P", - "side": "right" + "direction": "input", + "id": "ni_1728900283845124", + "name": "VGA_HS", + "side": "left" }, { "direction": "output", - "id": "ni_1725358330675181", - "name": "HDMI_D2_P", + "id": "ni_1728900283845125", + "name": "HDMI_D1_N", "side": "right" }, { "direction": "input", - "id": "ni_1725358330675182", - "name": "PXLCLK_I", + "id": "ni_1728900283845126", + "name": "DATA_I", "side": "left" }, - { - "direction": "output", - "id": "ni_1725358330675183", - "name": "HDMI_D0_N", - "side": "right" - }, { "direction": "input", - "id": "ni_1725358330675184", - "name": "LOCKED_I", + "id": "ni_1728900283845127", + "name": "VGUARD", "side": "left" }, { "direction": "input", - "id": "ni_1725358330675185", + "id": "ni_1728900283845128", "name": "VGA_VS", "side": "left" }, { - "direction": "input", - "id": "ni_1725358330675186", - "name": "VGA_DE", - "side": "left" + "direction": "output", + "id": "ni_1728900283845129", + "name": "HDMI_D2_P", + "side": "right" }, { "direction": "input", - "id": "ni_1725358330675187", - "name": "DIEN", + "id": "ni_1728900283845130", + "name": "PXLCLK_I", "side": "left" }, { "direction": "input", - "id": "ni_1725358330675188", - "name": "VGUARD", + "id": "ni_1728900283845131", + "name": "VGA_DE", "side": "left" }, { - "direction": "input", - "id": "ni_1725358330675189", - "name": "DIH", - "side": "left" + "direction": "output", + "id": "ni_1728900283845132", + "name": "HDMI_D1_P", + "side": "right" }, { - "direction": "input", - "id": "ni_1725358330675190", - "name": "DGUARD", - "side": "left" + "direction": "output", + "id": "ni_1728900283845133", + "name": "HDMI_D2_N", + "side": "right" }, { "direction": "input", - "id": "ni_1725358330675191", - "name": "PXLCLK_5X_I", + "id": "ni_1728900283845134", + "name": "CTL", "side": "left" + }, + { + "direction": "output", + "id": "ni_1728900283845135", + "name": "HDMI_D0_N", + "side": "right" } ], "name": "hdmi_tx", @@ -1309,48 +1309,48 @@ "twoColumn": true }, { - "id": "node_1725358330675200", + "id": "node_1728900283845144", "instanceName": "mmcm", "interfaces": [ { - "direction": "input", - "id": "ni_1725358330675193", - "name": "sys_rst", - "side": "left" + "direction": "output", + "id": "ni_1728900283845137", + "name": "clkgen_out1", + "side": "right" }, { "direction": "output", - "id": "ni_1725358330675194", + "id": "ni_1728900283845138", "name": "clkgen_locked", "side": "right" }, { "direction": "input", - "id": "ni_1725358330675195", - "name": "clkgen_ref", + "id": "ni_1728900283845139", + "name": "sys_clk", "side": "left" }, { "direction": "input", - "id": "ni_1725358330675196", - "name": "sys_clk", + "id": "ni_1728900283845140", + "name": "clkgen_ref", "side": "left" }, { - "direction": "output", - "id": "ni_1725358330675197", - "name": "clkgen_out0", - "side": "right" + "direction": "input", + "id": "ni_1728900283845141", + "name": "sys_rst", + "side": "left" }, { "direction": "output", - "id": "ni_1725358330675198", - "name": "clkgen_out1", + "id": "ni_1728900283845142", + "name": "clkgen_out0", "side": "right" }, { "direction": "input", - "id": "ni_1725358330675199", + "id": "ni_1728900283845143", "name": "axi", "side": "left" } @@ -1360,222 +1360,222 @@ "twoColumn": true }, { - "id": "node_1725358330675237", + "id": "node_1728900283845181", "instanceName": "ps7", "interfaces": [ { "direction": "output", - "id": "ni_1725358330675201", - "name": "SAXIHP0ARESETN", + "id": "ni_1728900283845145", + "name": "SAXIHP0RCOUNT", "side": "right" }, { "direction": "inout", - "id": "ni_1725358330675202", - "name": "ddr_cs_n", + "id": "ni_1728900283845146", + "name": "ddr_bankaddr", "side": "right" }, { "direction": "inout", - "id": "ni_1725358330675203", - "name": "ddr_dqs", + "id": "ni_1728900283845147", + "name": "ps_clk", "side": "right" }, { "direction": "inout", - "id": "ni_1725358330675204", - "name": "ddr_vr", - "side": "right" - }, - { - "direction": "output", - "id": "ni_1725358330675205", - "name": "MAXIGP0ARESETN", + "id": "ni_1728900283845148", + "name": "ddr_clk", "side": "right" }, { "direction": "input", - "id": "ni_1725358330675206", - "name": "IRQ_F2P_1", + "id": "ni_1728900283845149", + "name": "MAXIGP0ACLK", "side": "left" }, - { - "direction": "output", - "id": "ni_1725358330675207", - "name": "FCLK_RESET0_N", - "side": "right" - }, { "direction": "inout", - "id": "ni_1725358330675208", - "name": "ddr_clk_n", + "id": "ni_1728900283845150", + "name": "ddr_cas_n", "side": "right" }, { "direction": "inout", - "id": "ni_1725358330675209", - "name": "ps_mio", + "id": "ni_1728900283845151", + "name": "ddr_drstb", "side": "right" }, { - "direction": "inout", - "id": "ni_1725358330675210", - "name": "ddr_clk", + "direction": "output", + "id": "ni_1728900283845152", + "name": "MAXIGP0ARESETN", "side": "right" }, - { - "direction": "input", - "id": "ni_1725358330675211", - "name": "MAXIGP0ACLK", - "side": "left" - }, { "direction": "inout", - "id": "ni_1725358330675212", - "name": "ddr_vr_n", + "id": "ni_1728900283845153", + "name": "ddr_odt", "side": "right" }, { "direction": "inout", - "id": "ni_1725358330675213", - "name": "ddr_cke", + "id": "ni_1728900283845154", + "name": "ddr_cs_n", "side": "right" }, { - "direction": "inout", - "id": "ni_1725358330675214", - "name": "ddr_ras_n", - "side": "right" + "direction": "input", + "id": "ni_1728900283845155", + "name": "IRQ_F2P_1", + "side": "left" }, { "direction": "inout", - "id": "ni_1725358330675215", - "name": "ddr_cas_n", + "id": "ni_1728900283845156", + "name": "ddr_ras_n", "side": "right" }, { "direction": "inout", - "id": "ni_1725358330675216", - "name": "ddr_bankaddr", + "id": "ni_1728900283845157", + "name": "ps_mio", "side": "right" }, { "direction": "inout", - "id": "ni_1725358330675217", - "name": "ddr_addr", + "id": "ni_1728900283845158", + "name": "ps_srstb", "side": "right" }, { "direction": "inout", - "id": "ni_1725358330675218", + "id": "ni_1728900283845159", "name": "ddr_web", "side": "right" }, { "direction": "inout", - "id": "ni_1725358330675219", - "name": "ddr_dm", + "id": "ni_1728900283845160", + "name": "ddr_dqs", "side": "right" }, { - "direction": "input", - "id": "ni_1725358330675220", - "name": "IRQ_F2P_0", - "side": "left" + "direction": "output", + "id": "ni_1728900283845161", + "name": "FCLK0", + "side": "right" }, { "direction": "input", - "id": "ni_1725358330675221", + "id": "ni_1728900283845162", "name": "SAXIHP0ACLK", "side": "left" }, - { - "direction": "inout", - "id": "ni_1725358330675222", - "name": "ps_srstb", - "side": "right" - }, { "direction": "output", - "id": "ni_1725358330675223", - "name": "SAXIHP0WACOUNT", + "id": "ni_1728900283845163", + "name": "FCLK_RESET0_N", "side": "right" }, { "direction": "output", - "id": "ni_1725358330675224", - "name": "FCLK1", + "id": "ni_1728900283845164", + "name": "SAXIHP0RACOUNT", "side": "right" }, { "direction": "inout", - "id": "ni_1725358330675225", - "name": "ddr_drstb", + "id": "ni_1728900283845165", + "name": "ddr_dm", "side": "right" }, { "direction": "output", - "id": "ni_1725358330675226", - "name": "FCLK0", + "id": "ni_1728900283845166", + "name": "SAXIHP0ARESETN", "side": "right" }, { - "direction": "output", - "id": "ni_1725358330675227", - "name": "SAXIHP0RACOUNT", + "direction": "inout", + "id": "ni_1728900283845167", + "name": "ddr_addr", "side": "right" }, { "direction": "inout", - "id": "ni_1725358330675228", - "name": "ps_porb", + "id": "ni_1728900283845168", + "name": "ddr_dqs_n", "side": "right" }, { "direction": "inout", - "id": "ni_1725358330675229", - "name": "ps_clk", + "id": "ni_1728900283845169", + "name": "ps_porb", "side": "right" }, { "direction": "inout", - "id": "ni_1725358330675230", - "name": "ddr_dqs_n", + "id": "ni_1728900283845170", + "name": "ddr_cke", "side": "right" }, + { + "direction": "input", + "id": "ni_1728900283845171", + "name": "IRQ_F2P_0", + "side": "left" + }, { "direction": "output", - "id": "ni_1725358330675231", + "id": "ni_1728900283845172", "name": "SAXIHP0WCOUNT", "side": "right" }, { "direction": "inout", - "id": "ni_1725358330675232", - "name": "ddr_odt", + "id": "ni_1728900283845173", + "name": "ddr_vr_n", "side": "right" }, { "direction": "output", - "id": "ni_1725358330675233", - "name": "SAXIHP0RCOUNT", + "id": "ni_1728900283845174", + "name": "FCLK1", "side": "right" }, { "direction": "inout", - "id": "ni_1725358330675234", + "id": "ni_1728900283845175", "name": "ddr_dq", "side": "right" }, + { + "direction": "inout", + "id": "ni_1728900283845176", + "name": "ddr_clk_n", + "side": "right" + }, + { + "direction": "inout", + "id": "ni_1728900283845177", + "name": "ddr_vr", + "side": "right" + }, + { + "direction": "output", + "id": "ni_1728900283845178", + "name": "SAXIHP0WACOUNT", + "side": "right" + }, { "direction": "output", - "id": "ni_1725358330675235", + "id": "ni_1728900283845179", "name": "M_AXI_GP0", "side": "right" }, { "direction": "input", - "id": "ni_1725358330675236", + "id": "ni_1728900283845180", "name": "S_AXI_HP0", "side": "left" } @@ -1585,67 +1585,67 @@ "twoColumn": true }, { - "id": "node_1725358330675248", + "id": "node_1728900283845192", "instanceName": "reset0", "interfaces": [ { "direction": "input", - "id": "ni_1725358330675238", - "name": "mb_debug_sys_rst", + "id": "ni_1728900283845182", + "name": "ext_reset_in", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675239", - "name": "peripheral_aresetn", + "id": "ni_1728900283845183", + "name": "mb_reset", "side": "right" }, { "direction": "output", - "id": "ni_1725358330675240", - "name": "mb_reset", + "id": "ni_1728900283845184", + "name": "interconnect_aresetn", "side": "right" }, { "direction": "input", - "id": "ni_1725358330675241", - "name": "slowest_sync_clk", + "id": "ni_1728900283845185", + "name": "aux_reset_in", + "side": "left" + }, + { + "direction": "input", + "id": "ni_1728900283845186", + "name": "dcm_locked", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675242", - "name": "bus_struct_reset", + "id": "ni_1728900283845187", + "name": "peripheral_reset", "side": "right" }, { - "direction": "input", - "id": "ni_1725358330675243", - "name": "ext_reset_in", - "side": "left" + "direction": "output", + "id": "ni_1728900283845188", + "name": "peripheral_aresetn", + "side": "right" }, { "direction": "input", - "id": "ni_1725358330675244", - "name": "aux_reset_in", + "id": "ni_1728900283845189", + "name": "mb_debug_sys_rst", "side": "left" }, { "direction": "input", - "id": "ni_1725358330675245", - "name": "dcm_locked", + "id": "ni_1728900283845190", + "name": "slowest_sync_clk", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675246", - "name": "interconnect_aresetn", - "side": "right" - }, - { - "direction": "output", - "id": "ni_1725358330675247", - "name": "peripheral_reset", + "id": "ni_1728900283845191", + "name": "bus_struct_reset", "side": "right" } ], @@ -1654,67 +1654,67 @@ "twoColumn": true }, { - "id": "node_1725358330675259", + "id": "node_1728900283845203", "instanceName": "reset1", "interfaces": [ { "direction": "input", - "id": "ni_1725358330675249", - "name": "mb_debug_sys_rst", + "id": "ni_1728900283845193", + "name": "ext_reset_in", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675250", - "name": "peripheral_aresetn", + "id": "ni_1728900283845194", + "name": "mb_reset", "side": "right" }, { "direction": "output", - "id": "ni_1725358330675251", - "name": "mb_reset", + "id": "ni_1728900283845195", + "name": "interconnect_aresetn", "side": "right" }, { "direction": "input", - "id": "ni_1725358330675252", - "name": "slowest_sync_clk", + "id": "ni_1728900283845196", + "name": "aux_reset_in", + "side": "left" + }, + { + "direction": "input", + "id": "ni_1728900283845197", + "name": "dcm_locked", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675253", - "name": "bus_struct_reset", + "id": "ni_1728900283845198", + "name": "peripheral_reset", "side": "right" }, { - "direction": "input", - "id": "ni_1725358330675254", - "name": "ext_reset_in", - "side": "left" + "direction": "output", + "id": "ni_1728900283845199", + "name": "peripheral_aresetn", + "side": "right" }, { "direction": "input", - "id": "ni_1725358330675255", - "name": "aux_reset_in", + "id": "ni_1728900283845200", + "name": "mb_debug_sys_rst", "side": "left" }, { "direction": "input", - "id": "ni_1725358330675256", - "name": "dcm_locked", + "id": "ni_1728900283845201", + "name": "slowest_sync_clk", "side": "left" }, { "direction": "output", - "id": "ni_1725358330675257", - "name": "interconnect_aresetn", - "side": "right" - }, - { - "direction": "output", - "id": "ni_1725358330675258", - "name": "peripheral_reset", + "id": "ni_1728900283845202", + "name": "bus_struct_reset", "side": "right" } ], @@ -1723,12 +1723,12 @@ "twoColumn": true }, { - "id": "node_1725358330675262", + "id": "node_1728900283845206", "instanceName": "External Output", "interfaces": [ { "direction": "input", - "id": "ni_1725358330675261", + "id": "ni_1728900283845205", "name": "external", "side": "left" } @@ -1736,7 +1736,7 @@ "name": "External Output", "properties": [ { - "id": "1725358330675260", + "id": "1728900283845204", "name": "External Name", "value": "HDMI_CLK_P" } @@ -1744,12 +1744,12 @@ "twoColumn": true }, { - "id": "node_1725358330675265", + "id": "node_1728900283845209", "instanceName": "External Output", "interfaces": [ { "direction": "input", - "id": "ni_1725358330675264", + "id": "ni_1728900283845208", "name": "external", "side": "left" } @@ -1757,7 +1757,7 @@ "name": "External Output", "properties": [ { - "id": "1725358330675263", + "id": "1728900283845207", "name": "External Name", "value": "HDMI_CLK_N" } @@ -1765,12 +1765,12 @@ "twoColumn": true }, { - "id": "node_1725358330675268", + "id": "node_1728900283845212", "instanceName": "External Output", "interfaces": [ { "direction": "input", - "id": "ni_1725358330675267", + "id": "ni_1728900283845211", "name": "external", "side": "left" } @@ -1778,7 +1778,7 @@ "name": "External Output", "properties": [ { - "id": "1725358330675266", + "id": "1728900283845210", "name": "External Name", "value": "HDMI_D0_P" } @@ -1786,12 +1786,12 @@ "twoColumn": true }, { - "id": "node_1725358330675271", + "id": "node_1728900283845215", "instanceName": "External Output", "interfaces": [ { "direction": "input", - "id": "ni_1725358330675270", + "id": "ni_1728900283845214", "name": "external", "side": "left" } @@ -1799,7 +1799,7 @@ "name": "External Output", "properties": [ { - "id": "1725358330675269", + "id": "1728900283845213", "name": "External Name", "value": "HDMI_D0_N" } @@ -1807,12 +1807,12 @@ "twoColumn": true }, { - "id": "node_1725358330675274", + "id": "node_1728900283845218", "instanceName": "External Output", "interfaces": [ { "direction": "input", - "id": "ni_1725358330675273", + "id": "ni_1728900283845217", "name": "external", "side": "left" } @@ -1820,7 +1820,7 @@ "name": "External Output", "properties": [ { - "id": "1725358330675272", + "id": "1728900283845216", "name": "External Name", "value": "HDMI_D1_P" } @@ -1828,12 +1828,12 @@ "twoColumn": true }, { - "id": "node_1725358330675277", + "id": "node_1728900283845221", "instanceName": "External Output", "interfaces": [ { "direction": "input", - "id": "ni_1725358330675276", + "id": "ni_1728900283845220", "name": "external", "side": "left" } @@ -1841,7 +1841,7 @@ "name": "External Output", "properties": [ { - "id": "1725358330675275", + "id": "1728900283845219", "name": "External Name", "value": "HDMI_D1_N" } @@ -1849,12 +1849,12 @@ "twoColumn": true }, { - "id": "node_1725358330675280", + "id": "node_1728900283845224", "instanceName": "External Output", "interfaces": [ { "direction": "input", - "id": "ni_1725358330675279", + "id": "ni_1728900283845223", "name": "external", "side": "left" } @@ -1862,7 +1862,7 @@ "name": "External Output", "properties": [ { - "id": "1725358330675278", + "id": "1728900283845222", "name": "External Name", "value": "HDMI_D2_P" } @@ -1870,12 +1870,12 @@ "twoColumn": true }, { - "id": "node_1725358330675283", + "id": "node_1728900283845227", "instanceName": "External Output", "interfaces": [ { "direction": "input", - "id": "ni_1725358330675282", + "id": "ni_1728900283845226", "name": "external", "side": "left" } @@ -1883,7 +1883,7 @@ "name": "External Output", "properties": [ { - "id": "1725358330675281", + "id": "1728900283845225", "name": "External Name", "value": "HDMI_D2_N" } @@ -1891,12 +1891,12 @@ "twoColumn": true }, { - "id": "node_1725358330675286", + "id": "node_1728900283845230", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675285", + "id": "ni_1728900283845229", "name": "external", "side": "right" } @@ -1904,7 +1904,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675284", + "id": "1728900283845228", "name": "External Name", "value": "ddr_addr" } @@ -1912,12 +1912,12 @@ "twoColumn": true }, { - "id": "node_1725358330675289", + "id": "node_1728900283845233", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675288", + "id": "ni_1728900283845232", "name": "external", "side": "right" } @@ -1925,7 +1925,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675287", + "id": "1728900283845231", "name": "External Name", "value": "ddr_bankaddr" } @@ -1933,12 +1933,12 @@ "twoColumn": true }, { - "id": "node_1725358330675292", + "id": "node_1728900283845236", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675291", + "id": "ni_1728900283845235", "name": "external", "side": "right" } @@ -1946,7 +1946,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675290", + "id": "1728900283845234", "name": "External Name", "value": "ddr_cas_n" } @@ -1954,12 +1954,12 @@ "twoColumn": true }, { - "id": "node_1725358330675295", + "id": "node_1728900283845239", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675294", + "id": "ni_1728900283845238", "name": "external", "side": "right" } @@ -1967,7 +1967,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675293", + "id": "1728900283845237", "name": "External Name", "value": "ddr_cke" } @@ -1975,12 +1975,12 @@ "twoColumn": true }, { - "id": "node_1725358330675298", + "id": "node_1728900283845242", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675297", + "id": "ni_1728900283845241", "name": "external", "side": "right" } @@ -1988,7 +1988,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675296", + "id": "1728900283845240", "name": "External Name", "value": "ddr_clk" } @@ -1996,12 +1996,12 @@ "twoColumn": true }, { - "id": "node_1725358330675301", + "id": "node_1728900283845245", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675300", + "id": "ni_1728900283845244", "name": "external", "side": "right" } @@ -2009,7 +2009,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675299", + "id": "1728900283845243", "name": "External Name", "value": "ddr_clk_n" } @@ -2017,12 +2017,12 @@ "twoColumn": true }, { - "id": "node_1725358330675304", + "id": "node_1728900283845248", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675303", + "id": "ni_1728900283845247", "name": "external", "side": "right" } @@ -2030,7 +2030,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675302", + "id": "1728900283845246", "name": "External Name", "value": "ddr_cs_n" } @@ -2038,12 +2038,12 @@ "twoColumn": true }, { - "id": "node_1725358330675307", + "id": "node_1728900283845251", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675306", + "id": "ni_1728900283845250", "name": "external", "side": "right" } @@ -2051,7 +2051,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675305", + "id": "1728900283845249", "name": "External Name", "value": "ddr_dm" } @@ -2059,12 +2059,12 @@ "twoColumn": true }, { - "id": "node_1725358330675310", + "id": "node_1728900283845254", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675309", + "id": "ni_1728900283845253", "name": "external", "side": "right" } @@ -2072,7 +2072,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675308", + "id": "1728900283845252", "name": "External Name", "value": "ddr_dq" } @@ -2080,12 +2080,12 @@ "twoColumn": true }, { - "id": "node_1725358330675313", + "id": "node_1728900283845257", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675312", + "id": "ni_1728900283845256", "name": "external", "side": "right" } @@ -2093,7 +2093,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675311", + "id": "1728900283845255", "name": "External Name", "value": "ddr_dqs" } @@ -2101,12 +2101,12 @@ "twoColumn": true }, { - "id": "node_1725358330675316", + "id": "node_1728900283845260", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675315", + "id": "ni_1728900283845259", "name": "external", "side": "right" } @@ -2114,7 +2114,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675314", + "id": "1728900283845258", "name": "External Name", "value": "ddr_dqs_n" } @@ -2122,12 +2122,12 @@ "twoColumn": true }, { - "id": "node_1725358330675319", + "id": "node_1728900283845263", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675318", + "id": "ni_1728900283845262", "name": "external", "side": "right" } @@ -2135,7 +2135,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675317", + "id": "1728900283845261", "name": "External Name", "value": "ddr_drstb" } @@ -2143,12 +2143,12 @@ "twoColumn": true }, { - "id": "node_1725358330675322", + "id": "node_1728900283845266", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675321", + "id": "ni_1728900283845265", "name": "external", "side": "right" } @@ -2156,7 +2156,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675320", + "id": "1728900283845264", "name": "External Name", "value": "ddr_odt" } @@ -2164,12 +2164,12 @@ "twoColumn": true }, { - "id": "node_1725358330675325", + "id": "node_1728900283845269", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675324", + "id": "ni_1728900283845268", "name": "external", "side": "right" } @@ -2177,7 +2177,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675323", + "id": "1728900283845267", "name": "External Name", "value": "ddr_ras_n" } @@ -2185,12 +2185,12 @@ "twoColumn": true }, { - "id": "node_1725358330675328", + "id": "node_1728900283845272", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675327", + "id": "ni_1728900283845271", "name": "external", "side": "right" } @@ -2198,7 +2198,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675326", + "id": "1728900283845270", "name": "External Name", "value": "ddr_vr_n" } @@ -2206,12 +2206,12 @@ "twoColumn": true }, { - "id": "node_1725358330675331", + "id": "node_1728900283845275", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675330", + "id": "ni_1728900283845274", "name": "external", "side": "right" } @@ -2219,7 +2219,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675329", + "id": "1728900283845273", "name": "External Name", "value": "ddr_vr" } @@ -2227,12 +2227,12 @@ "twoColumn": true }, { - "id": "node_1725358330675334", + "id": "node_1728900283845278", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675333", + "id": "ni_1728900283845277", "name": "external", "side": "right" } @@ -2240,7 +2240,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675332", + "id": "1728900283845276", "name": "External Name", "value": "ddr_web" } @@ -2248,12 +2248,12 @@ "twoColumn": true }, { - "id": "node_1725358330675337", + "id": "node_1728900283845281", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675336", + "id": "ni_1728900283845280", "name": "external", "side": "right" } @@ -2261,7 +2261,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675335", + "id": "1728900283845279", "name": "External Name", "value": "ps_mio" } @@ -2269,12 +2269,12 @@ "twoColumn": true }, { - "id": "node_1725358330675340", + "id": "node_1728900283845284", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675339", + "id": "ni_1728900283845283", "name": "external", "side": "right" } @@ -2282,7 +2282,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675338", + "id": "1728900283845282", "name": "External Name", "value": "ps_clk" } @@ -2290,12 +2290,12 @@ "twoColumn": true }, { - "id": "node_1725358330675343", + "id": "node_1728900283845287", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675342", + "id": "ni_1728900283845286", "name": "external", "side": "right" } @@ -2303,7 +2303,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675341", + "id": "1728900283845285", "name": "External Name", "value": "ps_porb" } @@ -2311,12 +2311,12 @@ "twoColumn": true }, { - "id": "node_1725358330675346", + "id": "node_1728900283845290", "instanceName": "External Inout", "interfaces": [ { "direction": "inout", - "id": "ni_1725358330675345", + "id": "ni_1728900283845289", "name": "external", "side": "right" } @@ -2324,7 +2324,7 @@ "name": "External Inout", "properties": [ { - "id": "1725358330675344", + "id": "1728900283845288", "name": "External Name", "value": "ps_srstb" } @@ -2332,12 +2332,12 @@ "twoColumn": true }, { - "id": "node_1725358330675553", + "id": "node_1728900283846497", "instanceName": "Constant", "interfaces": [ { "direction": "output", - "id": "ni_1725358330675552", + "id": "ni_1728900283846496", "name": "constant", "side": "right" } @@ -2345,7 +2345,7 @@ "name": "Constant", "properties": [ { - "id": "1725358330675551", + "id": "1728900283846495", "name": "Constant Value", "value": "0" } @@ -2353,12 +2353,12 @@ "twoColumn": true }, { - "id": "node_1725358330675556", + "id": "node_1728900283846500", "instanceName": "Constant", "interfaces": [ { "direction": "output", - "id": "ni_1725358330675555", + "id": "ni_1728900283846499", "name": "constant", "side": "right" } @@ -2366,15 +2366,14 @@ "name": "Constant", "properties": [ { - "id": "1725358330675554", + "id": "1728900283846498", "name": "Constant Value", "value": "1" } ], "twoColumn": true } - ], - "scaling": 1 + ] } ] } diff --git a/tests/data/data_kpm/examples/hdmi/specification_hdmi.json b/tests/data/data_kpm/examples/hdmi/specification_hdmi.json index 2665222e..638fe473 100644 --- a/tests/data/data_kpm/examples/hdmi/specification_hdmi.json +++ b/tests/data/data_kpm/examples/hdmi/specification_hdmi.json @@ -31,6 +31,26 @@ "interfaceConnectionPattern": "solid" } }, + "layers": [ + { + "name": "IP Cores", + "nodeLayers": [ + "IP Cores" + ] + }, + { + "name": "Externals", + "nodeLayers": [ + "Externals" + ] + }, + { + "name": "Constants", + "nodeLayers": [ + "Constants" + ] + } + ], "layout": "CytoscapeEngine - grid", "movementStep": 15, "navbarItems": [ @@ -64,9 +84,9 @@ "category": "IPcore", "interfaces": [ { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "DE_O", + "name": "s00_axi_aclk", "type": [ "port" ] @@ -74,15 +94,15 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "CTL_O", + "name": "DGUARD_O", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "VGUARD_O", + "name": "S_AXIS_ACLK", "type": [ "port" ] @@ -90,7 +110,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "HSYNC_O", + "name": "DATA_O", "type": [ "port" ] @@ -98,7 +118,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "VSYNC_O", + "name": "DIEN_O", "type": [ "port" ] @@ -106,23 +126,23 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "DIH_O", + "name": "DE_O", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "s00_axi_aresetn", + "name": "VGUARD_O", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "S_AXIS_ACLK", + "name": "HSYNC_O", "type": [ "port" ] @@ -130,7 +150,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "DGUARD_O", + "name": "VSYNC_O", "type": [ "port" ] @@ -138,7 +158,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "FSYNC_O", + "name": "DIH_O", "type": [ "port" ] @@ -146,7 +166,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "DIEN_O", + "name": "CTL_O", "type": [ "port" ] @@ -162,7 +182,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "DATA_O", + "name": "FSYNC_O", "type": [ "port" ] @@ -170,7 +190,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "s00_axi_aclk", + "name": "s00_axi_aresetn", "type": [ "port" ] @@ -192,7 +212,7 @@ ] } ], - "layer": "axi_dispctrl", + "layer": "IP Cores", "name": "axi_dispctrl" }, { @@ -201,9 +221,9 @@ "category": "IPcore", "interfaces": [ { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "B", + "name": "A", "type": [ "port" ] @@ -211,7 +231,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "clkA", + "name": "clkB", "type": [ "port" ] @@ -219,21 +239,21 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "A", + "name": "clkA", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "clkB", + "name": "B", "type": [ "port" ] } ], - "layer": "clock_crossing", + "layer": "IP Cores", "name": "clock_crossing" }, { @@ -242,9 +262,9 @@ "category": "IPcore", "interfaces": [ { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "io_irq_writerDone", + "name": "io_sync_readerSync", "type": [ "port" ] @@ -252,7 +272,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "io_irq_readerDone", + "name": "io_irq_writerDone", "type": [ "port" ] @@ -260,7 +280,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "clock", + "name": "io_sync_writerSync", "type": [ "port" ] @@ -268,15 +288,15 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "reset", + "name": "clock", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "io_sync_writerSync", + "name": "io_irq_readerDone", "type": [ "port" ] @@ -284,7 +304,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "io_sync_readerSync", + "name": "reset", "type": [ "port" ] @@ -314,7 +334,7 @@ ] } ], - "layer": "dma_axi_in_axis_out", + "layer": "IP Cores", "name": "dma_axi_in_axis_out" }, { @@ -325,7 +345,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "PXLCLK_5X_I", + "name": "DGUARD", "type": [ "port" ] @@ -333,15 +353,15 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "HDMI_D2_N", + "name": "HDMI_CLK_P", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "HDMI_CLK_P", + "name": "PXLCLK_5X_I", "type": [ "port" ] @@ -349,15 +369,15 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "DGUARD", + "name": "LOCKED_I", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "VGA_VS", + "name": "HDMI_D0_P", "type": [ "port" ] @@ -365,7 +385,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "VGA_DE", + "name": "DIH", "type": [ "port" ] @@ -373,7 +393,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "DATA_I", + "name": "DIEN", "type": [ "port" ] @@ -381,15 +401,15 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "HDMI_D1_N", + "name": "HDMI_CLK_N", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "HDMI_D0_P", + "name": "VGA_HS", "type": [ "port" ] @@ -397,7 +417,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "HDMI_CLK_N", + "name": "HDMI_D1_N", "type": [ "port" ] @@ -405,7 +425,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "CTL", + "name": "DATA_I", "type": [ "port" ] @@ -413,23 +433,23 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "DIEN", + "name": "VGUARD", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "HDMI_D1_P", + "name": "VGA_VS", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "VGA_HS", + "name": "HDMI_D2_P", "type": [ "port" ] @@ -445,7 +465,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "DIH", + "name": "VGA_DE", "type": [ "port" ] @@ -453,37 +473,37 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "HDMI_D2_P", + "name": "HDMI_D1_P", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "VGUARD", + "name": "HDMI_D2_N", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "HDMI_D0_N", + "name": "CTL", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "LOCKED_I", + "name": "HDMI_D0_N", "type": [ "port" ] } ], - "layer": "hdmi_tx", + "layer": "IP Cores", "name": "hdmi_tx" }, { @@ -494,7 +514,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "clkgen_locked", + "name": "clkgen_out1", "type": [ "port" ] @@ -502,7 +522,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "clkgen_out1", + "name": "clkgen_locked", "type": [ "port" ] @@ -510,7 +530,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "sys_rst", + "name": "sys_clk", "type": [ "port" ] @@ -524,17 +544,17 @@ ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "clkgen_out0", + "name": "sys_rst", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "sys_clk", + "name": "clkgen_out0", "type": [ "port" ] @@ -548,7 +568,7 @@ ] } ], - "layer": "litex_mmcm", + "layer": "IP Cores", "name": "litex_mmcm" }, { @@ -559,39 +579,39 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "mb_debug_sys_rst", + "name": "ext_reset_in", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "dcm_locked", + "name": "mb_reset", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "aux_reset_in", + "name": "interconnect_aresetn", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "peripheral_aresetn", + "name": "aux_reset_in", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "interconnect_aresetn", + "name": "dcm_locked", "type": [ "port" ] @@ -599,7 +619,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "bus_struct_reset", + "name": "peripheral_reset", "type": [ "port" ] @@ -607,7 +627,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "peripheral_reset", + "name": "peripheral_aresetn", "type": [ "port" ] @@ -615,29 +635,29 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "slowest_sync_clk", + "name": "mb_debug_sys_rst", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "mb_reset", + "name": "slowest_sync_clk", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "ext_reset_in", + "name": "bus_struct_reset", "type": [ "port" ] } ], - "layer": "proc_sys_reset", + "layer": "IP Cores", "name": "proc_sys_reset" }, { @@ -646,9 +666,9 @@ "category": "IPcore", "interfaces": [ { - "direction": "inout", + "direction": "output", "maxConnectionsCount": -1, - "name": "ddr_web", + "name": "SAXIHP0RCOUNT", "type": [ "port" ] @@ -656,15 +676,15 @@ { "direction": "inout", "maxConnectionsCount": -1, - "name": "ddr_dq", + "name": "ddr_bankaddr", "type": [ "port" ] }, { - "direction": "input", + "direction": "inout", "maxConnectionsCount": -1, - "name": "IRQ_F2P_1", + "name": "ps_clk", "type": [ "port" ] @@ -672,23 +692,23 @@ { "direction": "inout", "maxConnectionsCount": -1, - "name": "ddr_odt", + "name": "ddr_clk", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "SAXIHP0RACOUNT", + "name": "MAXIGP0ACLK", "type": [ "port" ] }, { - "direction": "output", + "direction": "inout", "maxConnectionsCount": -1, - "name": "FCLK0", + "name": "ddr_cas_n", "type": [ "port" ] @@ -696,15 +716,15 @@ { "direction": "inout", "maxConnectionsCount": -1, - "name": "ddr_cke", + "name": "ddr_drstb", "type": [ "port" ] }, { - "direction": "inout", + "direction": "output", "maxConnectionsCount": -1, - "name": "ddr_cs_n", + "name": "MAXIGP0ARESETN", "type": [ "port" ] @@ -712,7 +732,7 @@ { "direction": "inout", "maxConnectionsCount": -1, - "name": "ddr_cas_n", + "name": "ddr_odt", "type": [ "port" ] @@ -720,7 +740,7 @@ { "direction": "inout", "maxConnectionsCount": -1, - "name": "ddr_vr_n", + "name": "ddr_cs_n", "type": [ "port" ] @@ -728,7 +748,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "IRQ_F2P_0", + "name": "IRQ_F2P_1", "type": [ "port" ] @@ -744,15 +764,15 @@ { "direction": "inout", "maxConnectionsCount": -1, - "name": "ps_srstb", + "name": "ps_mio", "type": [ "port" ] }, { - "direction": "output", + "direction": "inout", "maxConnectionsCount": -1, - "name": "SAXIHP0RCOUNT", + "name": "ps_srstb", "type": [ "port" ] @@ -760,7 +780,7 @@ { "direction": "inout", "maxConnectionsCount": -1, - "name": "ddr_clk_n", + "name": "ddr_web", "type": [ "port" ] @@ -768,7 +788,7 @@ { "direction": "inout", "maxConnectionsCount": -1, - "name": "ddr_dqs_n", + "name": "ddr_dqs", "type": [ "port" ] @@ -776,23 +796,23 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "FCLK1", + "name": "FCLK0", "type": [ "port" ] }, { - "direction": "inout", + "direction": "input", "maxConnectionsCount": -1, - "name": "ps_mio", + "name": "SAXIHP0ACLK", "type": [ "port" ] }, { - "direction": "inout", + "direction": "output", "maxConnectionsCount": -1, - "name": "ddr_dm", + "name": "FCLK_RESET0_N", "type": [ "port" ] @@ -800,7 +820,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "MAXIGP0ARESETN", + "name": "SAXIHP0RACOUNT", "type": [ "port" ] @@ -808,23 +828,23 @@ { "direction": "inout", "maxConnectionsCount": -1, - "name": "ps_clk", + "name": "ddr_dm", "type": [ "port" ] }, { - "direction": "inout", + "direction": "output", "maxConnectionsCount": -1, - "name": "ddr_drstb", + "name": "SAXIHP0ARESETN", "type": [ "port" ] }, { - "direction": "input", + "direction": "inout", "maxConnectionsCount": -1, - "name": "SAXIHP0ACLK", + "name": "ddr_addr", "type": [ "port" ] @@ -832,47 +852,47 @@ { "direction": "inout", "maxConnectionsCount": -1, - "name": "ps_porb", + "name": "ddr_dqs_n", "type": [ "port" ] }, { - "direction": "output", + "direction": "inout", "maxConnectionsCount": -1, - "name": "SAXIHP0ARESETN", + "name": "ps_porb", "type": [ "port" ] }, { - "direction": "output", + "direction": "inout", "maxConnectionsCount": -1, - "name": "FCLK_RESET0_N", + "name": "ddr_cke", "type": [ "port" ] }, { - "direction": "inout", + "direction": "input", "maxConnectionsCount": -1, - "name": "ddr_vr", + "name": "IRQ_F2P_0", "type": [ "port" ] }, { - "direction": "inout", + "direction": "output", "maxConnectionsCount": -1, - "name": "ddr_dqs", + "name": "SAXIHP0WCOUNT", "type": [ "port" ] }, { - "direction": "output", + "direction": "inout", "maxConnectionsCount": -1, - "name": "SAXIHP0WCOUNT", + "name": "ddr_vr_n", "type": [ "port" ] @@ -880,7 +900,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "SAXIHP0WACOUNT", + "name": "FCLK1", "type": [ "port" ] @@ -888,7 +908,7 @@ { "direction": "inout", "maxConnectionsCount": -1, - "name": "ddr_bankaddr", + "name": "ddr_dq", "type": [ "port" ] @@ -896,23 +916,23 @@ { "direction": "inout", "maxConnectionsCount": -1, - "name": "ddr_clk", + "name": "ddr_clk_n", "type": [ "port" ] }, { - "direction": "input", + "direction": "inout", "maxConnectionsCount": -1, - "name": "MAXIGP0ACLK", + "name": "ddr_vr", "type": [ "port" ] }, { - "direction": "inout", + "direction": "output", "maxConnectionsCount": -1, - "name": "ddr_addr", + "name": "SAXIHP0WACOUNT", "type": [ "port" ] @@ -934,7 +954,7 @@ ] } ], - "layer": "ps7", + "layer": "IP Cores", "name": "ps7" }, { @@ -975,7 +995,7 @@ ] } ], - "layer": "axi_axil_adapter", + "layer": "IP Cores", "name": "axi_axil_adapter", "properties": [ { @@ -1064,7 +1084,7 @@ ] } ], - "layer": "axi_interconnect", + "layer": "IP Cores", "name": "axi_interconnect", "properties": [ { @@ -1142,7 +1162,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "aresetn", + "name": "aclk", "type": [ "port" ] @@ -1150,7 +1170,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "aclk", + "name": "aresetn", "type": [ "port" ] @@ -1172,7 +1192,7 @@ ] } ], - "layer": "axi_protocol_converter", + "layer": "IP Cores", "name": "axi_protocol_converter" }, { @@ -1183,7 +1203,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "aresetn", + "name": "aclk", "type": [ "port" ] @@ -1191,7 +1211,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "aclk", + "name": "aresetn", "type": [ "port" ] @@ -1213,7 +1233,7 @@ ] } ], - "layer": "axis_dwidth_converter", + "layer": "IP Cores", "name": "axis_dwidth_converter", "properties": [ { @@ -1236,7 +1256,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "s_status_overflow", + "name": "s_status_bad_frame", "type": [ "port" ] @@ -1252,23 +1272,23 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "s_clk", + "name": "async_rst", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "m_status_overflow", + "name": "m_clk", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "async_rst", + "name": "m_status_overflow", "type": [ "port" ] @@ -1276,7 +1296,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "m_status_good_frame", + "name": "m_status_bad_frame", "type": [ "port" ] @@ -1284,23 +1304,23 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "s_status_bad_frame", + "name": "s_status_overflow", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "m_status_bad_frame", + "name": "s_clk", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "m_clk", + "name": "m_status_good_frame", "type": [ "port" ] @@ -1322,7 +1342,7 @@ ] } ], - "layer": "axis_async_fifo", + "layer": "IP Cores", "name": "axis_async_fifo", "properties": [ { @@ -1372,14 +1392,14 @@ "name": "external", "type": [ "port", - "iface_AXI4", - "iface_AXI4Stream", + "iface_AXI4Lite", "iface_AXI3", - "iface_AXI4Lite" + "iface_AXI4", + "iface_AXI4Stream" ] } ], - "layer": "External Output", + "layer": "Externals", "name": "External Output", "properties": [ { @@ -1399,14 +1419,14 @@ "name": "external", "type": [ "port", - "iface_AXI4", - "iface_AXI4Stream", + "iface_AXI4Lite", "iface_AXI3", - "iface_AXI4Lite" + "iface_AXI4", + "iface_AXI4Stream" ] } ], - "layer": "External Input", + "layer": "Externals", "name": "External Input", "properties": [ { @@ -1426,14 +1446,14 @@ "name": "external", "type": [ "port", - "iface_AXI4", - "iface_AXI4Stream", + "iface_AXI4Lite", "iface_AXI3", - "iface_AXI4Lite" + "iface_AXI4", + "iface_AXI4Stream" ] } ], - "layer": "External Inout", + "layer": "Externals", "name": "External Inout", "properties": [ { @@ -1453,14 +1473,14 @@ "name": "constant", "type": [ "port", - "iface_AXI4", - "iface_AXI4Stream", + "iface_AXI4Lite", "iface_AXI3", - "iface_AXI4Lite" + "iface_AXI4", + "iface_AXI4Stream" ] } ], - "layer": "Constant", + "layer": "Constants", "name": "Constant", "properties": [ { @@ -1491,7 +1511,7 @@ ] } ], - "layer": "Subgraph port", + "layer": "Externals", "name": "Subgraph port" } ] diff --git a/tests/data/data_kpm/examples/hierarchy/dataflow_hierarchy.json b/tests/data/data_kpm/examples/hierarchy/dataflow_hierarchy.json index 60c64a6d..9f15c84e 100644 --- a/tests/data/data_kpm/examples/hierarchy/dataflow_hierarchy.json +++ b/tests/data/data_kpm/examples/hierarchy/dataflow_hierarchy.json @@ -1,118 +1,118 @@ { "version": "20240723.13", - "entryGraph": "1725358409542677", + "entryGraph": "1728900283862677", "graphs": [ { "connections": [ { - "from": "ni_1725358409542681", - "id": "1725358409542700", - "to": "ni_1725358409542687" + "from": "ni_1728900283863681", + "id": "1728900283863700", + "to": "ni_1728900283863687" }, { - "from": "ni_1725358409542682", - "id": "1725358409542701", - "to": "ni_1725358409542686" + "from": "ni_1728900283863682", + "id": "1728900283863701", + "to": "ni_1728900283863686" }, { - "from": "ni_1725358409542703", - "id": "1725358409542705", - "to": "ni_1725358409542678" + "from": "ni_1728900283863703", + "id": "1728900283863705", + "to": "ni_1728900283863678" }, { - "from": "ni_1725358409542679", - "id": "1725358409542706", - "to": "ni_1725358409542691" + "from": "ni_1728900283863679", + "id": "1728900283863706", + "to": "ni_1728900283863691" }, { - "from": "ni_1725358409542688", - "id": "1725358409542707", - "to": "ni_1725358409542698" + "from": "ni_1728900283863688", + "id": "1728900283863707", + "to": "ni_1728900283863698" } ], - "id": "1725358409542666", + "id": "1728900283862666", "nodes": [ { - "id": "node_1725358409542685", + "id": "node_1728900283863685", "instanceName": "sub_1", "interfaces": [ { "direction": "input", - "id": "ni_1725358409542678", + "id": "ni_1728900283863678", "name": "cs_s1_int_const_in", "side": "left" }, { "direction": "input", - "id": "ni_1725358409542679", + "id": "ni_1728900283863679", "name": "cs_s1_mod_in_1", "side": "left" }, { "direction": "input", - "id": "ni_1725358409542680", + "id": "ni_1728900283863680", "name": "cs_s1_empty_in", "side": "left" }, { "direction": "output", - "id": "ni_1725358409542681", + "id": "ni_1728900283863681", "name": "cs_s1_int_out_1", "side": "right" }, { "direction": "output", - "id": "ni_1725358409542682", + "id": "ni_1728900283863682", "name": "cs_s1_int_out_2", "side": "right" }, { "direction": "output", - "id": "ni_1725358409542683", + "id": "ni_1728900283863683", "name": "cs_s1_empty_out", "side": "right" } ], "name": "New Graph Node", "properties": [], - "subgraph": "1725358409542684", + "subgraph": "1728900283863684", "twoColumn": true }, { - "id": "node_1725358409542690", + "id": "node_1728900283863690", "instanceName": "sub_2", "interfaces": [ { "direction": "input", - "id": "ni_1725358409542686", + "id": "ni_1728900283863686", "name": "cs_s2_int_in_2", "side": "left" }, { "direction": "input", - "id": "ni_1725358409542687", + "id": "ni_1728900283863687", "name": "cs_s2_int_in_1", "side": "left" }, { "direction": "output", - "id": "ni_1725358409542688", + "id": "ni_1728900283863688", "name": "cs_s2_mod_out_1", "side": "right" } ], "name": "New Graph Node", "properties": [], - "subgraph": "1725358409542689", + "subgraph": "1728900283863689", "twoColumn": true }, { - "id": "node_1725358409542704", + "id": "node_1728900283863704", "instanceName": "Constant", "interfaces": [ { "direction": "output", - "id": "ni_1725358409542703", + "id": "ni_1728900283863703", "name": "constant", "side": "right" } @@ -120,7 +120,7 @@ "name": "Constant", "properties": [ { - "id": "1725358409542702", + "id": "1728900283863702", "name": "Constant Value", "value": "1" } @@ -128,19 +128,19 @@ "twoColumn": true }, { - "id": "node_1725358409542693", + "id": "node_1728900283863693", "instanceName": "complex_sub cs_in_1", "interfaces": [ { "direction": "output", - "id": "ni_1725358409542691", + "id": "ni_1728900283863691", "name": "subgraph out", "side": "right" }, { "direction": "input", "externalName": "cs_in_1", - "id": "ni_1725358409542663", + "id": "ni_1728900283862663", "name": "subgraph in", "side": "left" } @@ -150,19 +150,19 @@ "twoColumn": true }, { - "id": "node_1725358409542696", + "id": "node_1728900283863696", "instanceName": "complex_sub cs_empty_port_in", "interfaces": [ { "direction": "output", - "id": "ni_1725358409542694", + "id": "ni_1728900283863694", "name": "subgraph out", "side": "right" }, { "direction": "input", "externalName": "cs_empty_port_in", - "id": "ni_1725358409542664", + "id": "ni_1728900283862664", "name": "subgraph in", "side": "left" } @@ -172,19 +172,19 @@ "twoColumn": true }, { - "id": "node_1725358409542699", + "id": "node_1728900283863699", "instanceName": "complex_sub cs_out_1", "interfaces": [ { "direction": "output", "externalName": "cs_out_1", - "id": "ni_1725358409542665", + "id": "ni_1728900283862665", "name": "subgraph out", "side": "right" }, { "direction": "input", - "id": "ni_1725358409542698", + "id": "ni_1728900283863698", "name": "subgraph in", "side": "left" } @@ -193,65 +193,64 @@ "properties": [], "twoColumn": true } - ], - "scaling": 1 + ] }, { "connections": [ { - "from": "ni_1725358409542709", - "id": "1725358409542737", - "to": "ni_1725358409542713" + "from": "ni_1728900283863710", + "id": "1728900283863737", + "to": "ni_1728900283863713" }, { - "from": "ni_1725358409542709", - "id": "1725358409542738", - "to": "ni_1725358409542716" + "from": "ni_1728900283863710", + "id": "1728900283863738", + "to": "ni_1728900283863717" }, { - "from": "ni_1725358409542710", - "id": "1725358409542739", - "to": "ni_1725358409542719" + "from": "ni_1728900283863708", + "id": "1728900283863739", + "to": "ni_1728900283863719" }, { - "from": "ni_1725358409542708", - "id": "1725358409542740", - "to": "ni_1725358409542722" + "from": "ni_1728900283863709", + "id": "1728900283863740", + "to": "ni_1728900283863722" }, { - "from": "ni_1725358409542712", - "id": "1725358409542741", - "to": "ni_1725358409542729" + "from": "ni_1728900283863712", + "id": "1728900283863741", + "to": "ni_1728900283863729" }, { - "from": "ni_1725358409542717", - "id": "1725358409542742", - "to": "ni_1725358409542732" + "from": "ni_1728900283863716", + "id": "1728900283863742", + "to": "ni_1728900283863732" } ], - "id": "1725358409542684", + "id": "1728900283863684", "nodes": [ { - "id": "node_1725358409542711", + "id": "node_1728900283863711", "instanceName": "s1_mod_1", "interfaces": [ { "direction": "input", - "id": "ni_1725358409542708", + "id": "ni_1728900283863708", + "name": "cs_s1_f_ext_const_in", + "side": "left" + }, + { + "direction": "input", + "id": "ni_1728900283863709", "name": "cs_s1_f_mod_in_1", "side": "left" }, { "direction": "output", - "id": "ni_1725358409542709", + "id": "ni_1728900283863710", "name": "cs_s1_mint_out_1", "side": "right" - }, - { - "direction": "input", - "id": "ni_1725358409542710", - "name": "cs_s1_f_ext_const_in", - "side": "left" } ], "name": "s1_mod_1", @@ -259,18 +258,18 @@ "twoColumn": true }, { - "id": "node_1725358409542714", + "id": "node_1728900283863714", "instanceName": "s1_mod_2", "interfaces": [ { "direction": "output", - "id": "ni_1725358409542712", + "id": "ni_1728900283863712", "name": "cs_s1_f_int_out_1", "side": "right" }, { "direction": "input", - "id": "ni_1725358409542713", + "id": "ni_1728900283863713", "name": "cs_s1_mint_in_1", "side": "left" } @@ -280,26 +279,26 @@ "twoColumn": true }, { - "id": "node_1725358409542718", + "id": "node_1728900283863718", "instanceName": "s1_mod_3", "interfaces": [ - { - "direction": "input", - "id": "ni_1725358409542716", - "name": "cs_s1_mint_in_2", - "side": "left" - }, { "direction": "output", - "id": "ni_1725358409542717", + "id": "ni_1728900283863716", "name": "cs_s1_f_int_out_2", "side": "right" + }, + { + "direction": "input", + "id": "ni_1728900283863717", + "name": "cs_s1_mint_in_2", + "side": "left" } ], "name": "s1_mod_3", "properties": [ { - "id": "1725358409542715", + "id": "1728900283863715", "name": "SUB_VALUE", "value": "18" } @@ -307,19 +306,19 @@ "twoColumn": true }, { - "id": "node_1725358409542721", + "id": "node_1728900283863721", "instanceName": "sub_1 cs_s1_int_const_in", "interfaces": [ { "direction": "output", - "id": "ni_1725358409542719", + "id": "ni_1728900283863719", "name": "subgraph out", "side": "right" }, { "direction": "input", "externalName": "cs_s1_int_const_in", - "id": "ni_1725358409542678", + "id": "ni_1728900283863678", "name": "subgraph in", "side": "left" } @@ -329,19 +328,19 @@ "twoColumn": true }, { - "id": "node_1725358409542724", + "id": "node_1728900283863724", "instanceName": "sub_1 cs_s1_mod_in_1", "interfaces": [ { "direction": "output", - "id": "ni_1725358409542722", + "id": "ni_1728900283863722", "name": "subgraph out", "side": "right" }, { "direction": "input", "externalName": "cs_s1_mod_in_1", - "id": "ni_1725358409542679", + "id": "ni_1728900283863679", "name": "subgraph in", "side": "left" } @@ -351,19 +350,19 @@ "twoColumn": true }, { - "id": "node_1725358409542727", + "id": "node_1728900283863727", "instanceName": "sub_1 cs_s1_empty_in", "interfaces": [ { "direction": "output", - "id": "ni_1725358409542725", + "id": "ni_1728900283863725", "name": "subgraph out", "side": "right" }, { "direction": "input", "externalName": "cs_s1_empty_in", - "id": "ni_1725358409542680", + "id": "ni_1728900283863680", "name": "subgraph in", "side": "left" } @@ -373,19 +372,19 @@ "twoColumn": true }, { - "id": "node_1725358409542730", + "id": "node_1728900283863730", "instanceName": "sub_1 cs_s1_int_out_1", "interfaces": [ { "direction": "output", "externalName": "cs_s1_int_out_1", - "id": "ni_1725358409542681", + "id": "ni_1728900283863681", "name": "subgraph out", "side": "right" }, { "direction": "input", - "id": "ni_1725358409542729", + "id": "ni_1728900283863729", "name": "subgraph in", "side": "left" } @@ -395,19 +394,19 @@ "twoColumn": true }, { - "id": "node_1725358409542733", + "id": "node_1728900283863733", "instanceName": "sub_1 cs_s1_int_out_2", "interfaces": [ { "direction": "output", "externalName": "cs_s1_int_out_2", - "id": "ni_1725358409542682", + "id": "ni_1728900283863682", "name": "subgraph out", "side": "right" }, { "direction": "input", - "id": "ni_1725358409542732", + "id": "ni_1728900283863732", "name": "subgraph in", "side": "left" } @@ -417,19 +416,19 @@ "twoColumn": true }, { - "id": "node_1725358409542736", + "id": "node_1728900283863736", "instanceName": "sub_1 cs_s1_empty_out", "interfaces": [ { "direction": "output", "externalName": "cs_s1_empty_out", - "id": "ni_1725358409542683", + "id": "ni_1728900283863683", "name": "subgraph out", "side": "right" }, { "direction": "input", - "id": "ni_1725358409542735", + "id": "ni_1728900283863735", "name": "subgraph in", "side": "left" } @@ -438,64 +437,63 @@ "properties": [], "twoColumn": true } - ], - "scaling": 1 + ] }, { "connections": [ { - "from": "ni_1725358409542743", - "id": "1725358409542761", - "to": "ni_1725358409542749" + "from": "ni_1728900283863743", + "id": "1728900283863761", + "to": "ni_1728900283863749" }, { - "from": "ni_1725358409542746", - "id": "1725358409542762", - "to": "ni_1725358409542748" + "from": "ni_1728900283863746", + "id": "1728900283863762", + "to": "ni_1728900283863750" }, { - "from": "ni_1725358409542744", - "id": "1725358409542763", - "to": "ni_1725358409542755" + "from": "ni_1728900283863744", + "id": "1728900283863763", + "to": "ni_1728900283863755" }, { - "from": "ni_1725358409542745", - "id": "1725358409542764", - "to": "ni_1725358409542752" + "from": "ni_1728900283863745", + "id": "1728900283863764", + "to": "ni_1728900283863752" }, { - "from": "ni_1725358409542750", - "id": "1725358409542765", - "to": "ni_1725358409542759" + "from": "ni_1728900283863748", + "id": "1728900283863765", + "to": "ni_1728900283863759" } ], - "id": "1725358409542689", + "id": "1728900283863689", "nodes": [ { - "id": "node_1725358409542747", + "id": "node_1728900283863747", "instanceName": "s2_mod_1", "interfaces": [ { "direction": "output", - "id": "ni_1725358409542743", + "id": "ni_1728900283863743", "name": "cs_s2_mint_out_1", "side": "right" }, { "direction": "input", - "id": "ni_1725358409542744", + "id": "ni_1728900283863744", "name": "cs_s2_f_int_in_1", "side": "left" }, { "direction": "input", - "id": "ni_1725358409542745", + "id": "ni_1728900283863745", "name": "cs_s2_f_int_in_2", "side": "left" }, { "direction": "output", - "id": "ni_1725358409542746", + "id": "ni_1728900283863746", "name": "cs_s2_mint_out_2", "side": "right" } @@ -505,26 +503,26 @@ "twoColumn": true }, { - "id": "node_1725358409542751", + "id": "node_1728900283863751", "instanceName": "s2_mod_2", "interfaces": [ { - "direction": "input", - "id": "ni_1725358409542748", - "name": "cs_s2_mint_in_2", - "side": "left" + "direction": "output", + "id": "ni_1728900283863748", + "name": "cs_s2_f_mod_out_1", + "side": "right" }, { "direction": "input", - "id": "ni_1725358409542749", + "id": "ni_1728900283863749", "name": "cs_s2_mint_in_1", "side": "left" }, { - "direction": "output", - "id": "ni_1725358409542750", - "name": "cs_s2_f_mod_out_1", - "side": "right" + "direction": "input", + "id": "ni_1728900283863750", + "name": "cs_s2_mint_in_2", + "side": "left" } ], "name": "s2_mod_2", @@ -532,19 +530,19 @@ "twoColumn": true }, { - "id": "node_1725358409542754", + "id": "node_1728900283863754", "instanceName": "sub_2 cs_s2_int_in_2", "interfaces": [ { "direction": "output", - "id": "ni_1725358409542752", + "id": "ni_1728900283863752", "name": "subgraph out", "side": "right" }, { "direction": "input", "externalName": "cs_s2_int_in_2", - "id": "ni_1725358409542686", + "id": "ni_1728900283863686", "name": "subgraph in", "side": "left" } @@ -554,19 +552,19 @@ "twoColumn": true }, { - "id": "node_1725358409542757", + "id": "node_1728900283863757", "instanceName": "sub_2 cs_s2_int_in_1", "interfaces": [ { "direction": "output", - "id": "ni_1725358409542755", + "id": "ni_1728900283863755", "name": "subgraph out", "side": "right" }, { "direction": "input", "externalName": "cs_s2_int_in_1", - "id": "ni_1725358409542687", + "id": "ni_1728900283863687", "name": "subgraph in", "side": "left" } @@ -576,19 +574,19 @@ "twoColumn": true }, { - "id": "node_1725358409542760", + "id": "node_1728900283863760", "instanceName": "sub_2 cs_s2_mod_out_1", "interfaces": [ { "direction": "output", "externalName": "cs_s2_mod_out_1", - "id": "ni_1725358409542688", + "id": "ni_1728900283863688", "name": "subgraph out", "side": "right" }, { "direction": "input", - "id": "ni_1725358409542759", + "id": "ni_1728900283863759", "name": "subgraph in", "side": "left" } @@ -597,57 +595,56 @@ "properties": [], "twoColumn": true } - ], - "scaling": 1 + ] }, { "connections": [ { - "from": "ni_1725358409542770", - "id": "1725358409542787", - "to": "ni_1725358409542773" + "from": "ni_1728900283863771", + "id": "1728900283863787", + "to": "ni_1728900283863776" }, { - "from": "ni_1725358409542767", - "id": "1725358409542788", - "to": "ni_1725358409542776" + "from": "ni_1728900283863767", + "id": "1728900283863788", + "to": "ni_1728900283863775" }, { - "from": "ni_1725358409542768", - "id": "1725358409542789", - "to": "ni_1725358409542778" + "from": "ni_1728900283863768", + "id": "1728900283863789", + "to": "ni_1728900283863778" }, { - "from": "ni_1725358409542771", - "id": "1725358409542790", - "to": "ni_1725358409542781" + "from": "ni_1728900283863770", + "id": "1728900283863790", + "to": "ni_1728900283863781" }, { - "from": "ni_1725358409542792", - "id": "1725358409542794", - "to": "ni_1725358409542774" + "from": "ni_1728900283863792", + "id": "1728900283863794", + "to": "ni_1728900283863773" }, { - "from": "ni_1725358409542775", - "id": "1725358409542795", - "to": "ni_1725358409542785" + "from": "ni_1728900283863774", + "id": "1728900283863795", + "to": "ni_1728900283863785" } ], - "id": "1725358409542671", + "id": "1728900283862671", "nodes": [ { - "id": "node_1725358409542769", + "id": "node_1728900283863769", "instanceName": "c_mod_1", "interfaces": [ { "direction": "output", - "id": "ni_1725358409542767", + "id": "ni_1728900283863767", "name": "c_int_out_1", "side": "right" }, { "direction": "input", - "id": "ni_1725358409542768", + "id": "ni_1728900283863768", "name": "c_mod_in_1", "side": "left" } @@ -655,7 +652,7 @@ "name": "c_mod_1", "properties": [ { - "id": "1725358409542766", + "id": "1728900283863766", "name": "MAX_VALUE", "value": "16" } @@ -663,20 +660,20 @@ "twoColumn": true }, { - "id": "node_1725358409542772", + "id": "node_1728900283863772", "instanceName": "c_mod_2", "interfaces": [ - { - "direction": "output", - "id": "ni_1725358409542770", - "name": "c_int_out_2", - "side": "right" - }, { "direction": "input", - "id": "ni_1725358409542771", + "id": "ni_1728900283863770", "name": "c_mod_in_2", "side": "left" + }, + { + "direction": "output", + "id": "ni_1728900283863771", + "name": "c_int_out_2", + "side": "right" } ], "name": "c_mod_2", @@ -684,32 +681,32 @@ "twoColumn": true }, { - "id": "node_1725358409542777", + "id": "node_1728900283863777", "instanceName": "c_mod_3", "interfaces": [ { "direction": "input", - "id": "ni_1725358409542773", - "name": "c_int_in_1", - "side": "left" - }, - { - "direction": "input", - "id": "ni_1725358409542774", + "id": "ni_1728900283863773", "name": "c_int_const_in", "side": "left" }, { "direction": "output", - "id": "ni_1725358409542775", + "id": "ni_1728900283863774", "name": "c_mod_out_1", "side": "right" }, { "direction": "input", - "id": "ni_1725358409542776", + "id": "ni_1728900283863775", "name": "c_int_in_2", "side": "left" + }, + { + "direction": "input", + "id": "ni_1728900283863776", + "name": "c_int_in_1", + "side": "left" } ], "name": "c_mod_3", @@ -717,12 +714,12 @@ "twoColumn": true }, { - "id": "node_1725358409542793", + "id": "node_1728900283863793", "instanceName": "Constant", "interfaces": [ { "direction": "output", - "id": "ni_1725358409542792", + "id": "ni_1728900283863792", "name": "constant", "side": "right" } @@ -730,7 +727,7 @@ "name": "Constant", "properties": [ { - "id": "1725358409542791", + "id": "1728900283863791", "name": "Constant Value", "value": "1" } @@ -738,19 +735,19 @@ "twoColumn": true }, { - "id": "node_1725358409542780", + "id": "node_1728900283863780", "instanceName": "counter c_in_1", "interfaces": [ { "direction": "output", - "id": "ni_1725358409542778", + "id": "ni_1728900283863778", "name": "subgraph out", "side": "right" }, { "direction": "input", "externalName": "c_in_1", - "id": "ni_1725358409542668", + "id": "ni_1728900283862668", "name": "subgraph in", "side": "left" } @@ -760,19 +757,19 @@ "twoColumn": true }, { - "id": "node_1725358409542783", + "id": "node_1728900283863783", "instanceName": "counter c_in_2", "interfaces": [ { "direction": "output", - "id": "ni_1725358409542781", + "id": "ni_1728900283863781", "name": "subgraph out", "side": "right" }, { "direction": "input", "externalName": "c_in_2", - "id": "ni_1725358409542669", + "id": "ni_1728900283862669", "name": "subgraph in", "side": "left" } @@ -782,19 +779,19 @@ "twoColumn": true }, { - "id": "node_1725358409542786", + "id": "node_1728900283863786", "instanceName": "counter c_out_1", "interfaces": [ { "direction": "output", "externalName": "c_out_1", - "id": "ni_1725358409542670", + "id": "ni_1728900283862670", "name": "subgraph out", "side": "right" }, { "direction": "input", - "id": "ni_1725358409542785", + "id": "ni_1728900283863785", "name": "subgraph in", "side": "left" } @@ -803,97 +800,96 @@ "properties": [], "twoColumn": true } - ], - "scaling": 1 + ] }, { "connections": [ { - "from": "ni_1725358409542670", - "id": "1725358409542673", - "to": "ni_1725358409542663" + "from": "ni_1728900283862670", + "id": "1728900283862673", + "to": "ni_1728900283862663" }, { - "from": "ni_1725358409542665", - "id": "1725358409542674", - "to": "ni_1725358409542661" + "from": "ni_1728900283862665", + "id": "1728900283862674", + "to": "ni_1728900283862661" }, { - "from": "ni_1725358409542655", - "id": "1725358409542675", - "to": "ni_1725358409542668" + "from": "ni_1728900283862655", + "id": "1728900283862675", + "to": "ni_1728900283862668" }, { - "from": "ni_1725358409542658", - "id": "1725358409542676", - "to": "ni_1725358409542669" + "from": "ni_1728900283862658", + "id": "1728900283862676", + "to": "ni_1728900283862669" } ], - "id": "1725358409542677", + "id": "1728900283862677", "nodes": [ { - "id": "node_1725358409542667", + "id": "node_1728900283862667", "instanceName": "complex_sub", "interfaces": [ { "direction": "input", - "id": "ni_1725358409542663", + "id": "ni_1728900283862663", "name": "cs_in_1", "side": "left" }, { "direction": "input", - "id": "ni_1725358409542664", + "id": "ni_1728900283862664", "name": "cs_empty_port_in", "side": "left" }, { "direction": "output", - "id": "ni_1725358409542665", + "id": "ni_1728900283862665", "name": "cs_out_1", "side": "right" } ], "name": "New Graph Node", "properties": [], - "subgraph": "1725358409542666", + "subgraph": "1728900283862666", "twoColumn": true }, { - "id": "node_1725358409542672", + "id": "node_1728900283862672", "instanceName": "counter", "interfaces": [ { "direction": "input", - "id": "ni_1725358409542668", + "id": "ni_1728900283862668", "name": "c_in_1", "side": "left" }, { "direction": "input", - "id": "ni_1725358409542669", + "id": "ni_1728900283862669", "name": "c_in_2", "side": "left" }, { "direction": "output", - "id": "ni_1725358409542670", + "id": "ni_1728900283862670", "name": "c_out_1", "side": "right" } ], "name": "New Graph Node", "properties": [], - "subgraph": "1725358409542671", + "subgraph": "1728900283862671", "twoColumn": true }, { - "id": "node_1725358409542656", + "id": "node_1728900283862656", "instanceName": "External Input", "interfaces": [ { "direction": "output", - "id": "ni_1725358409542655", + "id": "ni_1728900283862655", "name": "external", "side": "right" } @@ -901,7 +897,7 @@ "name": "External Input", "properties": [ { - "id": "1725358409542654", + "id": "1728900283862654", "name": "External Name", "value": "ex_out_1" } @@ -909,12 +905,12 @@ "twoColumn": true }, { - "id": "node_1725358409542659", + "id": "node_1728900283862659", "instanceName": "External Input", "interfaces": [ { "direction": "output", - "id": "ni_1725358409542658", + "id": "ni_1728900283862658", "name": "external", "side": "right" } @@ -922,7 +918,7 @@ "name": "External Input", "properties": [ { - "id": "1725358409542657", + "id": "1728900283862657", "name": "External Name", "value": "ex_out_2" } @@ -930,12 +926,12 @@ "twoColumn": true }, { - "id": "node_1725358409542662", + "id": "node_1728900283862662", "instanceName": "External Output", "interfaces": [ { "direction": "input", - "id": "ni_1725358409542661", + "id": "ni_1728900283862661", "name": "external", "side": "left" } @@ -943,15 +939,14 @@ "name": "External Output", "properties": [ { - "id": "1725358409542660", + "id": "1728900283862660", "name": "External Name", "value": "ex_in_1" } ], "twoColumn": true } - ], - "scaling": 1 + ] } ] } diff --git a/tests/data/data_kpm/examples/hierarchy/specification_hierarchy.json b/tests/data/data_kpm/examples/hierarchy/specification_hierarchy.json index 9d87a8d3..569c2f68 100644 --- a/tests/data/data_kpm/examples/hierarchy/specification_hierarchy.json +++ b/tests/data/data_kpm/examples/hierarchy/specification_hierarchy.json @@ -11,6 +11,26 @@ "interfaceConnectionPattern": "solid" } }, + "layers": [ + { + "name": "IP Cores", + "nodeLayers": [ + "IP Cores" + ] + }, + { + "name": "Externals", + "nodeLayers": [ + "Externals" + ] + }, + { + "name": "Constants", + "nodeLayers": [ + "Constants" + ] + } + ], "layout": "CytoscapeEngine - grid", "movementStep": 15, "navbarItems": [ @@ -44,23 +64,23 @@ "category": "IPcore", "interfaces": [ { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "c_mod_in_1", + "name": "c_int_out_1", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "c_int_out_1", + "name": "c_mod_in_1", "type": [ "port" ] } ], - "layer": "c_mod_1", + "layer": "IP Cores", "name": "c_mod_1", "properties": [ { @@ -76,23 +96,23 @@ "category": "IPcore", "interfaces": [ { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "c_int_out_2", + "name": "c_mod_in_2", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "c_mod_in_2", + "name": "c_int_out_2", "type": [ "port" ] } ], - "layer": "c_mod_2", + "layer": "IP Cores", "name": "c_mod_2" }, { @@ -103,7 +123,7 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "c_int_in_1", + "name": "c_int_const_in", "type": [ "port" ] @@ -127,13 +147,13 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "c_int_const_in", + "name": "c_int_in_1", "type": [ "port" ] } ], - "layer": "c_mod_3", + "layer": "IP Cores", "name": "c_mod_3" }, { @@ -142,9 +162,9 @@ "category": "IPcore", "interfaces": [ { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "cs_s1_mint_out_1", + "name": "cs_s1_f_ext_const_in", "type": [ "port" ] @@ -158,15 +178,15 @@ ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "cs_s1_f_ext_const_in", + "name": "cs_s1_mint_out_1", "type": [ "port" ] } ], - "layer": "s1_mod_1", + "layer": "IP Cores", "name": "s1_mod_1" }, { @@ -191,7 +211,7 @@ ] } ], - "layer": "s1_mod_2", + "layer": "IP Cores", "name": "s1_mod_2" }, { @@ -200,23 +220,23 @@ "category": "IPcore", "interfaces": [ { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "cs_s1_mint_in_2", + "name": "cs_s1_f_int_out_2", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "cs_s1_f_int_out_2", + "name": "cs_s1_mint_in_2", "type": [ "port" ] } ], - "layer": "s1_mod_3", + "layer": "IP Cores", "name": "s1_mod_3", "properties": [ { @@ -234,7 +254,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "cs_s2_mint_out_2", + "name": "cs_s2_mint_out_1", "type": [ "port" ] @@ -242,29 +262,29 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "cs_s2_f_int_in_2", + "name": "cs_s2_f_int_in_1", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "cs_s2_mint_out_1", + "name": "cs_s2_f_int_in_2", "type": [ "port" ] }, { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "cs_s2_f_int_in_1", + "name": "cs_s2_mint_out_2", "type": [ "port" ] } ], - "layer": "s2_mod_1", + "layer": "IP Cores", "name": "s2_mod_1" }, { @@ -273,17 +293,17 @@ "category": "IPcore", "interfaces": [ { - "direction": "input", + "direction": "output", "maxConnectionsCount": -1, - "name": "cs_s2_mint_in_2", + "name": "cs_s2_f_mod_out_1", "type": [ "port" ] }, { - "direction": "output", + "direction": "input", "maxConnectionsCount": -1, - "name": "cs_s2_f_mod_out_1", + "name": "cs_s2_mint_in_1", "type": [ "port" ] @@ -291,13 +311,13 @@ { "direction": "input", "maxConnectionsCount": -1, - "name": "cs_s2_mint_in_1", + "name": "cs_s2_mint_in_2", "type": [ "port" ] } ], - "layer": "s2_mod_2", + "layer": "IP Cores", "name": "s2_mod_2" }, { @@ -313,7 +333,7 @@ ] } ], - "layer": "External Output", + "layer": "Externals", "name": "External Output", "properties": [ { @@ -336,7 +356,7 @@ ] } ], - "layer": "External Input", + "layer": "Externals", "name": "External Input", "properties": [ { @@ -359,7 +379,7 @@ ] } ], - "layer": "External Inout", + "layer": "Externals", "name": "External Inout", "properties": [ { @@ -382,7 +402,7 @@ ] } ], - "layer": "Constant", + "layer": "Constants", "name": "Constant", "properties": [ { @@ -413,7 +433,7 @@ ] } ], - "layer": "Subgraph port", + "layer": "Externals", "name": "Subgraph port" } ] diff --git a/tests/data/data_kpm/examples/pwm/dataflow_pwm.json b/tests/data/data_kpm/examples/pwm/dataflow_pwm.json index d5a3a88c..1fd9fa32 100644 --- a/tests/data/data_kpm/examples/pwm/dataflow_pwm.json +++ b/tests/data/data_kpm/examples/pwm/dataflow_pwm.json @@ -1,77 +1,77 @@ { "version": "20240723.13", - "entryGraph": "172528132780655", + "entryGraph": "1728900283858653", "graphs": [ { "connections": [ { - "from": "ni_172528132780616", - "id": "172528132780647", - "to": "ni_17252813278067" + "from": "ni_1728900283858616", + "id": "1728900283858645", + "to": "ni_1728900283858604" }, { - "from": "ni_172528132780619", - "id": "172528132780648", - "to": "ni_17252813278066" + "from": "ni_1728900283858617", + "id": "1728900283858646", + "to": "ni_1728900283858605" }, { - "from": "ni_172528132780616", - "id": "172528132780649", - "to": "ni_172528132780611" + "from": "ni_1728900283858616", + "id": "1728900283858647", + "to": "ni_1728900283858611" }, { - "from": "ni_172528132780619", - "id": "172528132780650", - "to": "ni_172528132780613" + "from": "ni_1728900283858617", + "id": "1728900283858648", + "to": "ni_1728900283858610" }, { - "from": "ni_172528132780616", - "id": "172528132780651", - "to": "ni_172528132780618" + "from": "ni_1728900283858616", + "id": "1728900283858649", + "to": "ni_1728900283858614" }, { - "from": "ni_172528132780620", - "id": "172528132780652", - "to": "ni_17252813278068" + "from": "ni_1728900283858618", + "id": "1728900283858650", + "to": "ni_1728900283858606" }, { - "from": "ni_17252813278069", - "id": "172528132780653", - "to": "ni_172528132780614" + "from": "ni_1728900283858607", + "id": "1728900283858651", + "to": "ni_1728900283858612" }, { - "from": "ni_172528132780612", - "id": "172528132780654", - "to": "ni_172528132780623" + "from": "ni_1728900283858609", + "id": "1728900283858652", + "to": "ni_1728900283858621" } ], - "id": "172528132780655", + "id": "1728900283858653", "nodes": [ { - "id": "node_172528132780610", + "id": "node_1728900283858608", "instanceName": "axi_bridge", "interfaces": [ { "direction": "input", - "id": "ni_17252813278066", - "name": "rst", + "id": "ni_1728900283858604", + "name": "clk", "side": "left" }, { "direction": "input", - "id": "ni_17252813278067", - "name": "clk", + "id": "ni_1728900283858605", + "name": "rst", "side": "left" }, { "direction": "input", - "id": "ni_17252813278068", + "id": "ni_1728900283858606", "name": "s_axi", "side": "left" }, { "direction": "output", - "id": "ni_17252813278069", + "id": "ni_1728900283858607", "name": "m_axi", "side": "right" } @@ -79,32 +79,32 @@ "name": "axi_axil_adapter", "properties": [ { - "id": "17252813278060", + "id": "1728900283858598", "name": "ADDR_WIDTH", "value": "32" }, { - "id": "17252813278061", + "id": "1728900283858599", "name": "AXI_DATA_WIDTH", "value": "32" }, { - "id": "17252813278062", + "id": "1728900283858600", "name": "AXI_ID_WIDTH", "value": "12" }, { - "id": "17252813278063", + "id": "1728900283858601", "name": "AXI_STRB_WIDTH", "value": "AXI_DATA_WIDTH/8" }, { - "id": "17252813278064", + "id": "1728900283858602", "name": "AXIL_DATA_WIDTH", "value": "32" }, { - "id": "17252813278065", + "id": "1728900283858603", "name": "AXIL_STRB_WIDTH", "value": "AXIL_DATA_WIDTH/8" } @@ -112,30 +112,30 @@ "twoColumn": true }, { - "id": "node_172528132780615", + "id": "node_1728900283858613", "instanceName": "litex_pwm_top", "interfaces": [ - { - "direction": "input", - "id": "ni_172528132780611", - "name": "sys_clk", - "side": "left" - }, { "direction": "output", - "id": "ni_172528132780612", + "id": "ni_1728900283858609", "name": "pwm", "side": "right" }, { "direction": "input", - "id": "ni_172528132780613", + "id": "ni_1728900283858610", "name": "sys_rst", "side": "left" }, { "direction": "input", - "id": "ni_172528132780614", + "id": "ni_1728900283858611", + "name": "sys_clk", + "side": "left" + }, + { + "direction": "input", + "id": "ni_1728900283858612", "name": "s_axi", "side": "left" } @@ -145,36 +145,36 @@ "twoColumn": true }, { - "id": "node_172528132780621", + "id": "node_1728900283858619", "instanceName": "ps7", "interfaces": [ { - "direction": "output", - "id": "ni_172528132780616", - "name": "FCLK0", - "side": "right" + "direction": "input", + "id": "ni_1728900283858614", + "name": "MAXIGP0ACLK", + "side": "left" }, { "direction": "output", - "id": "ni_172528132780617", + "id": "ni_1728900283858615", "name": "MAXIGP0ARESETN", "side": "right" }, { - "direction": "input", - "id": "ni_172528132780618", - "name": "MAXIGP0ACLK", - "side": "left" + "direction": "output", + "id": "ni_1728900283858616", + "name": "FCLK0", + "side": "right" }, { "direction": "output", - "id": "ni_172528132780619", + "id": "ni_1728900283858617", "name": "FCLK_RESET0_N", "side": "right" }, { "direction": "output", - "id": "ni_172528132780620", + "id": "ni_1728900283858618", "name": "M_AXI_GP0", "side": "right" } @@ -184,12 +184,12 @@ "twoColumn": true }, { - "id": "node_172528132780624", + "id": "node_1728900283858622", "instanceName": "External Output", "interfaces": [ { "direction": "input", - "id": "ni_172528132780623", + "id": "ni_1728900283858621", "name": "external", "side": "left" } @@ -197,15 +197,14 @@ "name": "External Output", "properties": [ { - "id": "172528132780622", + "id": "1728900283858620", "name": "External Name", "value": "pwm" } ], "twoColumn": true } - ], - "scaling": 1 + ] } ] } diff --git a/tests/data/data_kpm/examples/pwm/specification_pwm.json b/tests/data/data_kpm/examples/pwm/specification_pwm.json index 94afe44f..5f4e6335 100644 --- a/tests/data/data_kpm/examples/pwm/specification_pwm.json +++ b/tests/data/data_kpm/examples/pwm/specification_pwm.json @@ -21,6 +21,26 @@ "interfaceConnectionPattern": "solid" } }, + "layers": [ + { + "name": "IP Cores", + "nodeLayers": [ + "IP Cores" + ] + }, + { + "name": "Externals", + "nodeLayers": [ + "Externals" + ] + }, + { + "name": "Constants", + "nodeLayers": [ + "Constants" + ] + } + ], "layout": "CytoscapeEngine - grid", "movementStep": 15, "navbarItems": [ @@ -86,7 +106,7 @@ ] } ], - "layer": "axi_axil_adapter", + "layer": "IP Cores", "name": "axi_axil_adapter", "properties": [ { @@ -145,7 +165,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "FCLK_RESET0_N", + "name": "FCLK0", "type": [ "port" ] @@ -153,7 +173,7 @@ { "direction": "output", "maxConnectionsCount": -1, - "name": "FCLK0", + "name": "FCLK_RESET0_N", "type": [ "port" ] @@ -167,7 +187,7 @@ ] } ], - "layer": "ps7", + "layer": "IP Cores", "name": "ps7" }, { @@ -208,7 +228,7 @@ ] } ], - "layer": "litex_pwm", + "layer": "IP Cores", "name": "litex_pwm" }, { @@ -226,7 +246,7 @@ ] } ], - "layer": "External Output", + "layer": "Externals", "name": "External Output", "properties": [ { @@ -251,7 +271,7 @@ ] } ], - "layer": "External Input", + "layer": "Externals", "name": "External Input", "properties": [ { @@ -276,7 +296,7 @@ ] } ], - "layer": "External Inout", + "layer": "Externals", "name": "External Inout", "properties": [ { @@ -301,7 +321,7 @@ ] } ], - "layer": "Constant", + "layer": "Constants", "name": "Constant", "properties": [ { @@ -332,7 +352,7 @@ ] } ], - "layer": "Subgraph port", + "layer": "Externals", "name": "Subgraph port" } ] diff --git a/tests/update_test_data.py b/tests/update_test_data.py index b98baa95..12447a5e 100644 --- a/tests/update_test_data.py +++ b/tests/update_test_data.py @@ -58,7 +58,9 @@ def change_ips_path(design: DesignDescription, example_name: str): for example_name, example_design in all_examples_designs.items(): change_ips_path(example_design, example_name) - example_design.save(Path(TEST_DATA_PATH) / example_name / f"project_{example_name}.yml") + example_design.save( + Path(TEST_DATA_PATH) / "examples" / example_name / f"project_{example_name}.yml" + ) @click.command() diff --git a/topwrap/design_to_kpm_dataflow_parser.py b/topwrap/design_to_kpm_dataflow_parser.py index 0d661565..de7c9555 100644 --- a/topwrap/design_to_kpm_dataflow_parser.py +++ b/topwrap/design_to_kpm_dataflow_parser.py @@ -8,7 +8,7 @@ from typing_extensions import override from topwrap.hdl_parsers_utils import PortDirection -from topwrap.ip_desc import IPCoreParameter +from topwrap.ip_desc import IPCoreDescription, IPCoreParameter from .design import DesignDescription, DesignExternalPorts, DesignSection from .kpm_common import ( @@ -20,7 +20,9 @@ SPECIFICATION_VERSION, SUBGRAPH_METANODE, get_metanode_property_value, + kpm_direction_to_port_dir, ) +from .util import JsonType @dataclass @@ -62,14 +64,14 @@ class KPMDataflowNodeInterface: "inout": KPM_DIR_INOUT, } - def __init__(self, name: str, direction: str, value: Optional[int] = None): + def __init__(self, name: str, direction: str, constant_value: Optional[int] = None): if direction not in self.kpm_direction_extensions_dict.values(): raise ValueError(f"Invalid interface direction: {direction}") self.id = "ni_" + IDGenerator().generate_id() self.name = name self.direction = direction - self.value = value + self.constant_value = constant_value self.external_name: Optional[str] = None def to_json_format(self): @@ -97,7 +99,7 @@ class KPMDataflowMetanodeInterface(KPMDataflowNodeInterface): SUB_IFACE_IN_NAME = "subgraph in" SUB_IFACE_OUT_NAME = "subgraph out" - def __init__(self, name: str, direction: str, **kwargs: Any): + def __init__(self, name: str, direction: str, constant_value: Optional[int] = None): meta_iface_names = [ self.EXT_IFACE_NAME, self.CONST_IFACE_NAME, @@ -107,7 +109,7 @@ def __init__(self, name: str, direction: str, **kwargs: Any): if name not in meta_iface_names: raise ValueError(f"Invalid metanode interface name: {name}") - super().__init__(name, direction, **kwargs) + super().__init__(name, direction, constant_value) class KPMDataflowNodeProperty: @@ -228,7 +230,7 @@ def __init__(self, value: int): KPMDataflowMetanodeInterface( KPMDataflowMetanodeInterface.CONST_IFACE_NAME, KPMDataflowNodeInterface.KPM_DIR_OUTPUT, - value=value, + constant_value=value, ) ], ) @@ -314,16 +316,16 @@ def _ipcore_param_to_kpm_value(param: IPCoreParameter) -> str: def get_kpm_nodes_from_design( - design_descr: DesignDescription, specification: dict + design_descr: DesignDescription, specification: JsonType ) -> List[KPMDataflowNode]: """Return list of nodes that will be created based on design and specification from names list""" nodes = [] design = design_descr.design parameters = design.parameters - for ip_name in design_descr.ips: - ports = design.ports.get(ip_name, {}) - ip_type = design_descr.ips[ip_name].path.stem - spec_node = _get_specification_node_by_type(ip_type, specification) + for inst_name in design_descr.ips: + ports = design.ports.get(inst_name, {}) + ip_name = IPCoreDescription.load(design_descr.ips[inst_name].path).name + spec_node = _get_specification_node_by_type(ip_name, specification) if spec_node is None: continue @@ -331,24 +333,26 @@ def get_kpm_nodes_from_design( prop["name"]: KPMDataflowNodeProperty(prop["name"], prop["default"]) for prop in spec_node.get("properties", []) } - if ip_name in parameters.keys(): - for param_name, param_val in parameters[ip_name].items(): + if inst_name in parameters.keys(): + for param_name, param_val in parameters[inst_name].items(): if param_name in kpm_properties.keys(): kpm_properties[param_name].value = _ipcore_param_to_kpm_value(param_val) else: - logging.warning(f"Parameter '{param_name}' not found in node {ip_name}") + logging.warning(f"Parameter '{param_name}' not found in node {inst_name}") interfaces = [] for interface in spec_node["interfaces"]: dir = interface["direction"] - value = ( - None - if ((dir != "input") or ("iface" in interface["type"][0])) - else ports.get(interface["name"]) - ) - interfaces.append(KPMDataflowNodeInterface(interface["name"], dir, value)) - - nodes.append(KPMDataflowNode(ip_name, ip_type, list(kpm_properties.values()), interfaces)) + const_val = ports.get(interface["name"]) + if ( + not isinstance(const_val, int) + or kpm_direction_to_port_dir(dir) != PortDirection.IN + or "iface" in interface["type"][0] + ): + const_val = None + interfaces.append(KPMDataflowNodeInterface(interface["name"], dir, const_val)) + + nodes.append(KPMDataflowNode(inst_name, ip_name, list(kpm_properties.values()), interfaces)) return nodes @@ -576,9 +580,9 @@ def kpm_constant_metanodes_from_nodes( for node in nodes: for port in node.interfaces: - value = port.value + value = port.constant_value - if not isinstance(value, int): + if value is None: continue if value in created: @@ -650,12 +654,14 @@ def kpm_metanodes_connections_from_design_descr( if kpm_interface is None: raise Exception(f"Node {ext_conn['ip_name']} interface was not found") - if isinstance(kpm_interface.value, int): + if kpm_interface.constant_value is not None: if kpm_interface.direction != KPMDataflowNodeInterface.KPM_DIR_INPUT: logging.warning("Cannot assign output port to constant value") continue - kpm_metanode = _find_dataflow_metanode_by_constant_value(metanodes, kpm_interface.value) + kpm_metanode = _find_dataflow_metanode_by_constant_value( + metanodes, kpm_interface.constant_value + ) else: kpm_metanode = _find_dataflow_metanode_by_external_name( metanodes, ext_conn["external_name"] diff --git a/topwrap/ips/axi/axis_dwidth_converter.yaml b/topwrap/ips/axi/axis_dwidth_converter.yaml index c379fd2b..f496bf5c 100644 --- a/topwrap/ips/axi/axis_dwidth_converter.yaml +++ b/topwrap/ips/axi/axis_dwidth_converter.yaml @@ -1,7 +1,7 @@ # Copyright (c) 2021-2024 Antmicro # SPDX-License-Identifier: Apache-2.0 -name: dwidth_converter +name: axis_dwidth_converter parameters: IN_DATA_WIDTH: 64 diff --git a/topwrap/yamls_to_kpm_spec_parser.py b/topwrap/yamls_to_kpm_spec_parser.py index b9df02e5..02f11fdf 100644 --- a/topwrap/yamls_to_kpm_spec_parser.py +++ b/topwrap/yamls_to_kpm_spec_parser.py @@ -3,7 +3,7 @@ import logging from dataclasses import dataclass -from pathlib import Path, PurePath +from pathlib import Path from typing import Dict, List, Optional from pipeline_manager.specification_builder import SpecificationBuilder @@ -179,7 +179,7 @@ def create_core_node_from_yaml(yamlfile: Path) -> NodeType: """Returns single KPM specification 'node' representing given IP core description YAML file""" ip_yaml = IPCoreDescription.load(Path(yamlfile)) - ip_name = PurePath(yamlfile).stem + ip_name = ip_yaml.name ip_props = _ipcore_params_to_prop_type(ip_yaml.parameters) ip_ports = _ipcore_ports_to_iface_type(ip_yaml.signals) ip_ifaces = _ipcore_ifaces_to_iface_type(ip_yaml.interfaces) @@ -306,11 +306,6 @@ def new_spec_builder(yamlfiles: List[Path]) -> JsonType: add_metadata_to_specification(specification_builder, interfaces_types) - # TODO: Switch to using SpecificationBuilder.create_and_validate_spec() once the library is fixed. - # specification = specification_builder.create_and_validate_spec( - # workspacedir=Path("../../build/workspace") - # ) - return specification_builder._construct_specification(sort_spec=False)