Update KPM client to handle new KPM version

- bumped KPM and KPM-backend-communication versions - changed KPM communication backend to asynchronous and implemented missing request handlers - adjusted generating KPM specification to the new format - adjusted parsing KPM dataflow to the new format - updated tests data to be in the new format - changed export code to send back the generated YAML to the frontend instead of saving it manually in backend Internal-tag: [#53247] Signed-off-by: Robert Winkler <[email protected]> Signed-off-by: Krzysztof Obłonczek <[email protected]>
antmicro · Mar 1, 2024 · 9ce31ad · 9ce31ad
1 parent da55b3b
commit 9ce31ad
Show file tree

Hide file tree

Showing 25 changed files with 1,762 additions and 1,743 deletions.
diff --git a/.ci.yml b/.ci.yml
@@ -47,12 +47,6 @@ pytest:
     paths:
       - cov_html
 
-docs-verify:
-  stage: test
-  tags: ['ace-x86_64']
-  script:
-    - eval ${VERIFY_SCRIPT}
-
 docs-build:
   image: $CI_DOCS_DOCKER_IMAGE
   stage: build
@@ -81,3 +75,8 @@ docs-deploy:
   artifacts:
     paths:
       - $CI_DOCS_ARCHIVE
+
+include:
+  - project: 'repositories/topwrap'
+    ref: internal_ci_yaml
+    file: '/internal.yml'
diff --git a/pyproject.toml b/pyproject.toml
@@ -22,8 +22,8 @@ dependencies = [
   "click",
   "amaranth==0.4.0.*",
   "numexpr",
-  "pipeline_manager_backend_communication @ git+https://github.com/antmicro/kenning-pipeline-manager-backend-communication@06b38824500d8239432e614bfa655d8e50b197cf",
-  "pipeline_manager @ git+https://github.com/antmicro/kenning-pipeline-manager@686c4592c4e816a72116107abaf8a55dec0ed5a1",
+  "pipeline_manager_backend_communication @ git+https://github.com/antmicro/kenning-pipeline-manager-backend-communication@eb690cfb7766bfbd85a4eff2a1e809573b8b72d0",
+  "pipeline_manager @ git+https://github.com/antmicro/kenning-pipeline-manager@f00e45573bb91ff5ac8760b1c4b73e8ff67085a0",
   "soc_generator @ git+https://github.com/antmicro/soc-generator@76ac5b3743bea1bb6e5d2ac7ecae31ab39d5e8b3"
 ]
 

diff --git a/tests/data/data_kpm/dataflow_ambigous_ports.json b/tests/data/data_kpm/dataflow_ambigous_ports.json
@@ -3,7 +3,6 @@
         "id": "169383254977833",
         "nodes": [
             {
-                "type": "ps7",
                 "id": "8863c553-29cb-452d-8ae1-4c62089947a9",
                 "position": {
                     "x": -1260,
@@ -50,10 +49,10 @@
                 ],
                 "properties": [],
                 "enabledInterfaceGroups": [],
+                "instanceName": "ps7",
                 "name": "ps7"
             },
             {
-                "type": "External Output",
                 "id": "d8594cde-ae77-4e02-9cfa-d58a2cc77015",
                 "position": {
                     "x": -720,
@@ -78,6 +77,7 @@
                     }
                 ],
                 "enabledInterfaceGroups": [],
+                "instanceName": "External Output",
                 "name": "External Output"
             }
         ],
@@ -99,8 +99,8 @@
         },
         "scaling": 0.7543196738637923
     },
-    "graphTemplateInstances": [],
-    "version": "20230824.9",
+    "subgraphs": [],
+    "version": "20230830.11",
     "metadata": {
         "randomizedOffset": true
     }

diff --git a/tests/data/data_kpm/dataflow_duplicate_ext_input_ifaces.json b/tests/data/data_kpm/dataflow_duplicate_ext_input_ifaces.json
@@ -3,7 +3,6 @@
         "id": "169383254977833",
         "nodes": [
             {
-                "type": "axi_axil_adapter",
                 "id": "103e88ba-56b6-4c30-bdd1-f0a3a4be5b24",
                 "position": {
                     "x": -900,
@@ -74,10 +73,10 @@
                     }
                 ],
                 "enabledInterfaceGroups": [],
-                "name": "axi_axil_adapter_1"
+                "instanceName": "axi_axil_adapter_1",
+                "name": "axi_axil_adapter"
             },
             {
-                "type": "axi_axil_adapter",
                 "id": "33794eef-49eb-4eb5-bf8d-c258f6f830ff",
                 "position": {
                     "x": -915,
@@ -148,10 +147,10 @@
                     }
                 ],
                 "enabledInterfaceGroups": [],
-                "name": "axi_axil_adapter_2"
+                "instanceName": "axi_axil_adapter_2",
+                "name": "axi_axil_adapter"
             },
             {
-                "type": "External Input",
                 "id": "78a9d846-6c7c-4471-9b9b-c1ef91cdb2ad",
                 "position": {
                     "x": -1470,
@@ -176,10 +175,10 @@
                     }
                 ],
                 "enabledInterfaceGroups": [],
+                "instanceName": "External Input",
                 "name": "External Input"
             },
             {
-                "type": "External Input",
                 "id": "5358601a-962e-4097-9030-ac9f587e5f09",
                 "position": {
                     "x": -1485,
@@ -204,6 +203,7 @@
                     }
                 ],
                 "enabledInterfaceGroups": [],
+                "instanceName": "External Input",
                 "name": "External Input"
             }
         ],
@@ -225,8 +225,8 @@
         },
         "scaling": 0.5952100070290618
     },
-    "graphTemplateInstances": [],
-    "version": "20230824.9",
+    "subgraphs": [],
+    "version": "20230830.11",
     "metadata": {
         "randomizedOffset": true
     }

diff --git a/tests/data/data_kpm/dataflow_duplicate_ext_out_ports.json b/tests/data/data_kpm/dataflow_duplicate_ext_out_ports.json
@@ -3,7 +3,6 @@
         "id": "169383254977833",
         "nodes": [
             {
-                "type": "litex_pwm",
                 "id": "d28313da-8c30-4ede-9e28-99ee34ab8a5d",
                 "position": {
                     "x": -1410,
@@ -43,10 +42,10 @@
                 ],
                 "properties": [],
                 "enabledInterfaceGroups": [],
+                "instanceName": "litex_pwm",
                 "name": "litex_pwm"
             },
             {
-                "type": "litex_pwm",
                 "id": "a45f5d03-11c4-41fc-b7bb-84245b032f4a",
                 "position": {
                     "x": -1425,
@@ -86,10 +85,10 @@
                 ],
                 "properties": [],
                 "enabledInterfaceGroups": [],
-                "name": "litex_pwm_1"
+                "instanceName": "litex_pwm_1",
+                "name": "litex_pwm"
             },
             {
-                "type": "External Output",
                 "id": "5d9602e1-4f16-4b94-9d28-48c5e1e15faf",
                 "position": {
                     "x": -885,
@@ -114,10 +113,10 @@
                     }
                 ],
                 "enabledInterfaceGroups": [],
+                "instanceName": "External Output",
                 "name": "External Output"
             },
             {
-                "type": "External Output",
                 "id": "0fab6d5b-f955-4d61-9c7a-fbecc8945854",
                 "position": {
                     "x": -840,
@@ -142,6 +141,7 @@
                     }
                 ],
                 "enabledInterfaceGroups": [],
+                "instanceName": "External Output",
                 "name": "External Output"
             }
         ],
@@ -163,8 +163,8 @@
         },
         "scaling": 0.5952100070290618
     },
-    "graphTemplateInstances": [],
-    "version": "20230824.9",
+    "subgraphs": [],
+    "version": "20230830.11",
     "metadata": {
         "randomizedOffset": true
     }

diff --git a/tests/data/data_kpm/dataflow_duplicate_ips.json b/tests/data/data_kpm/dataflow_duplicate_ips.json
@@ -3,7 +3,6 @@
         "id": "169383254977833",
         "nodes": [
             {
-                "type": "ps7",
                 "id": "352acf91-83d7-4f5b-a0ec-a16c27b3e78c",
                 "position": {
                     "x": -1275,
@@ -50,10 +49,10 @@
                 ],
                 "properties": [],
                 "enabledInterfaceGroups": [],
+                "instanceName": "ps7",
                 "name": "ps7"
             },
             {
-                "type": "ps7",
                 "id": "0d73a381-73bb-4189-8a5a-c24e6ba3889e",
                 "position": {
                     "x": -1275,
@@ -100,6 +99,7 @@
                 ],
                 "properties": [],
                 "enabledInterfaceGroups": [],
+                "instanceName": "ps7",
                 "name": "ps7"
             }
         ],
@@ -110,8 +110,8 @@
         },
         "scaling": 0.5952100070290618
     },
-    "graphTemplateInstances": [],
-    "version": "20230824.9",
+    "subgraphs": [],
+    "version": "20230830.11",
     "metadata": {
         "randomizedOffset": true
     }

diff --git a/tests/data/data_kpm/dataflow_external_metanodes_mismatch.json b/tests/data/data_kpm/dataflow_external_metanodes_mismatch.json
@@ -3,7 +3,6 @@
         "id": "169383254977833",
         "nodes": [
             {
-                "type": "litex_pwm",
                 "id": "0c7c9066-3c9f-471e-b1b3-9317b671d025",
                 "position": {
                     "x": -1110,
@@ -43,10 +42,10 @@
                 ],
                 "properties": [],
                 "enabledInterfaceGroups": [],
+                "instanceName": "litex_pwm",
                 "name": "litex_pwm"
             },
             {
-                "type": "External Inout",
                 "id": "4179b3ec-159d-4906-8bed-74e4b6f60bcd",
                 "position": {
                     "x": -615,
@@ -71,6 +70,7 @@
                     }
                 ],
                 "enabledInterfaceGroups": [],
+                "instanceName": "External Inout",
                 "name": "External Inout"
             }
         ],
@@ -87,8 +87,8 @@
         },
         "scaling": 0.5952100070290618
     },
-    "graphTemplateInstances": [],
-    "version": "20230824.9",
+    "subgraphs": [],
+    "version": "20230830.11",
     "metadata": {
         "randomizedOffset": true
     }

diff --git a/tests/data/data_kpm/dataflow_inouts_connections.json b/tests/data/data_kpm/dataflow_inouts_connections.json
@@ -3,7 +3,6 @@
         "id": "a868145c-165b-43df-96ae-f67a027cc67a",
         "nodes": [
             {
-                "type": "gen_iobuf",
                 "id": "a3f4d70b-21e9-4c01-a4d8-9a2556c06282",
                 "position": {
                     "x": -660,
@@ -50,10 +49,10 @@
                     }
                 ],
                 "properties": [],
-                "name": "gen_iobuf_1"
+                "instanceName": "gen_iobuf_1",
+                "name": "gen_iobuf"
             },
             {
-                "type": "gen_iobuf",
                 "id": "0d52d66f-0a1f-4100-b168-57f336473600",
                 "position": {
                     "x": -660,
@@ -100,7 +99,8 @@
                     }
                 ],
                 "properties": [],
-                "name": "gen_iobuf_2"
+                "instanceName": "gen_iobuf_2",
+                "name": "gen_iobuf"
             }
         ],
         "connections": [
@@ -116,6 +116,6 @@
         },
         "scaling": 1
     },
-    "graphTemplateInstances": [],
-    "version": "20230619.3"
+    "subgraphs": [],
+    "version": "20230830.11"
 }
diff --git a/tests/data/data_kpm/dataflow_invalid_params.json b/tests/data/data_kpm/dataflow_invalid_params.json
@@ -3,7 +3,6 @@
         "id": "169383254977833",
         "nodes": [
             {
-                "type": "axi_axil_adapter",
                 "id": "a322afe0-c7b7-4f81-9002-9229bba14d0d",
                 "position": {
                     "x": -1155,
@@ -74,6 +73,7 @@
                     }
                 ],
                 "enabledInterfaceGroups": [],
+                "instanceName": "axi_axil_adapter",
                 "name": "axi_axil_adapter"
             }
         ],
@@ -84,8 +84,8 @@
         },
         "scaling": 0.5952100070290618
     },
-    "graphTemplateInstances": [],
-    "version": "20230824.9",
+    "subgraphs": [],
+    "version": "20230830.11",
     "metadata": {
         "randomizedOffset": true
     }

diff --git a/tests/data/data_kpm/dataflow_meta_to_meta_conn.json b/tests/data/data_kpm/dataflow_meta_to_meta_conn.json
@@ -3,7 +3,6 @@
         "id": "169383254977833",
         "nodes": [
             {
-                "type": "External Inout",
                 "id": "6c96482c-fc3e-43bb-a6d7-23e232dc804f",
                 "position": {
                     "x": -855,
@@ -28,10 +27,10 @@
                     }
                 ],
                 "enabledInterfaceGroups": [],
+                "instanceName": "External Inout",
                 "name": "External Inout"
             },
             {
-                "type": "External Input",
                 "id": "35ef04e1-eddd-4ff7-90d4-644d003d37d6",
                 "position": {
                     "x": -1320,
@@ -56,6 +55,7 @@
                     }
                 ],
                 "enabledInterfaceGroups": [],
+                "instanceName": "External Input",
                 "name": "External Input"
             }
         ],
@@ -72,8 +72,8 @@
         },
         "scaling": 0.5952100070290618
     },
-    "graphTemplateInstances": [],
-    "version": "20230824.9",
+    "subgraphs": [],
+    "version": "20230830.11",
     "metadata": {
         "randomizedOffset": true
     }