Skip to content

Commit

Permalink
Final changes for 1.4.1 release, including version updates. (#507)
Browse files Browse the repository at this point in the history
I used #327 as an example, and followed the instructions mentioned in #327.

Signed-off-by: smolkaj <[email protected]>
  • Loading branch information
smolkaj authored Oct 21, 2024
1 parent fe85996 commit 36e8b46
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 32 deletions.
18 changes: 4 additions & 14 deletions bazel/example/WORKSPACE.bazel
Original file line number Diff line number Diff line change
@@ -1,29 +1,19 @@
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

# In your own project, you will likely want to use `http_archive` instead
# of `local_repository` to load p4runtime.
local_repository(
name = "com_github_p4lang_p4runtime",
path = "../../proto",
)

# In your own project, you will likely want to use `http_archive` or
# `git_repository` instead of `local_repository` to load p4runtime.

# http_archive(
# name = "com_github_p4lang_p4runtime",
# urls = ["https://github.com/p4lang/p4runtime/archive/v1.4.0.tar.gz"],
# strip_prefix = "p4runtime-1.4.0/proto",
# urls = ["https://github.com/p4lang/p4runtime/archive/v1.4.1.tar.gz"],
# strip_prefix = "p4runtime-1.4.1/proto",
# # sha256 = "<insert hash value here>",
# )

# git_repository(
# name = "com_github_p4lang_p4runtime",
# 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.4.0",
# )

load("@com_github_p4lang_p4runtime//:p4runtime_deps.bzl", "p4runtime_deps")

p4runtime_deps()
Expand Down
2 changes: 1 addition & 1 deletion 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.4.0-dev
Title Note: version 1.4.1
Title Footer: &date;
Author: The P4.org API Working Group
Heading depth: 5
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.3 specification restricts the types that it supports
The P4Runtime v1.4 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.3 supports all
above. For such values, the P4Runtime specification v1.4 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.3)
this work are actually supported for P4Runtime 1.4)
+ 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.3
contains the name of a type declared using `typedef`. P4Runtime v1.4
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.3. The "base" type must always be one of those for
for P4Runtime v1.4. The "base" type must always be one of those for
every constrained value.


Expand Down
24 changes: 12 additions & 12 deletions docs/v1/references.bib
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ @ONLINE { Stratum

@ONLINE { P4ComplexTypes,
title = "Complex types in $P4_{16}$",
url = "https://p4.org/p4-spec/docs/P4-16-v1.2.1.html#sec-p4-type"
url = "https://p4.org/wp-content/uploads/2024/10/P4-16-spec-v1.2.5.html#sec-p4-type"
}

@ONLINE { ProtoDefaults,
Expand All @@ -47,22 +47,22 @@ @ONLINE { PIRepo

@ONLINE { P4TableProperties,
title = "Table properties in $P4_{16}$",
url = "https://p4.org/p4-spec/docs/P4-16-v1.2.1.html#sec-table-props"
url = "https://p4.org/wp-content/uploads/2024/10/P4-16-spec-v1.2.5.html#sec-table-props"
}

@ONLINE { P4ValueSets,
title = "Value Sets in $P4_{16}$",
url = "https://p4.org/p4-spec/docs/P4-16-v1.2.1.html#sec-value-set"
url = "https://p4.org/wp-content/uploads/2024/10/P4-16-spec-v1.2.5.html#sec-value-set"
}

@ONLINE { P4SelectExpr,
title = "Select expressions in $P4_{16}$",
url = "https://p4.org/p4-spec/docs/P4-16-v1.2.1.html#sec-select"
url = "https://p4.org/wp-content/uploads/2024/10/P4-16-spec-v1.2.5.html#sec-select"
}

@ONLINE { P4Revisions110,
title = "Summary of changes made in $P4_{16}$ version 1.1.0",
url = "https://p4.org/p4-spec/docs/P4-16-v1.2.1.html#sec-summary-of-changes-made-in-version-110"
url = "https://p4.org/wp-content/uploads/2024/10/P4-16-spec-v1.2.5.html#sec-summary-of-changes-made-in-version-110"
}

@ONLINE { P4Revisions122,
Expand All @@ -77,7 +77,7 @@ @ONLINE { P4Revisions124

@ONLINE { P4Spec,
title = "$P4_{16}$ 1.2.1 specification",
url = "https://p4.org/p4-spec/docs/P4-16-v1.2.1.html"
url = "https://p4.org/wp-content/uploads/2024/10/P4-16-spec-v1.2.5.html"
}

@ONLINE { PSA,
Expand All @@ -92,7 +92,7 @@ @ONLINE { PNA

@ONLINE { P4Enums,
title = "Enums in $P4_{16}$",
url = "https://p4.org/p4-spec/docs/P4-16-v1.2.1.html#sec-enum-types"
url = "https://p4.org/wp-content/uploads/2024/10/P4-16-spec-v1.2.5.html#sec-enum-types"
}

@ONLINE { ProtoAny,
Expand Down Expand Up @@ -128,7 +128,7 @@ @ONLINE { P4APIWGCharter

@ONLINE { P4NewTypes,
title = "Introducing new types in $P4_{16}$",
url = "https://p4.org/p4-spec/docs/P4-16-v1.2.1.html#sec-newtype"
url = "https://p4.org/wp-content/uploads/2024/10/P4-16-spec-v1.2.5.html#sec-newtype"
}

@ONLINE { APIVersioning,
Expand Down Expand Up @@ -158,7 +158,7 @@ @ONLINE { RFC2697

@ONLINE { P4MatchTypes,
title = "Match types in P4",
url = "https://p4.org/p4-spec/docs/P4-16-v1.2.1.html#sec-match-kind-type"
url = "https://p4.org/wp-content/uploads/2024/10/P4-16-spec-v1.2.5.html#sec-match-kind-type"
}

@ONLINE { gRPCStreamC,
Expand All @@ -173,7 +173,7 @@ @ONLINE { gRPCAuth

@ONLINE { P4ActionAnnotations,
title = "P4 standard annotations on table actions",
url = "https://p4.org/p4-spec/docs/P4-16-v1.2.1.html#sec-table-action-anno"
url = "https://p4.org/wp-content/uploads/2024/10/P4-16-spec-v1.2.5.html#sec-table-action-anno"
}

@ONLINE { PSAActionSelector,
Expand All @@ -193,7 +193,7 @@ @ONLINE { PSAAtomicityOfControlPlaneOps

@ONLINE { P4Concurrency,
title = "P4 Concurrency Model",
url = "https://p4.org/p4-spec/docs/P4-16-v1.2.1.html#sec-concurrency"
url = "https://p4.org/wp-content/uploads/2024/10/P4-16-spec-v1.2.5.html#sec-concurrency"
}

@ONLINE { PSATranslation,
Expand All @@ -213,7 +213,7 @@ @ONLINE { ProtoOneOfBackwardsCompatibility

@ONLINE { P4Annotations,
title = "P4 Annotations",
url = "https://p4.org/p4-spec/docs/P4-16-v1.2.1.html#sec-annotations"
url = "https://p4.org/wp-content/uploads/2024/10/P4-16-spec-v1.2.5.html#sec-annotations"
}

@ONLINE { v1model,
Expand Down

0 comments on commit 36e8b46

Please sign in to comment.