Skip to content

[MakeSharedObjects] Add an arg to keep externrefs #9157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tlively wants to merge 1 commit into
base: make-shared-obj-unshared-pass-arg
Choose a base branch
from
+112 −6
Open

[MakeSharedObjects] Add an arg to keep externrefs #9157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/passes/MakeSharedObjects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ struct MakeSharedObjects
: WalkerPass<PostWalker<MakeSharedObjects,
UnifiedExpressionVisitor<MakeSharedObjects>>> {
Shareability shared = Shared;
bool lowerExterns = true;
Type funcref = Type(HeapTypes::func, Nullable);
Type externref = Type(HeapTypes::ext, Nullable);

Expand Down Expand Up @@ -328,11 +329,13 @@ struct MakeSharedObjects
if (type.isMaybeShared(HeapType::nofunc)) {
return HeapTypes::none.getBasic(shared);
}
if (type == HeapType::ext || type == HeapType::string) {
return HeapTypes::i31.getBasic(shared);
}
if (type == HeapType::noext) {
return HeapTypes::none.getBasic(shared);
if (lowerExterns) {
if (type == HeapType::ext || type == HeapType::string) {
return HeapTypes::i31.getBasic(shared);
}
if (type == HeapType::noext) {
return HeapTypes::none.getBasic(shared);
}
}
if (type.isBasic()) {
return type.getBasic(shared);
Expand Down Expand Up @@ -703,7 +706,7 @@ struct MakeSharedObjects
}

void visitRefAs(RefAs* curr) {
if (curr->type == Type::unreachable) {
if (!lowerExterns || curr->type == Type::unreachable) {
return;
}
if (curr->op == AnyConvertExtern) {
Expand Down Expand Up @@ -854,6 +857,10 @@ struct MakeSharedObjects
if (hasArgument("make-shared-objects-unshared")) {
shared = Unshared;
}
if (hasArgument("make-shared-objects-keep-externs")) {
lowerExterns = false;
externTable.type = Type::none;
}
funcTable.wasm = wasm;
funcTable.shared = shared;
externTable.wasm = wasm;
Expand Down
99 changes: 99 additions & 0 deletions test/lit/passes/make-shared-objects-unshared.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

;; RUN: wasm-opt %s -all --make-shared-objects -S -o - | filecheck %s --check-prefix=SHARED
;; RUN: wasm-opt %s -all --make-shared-objects --pass-arg=make-shared-objects-unshared -S -o - | filecheck %s --check-prefix=UNSHARED
;; RUN: wasm-opt %s -all --make-shared-objects --pass-arg=make-shared-objects-unshared --pass-arg=make-shared-objects-keep-externs -S -o - | filecheck %s --check-prefix=KEEP-EXTERNS

(module
;; SHARED: (type $struct (shared (struct (field (mut (ref null (shared i31)))) (field (mut (ref null (shared i31)))) (field (mut (ref null (shared any)))))))
Expand All @@ -10,12 +11,33 @@
;; UNSHARED: (type $struct (struct (field (mut i31ref)) (field (mut i31ref)) (field (mut anyref))))

;; UNSHARED: (type $sig (func (param i31ref i31ref) (result anyref)))
;; KEEP-EXTERNS: (type $struct (struct (field (mut i31ref)) (field (mut externref)) (field (mut anyref))))

;; KEEP-EXTERNS: (type $sig (func (param i31ref externref) (result anyref)))
(type $sig (func (param funcref externref) (result anyref)))
(type $struct (struct (field (mut funcref)) (field (mut externref)) (field (mut anyref))))
;; SHARED: (type $array (shared (array (mut (ref null $struct)))))
;; UNSHARED: (type $array (array (mut (ref null $struct))))
;; KEEP-EXTERNS: (type $array (array (mut (ref null $struct))))
(type $array (array (mut (ref null $struct))))

;; KEEP-EXTERNS: (type $3 (func (param externref)))

;; KEEP-EXTERNS: (type $4 (func (param i31ref externref) (result i31ref externref)))

;; KEEP-EXTERNS: (type $5 (func (param (ref null $array))))

;; KEEP-EXTERNS: (type $6 (func (param (ref $struct))))

;; KEEP-EXTERNS: (type $7 (func (param (ref $struct) (ref i31))))

;; KEEP-EXTERNS: (type $8 (func (param (ref $struct)) (result externref)))

;; KEEP-EXTERNS: (type $9 (func (param externref) (result externref)))

;; KEEP-EXTERNS: (import "env" "imported_global" (global $imported_global externref))

;; KEEP-EXTERNS: (import "env" "imported_func" (func $imported_func (type $4) (param i31ref externref) (result i31ref externref)))
(import "env" "imported_func" (func $imported_func (param funcref externref) (result funcref externref)))
(import "env" "imported_global" (global $imported_global externref))
;; SHARED: (type $3 (func (param externref)))
Expand Down Expand Up @@ -92,8 +114,14 @@
;; UNSHARED: (import "env" "extern_to_any" (func $extern_to_any (exact (type $15) (param externref) (result anyref))))

;; UNSHARED: (import "env" "tag" (tag $tag (type $3) (param externref)))
;; KEEP-EXTERNS: (import "env" "tag" (tag $tag (type $3) (param externref)))
(import "env" "tag" (tag $tag (param externref)))

;; KEEP-EXTERNS: (table $funcs 1 1 funcref)

;; KEEP-EXTERNS: (elem $funcs (i32.const 0) $exported_func)

;; KEEP-EXTERNS: (export "exported_func" (func $exported_func))
(export "exported_func" (func $exported_func))

;; SHARED: (global $imported_global (ref null (shared i31)) (ref.i31_shared
Expand Down Expand Up @@ -182,6 +210,11 @@
;; UNSHARED-NEXT: )
;; UNSHARED-NEXT: )
;; UNSHARED-NEXT: )
;; KEEP-EXTERNS: (func $exported_func (type $sig) (param $f i31ref) (param $e externref) (result anyref)
;; KEEP-EXTERNS-NEXT: (any.convert_extern
;; KEEP-EXTERNS-NEXT: (local.get $e)
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: )
(func $exported_func (param $f funcref) (param $e externref) (result anyref)
;; Exported function taking funcref and externref and returning anyref.
(any.convert_extern
Expand All @@ -203,6 +236,13 @@
;; UNSHARED-NEXT: (local $eq eqref)
;; UNSHARED-NEXT: (nop)
;; UNSHARED-NEXT: )
;; KEEP-EXTERNS: (func $basic-types (type $5) (param $a (ref null $array))
;; KEEP-EXTERNS-NEXT: (local $nf nullref)
;; KEEP-EXTERNS-NEXT: (local $ne nullexternref)
;; KEEP-EXTERNS-NEXT: (local $str stringref)
;; KEEP-EXTERNS-NEXT: (local $eq eqref)
;; KEEP-EXTERNS-NEXT: (nop)
;; KEEP-EXTERNS-NEXT: )
(func $basic-types (param $a (ref null $array))
;; Test lowering of array and basic heap types in parameters and locals.
(local $nf nullfuncref)
Expand Down Expand Up @@ -236,6 +276,18 @@
;; UNSHARED-NEXT: (global.get $imported_global)
;; UNSHARED-NEXT: )
;; UNSHARED-NEXT: )
;; KEEP-EXTERNS: (func $ref-func-and-global (type $6) (param $s (ref $struct))
;; KEEP-EXTERNS-NEXT: (struct.set $struct 0
;; KEEP-EXTERNS-NEXT: (local.get $s)
;; KEEP-EXTERNS-NEXT: (ref.i31
;; KEEP-EXTERNS-NEXT: (i32.const 0)
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: (struct.set $struct 1
;; KEEP-EXTERNS-NEXT: (local.get $s)
;; KEEP-EXTERNS-NEXT: (global.get $imported_global)
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: )
(func $ref-func-and-global (param $s (ref $struct))
;; Store ref.func and an imported externref global into struct fields.
(struct.set $struct 0
Expand Down Expand Up @@ -280,6 +332,22 @@
;; UNSHARED-NEXT: )
;; UNSHARED-NEXT: )
;; UNSHARED-NEXT: )
;; KEEP-EXTERNS: (func $call-ref (type $7) (param $s (ref $struct)) (param $f (ref i31))
;; KEEP-EXTERNS-NEXT: (struct.set $struct 2
;; KEEP-EXTERNS-NEXT: (local.get $s)
;; KEEP-EXTERNS-NEXT: (call_indirect $funcs (type $sig)
;; KEEP-EXTERNS-NEXT: (struct.get $struct 0
;; KEEP-EXTERNS-NEXT: (local.get $s)
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: (struct.get $struct 1
;; KEEP-EXTERNS-NEXT: (local.get $s)
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: (i31.get_u
;; KEEP-EXTERNS-NEXT: (local.get $f)
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: )
(func $call-ref (param $s (ref $struct)) (param $f (ref $sig))
;; Lower call_ref to call_indirect over the $funcs table.
(struct.set $struct 2
Expand Down Expand Up @@ -342,6 +410,25 @@
;; UNSHARED-NEXT: )
;; UNSHARED-NEXT: )
;; UNSHARED-NEXT: )
;; KEEP-EXTERNS: (func $call-imported-func-and-convert (type $8) (param $s (ref $struct)) (result externref)
;; KEEP-EXTERNS-NEXT: (tuple.drop 2
;; KEEP-EXTERNS-NEXT: (call $imported_func
;; KEEP-EXTERNS-NEXT: (struct.get $struct 0
;; KEEP-EXTERNS-NEXT: (local.get $s)
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: (extern.convert_any
;; KEEP-EXTERNS-NEXT: (struct.get $struct 2
;; KEEP-EXTERNS-NEXT: (local.get $s)
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: (extern.convert_any
;; KEEP-EXTERNS-NEXT: (struct.get $struct 2
;; KEEP-EXTERNS-NEXT: (local.get $s)
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: )
(func $call-imported-func-and-convert (param $s (ref $struct)) (result externref)
;; Convert anyref to externref and call an imported function.
(tuple.drop 2
Expand Down Expand Up @@ -395,6 +482,18 @@
;; UNSHARED-NEXT: )
;; UNSHARED-NEXT: )
;; UNSHARED-NEXT: )
;; KEEP-EXTERNS: (func $test-tag (type $9) (param $e externref) (result externref)
;; KEEP-EXTERNS-NEXT: (try (result externref)
;; KEEP-EXTERNS-NEXT: (do
;; KEEP-EXTERNS-NEXT: (throw $tag
;; KEEP-EXTERNS-NEXT: (local.get $e)
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: (catch $tag
;; KEEP-EXTERNS-NEXT: (pop externref)
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: )
;; KEEP-EXTERNS-NEXT: )
(func $test-tag (param $e externref) (result externref)
;; Throw and catch an externref tag with i31ref table conversions.
(try (result externref)
Expand Down
Loading