Merge branch 'main' into component-attestation

Author: gionut

Cargo.lock

@@ -317,7 +317,7 @@ component-async-tests = { path = "crates/misc/component-async-tests" }
 
 # Bytecode Alliance maintained dependencies:
 # ---------------------------
-regalloc2 = "0.13.2"
+regalloc2 = "0.13.3"
 
 # cap-std family:
 target-lexicon = "0.13.0"
@@ -330,25 +330,25 @@ cap-tempfile = "3.4.5"
 fs-set-times = "0.20.3"
 system-interface = { version = "0.27.3", features = ["cap_std_impls"] }
 io-lifetimes = { version = "2.0.3", default-features = false }
-io-extras = "0.18.1"
+io-extras = "0.18.4"
 rustix = "1.0.8"
 # wit-bindgen:
-wit-bindgen = { version = "0.46.0", default-features = false }
-wit-bindgen-rust-macro = { version = "0.46.0", default-features = false }
+wit-bindgen = { version = "0.48.0", default-features = false }
+wit-bindgen-rust-macro = { version = "0.48.0", default-features = false }
 
 # wasm-tools family:
-wasmparser = { version = "0.240.0", default-features = false, features = ['simd'] }
-wat = "1.240.0"
-wast = "240.0.0"
-wasmprinter = "0.240.0"
-wasm-encoder = "0.240.0"
-wasm-smith = "0.240.0"
-wasm-mutate = "0.240.0"
-wit-parser = "0.240.0"
-wit-component = "0.240.0"
-wasm-wave = "0.240.0"
-wasm-compose = "0.240.0"
-json-from-wast = "0.240.0"
+wasmparser = { version = "0.241.0", default-features = false, features = ['simd'] }
+wat = "1.241.0"
+wast = "241.0.0"
+wasmprinter = "0.241.0"
+wasm-encoder = "0.241.0"
+wasm-smith = "0.241.0"
+wasm-mutate = "0.241.0"
+wit-parser = "0.241.0"
+wit-component = "0.241.0"
+wasm-wave = "0.241.0"
+wasm-compose = "0.241.0"
+json-from-wast = "0.241.0"
 
 # Non-Bytecode Alliance maintained dependencies:
 # --------------------------
@@ -359,7 +359,7 @@ object = { version = "0.37.3", default-features = false, features = ['read_core'
 gimli = { version = "0.32.3", default-features = false, features = ['read'] }
 addr2line = { version = "0.25.1", default-features = false }
 anyhow = { version = "1.0.100", default-features = false }
-windows-sys = "0.60.2"
+windows-sys = "0.61.2"
 env_logger = "0.11.5"
 log = { version = "0.4.28", default-features = false }
 clap = { version = "4.5.48", default-features = false, features = ["std", "derive"] }
@@ -391,7 +391,7 @@ tempfile = "3.23.0"
 filecheck = "0.5.0"
 libc = { version = "0.2.177", default-features = true }
 file-per-thread-logger = "0.2.0"
-tokio = { version = "1.47.1", features = [ "rt", "time" ] }
+tokio = { version = "1.48.0", features = [ "rt", "time" ] }
 hyper = "1.7.0"
 http = "1.3.1"
 http-body = "1.0.1"

Cargo.toml

@@ -40,7 +40,6 @@ capstone = { workspace = true, optional = true }
 target-lexicon = { workspace = true, features = ["std"] }
 env_logger = { workspace = true }
 rayon = { version = "1", optional = true }
-indicatif = "0.13.0"
 thiserror = { workspace = true }
 walkdir = { workspace = true }
 anyhow = { workspace = true }

cranelift/Cargo.toml

@@ -3948,6 +3948,15 @@
         (add_logical_mem_zext32_with_flags_paired ty y (sink_uload32 x))
         (trap_if_impl (mask_as_cond 3) tc)))
 
+;;;; Rules for `uadd_overflow` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(rule 0 (lower (has_type (ty_32_or_64 ty) (uadd_overflow x y)))
+      (let ((sum Reg (add_reg ty x y))
+            (overflow Reg
+              (lower_bool $I8
+                          (bool (icmpu_reg ty sum x) (intcc_as_cond (IntCC.UnsignedLessThan))))))
+        (output_pair sum overflow)))
+
 ;;;; Rules for `return` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (rule (lower (return args))

cranelift/codegen/src/isa/s390x/lower.isle

@@ -350,3 +350,29 @@
   (if-let true (i64_lt x 0))
   (iconst_u ty 0))
 
+;; (x < y) & (x ≠ -1) = (x < y)
+(rule
+  (simplify (band ty (ne ty x (iconst_s _ -1)) (ugt ty y x)))
+   (ult ty x y))
+(rule
+  (simplify (band ty (ne ty x (iconst_s _ -1)) (ult ty x z)))
+   (ult ty x z))
+(rule
+  (simplify (band ty (ne ty (iconst_s _ -1) x) (ugt ty y x)))
+   (ult ty x y))
+(rule
+  (simplify (band ty (ne ty (iconst_s _ -1) x) (ult ty x z)))
+   (ult ty x z))
+(rule
+  (simplify (band ty (ugt ty x y) (ne ty y (iconst_s _ -1))))
+   (ult ty y x))
+(rule
+  (simplify (band ty (ugt ty x y) (ne ty (iconst_s _ -1) y)))
+   (ult ty y x))
+(rule
+  (simplify (band ty (ult ty x y) (ne ty x (iconst_s _ -1))))
+   (ult ty x y))
+(rule
+  (simplify (band ty (ult ty x y) (ne ty (iconst_s _ -1) x)))
+   (ult ty x y))
+

cranelift/codegen/src/opts/icmp.isle

@@ -405,3 +405,19 @@ block0(v0: i32):
 ;     return v9  ; v9 = 0
 ; }
 
+;; (x <u y) & (x != -1) => (x <_u y)
+function %test_ult_ne_minus_one(i32, i32) -> i8 fast {
+block0(v0: i32, v1: i32):
+    v2 = icmp ult v0, v1
+    v3 = iconst.i32 -1
+    v4 = icmp ne v0, v3
+    v5 = band v2, v4
+    return v5
+}
+
+; function %test_ult_ne_minus_one(i32, i32) -> i8 fast {
+; block0(v0: i32, v1: i32):
+;     v6 = icmp ult v0, v1
+;     return v6
+; }
+

cranelift/filetests/filetests/egraph/icmp.clif

@@ -0,0 +1,51 @@
+test compile precise-output
+target s390x
+
+function %f2(i32, i32) -> i32, i8 {
+block0(v0: i32, v1: i32):
+    v2, v3 = uadd_overflow v0, v1
+    return v2, v3
+}
+
+; VCode:
+; block0:
+;   ark %r5, %r2, %r3
+;   clr %r5, %r2
+;   lhi %r3, 0
+;   lochil %r3, 1
+;   lgr %r2, %r5
+;   br %r14
+;
+; Disassembled:
+; block0: ; offset 0x0
+;   ark %r5, %r2, %r3
+;   clr %r5, %r2
+;   lhi %r3, 0
+;   lochil %r3, 1
+;   lgr %r2, %r5
+;   br %r14
+
+function %f4(i64, i64) -> i64, i8 {
+block0(v0: i64, v1: i64):
+    v2, v3 = uadd_overflow v0, v1
+    return v2, v3
+}
+
+; VCode:
+; block0:
+;   agrk %r5, %r2, %r3
+;   clgr %r5, %r2
+;   lhi %r3, 0
+;   lochil %r3, 1
+;   lgr %r2, %r5
+;   br %r14
+;
+; Disassembled:
+; block0: ; offset 0x0
+;   agrk %r5, %r2, %r3
+;   clgr %r5, %r2
+;   lhi %r3, 0
+;   lochil %r3, 1
+;   lgr %r2, %r5
+;   br %r14
+

cranelift/filetests/filetests/isa/s390x/uadd_overflow.clif

@@ -159,3 +159,14 @@ block0(v0: i32):
 
 ; run: %test_ult_sgt_neg_const_x(42) == 0
 
+;; (x <u y) & (x != -1) => (x <_u y)
+function %test_ult_ne_minus_one(i32, i32) -> i8 {
+block0(v0: i32, v1: i32):
+    v2 = icmp ult v0, v1
+    v3 = iconst.i32 -1
+    v4 = icmp ne v0, v3
+    v5 = band v2, v4
+    return v5
+}
+; run: %test_ult_ne_minus_one(3, 5) == 1
+; run: %test_ult_ne_minus_one(-1, 1) == 0

cranelift/filetests/filetests/runtests/icmp.clif

@@ -1,10 +1,11 @@
 test interpret
 test run
 set enable_llvm_abi_extensions=true
-target aarch64
 set enable_multi_ret_implicit_sret
 target x86_64
+target aarch64
 target riscv64
+target s390x
 target pulley32
 target pulley32be
 target pulley64