bpf: split complexity configurations into separate files #26925
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lmb
added
sig/loader
|
/ci-verifier |
|
/ci-verifier |
|
/test |
|
This PR is probably best reviewed with |
christarazi
approved these changes
Jul 19, 2023
|
/test |
rgo3
approved these changes
Jul 21, 2023
The complexity testsuite currently loads configuration from
a single file for each BPF object and kernel version. In the
file each line is a distinct configuration for that BPF object.
For example:
-DFOO=1
-DBAR=1
would compile twice. Once with FOO defined, once with BAR.
In practice we have about 30 to 40 defines per each line,
which makes editing, diffing, etc. a nightmare.
Switch the format from one line per configuration to one
file per configuration. This makes it easier to diff and
also to resolve merge conflicts.
The existing configurations were converted to invidiual
files using the following script:
#!/bin/bash
set -euo pipefail
for dir in bpf/complexity-tests/*; do
test -d "$dir" || continue
pushd "$dir" || exit 2
for f in *.txt; do
i=0
while read -r line; do
test -z "$line" && continue
i=$((i + 1))
target="$(basename "$f" .txt)"
mkdir -p "$target"
echo "${line// /$'\n'}" > "$target/$i.txt"
done < "$f"
done
popd || exit 2
done
Signed-off-by: Lorenz Bauer <lmb@isovalent.com>
|
/test |
|
Travis failure is due to #26617 |
lmb
added
the
ready-to-merge
|
Timo is on PTO, so no review from him. Dylan and Robin reviewed instead. |
jibi
added
the
needs-backport/1.14
jibi
added
backport-pending/1.14
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The complexity testsuite currently loads configuration from a single file for each BPF object and kernel version. In the file each line is a distinct configuration for that BPF object. For example:
would compile twice. Once with FOO defined, once with BAR. In practice we have about 30 to 40 defines per each line, which makes editing, diffing, etc. a nightmare.
Switch the format from one line per configration to one file per configuration. This makes it easier to diff and also to resolve merge conflicts.
The existing configurations were converted to invidiual files using the following script: