Update the dash-pipeline programs. (p4lang#4060)

* Update the dash-pipeline programs. * Temporarily patch pna code. * Reference files. * Refresh the programs again and update the README.
jafingerhut · Oct 3, 2023 · 44bf90f · 44bf90f
1 parent d785e24
commit 44bf90f
Show file tree

Hide file tree

Showing 19 changed files with 10,918 additions and 1,805 deletions.
diff --git a/backends/bmv2/CMakeLists.txt b/backends/bmv2/CMakeLists.txt
@@ -130,7 +130,7 @@ p4c_find_tests("${P4TESTS_FOR_V1MODEL}" v1tests INCLUDE "${V1_INCLUDE_PATTERNS}"
 
 set (BMV2_V1MODEL_TEST_SUITES
   "${P4C_SOURCE_DIR}/testdata/p4_16_bmv_errors/*-bmv2.p4"
-  "${P4C_SOURCE_DIR}/testdata/p4_16_samples/dash/*.p4"
+  "${P4C_SOURCE_DIR}/testdata/p4_16_samples/dash/*-bmv2.p4"
   "${P4C_SOURCE_DIR}/testdata/p4_16_samples/fabric_*/fabric.p4"
   "${P4C_SOURCE_DIR}/testdata/p4_16_samples/omec/*.p4"
   "${P4C_SOURCE_DIR}/testdata/p4_16_samples/pins/*.p4"

diff --git a/..._16_samples_outputs/dash/dash-pipeline.p4 → dash-pipeline-bmv2.p4 b/..._16_samples_outputs/dash/dash-pipeline.p4 → dash-pipeline-bmv2.p4
diff --git a/testdata/p4_16_samples/dash/README.md b/testdata/p4_16_samples/dash/README.md
@@ -2,3 +2,13 @@
 The Disaggregated API for SONiC Hosts (DASH) defines a behavioral model for conformance testing of network devices. The P4 programs contained here model various network architecture scenarios related to the DASH project.
 
 They are sourced from https://github.com/sonic-net/DASH. For more information, please see https://github.com/sonic-net/DASH/blob/main/documentation/general/dash-high-level-design.md.
+
+To refresh the DASH programs used here, please use the following commands:
+
+```
+git clone https://github.com/sonic-net/DASH
+# V1Model version
+p4test DASH/dash-pipeline/bmv2/dash_pipeline.p4  -DTARGET_BMV2_V1MODEL --pp dash-pipeline-v1model-bmv2.p4
+# PNA Version
+p4test DASH/dash-pipeline/bmv2/dash_pipeline.p4  -DTARGET_DPDK_PNA --pp dash-pipeline-pna-dpdk.p4
+```