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

Dead code eliminator: use default if other actions won't be executed #56

Merged
merged 7 commits into from
Feb 24, 2024
Merged

Dead code eliminator: use default if other actions won't be executed #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
801a850
Dead code eliminator: use default if other actions won't be executed
RabbitWhite1 Feb 23, 2024
4c0619b
lint
RabbitWhite1 Feb 23, 2024
17942c8
update more reference files
RabbitWhite1 Feb 23, 2024
11da514
fix
RabbitWhite1 Feb 23, 2024
5de49df
Record eliminated nodes with potential replaced nodes
RabbitWhite1 Feb 23, 2024
fb454b6
Merge branch 'master' into zhanghan/default-action
RabbitWhite1 Feb 23, 2024
0a4d536
update ref
RabbitWhite1 Feb 23, 2024
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
30 changes: 23 additions & 7 deletions passes/elim_dead_code.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,19 @@ const IR::Node *ElimDeadCode::preorder(IR::IfStatement *stmt) {
if (reachability.value()) {
printInfo("%1% true branch will always be executed.", stmt);
if (stmt->ifFalse != nullptr) {
eliminatedNodes.push_back(stmt->ifFalse);
eliminatedNodes.push_back({stmt->ifFalse, nullptr});
}
stmt->ifFalse = nullptr;
return stmt;
}
stmt->condition = new IR::LNot(stmt->condition);
if (stmt->ifFalse != nullptr) {
printInfo("%1% false branch will always be executed.", stmt);
eliminatedNodes.push_back(stmt->ifTrue);
eliminatedNodes.push_back({stmt->ifTrue, nullptr});
stmt->ifTrue = stmt->ifFalse;
} else {
printInfo("%1% true branch can be deleted.", stmt);
eliminatedNodes.push_back(stmt);
eliminatedNodes.push_back({stmt, nullptr});
stmt->ifTrue = new IR::EmptyStatement(stmt->getSourceInfo());
}
stmt->ifFalse = nullptr;
Expand Down Expand Up @@ -94,7 +94,7 @@ const IR::Node *ElimDeadCode::preorder(IR::SwitchStatement *switchStmt) {
break;
}
printInfo("%1% can be deleted.", switchCase);
eliminatedNodes.push_back(switchCase);
eliminatedNodes.push_back({switchCase, nullptr});
}
if (filteredSwitchCases.empty()) {
return new IR::EmptyStatement(switchStmt->getSourceInfo());
Expand Down Expand Up @@ -149,7 +149,7 @@ const IR::Node *ElimDeadCode::preorder(IR::Member *member) {

const auto *result = new IR::BoolLiteral(member->srcInfo, reachability);
printInfo("%1% can be replaced with %2%.", member, result->toString());
eliminatedNodes.push_back(member);
eliminatedNodes.push_back({member, nullptr});
return result;
}

Expand Down Expand Up @@ -187,12 +187,28 @@ const IR::Node *ElimDeadCode::preorder(IR::MethodCallStatement *stmt) {
}
}

// Action annotated with `@defaultonly` is ignored before. If no action can be reachable
// based on previous analysis, we replace the apply call to the default action call.
// Only when the default action has an empty body, we remove the apply.
auto *defaultAction = table.getDefaultAction()->to<IR::MethodCallExpression>();
if (defaultAction != nullptr) {
auto decl = getActionDecl(refMap, *defaultAction);
if (decl.has_value() && !decl.value()->body->components.empty()) {
printInfo("Replacing table apply with default action %1%", defaultAction);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, we can still add some form of eliminated node here. Otherwise we do not track that we have modified the table here. What do you think?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the sense of eliminatedNodes.push_back(stmt); or something similar. Our current ref files do not quite capture this ambiguity.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I think a better way is to create another vector to store these because they are not simply eliminated. What do you think?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could make it a vector of pairs, with the original node and the replaced node.

There is a question on the performance impact when we keep adding nodes. Recall that this code may run on every control-plane update message. But I do not think it will have much impact because we only invoke the elimination when the semantics have changed. Still, it's something we should keep in mind.

Copy link
Collaborator Author

@RabbitWhite1 RabbitWhite1 Feb 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could make it a vector of pairs, with the original node and the replaced node.

That sounds good. I will do it soon.

And yes, I agree on the performance thing.

auto *replacement = new IR::MethodCallStatement(stmt->getSourceInfo(), defaultAction);
eliminatedNodes.push_back({stmt, replacement});
return replacement;
}
}

// There is no action to execute other than an empty action, remove the table.
printInfo("Removing %1%", stmt);
eliminatedNodes.push_back(stmt);
eliminatedNodes.push_back({stmt, nullptr});
return new IR::EmptyStatement(stmt->getSourceInfo());
}

std::vector<const IR::Node *> ElimDeadCode::getEliminatedNodes() const { return eliminatedNodes; }
std::vector<EliminatedReplacedPair> ElimDeadCode::getEliminatedNodes() const {
return eliminatedNodes;
}

} // namespace P4Tools::Flay
9 changes: 6 additions & 3 deletions passes/elim_dead_code.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@

namespace P4Tools::Flay {

/// The eliminated and optionally replaced node.
using EliminatedReplacedPair = std::pair<const IR::Node *, const IR::Node *>;

/// This compiler pass looks up program nodes in the reachability map and deletes nodes which are
/// not executable according to the computation in the map.
class ElimDeadCode : public Transform {
Expand All @@ -23,8 +26,8 @@ class ElimDeadCode : public Transform {
/// The precomputed reference map.
std::reference_wrapper<const P4::ReferenceMap> refMap;

/// The list of eliminated nodes. Used for bookkeeping.
std::vector<const IR::Node *> eliminatedNodes;
/// The list of eliminated and optionally replaced nodes. Used for bookkeeping.
std::vector<EliminatedReplacedPair> eliminatedNodes;

const IR::Node *preorder(IR::IfStatement *stmt) override;
const IR::Node *preorder(IR::SwitchStatement *switchStmt) override;
Expand All @@ -37,7 +40,7 @@ class ElimDeadCode : public Transform {
explicit ElimDeadCode(const P4::ReferenceMap &refMap,
const AbstractReachabilityMap &reachabilityMap);

[[nodiscard]] std::vector<const IR::Node *> getEliminatedNodes() const;
[[nodiscard]] std::vector<EliminatedReplacedPair> getEliminatedNodes() const;
};

/// A utility pass to extract information from a freshly parsed P4 program.
Expand Down
2 changes: 1 addition & 1 deletion service/flay_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ const IR::P4Program &FlayService::getOriginalProgram() const { return originalPr

const FlayCompilerResult &FlayService::getCompilerResult() const { return compilerResult.get(); }

const std::vector<const IR::Node *> &FlayService::getEliminatedNodes() const {
const std::vector<EliminatedReplacedPair> &FlayService::getEliminatedNodes() const {
return eliminatedNodes;
}

Expand Down
11 changes: 6 additions & 5 deletions service/flay_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

#include "backends/p4tools/modules/flay/core/compiler_target.h"
#include "backends/p4tools/modules/flay/core/reachability.h"
#include "backends/p4tools/modules/flay/passes/elim_dead_code.h"

namespace P4Tools::Flay {

Expand Down Expand Up @@ -58,8 +59,8 @@ class FlayService final : public p4::v1::P4Runtime::Service {
/// For exiting the gRPC server (useful for benchmarking).
std::promise<void> exitRequested;

/// The list of eliminated nodes. Used for bookkeeping.
std::vector<const IR::Node *> eliminatedNodes;
/// The list of eliminated and optionally replaced nodes. Used for bookkeeping.
std::vector<EliminatedReplacedPair> eliminatedNodes;

/// Compute whether the semantics of the program under this control plane configuration have
/// changed since the last update.
Expand Down Expand Up @@ -98,8 +99,8 @@ class FlayService final : public p4::v1::P4Runtime::Service {
/// @returns the original program.
[[nodiscard]] const IR::P4Program &getOriginalProgram() const;

/// @returns the list of eliminated nodes.
[[nodiscard]] const std::vector<const IR::Node *> &getEliminatedNodes() const;
/// @returns the list of eliminated (and potential replaced) nodes.
[[nodiscard]] const std::vector<EliminatedReplacedPair> &getEliminatedNodes() const;

/// @returns a reference to the compiler result that this program info object was initialized
/// with.
Expand All @@ -114,7 +115,7 @@ struct FlayServiceStatistics {
// The optimized program.
const IR::P4Program *optimizedProgram;
// The nodes eliminated in the program.
std::vector<const IR::Node *> eliminatedNodes;
std::vector<EliminatedReplacedPair> eliminatedNodes;
};

/// Wrapper class to simplify benchmarking and the collection of statics.
Expand Down
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/arith-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 35: apply { t.apply(); }
Replaced node at line 35: apply { t.apply(); } with add()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/arith1-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 35: apply { t.apply(); }
Replaced node at line 35: apply { t.apply(); } with compare()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/arith2-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 35: apply { t.apply(); }
Replaced node at line 35: apply { t.apply(); } with compare()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/arith3-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 35: apply { t.apply(); }
Replaced node at line 35: apply { t.apply(); } with shift()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/arith4-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 35: apply { t.apply(); }
Replaced node at line 35: apply { t.apply(); } with shift()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/arith5-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 35: apply { t.apply(); }
Replaced node at line 35: apply { t.apply(); } with shift()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/checksum1-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 132: guh.apply();
Replaced node at line 132: guh.apply(); with foo()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/concat-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 35: apply { t.apply(); }
Replaced node at line 35: apply { t.apply(); } with concat()
4 changes: 2 additions & 2 deletions targets/bmv2/test/testdata/config/dash-pipeline-v1model-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ Eliminated node at line 576: if (use_dst_vnet_vni == 1) {
Eliminated node at line 665: } else if (packet_action == 1) {
Eliminated node at line 913: if (vip.apply().hit) {
Eliminated node at line 913: if (vip.apply().hit) {
Eliminated node at line 919: eni_ether_address_map.apply();
Replaced node at line 919: eni_ether_address_map.apply(); with deny()
Eliminated node at line 924: vxlan_decap_pa_validate: {
Eliminated node at line 951: eni.apply();
Replaced node at line 951: eni.apply(); with deny()
Eliminated node at line (unknown):
Eliminated node at line 457: if (meta.stage1_dash_acl_group_id != 0) {
Eliminated node at line 467: if (meta.stage2_dash_acl_group_id != 0) {
Expand Down
4 changes: 2 additions & 2 deletions targets/bmv2/test/testdata/config/pins_middleblock.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Eliminated node at line 741: acl_pre_ingress_table.apply();
Eliminated node at line 412: vrf_table.apply();
Eliminated node at line 415: ipv4_table.apply();
Eliminated node at line 417: ipv6_table.apply();
Replaced node at line 415: ipv4_table.apply(); with drop()
Replaced node at line 417: ipv6_table.apply(); with drop()
Eliminated node at line 419: if (wcmp_group_id_valid) {
Eliminated node at line 422: if (nexthop_id_valid) {
Eliminated node at line 689: acl_ingress_table.apply();
Expand Down
6 changes: 3 additions & 3 deletions targets/bmv2/test/testdata/dash-pipeline-v1model-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ Eliminated node at line 664: meta.dropped = true;
Eliminated node at line 665: } else if (packet_action == 1) {
Eliminated node at line 913: if (vip.apply().hit) {
Eliminated node at line 913: if (vip.apply().hit) {
Eliminated node at line 916: direction_lookup.apply();
Replaced node at line 916: direction_lookup.apply(); with set_inbound_direction()
Eliminated node at line 917: appliance.apply();
Eliminated node at line 918: meta.eni_addr = (meta.direction == dash_direction_t.OUTBOUND ? hdr.inner_ethernet.src_addr : hdr.inner_ethernet.dst_addr);
Eliminated node at line 919: eni_ether_address_map.apply();
Replaced node at line 919: eni_ether_address_map.apply(); with deny()
Eliminated node at line 921: vxlan_decap(hdr);
Eliminated node at line 924: vxlan_decap_pa_validate: {
Eliminated node at line 951: eni.apply();
Replaced node at line 951: eni.apply(); with deny()
Eliminated node at line 955: acl_group.apply();
Eliminated node at line 957: outbound.apply(hdr, meta);
Eliminated node at line (unknown):
Expand Down
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/drop-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 38: forward.apply();
Replaced node at line 38: forward.apply(); with drop()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/issue-3312-graph-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 73: t2.apply();
Replaced node at line 73: t2.apply(); with add()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/issue1049-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Eliminated node at line 106: guh.apply();
Replaced node at line 106: guh.apply(); with hash_drop_decision()
Eliminated node at line 107: debug_table.apply();
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/issue1062-1-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 69: t_exact.apply();
Replaced node at line 69: t_exact.apply(); with set_error_idx(8w0)
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/issue1538.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 87: mac_da.apply();
Replaced node at line 87: mac_da.apply(); with my_drop()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/issue1544-1-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 82: mac_da.apply();
Replaced node at line 82: mac_da.apply(); with my_drop()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/issue1544-2-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 80: mac_da.apply();
Replaced node at line 80: mac_da.apply(); with my_drop()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/issue1544-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 80: mac_da.apply();
Replaced node at line 80: mac_da.apply(); with my_drop()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/issue1713-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 46: apply { t.apply(); }
Replaced node at line 46: apply { t.apply(); } with case0()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/issue1739-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Eliminated node at line 117: ipv4_sa_filter.apply();
Eliminated node at line 118: ipv4_da_lpm.apply();
Replaced node at line 118: ipv4_da_lpm.apply(); with my_drop()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/issue1765-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 133: guh.apply();
Replaced node at line 133: guh.apply(); with foo()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/issue298-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Eliminated node at line 164: drop_tbl.apply();
Eliminated node at line 187: round_tbl.apply();
Replaced node at line 187: round_tbl.apply(); with read_round()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/issue364-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 57: apply { t.apply(); }
Replaced node at line 57: apply { t.apply(); } with my_action(9w0)
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/issue414-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 81: guh.apply();
Replaced node at line 81: guh.apply(); with foo()
6 changes: 3 additions & 3 deletions targets/bmv2/test/testdata/issue461-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Eliminated node at line 127: ipv4_da_lpm.apply();
Eliminated node at line 128: mac_da.apply();
Eliminated node at line 150: send_frame.apply();
Replaced node at line 127: ipv4_da_lpm.apply(); with drop_with_count()
Replaced node at line 128: mac_da.apply(); with my_drop()
Replaced node at line 150: send_frame.apply(); with my_drop()
6 changes: 3 additions & 3 deletions targets/bmv2/test/testdata/issue561-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Eliminated node at line 306: ipv4_da_lpm.apply();
Eliminated node at line 307: mac_da.apply();
Eliminated node at line 330: send_frame.apply();
Replaced node at line 306: ipv4_da_lpm.apply(); with my_drop()
Replaced node at line 307: mac_da.apply(); with my_drop()
Replaced node at line 330: send_frame.apply(); with my_drop()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/parser-locals2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 97: guh.apply();
Replaced node at line 97: guh.apply(); with foo()
4 changes: 2 additions & 2 deletions targets/bmv2/test/testdata/pins_fabric.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Eliminated node at line 803: acl_pre_ingress_table.apply();
Eliminated node at line 554: l3_admit_table.apply();
Eliminated node at line 418: vrf_table.apply();
Eliminated node at line 421: ipv4_table.apply();
Eliminated node at line 423: ipv6_table.apply();
Replaced node at line 421: ipv4_table.apply(); with drop()
Replaced node at line 423: ipv6_table.apply(); with drop()
Eliminated node at line 425: if (wcmp_group_id_valid) {
Eliminated node at line 428: if (nexthop_id_valid) {
Eliminated node at line 750: acl_ingress_table.apply();
Expand Down
4 changes: 2 additions & 2 deletions targets/bmv2/test/testdata/pins_middleblock.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Eliminated node at line 741: acl_pre_ingress_table.apply();
Eliminated node at line 548: l3_admit_table.apply();
Eliminated node at line 412: vrf_table.apply();
Eliminated node at line 415: ipv4_table.apply();
Eliminated node at line 417: ipv6_table.apply();
Replaced node at line 415: ipv4_table.apply(); with drop()
Replaced node at line 417: ipv6_table.apply(); with drop()
Eliminated node at line 419: if (wcmp_group_id_valid) {
Eliminated node at line 422: if (nexthop_id_valid) {
Eliminated node at line 689: acl_ingress_table.apply();
Expand Down
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/slice-def-use1.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 57: tbl_act.apply();
Replaced node at line 57: tbl_act.apply(); with act()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/stack_complex-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 63: apply { t.apply(); }
Replaced node at line 63: apply { t.apply(); } with set_port()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/strength3.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 57: apply { t.apply(); }
Replaced node at line 57: apply { t.apply(); } with case0()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/strength6.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 51: apply { t.apply(); }
Replaced node at line 51: apply { t.apply(); } with case0()
2 changes: 1 addition & 1 deletion targets/bmv2/test/testdata/unused-counter-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 59: apply { t.apply(); }
Replaced node at line 59: apply { t.apply(); } with my_action(9w0)
6 changes: 3 additions & 3 deletions targets/bmv2/test/testdata/use-priority-as-name.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Eliminated node at line 133: ipv4_da_lpm.apply();
Eliminated node at line 134: mac_da.apply();
Eliminated node at line 162: send_frame.apply();
Replaced node at line 133: ipv4_da_lpm.apply(); with my_drop()
Replaced node at line 134: mac_da.apply(); with my_drop()
Replaced node at line 162: send_frame.apply(); with my_drop()
4 changes: 2 additions & 2 deletions targets/bmv2/test/testdata/v1model-special-ops-bmv2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Eliminated node at line 290: if ((standard_metadata.instance_type == BMV2_V1MODEL_INSTANCE_TYPE_RESUBMIT)) {
Eliminated node at line 293: } else if ((standard_metadata.instance_type == BMV2_V1MODEL_INSTANCE_TYPE_RECIRC)) {
Eliminated node at line 297: ipv4_da_lpm.apply();
Replaced node at line 297: ipv4_da_lpm.apply(); with my_drop()
Eliminated node at line 299: if (meta.fwd.l2ptr != 0) {
Eliminated node at line 364: if ((standard_metadata.instance_type == BMV2_V1MODEL_INSTANCE_TYPE_INGRESS_CLONE)) {
Eliminated node at line 370: } else if ((standard_metadata.instance_type == BMV2_V1MODEL_INSTANCE_TYPE_EGRESS_CLONE)) {
Eliminated node at line 377: if ((standard_metadata.instance_type == BMV2_V1MODEL_INSTANCE_TYPE_REPLICATION)) {
Eliminated node at line 382: send_frame.apply();
Replaced node at line 382: send_frame.apply(); with my_drop()
2 changes: 1 addition & 1 deletion targets/tofino/test/testdata/bri_with_pdfixed_thrift.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Eliminated node at line 119: forward.apply();
Replaced node at line 119: forward.apply(); with miss()
Eliminated node at line 121: ipRouteMulticast.apply();
2 changes: 1 addition & 1 deletion targets/tofino/test/testdata/tna_action_selector.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Eliminated node at line 127: forward.apply();
Replaced node at line 127: forward.apply(); with miss()
Eliminated node at line 128: set_dest.apply();
4 changes: 2 additions & 2 deletions targets/tofino/test/testdata/tna_custom_hash.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Eliminated node at line 141: output_port.apply();
Eliminated node at line 145: tbl_hash1.apply();
Eliminated node at line 146: tbl_hash2.apply();
Replaced node at line 145: tbl_hash1.apply(); with apply_hash1()
Replaced node at line 146: tbl_hash2.apply(); with apply_hash2()
2 changes: 1 addition & 1 deletion targets/tofino/test/testdata/tna_digest.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Eliminated node at line 86: } else if (ig_dprsr_md.digest_type == 2) {
Eliminated node at line 154: smac.apply();
Replaced node at line 154: smac.apply(); with smac_miss()
Eliminated node at line 165: dmac.apply();
2 changes: 1 addition & 1 deletion targets/tofino/test/testdata/tna_dkm.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Eliminated node at line 153: forward.apply();
Replaced node at line 153: forward.apply(); with miss()
Eliminated node at line 155: ipRoute.apply();
2 changes: 1 addition & 1 deletion targets/tofino/test/testdata/tna_dyn_hashing.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 135: bloom_filter_1_0.apply();
Replaced node at line 135: bloom_filter_1_0.apply(); with check_bloom_filter_1()
2 changes: 1 addition & 1 deletion targets/tofino/test/testdata/tna_exact_match.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Eliminated node at line 168: forward.apply();
Replaced node at line 168: forward.apply(); with miss(3w0x1)
Eliminated node at line 170: ipRoute.apply();
Eliminated node at line 171: forward_timeout.apply();
2 changes: 1 addition & 1 deletion targets/tofino/test/testdata/tna_lpm_match.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Eliminated node at line 128: forward.apply();
Replaced node at line 128: forward.apply(); with miss()
Eliminated node at line 129: alpm_forward.apply();
2 changes: 1 addition & 1 deletion targets/tofino/test/testdata/tna_multicast.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Eliminated node at line 202: ing_port.apply();
Eliminated node at line 203: ing_src_ifid.apply();
Eliminated node at line 204: ing_dmac.apply();
Replaced node at line 204: ing_dmac.apply(); with flood()
Eliminated node at line 205: if (ig_md.l3 == 1) {
2 changes: 1 addition & 1 deletion targets/tofino/test/testdata/tna_operations.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Eliminated node at line 130: forward.apply();
Replaced node at line 130: forward.apply(); with miss()
Eliminated node at line 131: forward_dst.apply();
4 changes: 2 additions & 2 deletions targets/tofino/test/testdata/tna_pktgen.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Eliminated node at line 119: t.apply();
Eliminated node at line 121: p.apply();
Replaced node at line 119: t.apply(); with drop()
Replaced node at line 121: p.apply(); with drop()
2 changes: 1 addition & 1 deletion targets/tofino/test/testdata/tna_port_metadata.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 126: port_md_exm_match.apply();
Replaced node at line 126: port_md_exm_match.apply(); with miss()
2 changes: 1 addition & 1 deletion targets/tofino/test/testdata/tna_port_metadata_extern.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 135: port_md_exm_match.apply();
Replaced node at line 135: port_md_exm_match.apply(); with miss()
2 changes: 1 addition & 1 deletion targets/tofino/test/testdata/tna_ports.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Eliminated node at line 128: forward.apply();
Replaced node at line 128: forward.apply(); with miss()
Eliminated node at line 130: ipRoute.apply();
2 changes: 1 addition & 1 deletion targets/tofino/test/testdata/tna_random.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 61: bypass_egress.apply();
Replaced node at line 61: bypass_egress.apply(); with set_bypass_egress()
2 changes: 1 addition & 1 deletion targets/tofino/test/testdata/tna_range_match.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eliminated node at line 102: forward.apply();
Replaced node at line 102: forward.apply(); with miss()
Loading
Loading