[Compilation Hints] Add all call instructions (#7588)

Author: kripken

src/parser/contexts.h

@@ -2385,7 +2385,9 @@ struct ParseDefsCtx : TypeParserCtx<ParseDefsCtx>, AnnotationParserCtx {
                             bool isReturn) {
     auto t = getTable(pos, table);
     CHECK_ERR(t);
-    return withLoc(pos, irBuilder.makeCallIndirect(*t, type, isReturn));
+    auto inline_ = getInlineHint(annotations);
+    return withLoc(pos,
+                   irBuilder.makeCallIndirect(*t, type, isReturn, inline_));
   }
 
   // Return the branch hint for a branching instruction, if there is one.
@@ -2561,7 +2563,8 @@ struct ParseDefsCtx : TypeParserCtx<ParseDefsCtx>, AnnotationParserCtx {
                        const std::vector<Annotation>& annotations,
                        HeapType type,
                        bool isReturn) {
-    return withLoc(pos, irBuilder.makeCallRef(type, isReturn));
+    auto inline_ = getInlineHint(annotations);
+    return withLoc(pos, irBuilder.makeCallRef(type, isReturn, inline_));
   }
 
   Result<> makeRefI31(Index pos,

src/wasm-ir-builder.h

@@ -127,7 +127,10 @@ class IRBuilder : public UnifiedExpressionVisitor<IRBuilder, Result<>> {
   Result<> makeCall(Name func,
                     bool isReturn,
                     std::optional<std::uint8_t> inline_ = std::nullopt);
-  Result<> makeCallIndirect(Name table, HeapType type, bool isReturn);
+  Result<> makeCallIndirect(Name table,
+                            HeapType type,
+                            bool isReturn,
+                            std::optional<std::uint8_t> inline_ = std::nullopt);
   Result<> makeLocalGet(Index local);
   Result<> makeLocalSet(Index local);
   Result<> makeLocalTee(Index local);
@@ -201,7 +204,9 @@ class IRBuilder : public UnifiedExpressionVisitor<IRBuilder, Result<>> {
   Result<> makeTupleDrop(uint32_t arity);
   Result<> makeRefI31(Shareability share);
   Result<> makeI31Get(bool signed_);
-  Result<> makeCallRef(HeapType type, bool isReturn);
+  Result<> makeCallRef(HeapType type,
+                       bool isReturn,
+                       std::optional<std::uint8_t> inline_ = std::nullopt);
   Result<> makeRefTest(Type type);
   Result<> makeRefCast(Type type);
   Result<> makeBrOn(Index label,

src/wasm/wasm-ir-builder.cpp

@@ -1456,13 +1456,18 @@ Result<> IRBuilder::makeCall(Name func,
   return Ok{};
 }
 
-Result<> IRBuilder::makeCallIndirect(Name table, HeapType type, bool isReturn) {
+Result<> IRBuilder::makeCallIndirect(Name table,
+                                     HeapType type,
+                                     bool isReturn,
+                                     std::optional<std::uint8_t> inline_) {
   CallIndirect curr(wasm.allocator);
   curr.heapType = type;
   curr.operands.resize(type.getSignature().params.size());
   CHECK_ERR(visitCallIndirect(&curr));
-  push(builder.makeCallIndirect(
-    table, curr.target, curr.operands, type, isReturn));
+  auto* call =
+    builder.makeCallIndirect(table, curr.target, curr.operands, type, isReturn);
+  push(call);
+  addInlineHint(call, inline_);
   return Ok{};
 }
 
@@ -1952,7 +1957,9 @@ Result<> IRBuilder::makeI31Get(bool signed_) {
   return Ok{};
 }
 
-Result<> IRBuilder::makeCallRef(HeapType type, bool isReturn) {
+Result<> IRBuilder::makeCallRef(HeapType type,
+                                bool isReturn,
+                                std::optional<std::uint8_t> inline_) {
   CallRef curr(wasm.allocator);
   if (!type.isSignature()) {
     return Err{"expected function type"};
@@ -1961,7 +1968,10 @@ Result<> IRBuilder::makeCallRef(HeapType type, bool isReturn) {
   curr.operands.resize(type.getSignature().params.size());
   CHECK_ERR(ChildPopper{*this}.visitCallRef(&curr, type));
   CHECK_ERR(validateTypeAnnotation(type, curr.target));
-  push(builder.makeCallRef(curr.target, curr.operands, sig.results, isReturn));
+  auto* call =
+    builder.makeCallRef(curr.target, curr.operands, sig.results, isReturn);
+  push(call);
+  addInlineHint(call, inline_);
   return Ok{};
 }
 

test/lit/compilation-hints.wast

@@ -5,9 +5,15 @@
 ;; TODO: wasm-opt -all --roundtrip %s -S -o - | filecheck %s --check-prefix=RTRIP
 
 (module
-  ;; CHECK:      (type $0 (func))
+  ;; CHECK:      (type $func (func))
+  (type $func (func))
 
-  ;; CHECK:      (func $func (type $0)
+  ;; CHECK:      (table $table 10 20 funcref)
+  (table $table 10 20 funcref)
+
+  ;; CHECK:      (elem declare func $func)
+
+  ;; CHECK:      (func $func (type $func)
   ;; CHECK-NEXT:  (@metadata.code.inline "\00")
   ;; CHECK-NEXT:  (call $func)
   ;; CHECK-NEXT:  (@metadata.code.inline "\01")
@@ -31,6 +37,27 @@
     (call $func)
   )
 
+  ;; CHECK:      (func $other-calls (type $func)
+  ;; CHECK-NEXT:  (@metadata.code.inline "\12")
+  ;; CHECK-NEXT:  (call_indirect $table (type $func)
+  ;; CHECK-NEXT:   (i32.const 0)
+  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT:  (@metadata.code.inline "\34")
+  ;; CHECK-NEXT:  (call_ref $func
+  ;; CHECK-NEXT:   (ref.func $func)
+  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT: )
+  (func $other-calls
+    (@metadata.code.inline "\12")
+    (call_indirect (type $func)
+      (i32.const 0)
+    )
+    (@metadata.code.inline "\34")
+    (call_ref $func
+      (ref.func $func)
+    )
+  )
+
   ;; TODO: test function annotations, after
   ;; https://github.com/WebAssembly/tool-conventions/issues/251
 )