Skip to content

Commit db53ecb

Browse files
committed
Better name for inout / out argument placeholder variables
Signed-off-by: Anton Korobeynikov <[email protected]>
1 parent 3c52506 commit db53ecb

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

test/Translate/Ops/calls.p4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ action bazz(in int<16> arg1) {
3636
// CHECK: p4hir.call @bar() : () -> ()
3737
bar();
3838
// CHECK: p4hir.scope
39-
// CHECK: %[[VAR_A:.*]] = p4hir.variable ["a_out"] : <!i16i>
39+
// CHECK: %[[VAR_A:.*]] = p4hir.variable ["a_out_arg"] : <!i16i>
4040
// CHECK: p4hir.call @quuz(%[[VAR_A]]) : (!p4hir.ref<!i16i>) -> ()
4141
// CHECK: p4hir.read %[[VAR_A]] : <!i16i>
4242
int<16> val;
4343
quuz(val);
4444
// CHECK: p4hir.scope
45-
// CHECK: %[[VAR_X:.*]] = p4hir.variable ["x_inout", init] : <!i16i>
45+
// CHECK: %[[VAR_X:.*]] = p4hir.variable ["x_inout_arg", init] : <!i16i>
4646
// CHECK: %[[VAL_X:.*]] = p4hir.read %[[VAL:.*]] : <!i16i>
4747
// CHECK: p4hir.assign %[[VAL_X]], %[[VAR_X]] : <!i16i>
4848
// CHECK: p4hir.call @baz(%[[VAR_X]])

test/Translate/Ops/function.p4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ action test_param() {
4444
// CHECK-LABEL: p4hir.func action @test_param() {
4545
// CHECK: %[[A:.*]] = p4hir.variable ["a"] : <!b1i>
4646
// CHECK: p4hir.scope {
47-
// CHECK: %[[X_INOUT:.*]] = p4hir.variable ["x_inout", init] : <!b1i>
47+
// CHECK: %[[X_INOUT:.*]] = p4hir.variable ["x_inout_arg", init] : <!b1i>
4848
// CHECK: %[[A_VAL:.*]] = p4hir.read %[[A]] : <!b1i>
4949
// CHECK: p4hir.assign %[[A_VAL]], %[[X_INOUT]] : <!b1i>
5050
// CHECK: %[[G_VAL:.*]] = p4hir.scope {
51-
// CHECK: %[[Z_INOUT:.*]] = p4hir.variable ["z_inout", init] : <!b1i>
51+
// CHECK: %[[Z_INOUT:.*]] = p4hir.variable ["z_inout_arg", init] : <!b1i>
5252
// CHECK: %[[A_VAL2:.*]] = p4hir.read %[[A]] : <!b1i>
5353
// CHECK: p4hir.assign %[[A_VAL2]], %[[Z_INOUT]] : <!b1i>
5454
// CHECK: %[[G_RES:.*]] = p4hir.call @g(%[[Z_INOUT]]) : (!p4hir.ref<!b1i>) -> !b1i

tools/p4mlir-translate/translate.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -916,8 +916,9 @@ bool P4HIRConverter::preorder(const P4::IR::MethodCallExpression *mce) {
916916
auto copyIn = b.create<P4HIR::VariableOp>(
917917
loc, ref,
918918
mlir::StringAttr::get(
919-
context(), llvm::Twine(params[idx]->name.string_view()) +
920-
(dir == P4::IR::Direction::InOut ? "_inout" : "_out")));
919+
context(),
920+
llvm::Twine(params[idx]->name.string_view()) +
921+
(dir == P4::IR::Direction::InOut ? "_inout_arg" : "_out_arg")));
921922

922923
if (dir == P4::IR::Direction::InOut) {
923924
copyIn.setInit(true);

0 commit comments

Comments
 (0)