Bumped supported revisions of P4 tools
Includes:
- Use new P4Runtime "v1" package names
- Removed VALID match
- New table entry priority spec (1 is min priority, not 0)
- Fixed p4c-bm2-ss to include arch flag
- Re-compiled P4 programs with more recent p4c (with updated p4info)
Change-Id: I05908f40eda0f0c755009268fd261fb8bcc9be35
diff --git a/pipelines/fabric/src/main/resources/Makefile b/pipelines/fabric/src/main/resources/Makefile
index 1873071..c3016f8 100644
--- a/pipelines/fabric/src/main/resources/Makefile
+++ b/pipelines/fabric/src/main/resources/Makefile
@@ -4,19 +4,20 @@
all: bmv2 bmv2-spgw
-bmv2:
- p4c -v -x p4-16 -b bmv2-v1model \
- $(BMV2_OPTIONS) -o p4c-out/bmv2 \
- --p4runtime-file p4c-out/bmv2/fabric.p4info \
- --p4runtime-format text fabric.p4
- mv p4c-out/bmv2/fabric.p4rt p4c-out/bmv2/fabric.p4info
- rm -f p4c-out/bmv2/fabric.p4i
+bmv2: makedir
+ p4c-bm2-ss --arch v1model -o p4c-out/bmv2/fabric.json \
+ $(BMV2_OPTIONS) \
+ --p4runtime-file p4c-out/bmv2/fabric.p4info \
+ --p4runtime-format text fabric.p4
-bmv2-spgw:
- p4c-bm2-ss -o p4c-out/bmv2/fabric-spgw.json \
- $(BMV2_OPTIONS) -DWITH_SPGW \
- --p4runtime-file p4c-out/bmv2/fabric-spgw.p4info \
- --p4runtime-format text fabric.p4
+bmv2-spgw: makedir
+ p4c-bm2-ss --arch v1model -o p4c-out/bmv2/fabric-spgw.json \
+ $(BMV2_OPTIONS) -DWITH_SPGW \
+ --p4runtime-file p4c-out/bmv2/fabric-spgw.p4info \
+ --p4runtime-format text fabric.p4
+
+makedir:
+ mkdir -p p4c-out/bmv2
clean:
- rm -rf p4c-out/*
+ rm -rf p4c-out/bmv2/*