Skip to content

Commit b5101ec

Browse files
alexcrichtonalexcrichton
authored
pulley: Ungate the GC_TYPES feature from Pulley (#9785)
* pulley: Ungate the `GC_TYPES` feature from Pulley Similar to #9779 this remove the `GC_TYPES` feature from the list of panicking features in Pulley. In doing so this then additionally fixes a number of panics and then adds more tests that are working. Some other minor instructions are filled out to ensure that tests are working on both 32 and 64-bit platforms. * Flag test as now passing
1 parent d2a22d4 commit b5101ec

File tree

9 files changed

+75
-27
lines changed

9 files changed

+75
-27
lines changed

‎cranelift/codegen/src/isa/pulley_shared/inst/mod.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,10 @@ where
378378
match self.inst {
379379
Inst::Raw {
380380
raw: RawInst::Trap { .. },
381-
} => true,
381+
}
382+
| Inst::Call { .. }
383+
| Inst::IndirectCall { .. }
384+
| Inst::IndirectCallHost { .. } => true,
382385
_ => false,
383386
}
384387
}

‎cranelift/codegen/src/isa/pulley_shared/lower.isle

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,19 @@
212212

213213
;;;; Rules for `band` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
214214

215-
(rule (lower (has_type $I32 (band a b)))
216-
(pulley_xand32 a b))
215+
(rule 0 (lower (has_type (fits_in_32 _) (band a b)))
216+
(pulley_xand32 a b))
217+
218+
(rule 1 (lower (has_type $I64 (band a b)))
219+
(pulley_xand64 a b))
220+
221+
;;;; Rules for `bor` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
222+
223+
(rule 0 (lower (has_type (fits_in_32 _) (bor a b)))
224+
(pulley_xor32 a b))
225+
226+
(rule 1 (lower (has_type $I64 (bor a b)))
227+
(pulley_xor64 a b))
217228

218229
;;;; Rules for `icmp` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
219230

‎crates/cranelift/src/gc/enabled/drc.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ impl GcCompiler for DrcCompiler {
301301
init: super::ArrayInit<'_>,
302302
) -> WasmResult<ir::Value> {
303303
let interned_type_index = func_env.module.types[array_type_index];
304+
let ptr_ty = func_env.pointer_type();
304305

305306
let len_offset = gc_compiler(func_env)?.layouts().array_length_field_offset();
306307
let array_layout = func_env.array_layout(interned_type_index).clone();
@@ -338,9 +339,7 @@ impl GcCompiler for DrcCompiler {
338339
.store(ir::MemFlags::trusted(), len, len_addr, 0);
339340

340341
// Finally, initialize the elements.
341-
let len_to_elems_delta = builder
342-
.ins()
343-
.iconst(ir::types::I64, i64::from(len_to_elems_delta));
342+
let len_to_elems_delta = builder.ins().iconst(ptr_ty, i64::from(len_to_elems_delta));
344343
let elems_addr = builder.ins().iadd(len_addr, len_to_elems_delta);
345344
init.initialize(
346345
func_env,

‎crates/cranelift/src/gc/enabled/null.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ impl GcCompiler for NullCompiler {
155155
init: super::ArrayInit<'_>,
156156
) -> WasmResult<ir::Value> {
157157
let interned_type_index = func_env.module.types[array_type_index];
158+
let ptr_ty = func_env.pointer_type();
158159

159160
let len_offset = gc_compiler(func_env)?.layouts().array_length_field_offset();
160161
let array_layout = func_env.array_layout(interned_type_index).clone();
@@ -190,9 +191,7 @@ impl GcCompiler for NullCompiler {
190191
.store(ir::MemFlags::trusted(), len, len_addr, 0);
191192

192193
// Finally, initialize the elements.
193-
let len_to_elems_delta = builder
194-
.ins()
195-
.iconst(ir::types::I64, i64::from(len_to_elems_delta));
194+
let len_to_elems_delta = builder.ins().iconst(ptr_ty, i64::from(len_to_elems_delta));
196195
let elems_addr = builder.ins().iadd(len_addr, len_to_elems_delta);
197196
init.initialize(
198197
func_env,

‎crates/wasmtime/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1965,7 +1965,7 @@ impl Config {
19651965
// errors are panics though due to unimplemented bits in ABI
19661966
// code and those causes are listed here.
19671967
if self.compiler_target().is_pulley() {
1968-
return WasmFeatures::TAIL_CALL | WasmFeatures::GC_TYPES;
1968+
return WasmFeatures::TAIL_CALL;
19691969
}
19701970

19711971
// Other Cranelift backends are either 100% missing or complete

‎crates/wasmtime/src/runtime/externals/table.rs

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,6 @@ impl Table {
441441
mod tests {
442442
use super::*;
443443
use crate::{Instance, Module, Store};
444-
use wasmtime_environ::TripleExt;
445444

446445
#[test]
447446
fn hash_key_is_stable_across_duplicate_store_data_entries() -> Result<()> {
@@ -453,20 +452,7 @@ mod tests {
453452
(table (export "t") 1 1 externref)
454453
)
455454
"#,
456-
);
457-
// Expect this test to fail on pulley at this time. When pulley supports
458-
// externref this should switch back to using `?` on the constructor
459-
// above for all platforms.
460-
let module = match module {
461-
Ok(module) => {
462-
assert!(!store.engine().target().is_pulley());
463-
module
464-
}
465-
Err(e) => {
466-
assert!(store.engine().target().is_pulley(), "bad error {e:?}");
467-
return Ok(());
468-
}
469-
};
455+
)?;
470456
let instance = Instance::new(&mut store, &module, &[])?;
471457

472458
// Each time we `get_table`, we call `Table::from_wasmtime` which adds

‎crates/wast-util/src/lib.rs

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,31 +412,53 @@ impl WastTest {
412412
"misc_testsuite/component-model/import.wast",
413413
"misc_testsuite/component-model/instance.wast",
414414
"misc_testsuite/component-model/linking.wast",
415+
"misc_testsuite/component-model/modules.wast",
415416
"misc_testsuite/component-model/nested.wast",
417+
"misc_testsuite/component-model/resources.wast",
416418
"misc_testsuite/component-model/types.wast",
417419
"misc_testsuite/control-flow.wast",
418420
"misc_testsuite/custom-page-sizes/custom-page-sizes.wast",
419421
"misc_testsuite/elem-ref-null.wast",
420422
"misc_testsuite/elem_drop.wast",
421423
"misc_testsuite/empty.wast",
422424
"misc_testsuite/export-large-signature.wast",
425+
"misc_testsuite/externref-id-function.wast",
426+
"misc_testsuite/externref-segment.wast",
427+
"misc_testsuite/externref-table-dropped-segment-issue-8281.wast",
423428
"misc_testsuite/fib.wast",
424429
"misc_testsuite/func-400-params.wast",
430+
"misc_testsuite/gc/array-alloc-too-large.wast",
431+
"misc_testsuite/gc/array-init-data.wast",
432+
"misc_testsuite/gc/array-new-data.wast",
433+
"misc_testsuite/gc/array-new-elem.wast",
434+
"misc_testsuite/gc/array-types.wast",
435+
"misc_testsuite/gc/externref-segment.wast",
436+
"misc_testsuite/gc/func-refs-in-gc-heap.wast",
425437
"misc_testsuite/gc/more-rec-groups-than-types.wast",
438+
"misc_testsuite/gc/null-i31ref.wast",
426439
"misc_testsuite/gc/rec-group-funcs.wast",
440+
"misc_testsuite/gc/struct-types.wast",
427441
"misc_testsuite/imported-memory-copy.wast",
428442
"misc_testsuite/issue4857.wast",
443+
"misc_testsuite/linking-errors.wast",
429444
"misc_testsuite/memory-copy.wast",
430445
"misc_testsuite/memory64/bounds.wast",
431446
"misc_testsuite/memory64/linking-errors.wast",
432447
"misc_testsuite/memory64/linking.wast",
448+
"misc_testsuite/memory64/more-than-4gb.wast",
433449
"misc_testsuite/memory64/multi-memory.wast",
434450
"misc_testsuite/memory64/offsets.wast",
435451
"misc_testsuite/multi-memory/simple.wast",
452+
"misc_testsuite/mutable_externref_globals.wast",
453+
"misc_testsuite/no-mixup-stack-maps.wast",
436454
"misc_testsuite/partial-init-memory-segment.wast",
437455
"misc_testsuite/rs2wasm-add-func.wast",
456+
"misc_testsuite/simple_ref_is_null.wast",
438457
"misc_testsuite/stack_overflow.wast",
439458
"misc_testsuite/table_grow_with_funcref.wast",
459+
"misc_testsuite/threads/LB.wast",
460+
"misc_testsuite/threads/MP.wast",
461+
"misc_testsuite/threads/SB.wast",
440462
"misc_testsuite/threads/atomics_notify.wast",
441463
"misc_testsuite/threads/atomics_wait_address.wast",
442464
"misc_testsuite/threads/wait_notify.wast",
@@ -504,12 +526,14 @@ impl WastTest {
504526
"spec_testsuite/proposals/threads/atomics_wait_address.wast",
505527
"spec_testsuite/proposals/threads/exports.wast",
506528
"spec_testsuite/proposals/threads/wait_notify.wast",
529+
"spec_testsuite/ref_null.wast",
507530
"spec_testsuite/simd_linking.wast",
508531
"spec_testsuite/skip-stack-guard-page.wast",
509532
"spec_testsuite/start.wast",
510533
"spec_testsuite/store.wast",
511534
"spec_testsuite/table-sub.wast",
512535
"spec_testsuite/table.wast",
536+
"spec_testsuite/table_size.wast",
513537
"spec_testsuite/token.wast",
514538
"spec_testsuite/type.wast",
515539
"spec_testsuite/unreachable.wast",
@@ -520,7 +544,6 @@ impl WastTest {
520544
"spec_testsuite/utf8-import-field.wast",
521545
"spec_testsuite/utf8-import-module.wast",
522546
"spec_testsuite/utf8-invalid-encoding.wast",
523-
"misc_testsuite/memory64/more-than-4gb.wast",
524547
];
525548

526549
if supported.iter().any(|part| self.path.ends_with(part)) {

‎pulley/src/interp.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1578,6 +1578,27 @@ impl OpVisitor for Interpreter<'_> {
15781578
self.state[operands.dst].set_u32(a & b);
15791579
ControlFlow::Continue(())
15801580
}
1581+
1582+
fn xand64(&mut self, operands: BinaryOperands<XReg>) -> ControlFlow<Done> {
1583+
let a = self.state[operands.src1].get_u64();
1584+
let b = self.state[operands.src2].get_u64();
1585+
self.state[operands.dst].set_u64(a & b);
1586+
ControlFlow::Continue(())
1587+
}
1588+
1589+
fn xor32(&mut self, operands: BinaryOperands<XReg>) -> ControlFlow<Done> {
1590+
let a = self.state[operands.src1].get_u32();
1591+
let b = self.state[operands.src2].get_u32();
1592+
self.state[operands.dst].set_u32(a | b);
1593+
ControlFlow::Continue(())
1594+
}
1595+
1596+
fn xor64(&mut self, operands: BinaryOperands<XReg>) -> ControlFlow<Done> {
1597+
let a = self.state[operands.src1].get_u64();
1598+
let b = self.state[operands.src2].get_u64();
1599+
self.state[operands.dst].set_u64(a | b);
1600+
ControlFlow::Continue(())
1601+
}
15811602
}
15821603

15831604
impl ExtendedOpVisitor for Interpreter<'_> {

‎pulley/src/lib.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,14 @@ macro_rules! for_each_op {
325325
/// `dst = src1 / src2` (signed)
326326
xdiv32_s = XDiv32S { operands: BinaryOperands<XReg> };
327327

328-
/// `dst = src1 & src2`
328+
/// `low32(dst) = low32(src1) & low32(src2)`
329329
xand32 = XAnd32 { operands: BinaryOperands<XReg> };
330+
/// `dst = src1 & src2`
331+
xand64 = XAnd64 { operands: BinaryOperands<XReg> };
332+
/// `low32(dst) = low32(src1) | low32(src2)`
333+
xor32 = XOr32 { operands: BinaryOperands<XReg> };
334+
/// `dst = src1 | src2`
335+
xor64 = XOr64 { operands: BinaryOperands<XReg> };
330336
}
331337
};
332338
}

0 commit comments

Comments
 (0)