From bd19174b0f8a99dd0ea39a185dae311e5f8b3606 Mon Sep 17 00:00:00 2001 From: Antonin Bas Date: Fri, 20 Nov 2020 15:55:22 -0800 Subject: [PATCH] Update version to 1.3.0 for release --- bazel/example/WORKSPACE.bazel | 6 +++--- docs/v1/P4Runtime-Spec.mdk | 8 +++++--- docs/v1/guidance-for-generating-p4info.md | 10 +++++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/bazel/example/WORKSPACE.bazel b/bazel/example/WORKSPACE.bazel index a15e9e14..011a48d2 100644 --- a/bazel/example/WORKSPACE.bazel +++ b/bazel/example/WORKSPACE.bazel @@ -11,8 +11,8 @@ local_repository( # http_archive( # name = "com_github_p4lang_p4runtime", -# urls = ["https://github.com/p4lang/p4runtime/archive/v1.2.0.tar.gz"], -# strip_prefix = "p4runtime-1.2.0/proto", +# urls = ["https://github.com/p4lang/p4runtime/archive/v1.3.0.tar.gz"], +# strip_prefix = "p4runtime-1.3.0/proto", # # sha256 = "", # ) @@ -21,7 +21,7 @@ local_repository( # remote = "https://github.com/p4lang/p4runtime.git", # # strip_prefix = "proto", # https://github.com/bazelbuild/bazel/issues/10062 # patch_cmds = ["mv proto/* ."], # Workaround since strip_prefix is broken. -# tag = "v1.2", +# tag = "v1.3.0", # ) load("@com_github_p4lang_p4runtime//:p4runtime_deps.bzl", "p4runtime_deps") diff --git a/docs/v1/P4Runtime-Spec.mdk b/docs/v1/P4Runtime-Spec.mdk index c187f9e6..ce3142a0 100755 --- a/docs/v1/P4Runtime-Spec.mdk +++ b/docs/v1/P4Runtime-Spec.mdk @@ -1,5 +1,5 @@ Title : P4Runtime Specification -Title Note: version 1.2.0 +Title Note: version 1.3.0 Title Footer: &date; Author: The P4.org API Working Group Heading depth: 5 @@ -223,7 +223,7 @@ protocol-independent runtime APIs for P4-defined or P4-described data planes. This document specifies one such API, called *P4Runtime*. It is meant to disambiguate and augment the programmatic API definition expressed in Protobuf format and available at -[https://github.com/p4lang/p4runtime/tree/v1.2.0/proto](https://github.com/p4lang/p4runtime/tree/v1.2.0/proto). +[https://github.com/p4lang/p4runtime/tree/v1.3.0/proto](https://github.com/p4lang/p4runtime/tree/v1.3.0/proto). ## P4 Language Version Applicability @@ -1240,7 +1240,7 @@ processing, as it allows tools to point out the precise source of errors for invalid annotations. The `SourceLocation` message associated with an annotation holds the location of -the `@` symbol introducing the annotation in the P4 source code; the message can +the `@` symbol introducing the annotation in the P4 source code; the message can be found in the following place: * For **unstructured annotations**, every message containing a field @@ -6103,6 +6103,8 @@ properties, but we may include on in future versions of the API. using the watch port feature with the `p4runtime_translation` feature. * Replace master, slave, master arbitration with more inclusive language: primary, backup, and client arbitration +* Clarify that source locations for annotations are optional in the P4Info + message. ### Changes in v1.2.0 diff --git a/docs/v1/guidance-for-generating-p4info.md b/docs/v1/guidance-for-generating-p4info.md index 54262426..e1eb93ec 100644 --- a/docs/v1/guidance-for-generating-p4info.md +++ b/docs/v1/guidance-for-generating-p4info.md @@ -38,7 +38,7 @@ representing the name of the library, its major version, etc. ## Handling P4_16 `type` and the `p4runtime_translation` annotation -The P4Runtime v1.2 specification restricts the types that it supports +The P4Runtime v1.3 specification restricts the types that it supports for the following kinds of things: + table search key fields, defined in the P4Info message in a @@ -54,13 +54,13 @@ for the following kinds of things: Later in this section, we will use the term "constrained value" for brevity, instead of repeating all of the kinds of objects listed -above. For such values, the P4Runtime specification v1.2 supports all +above. For such values, the P4Runtime specification v1.3 supports all of the following types, but currently no others: + `bit` + an `enum` with an underlying type of `bit`, also called a serializable `enum` (TBD whether all of the pieces needed to make - this work are actually supported for P4Runtime 1.2) + this work are actually supported for P4Runtime 1.3) + a `typedef` or `type` name that, when "followed back" to the lowest base type, is one of the above. (As of the P4_16 language specification version 1.2.1, it is not required to support a `type` @@ -100,7 +100,7 @@ type_list(x) { Note that `type_list(x)` always starts with zero or more `type` names, and always ends with one type that is neither a `type` nor `typedef` name, e.g. `bit`, a header type, struct type, etc. It never -contains the name of a type declared using `typedef`. P4Runtime v1.2 +contains the name of a type declared using `typedef`. P4Runtime v1.3 only supports `p4runtime_translation` annotations on `type` definitions. If any such annotations occur on a `typedef` definition, they should be ignored. @@ -111,7 +111,7 @@ of type names. In order to create such a cycle, the first `type` or type name, and this is not allowed. If the last type is not `bit` or `enum bit`, that is an error -for P4Runtime v1.2. The "base" type must always be one of those for +for P4Runtime v1.3. The "base" type must always be one of those for every constrained value.