Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update version to 1.3.0 for release #327

Merged
merged 1 commit into from
Dec 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bazel/example/WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
antoninbas marked this conversation as resolved.
Show resolved Hide resolved
# # sha256 = "<insert hash value here>",
# )

Expand All @@ -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")
Expand Down
8 changes: 5 additions & 3 deletions docs/v1/P4Runtime-Spec.mdk
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions docs/v1/guidance-for-generating-p4info.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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<W>`
+ an `enum` with an underlying type of `bit<W>`, 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`
Expand Down Expand Up @@ -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<W>`, 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.
Expand All @@ -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<W>` or `enum bit<W>`, 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.


Expand Down