Skip to content

Fixes for upstream changes. #20

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

Merged
merged 1 commit into from
Jun 7, 2024
Merged

Fixes for upstream changes. #20

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
3 changes: 1 addition & 2 deletions targets/bmv2/program_info.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#include "backends/p4tools/modules/p4rtsmith/core/program_info.h"
#include "control-plane/p4RuntimeSerializer.h"
#include "ir/ir.h"

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
Expand All @@ -14,6 +13,6 @@ namespace P4Tools::RTSmith::V1Model {

Bmv2V1ModelProgramInfo::Bmv2V1ModelProgramInfo(const CompilerResult &compilerResult)
: ProgramInfo(compilerResult, P4::P4RuntimeSerializer::get()->generateP4Runtime(
&compilerResult.getProgram(), "v1model")) {}
&compilerResult.getProgram(), cstring("v1model"))) {}

} // namespace P4Tools::RTSmith::V1Model
3 changes: 1 addition & 2 deletions targets/tofino/program_info.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#include "backends/p4tools/modules/p4rtsmith/core/program_info.h"
#include "control-plane/p4RuntimeSerializer.h"
#include "ir/ir.h"

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
Expand All @@ -14,6 +13,6 @@ namespace P4Tools::RTSmith::Tna {

TofinoTnaProgramInfo::TofinoTnaProgramInfo(const CompilerResult &compilerResult)
: ProgramInfo(compilerResult, P4::P4RuntimeSerializer::get()->generateP4Runtime(
&compilerResult.getProgram(), "tna")) {}
&compilerResult.getProgram(), cstring("tna"))) {}

} // namespace P4Tools::RTSmith::Tna
5 changes: 3 additions & 2 deletions test/core/rtsmith_api_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ V1Switch(parse(), verifyChecksum(), ingress(), egress(), computeChecksum(), depa

CompilerOptions generateDefaultApiTestCompilerOptions() {
auto compilerOptions = CompilerOptions();
compilerOptions.target = "bmv2";
compilerOptions.arch = "v1model";
// TODO: Remove the cstring copy.
compilerOptions.target = cstring("bmv2");
compilerOptions.arch = cstring("v1model");
return compilerOptions;
}

Expand Down