[Heavy] Remove ApplyActionOp

Author: ricejasonf

heavy/include/nbdl_gen/Nbdl.td

@@ -358,15 +358,6 @@ def Nbdl_VisitOp : Nbdl_Op<"visit", []> {
   let results = (outs Nbdl_Type:$result);
 }
 
-def Nbdl_ApplyActionOp : Nbdl_Op<"apply_action", [Terminator]> {
-  let description = [{
-    Create a call to nbdl::apply_action which is dispatched
-    by the type of the LHS in C++.
-  }];
-  let arguments = (ins Nbdl_Type:$lhs, Variadic<Nbdl_Type>:$args);
-  let results = (outs);
-}
-
 def Nbdl_ConsumerOp : Nbdl_Op<"consumer", []> {
   let description = [{
     A consumer is an object provided with an object
@@ -389,8 +380,6 @@ def Nbdl_ConstOp : Nbdl_Op<"const", []> {
     We don't modify the type in IR land but rely on C++
     to manage underlying types. This is analogous to an
     immutable borrow I think.
-    We generally only allow mutation to occur to the operands
-    of nbdl.apply_action or nbdl.resolve.
   }];
 
   let arguments = (ins Nbdl_Type:$arg);

heavy/lib/Nbdl/NbdlWriter.cpp

@@ -359,7 +359,6 @@ class FuncWriter : public NbdlWriter<FuncWriter> {
     else if (isa<MatchIfOp>(Op))      return Visit(cast<MatchIfOp>(Op));
     else if (isa<FuncOp>(Op))         return Visit(cast<FuncOp>(Op));
     else if (isa<StoreComposeOp>(Op)) return Visit(cast<StoreComposeOp>(Op));
-    else if (isa<ApplyActionOp>(Op))  return Visit(cast<ApplyActionOp>(Op));
     else if (isa<ScopeOp>(Op))
       return VisitRegion(cast<ScopeOp>(Op).getBody());
     else if (isa<ConstexprOp, LiteralOp>(Op)) return;
@@ -454,17 +453,6 @@ class FuncWriter : public NbdlWriter<FuncWriter> {
     // Do nothing.
   }
 
-  void Visit(ApplyActionOp Op) {
-    OS << "::nbdl::apply_action(";
-    WriteExpr(Op.getLhs());
-    OS << ", ";
-    llvm::interleave(Op.getArgs(), OS,
-        [&](mlir::Value V) {
-          WriteExpr(V);
-        }, ",\n");
-    OS << ");\n";
-  }
-
   void Visit(StoreComposeOp Op) {
     // Note the C++ function does (Key, Rhs, Lhs) for some reason.
     OS << "auto ";

heavy/test/Nbdl/apply_action.scm renamed to heavy/test/Nbdl/close_previous_scope.scm

@@ -10,8 +10,24 @@
 (define !nbdl.store (type "!nbdl.store"))
 (define !nbdl.unit (type "!nbdl.unit"))
 (define !nbdl.symbol (type "!nbdl.symbol"))
+(define !nbdl.unit (type "!nbdl.unit"))
 (define i32 (type "i32"))
 
+(define (resolve . args)
+  (define Result
+    (result
+      (create-op "nbdl.visit"
+                 (loc: 0)
+                 (operands: args)
+                 (attributes:)
+                 (result-types: !nbdl.unit)
+                 )))
+  (create-op "nbdl.discard"
+             (loc: 0)
+             (operands: Result)
+             (attributes:)
+             (result-types:)))
+
 (define my_match_params
   (%build-match-params
     'my_match_params
@@ -53,11 +69,8 @@
               ("type" (string-attr "std::string")))
             (result-types:)
             (region: "body" ((MatchedStore : !nbdl.store))
-              (create-op "nbdl.apply_action"
-                (loc: 0)
-                (operands: MatchedStore Foo)
-                (attributes:)
-                (result-types:))))))
+              (resolve MatchedStore Foo)
+                ))))
       ; Foo is not allowed after this (because it could be invalidated.)
       (close-previous-scope)
       (close-previous-scope) ; Should do nothing.
@@ -68,17 +81,14 @@
                           (attributes:
                             ("expr" (string-attr "::some_tag{}")))
                           (result-types: !nbdl.store)))))
-        (create-op "nbdl.apply_action"
-          (loc: 0)
-          (operands: Store SomeTag)
-          (attributes:)
-          (result-types:))))))
+        (resolve
+          Store SomeTag)))))
 
 (unless (verify current-nbdl-module)
   (error "verification failed {}" my_match_params))
 
 ; TODO Handle perfect forwarding.
-; CHECK: nbdl::apply_action(arg_3, get_2)
-; CHECK: nbdl::apply_action(arg_0, ::some_tag{})
+; CHECK: arg_3(get_2);
+; CHECK: arg_0(::some_tag{});
 (translate-cpp my_match_params)
 (newline)