Stop using file name as the IP Core name in spec and dataflow builders

antmicro · Oct 15, 2024 · ea5fd0e · ea5fd0e
1 parent fb66f8c
commit ea5fd0e
Show file tree

Hide file tree

Showing 21 changed files with 1,469 additions and 1,400 deletions.
diff --git 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
@@ -1,7 +1,7 @@
 # Copyright (c) 2021-2024 Antmicro <www.antmicro.com>
 # 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
@@ -1,7 +1,7 @@
 # Copyright (c) 2021-2024 Antmicro <www.antmicro.com>
 # 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
@@ -1,7 +1,7 @@
 # Copyright (c) 2021-2024 Antmicro <www.antmicro.com>
 # 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
@@ -1,7 +1,7 @@
 # Copyright (c) 2021-2024 Antmicro <www.antmicro.com>
 # 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
@@ -1,7 +1,7 @@
 # Copyright (c) 2021-2024 Antmicro <www.antmicro.com>
 # 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
@@ -1,7 +1,7 @@
 # Copyright (c) 2021-2024 Antmicro <www.antmicro.com>
 # 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
@@ -1,7 +1,7 @@
 # Copyright (c) 2021-2024 Antmicro <www.antmicro.com>
 # 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
@@ -1,7 +1,7 @@
 # Copyright (c) 2021-2024 Antmicro <www.antmicro.com>
 # 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
@@ -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
@@ -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,39 +121,39 @@
       "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"
           ]
         },
         {
           "direction": "input",
           "maxConnectionsCount": -1,
-          "name": "c_int_const_in",
+          "name": "c_int_in_2",
           "type": [
             "port"
           ]
         },
         {
           "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,21 +303,21 @@
         {
           "direction": "input",
           "maxConnectionsCount": -1,
-          "name": "cs_s2_mint_in_2",
+          "name": "cs_s2_mint_in_1",
           "type": [
             "port"
           ]
         },
         {
           "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"
     }
   ]