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.

Sign up for GitHub

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

Jump to bottom

Fix bpf_conformance() API to set groups #201

Merged
merged 1 commit into from
Feb 12, 2024
Merged

Fix bpf_conformance() API to set groups #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions include/bpf_conformance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ typedef enum class _bpf_conformance_groups
divmul64 = 0x00000020,
packet = 0x00000040,
callx = 0x00000080,
default_groups = base32 | base64 | atomic32 | atomic64 | divmul32 | divmul64, // not callx or packet
} bpf_conformance_groups_t;

inline bpf_conformance_groups_t
Expand Down Expand Up @@ -118,6 +119,7 @@ bpf_conformance_options(
* @param[in] include_test_regex A regex that matches the tests to include.
* @param[in] exclude_test_regex A regex that matches the tests to exclude.
* @param[in] cpu_version The CPU version to run the tests with.
* @param[in] groups The conformance groups to run the tests with.
* @param[in] list_instructions_option Option controlling which instructions to list.
* @param[in] debug Print debug information.
* @return The test results for each test file.
Expand All @@ -130,6 +132,7 @@ bpf_conformance(
std::optional<std::string> include_test_regex = std::nullopt,
std::optional<std::string> exclude_test_regex = std::nullopt,
bpf_conformance_test_cpu_version_t cpu_version = bpf_conformance_test_cpu_version_t::v3,
bpf_conformance_groups_t groups = bpf_conformance_groups_t::default_groups,
bpf_conformance_list_instructions_t list_instructions_option =
bpf_conformance_list_instructions_t::LIST_INSTRUCTIONS_NONE,
bool debug = false)
Expand All @@ -138,6 +141,7 @@ bpf_conformance(
options.include_test_regex = include_test_regex;
options.exclude_test_regex = exclude_test_regex;
options.cpu_version = cpu_version;
options.groups = groups,
options.list_instructions_option = list_instructions_option;
options.debug = debug;
return bpf_conformance_options(test_files, plugin_path, plugin_options, options);
Expand Down
6 changes: 1 addition & 5 deletions src/runner.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,7 @@ main(int argc, char** argv)
}

// Enable default conformance groups, which don't include callx or packet.
bpf_conformance_groups_t groups = bpf_conformance_groups_t::base32 | bpf_conformance_groups_t::base64 |
bpf_conformance_groups_t::divmul32 | bpf_conformance_groups_t::divmul64;
if (cpu_version >= bpf_conformance_test_cpu_version_t::v3) {
groups |= bpf_conformance_groups_t::atomic32 | bpf_conformance_groups_t::atomic64;
}
bpf_conformance_groups_t groups = bpf_conformance_groups_t::default_groups;
if (vm.count("include_groups")) {
auto include_groups = vm["include_groups"].as<std::vector<std::string>>();
for (std::string group_name : include_groups) {
Expand Down