From cf48c233d387b162b3585d23ff531f7a2ba58f23 Mon Sep 17 00:00:00 2001
From: Andy Fingerhut <andy_fingerhut@alum.wustl.edu>
Date: Sat, 1 Jul 2023 07:06:05 -0400
Subject: [PATCH] Update commits to 2023 jul 01 (#519)

* Support negative-valued action parameters
by converting them in the Python helper code into a positive value
whose bit pattern is the 2's complement representation of the negative
value.

* Update commit SHAs of `vagrant up dev` to latest as of 2023-Jul-01

* Update vm-ubuntu-20.04/README.md for 2023-Jul-01
---
 vm-ubuntu-20.04/README.md             | 26 +++++++++-----------------
 vm-ubuntu-20.04/user-dev-bootstrap.sh |  8 ++++----
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/vm-ubuntu-20.04/README.md b/vm-ubuntu-20.04/README.md
index 7a3185b..556a7b8 100644
--- a/vm-ubuntu-20.04/README.md
+++ b/vm-ubuntu-20.04/README.md
@@ -105,16 +105,8 @@ cd build
 make -j2 check |& tee make-check-out.txt
 ```
 
-As of 2022-04-02, the p4c compiler passes all but 64 of its included
-tests.
-
-The relatively small group of tests whose names begin with 'ebpf' and
-'ubpf' fail.  They work fine in the continuous integration tests on
-the https://github.com/p4lang/p4c project, because the VM used to run
-those tests has additional software installed to enable it.  Perhaps
-future versions of this VM will enable the ebpf and ubpf back ends to
-pass these tests, also.  Contributions are welcome to the needed
-changes in the VM build scripts to enable this.
+As of 2023-07-01, the p4c compiler passes all of its included tests,
+except for some of the p4testgen tests (if those are enabled).
 
 
 ## Send ping packets in the solution to `basic` exercise of `p4lang/tutorials` repository
@@ -153,8 +145,8 @@ them again.
 
 For the particular case of creating the VM named:
 
-+ 'P4 Tutorial Development 2022-04-02'
-+ created on April 2, 2022
++ 'P4 Tutorial Development 2023-07-01'
++ created on July 1, 2023
 
 here were the host OS details, in case it turns out that matters to
 the finished VM image for some reason:
@@ -166,7 +158,7 @@ the finished VM image for some reason:
 In the VirtualBox GUI interface:
 
 + Choose menu item File -> Export Appliance ...
-+ Select the VM named 'P4 Tutorial Development 2022-04-02' and click
++ Select the VM named 'P4 Tutorial Development 2023-07-01' and click
   Continue button
 
 + Format
@@ -175,7 +167,7 @@ In the VirtualBox GUI interface:
     + Open Virtualization Format 0.9
     + Open Virtualization Format 2.0
 + Target file
-  + I used: /Users/andy/Documents/P4 Tutorials Development 2022-04-02.ova
+  + I used: /Users/andy/Documents/P4 Tutorials Development 2023-07-01.ova
 + Mac Address Policy
   + I used: Include only NAT network adapter MAC addresses
   + Other available options were:
@@ -189,16 +181,16 @@ Clicked "Continue" button.
 
 Virtual system settings:
 
-+ Name: P4 Tutorial 2022-04-02
++ Name: P4 Tutorial 2023-07-01
 + Product: I left this blank
 + Product-URL: I left this blank
 + Vendor: P4.org - P4 Language Consortium
 + Vendor-URL: https://p4.org
-+ Version: 2022-04-02
++ Version: 2023-07-01
 + Description:
 
 ```
-Open source P4 development tools built from latest source code as of 2022-Apr-02 and packaged into an Ubuntu 20.04 Desktop Linux VM for the AMD64 architecture.
+Open source P4 development tools built from latest source code as of 2023-Jul-01 and packaged into an Ubuntu 20.04 Desktop Linux VM for the AMD64 architecture.
 ```
 
 + License
diff --git a/vm-ubuntu-20.04/user-dev-bootstrap.sh b/vm-ubuntu-20.04/user-dev-bootstrap.sh
index 209d13d..8e83ef4 100755
--- a/vm-ubuntu-20.04/user-dev-bootstrap.sh
+++ b/vm-ubuntu-20.04/user-dev-bootstrap.sh
@@ -4,10 +4,10 @@
 set -xe
 
 #Src
-BMV2_COMMIT="1c44f6d79c4d99e9c68789973b5ea08a1580ae7d"  # 2023-Jun-24
-PI_COMMIT="25e218b1b91cb083d51039118c9df469b842e8f9"    # 2023-Jun-24
-P4C_COMMIT="0d3dcd626ddbfdf1f5618ff84ecb1e34346c7134"   # 2023-Jun-24
-PTF_COMMIT="d2e2d8ad005a451ad11f9d21af50079a0552921a"   # 2023-Jun-24
+BMV2_COMMIT="6ee70b5eff7f510b32c074aaa4f00358f594fecb"  # 2023-Jul-01
+PI_COMMIT="f043e6f5f4271076ad7e58aa9889c82dbfc8c3ca"    # 2023-Jul-01
+P4C_COMMIT="c7a503d5b6f5711cf61e7e2878eaa670fd90c71d"   # 2023-Jul-01
+PTF_COMMIT="d2e2d8ad005a451ad11f9d21af50079a0552921a"   # 2023-Jul-01
 PROTOBUF_COMMIT="v3.18.1"
 GRPC_COMMIT="tags/v1.43.2"