Merge with upstream (#270)

.github/workflows/main.yml

@@ -605,9 +605,12 @@ jobs:
     # Check that `pulley-interpreter` compiles with tail calls enabled.  Don't
     # actually run the tests with tail calls enabled, because they are not yet
     # implemented in rustc and cause an ICE.
-    - run: cargo check -p pulley-interpreter
+    - run: cargo check -p pulley-interpreter --all-features
       env:
         RUSTFLAGS: "--cfg pulley_tail_calls"
+    - run: cargo test -p pulley-interpreter --all-features --release
+      env:
+        RUSTFLAGS: "--cfg pulley_assume_llvm_makes_tail_calls"
 
     # Ensure that fuzzers still build.
     #

ADOPTERS.md

@@ -12,6 +12,7 @@ Wasmtime is used in many different production use-cases. This list has grown sig
 | [Embark Studios](https://www.embark-studios.com/) | [@repi](https://github.com/repi) | ![production](https://img.shields.io/badge/-production-blue?style=flat) | Rust game engine |
 | [Fastly](https://fastly.com/) | [@fitzgen](https://github.com/fitzgen) | ![production](https://img.shields.io/badge/-production-blue?style=flat) | The Compute@Edge platform helps you compile your custom code to WebAssembly and runs it at the Fastly edge using the WebAssembly System Interface for each compute request. |
 | [Fermyon](https://fermyon.com) | [@tschneidereit](https://github.com/tschneidereit) | ![production](https://img.shields.io/badge/-production-blue?style=flat) | Fermyon Cloud is a cloud application platform for WebAssembly-based serverless functions and microservices. |
+| [Huawei](https://www.huawei.com) | [@mohrobati](https://github.com/mohrobati) | ![production](https://img.shields.io/badge/-production-blue?style=flat) | Huawei Cloud uses Wasmtime to run WebAssembly functions in both serverless cloud and on the edge. |
 | [InfinyOn](https://infinyon.com/) | [@sehz](https://github.com/sehz) | ![production](https://img.shields.io/badge/-production-blue?style=flat) | InfinyOn leverages the power of WebAssembly SmartModules to execute real-time data transformations. |
 | [Microsoft](https://microsoft.com/) | [@devigned](https://gist.github.com/devigned) | ![production](https://img.shields.io/badge/-production-blue?style=flat) | Microsoft has had Wasmtime in preview for its WebAssembly System Interface (WASI) node pools in Azure Kubernetes Service since October 2021. |
 | [Redpanda](https://redpanda.com/) | [@rockwotj](https://github.com/rockwotj) | ![beta](https://img.shields.io/badge/-production-blue?style=flat) | Redpanda Data Transforms allow developers to transform data directly in the message broker. |

Cargo.toml

@@ -179,8 +179,13 @@ unused_import_braces = 'warn'
 unused-lifetimes = 'warn'
 unused-macro-rules = 'warn'
 
-# Don't warn about unknown cfg condition in `#[cfg(pulley_tail_calls)]`
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(pulley_tail_calls)'] }
+# Don't warn about unknown cfgs for pulley
+[workspace.lints.rust.unexpected_cfgs]
+level = "warn"
+check-cfg = [
+  'cfg(pulley_tail_calls)',
+  'cfg(pulley_assume_llvm_makes_tail_calls)',
+]
 
 [workspace.lints.clippy]
 # The default set of lints in Clippy is viewed as "too noisy" right now so
@@ -198,7 +203,7 @@ unnecessary_cast = 'warn'
 allow_attributes_without_reason = 'warn'
 
 [workspace.dependencies]
-arbitrary = { version = "1.3.1" }
+arbitrary = { version = "1.4.0" }
 wasmtime-wmemcheck = { path = "crates/wmemcheck", version = "=29.0.0" }
 wasmtime = { path = "crates/wasmtime", version = "29.0.0", default-features = false }
 wasmtime-c-api-macros = { path = "crates/c-api-macros", version = "=29.0.0" }

cranelift/codegen/Cargo.toml

@@ -86,7 +86,12 @@ x86 = []
 arm64 = []
 s390x = []
 riscv64 = []
-pulley = ["dep:pulley-interpreter", "pulley-interpreter/encode", "pulley-interpreter/disas"]
+pulley = [
+  "dep:pulley-interpreter",
+  "pulley-interpreter/encode",
+  "pulley-interpreter/disas",
+  "cranelift-codegen-meta/pulley",
+]
 # Enable the ISA target for the host machine
 host-arch = []
 

cranelift/codegen/meta/Cargo.toml

@@ -17,3 +17,7 @@ rustdoc-args = [ "--document-private-items" ]
 
 [dependencies]
 cranelift-codegen-shared = { path = "../shared", version = "0.116.0" }
+pulley-interpreter = { workspace = true, optional = true }
+
+[features]
+pulley = ['dep:pulley-interpreter']

cranelift/codegen/meta/src/isle.rs

@@ -64,6 +64,8 @@ pub fn get_isle_compilations(
     let prelude_isle = codegen_crate_dir.join("src").join("prelude.isle");
     let prelude_opt_isle = codegen_crate_dir.join("src").join("prelude_opt.isle");
     let prelude_lower_isle = codegen_crate_dir.join("src").join("prelude_lower.isle");
+    #[cfg(feature = "pulley")]
+    let pulley_gen = gen_dir.join("pulley_gen.isle");
 
     // Directory for mid-end optimizations.
     let src_opts = codegen_crate_dir.join("src").join("opts");
@@ -73,6 +75,7 @@ pub fn get_isle_compilations(
     let src_isa_aarch64 = codegen_crate_dir.join("src").join("isa").join("aarch64");
     let src_isa_s390x = codegen_crate_dir.join("src").join("isa").join("s390x");
     let src_isa_risc_v = codegen_crate_dir.join("src").join("isa").join("riscv64");
+    #[cfg(feature = "pulley")]
     let src_isa_pulley_shared = codegen_crate_dir
         .join("src")
         .join("isa")
@@ -166,6 +169,7 @@ pub fn get_isle_compilations(
                 untracked_inputs: vec![clif_lower_isle.clone()],
             },
             // The Pulley instruction selector.
+            #[cfg(feature = "pulley")]
             IsleCompilation {
                 name: "pulley".to_string(),
                 output: gen_dir.join("isle_pulley_shared.rs"),
@@ -175,7 +179,7 @@ pub fn get_isle_compilations(
                     src_isa_pulley_shared.join("inst.isle"),
                     src_isa_pulley_shared.join("lower.isle"),
                 ],
-                untracked_inputs: vec![clif_lower_isle.clone()],
+                untracked_inputs: vec![pulley_gen.clone(), clif_lower_isle.clone()],
             },
         ],
     }

cranelift/codegen/meta/src/lib.rs

@@ -20,6 +20,9 @@ mod constant_hash;
 mod shared;
 mod unique_table;
 
+#[cfg(feature = "pulley")]
+mod pulley;
+
 /// Generate an ISA from an architecture string (e.g. "x86_64").
 pub fn isa_from_arch(arch: &str) -> Result<isa::Isa, String> {
     isa::Isa::from_arch(arch).ok_or_else(|| format!("no supported isa found for arch `{arch}`"))
@@ -63,6 +66,11 @@ fn generate_rust_for_shared_defs(
         )?;
     }
 
+    #[cfg(feature = "pulley")]
+    if isas.contains(&isa::Isa::Pulley32) || isas.contains(&isa::Isa::Pulley64) {
+        pulley::generate_rust("pulley_inst_gen.rs", out_dir)?;
+    }
+
     Ok(())
 }
 
@@ -82,7 +90,12 @@ fn generate_isle_for_shared_defs(
         "clif_opt.isle",
         "clif_lower.isle",
         isle_dir,
-    )
+    )?;
+
+    #[cfg(feature = "pulley")]
+    pulley::generate_isle("pulley_gen.isle", isle_dir)?;
+
+    Ok(())
 }
 
 /// Generates all the source files used in Cranelift from the meta-language.