Merge branch 'main' into feature/formatting-only-option

Author: Vineet1101

backends/p4tools/modules/testgen/targets/bmv2/test/BMV2PTFXfail.cmake

@@ -204,7 +204,6 @@ p4tools_add_xfail_reason(
 p4tools_add_xfail_reason(
   "testgen-p4c-bmv2-ptf"
   "BMv2 target only supports headers with fields totaling a multiple of 8 bits"
-  custom-type-restricted-fields.p4
   issue3225.p4
 )
 

backends/p4tools/modules/testgen/targets/bmv2/test/BMV2STFXfail.cmake

@@ -188,7 +188,6 @@ p4tools_add_xfail_reason(
 p4tools_add_xfail_reason(
   "testgen-p4c-bmv2-stf"
   "BMv2 target only supports headers with fields totaling a multiple of 8 bits"
-  custom-type-restricted-fields.p4
   issue3225.p4
 )
 

backends/tc/runtime/cleanup

@@ -21,9 +21,9 @@ if ! [ -f "$RUNTIME_DIR/setup" ]; then
     exit 1
 fi
 
-rm -rf $EXTRACT_DIR
-rm -f $RUNTIME_DIR/id_rsa
-rm -f $RUNTIME_DIR/id_rsa.pub
+rm -rf "$EXTRACT_DIR"
+rm -f "$RUNTIME_DIR/id_rsa"
+rm -f "$RUNTIME_DIR/id_rsa.pub"
 rm -f linux-image-*.deb
 
 deluser ci --remove-home

backends/tofino/bf-asm/bflink

@@ -164,18 +164,18 @@ if [ -z "$output_dir" ]; then
     output_dir="./"
 fi
 if ! $debug_info; then
-    rm -f $object_files
+    rm -f "$object_files"
 fi
 if [ ! -z "$base_program" ] ; then
     pp=$output_dir/${base_program}.p4i
-    if ! $debug_info && test -e $pp ; then rm -f $pp; fi
+    if ! $debug_info && test -e "$pp" ; then rm -f "$pp"; fi
 fi
-if ! $debug_info && test -e $output_dir/bfas.config.log ; then
-    rm -f $output_dir/bfas.config.log
+if ! $debug_info && test -e "$output_dir/bfas.config.log" ; then
+    rm -f "$output_dir/bfas.config.log"
 fi
 # if we uncompressed, remove the directory
 if [ -d "$tmpdir" ]; then
-    rm -rf $tmpdir
+    rm -rf "$tmpdir"
 fi
 
 # exit with a return code if walle failed

backends/tofino/bootstrap_bfn_env.sh

@@ -36,7 +36,7 @@ while [ $# -gt 0 ]; do
 done
 
 installdir="$topdir/install"
-rm -rf $installdir
+rm -rf "$installdir"
 mkdir -p $installdir
 
 if [ $skip_os_deps = false ]; then
@@ -69,7 +69,7 @@ gitclone() {
     if [ ! -z $3 ]; then branch=$3; fi
     [ -e "$2" ] && die "$2 already exists!"
     [ ! -d "$(dirname $2)" ] && die "$(dirname $2) not a directory"
-    git clone --recursive -b $branch $1 $2 || { rm -rf $2; die "can't clone $1"; }
+    git clone --recursive -b $branch $1 $2 || { rm -rf "$2"; die "can't clone $1"; }
 }
 
 echo "Using $topdir as top level directory for git repositories"
@@ -388,7 +388,7 @@ cd ..
 $SUDO rm -rf ptf
 popd # tmpdir
 echo "Removing $tmpdir"
-rm -rf $tmpdir
+rm -rf "$tmpdir"
 
 if [ $(uname -s) == 'Linux' ]; then
     echo "Checking for huge pages"

backends/tofino/scripts/install_boost_static.sh

@@ -59,7 +59,7 @@ function install_boost() {
             $SUDO ./b2 install --build-type=minimal variant=release \
                   link=${boost_lib_type} runtime-link=${boost_lib_type} || \
             die "failed to install boost"
-        cd /tmp && rm -rf boost_${boost_ver}
+        cd /tmp && rm -rf "boost_${boost_ver}"
     fi
 }
 

backends/tofino/scripts/p4c_build_for_arch.sh

@@ -33,7 +33,7 @@ chmod 755 bootstrap.${arch}.sh
 cd $WORKSPACE/bf-p4c-compilers/
 ./bootstrap.${arch}.sh  --prefix $install_dir --exec-prefix=$install_dir/$arch
 
-rm -f ./bootstrap.${arch}.sh p4c/bootstrap.${arch}.sh
+rm -f "./bootstrap.${arch}.sh" "p4c/bootstrap.${arch}.sh"
 
 cd ${build_dir}
 make -j $parallel_make install

testdata/p4_16_samples/custom-type-restricted-fields.p4

@@ -38,7 +38,7 @@ header ethernet_t {
 header packet_out_t {
   bit<9> egress_port; /* suggested port where the packet
                          should be sent */
-  bit<8> queue_id;    /* suggested queue ID */
+  bit<7> queue_id;    /* suggested queue ID */
   EthernetAddr_t not_actually_useful;
 }
 

testdata/p4_16_samples_outputs/custom-type-restricted-fields-first.p4

@@ -13,7 +13,7 @@ header ethernet_t {
 
 @controller_header("packet_out") header packet_out_t {
     bit<9>         egress_port;
-    bit<8>         queue_id;
+    bit<7>         queue_id;
     EthernetAddr_t not_actually_useful;
 }
 

testdata/p4_16_samples_outputs/custom-type-restricted-fields-frontend.p4

@@ -13,7 +13,7 @@ header ethernet_t {
 
 @controller_header("packet_out") header packet_out_t {
     bit<9>         egress_port;
-    bit<8>         queue_id;
+    bit<7>         queue_id;
     EthernetAddr_t not_actually_useful;
 }