add plumbing for task.cancel intrinsic

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

Author: dicej

Cargo.lock

@@ -595,18 +595,18 @@ lto = true
 
 # TODO: remove this once we've switched to a wasm-tools/wit-bindgen release:
 [patch.crates-io]
-wasmparser = { git = "https://github.com/dicej/wasm-tools", branch = "subtask-cancel" }
-wat = { git = "https://github.com/dicej/wasm-tools", branch = "subtask-cancel" }
-wast = { git = "https://github.com/dicej/wasm-tools", branch = "subtask-cancel" }
-wasmprinter = { git = "https://github.com/dicej/wasm-tools", branch = "subtask-cancel" }
-wasm-encoder = { git = "https://github.com/dicej/wasm-tools", branch = "subtask-cancel" }
-wasm-smith = { git = "https://github.com/dicej/wasm-tools", branch = "subtask-cancel" }
-wasm-mutate = { git = "https://github.com/dicej/wasm-tools", branch = "subtask-cancel" }
-wit-parser = { git = "https://github.com/dicej/wasm-tools", branch = "subtask-cancel" }
-wit-component = { git = "https://github.com/dicej/wasm-tools", branch = "subtask-cancel" }
-wasm-wave = { git = "https://github.com/dicej/wasm-tools", branch = "subtask-cancel" }
-wasm-compose = { git = "https://github.com/dicej/wasm-tools", branch = "subtask-cancel" }
-wasm-metadata = { git = "https://github.com/dicej/wasm-tools", branch = "subtask-cancel" }
+wasmparser = { git = "https://github.com/dicej/wasm-tools", branch = "task-cancel" }
+wat = { git = "https://github.com/dicej/wasm-tools", branch = "task-cancel" }
+wast = { git = "https://github.com/dicej/wasm-tools", branch = "task-cancel" }
+wasmprinter = { git = "https://github.com/dicej/wasm-tools", branch = "task-cancel" }
+wasm-encoder = { git = "https://github.com/dicej/wasm-tools", branch = "task-cancel" }
+wasm-smith = { git = "https://github.com/dicej/wasm-tools", branch = "task-cancel" }
+wasm-mutate = { git = "https://github.com/dicej/wasm-tools", branch = "task-cancel" }
+wit-parser = { git = "https://github.com/dicej/wasm-tools", branch = "task-cancel" }
+wit-component = { git = "https://github.com/dicej/wasm-tools", branch = "task-cancel" }
+wasm-wave = { git = "https://github.com/dicej/wasm-tools", branch = "task-cancel" }
+wasm-compose = { git = "https://github.com/dicej/wasm-tools", branch = "task-cancel" }
+wasm-metadata = { git = "https://github.com/dicej/wasm-tools", branch = "task-cancel" }
 wit-bindgen = { git = "https://github.com/bytecodealliance/witx-bindgen" }
 wit-bindgen-rt = { git = "https://github.com/bytecodealliance/witx-bindgen" }
 wit-bindgen-rust-macro = { git = "https://github.com/bytecodealliance/witx-bindgen" }

Cargo.toml

@@ -108,6 +108,7 @@ impl<'a> TrampolineCompiler<'a> {
             Trampoline::TaskReturn { results, options } => {
                 self.translate_task_return_call(*results, options)
             }
+            Trampoline::TaskCancel { instance } => self.translate_task_cancel_call(*instance),
             Trampoline::WaitableSetNew { instance } => self.translate_waitable_set_new(*instance),
             Trampoline::WaitableSetWait {
                 instance,
@@ -653,6 +654,25 @@ impl<'a> TrampolineCompiler<'a> {
         );
     }
 
+    fn translate_task_cancel_call(&mut self, caller_instance: RuntimeComponentInstanceIndex) {
+        let args = self.builder.func.dfg.block_params(self.block0).to_vec();
+        let vmctx = args[0];
+
+        let callee_args = vec![
+            vmctx,
+            self.builder
+                .ins()
+                .iconst(ir::types::I32, i64::from(caller_instance.as_u32())),
+        ];
+
+        self.translate_intrinsic_libcall(
+            vmctx,
+            host::task_cancel,
+            &callee_args,
+            TrapSentinel::Falsy,
+        );
+    }
+
     fn translate_task_wait_or_poll_call(
         &mut self,
         caller_instance: RuntimeComponentInstanceIndex,

crates/cranelift/src/compiler/component.rs

@@ -88,6 +88,8 @@ macro_rules! foreach_builtin_component_function {
             #[cfg(feature = "component-model-async")]
             task_return(vmctx: vmctx, ty: u32, memory: ptr_u8, string_encoding: u8, storage: ptr_u8, storage_len: size) -> bool;
             #[cfg(feature = "component-model-async")]
+            task_cancel(vmctx: vmctx, caller_instance: u32) -> bool;
+            #[cfg(feature = "component-model-async")]
             waitable_set_new(vmctx: vmctx, caller_instance: u32) -> u64;
             #[cfg(feature = "component-model-async")]
             waitable_set_wait(vmctx: vmctx, caller_instance: u32, async_: u8, memory: ptr_u8, set: u32, payload: u32) -> u64;

crates/environ/src/component.rs

@@ -291,6 +291,9 @@ pub enum Trampoline {
         results: TypeTupleIndex,
         options: CanonicalOptions,
     },
+    TaskCancel {
+        instance: RuntimeComponentInstanceIndex,
+    },
     WaitableSetNew {
         instance: RuntimeComponentInstanceIndex,
     },
@@ -799,6 +802,9 @@ impl LinearizeDfg<'_> {
                 results: *results,
                 options: self.options(options),
             },
+            Trampoline::TaskCancel { instance } => info::Trampoline::TaskCancel {
+                instance: *instance,
+            },
             Trampoline::WaitableSetNew { instance } => info::Trampoline::WaitableSetNew {
                 instance: *instance,
             },

crates/environ/src/component/dfg.rs

@@ -720,6 +720,14 @@ pub enum Trampoline {
         options: CanonicalOptions,
     },
 
+    /// A `task.cancel` intrinsic, which acknowledges a `CANCELLED` event
+    /// delivered to a guest task previously created by a call to an async
+    /// export.
+    TaskCancel {
+        /// The specific component instance which is calling the intrinsic.
+        instance: RuntimeComponentInstanceIndex,
+    },
+
     /// A `waitable-set.new` intrinsic.
     WaitableSetNew {
         /// The specific component instance which is calling the intrinsic.
@@ -1051,6 +1059,7 @@ impl Trampoline {
             ResourceDrop(i) => format!("component-resource-drop[{}]", i.as_u32()),
             BackpressureSet { .. } => format!("backpressure-set"),
             TaskReturn { .. } => format!("task-return"),
+            TaskCancel { .. } => format!("task-cancel"),
             WaitableSetNew { .. } => format!("waitable-set-new"),
             WaitableSetWait { .. } => format!("waitable-set-wait"),
             WaitableSetPoll { .. } => format!("waitable-set-poll"),

crates/environ/src/component/info.rs

@@ -196,6 +196,9 @@ enum LocalInitializer<'data> {
         result: Option<ComponentValType>,
         options: LocalCanonicalOptions,
     },
+    TaskCancel {
+        func: ModuleInternedTypeIndex,
+    },
     WaitableSetNew {
         func: ModuleInternedTypeIndex,
     },
@@ -679,6 +682,11 @@ impl<'a, 'data> Translator<'a, 'data> {
                                 options,
                             }
                         }
+                        wasmparser::CanonicalFunction::TaskCancel => {
+                            let func = self.core_func_signature(core_func_index)?;
+                            core_func_index += 1;
+                            LocalInitializer::TaskCancel { func }
+                        }
                         wasmparser::CanonicalFunction::WaitableSetNew => {
                             let func = self.core_func_signature(core_func_index)?;
                             core_func_index += 1;

crates/environ/src/component/translate.rs

@@ -698,6 +698,15 @@ impl<'a> Inliner<'a> {
                     .push((*func, dfg::Trampoline::TaskReturn { results, options }));
                 frame.funcs.push(dfg::CoreDef::Trampoline(index));
             }
+            TaskCancel { func } => {
+                let index = self.result.trampolines.push((
+                    *func,
+                    dfg::Trampoline::TaskCancel {
+                        instance: frame.instance,
+                    },
+                ));
+                frame.funcs.push(dfg::CoreDef::Trampoline(index));
+            }
             WaitableSetNew { func } => {
                 let index = self.result.trampolines.push((
                     *func,

crates/environ/src/component/translate/inline.rs

@@ -1934,6 +1934,14 @@ impl ComponentInstance {
         Ok(())
     }
 
+    pub(crate) fn task_cancel(
+        &mut self,
+        caller_instance: RuntimeComponentInstanceIndex,
+    ) -> Result<()> {
+        _ = caller_instance;
+        todo!()
+    }
+
     pub(crate) fn backpressure_set(
         &mut self,
         caller_instance: RuntimeComponentInstanceIndex,

crates/wasmtime/src/runtime/component/concurrent.rs

@@ -615,6 +615,15 @@ unsafe fn task_return(
     })
 }
 
+#[cfg(feature = "component-model-async")]
+unsafe fn task_cancel(vmctx: NonNull<VMComponentContext>, caller_instance: u32) -> Result<()> {
+    ComponentInstance::from_vmctx(vmctx, |instance| {
+        instance.task_cancel(
+            wasmtime_environ::component::RuntimeComponentInstanceIndex::from_u32(caller_instance),
+        )
+    })
+}
+
 #[cfg(feature = "component-model-async")]
 unsafe fn waitable_set_new(
     vmctx: NonNull<VMComponentContext>,