Skip to content

[NFC] Handle atomic arrays in Heap2Local #8549

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

Merged
tlively merged 1 commit into from
Mar 30, 2026
+107 −9
Merged

[NFC] Handle atomic arrays in Heap2Local #8549

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
8 changes: 3 additions & 5 deletions src/passes/Heap2Local.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1387,9 +1387,8 @@ struct Array2Struct : PostWalker<Array2Struct> {
}

// Convert the ArraySet into a StructSet.
// TODO: Handle atomic array accesses.
replaceCurrent(builder.makeStructSet(
index, curr->ref, curr->value, MemoryOrder::Unordered));
replaceCurrent(
builder.makeStructSet(index, curr->ref, curr->value, curr->order));
}

void visitArrayGet(ArrayGet* curr) {
Expand All @@ -1408,9 +1407,8 @@ struct Array2Struct : PostWalker<Array2Struct> {
}

// Convert the ArrayGet into a StructGet.
// TODO: Handle atomic array accesses.
replaceCurrent(builder.makeStructGet(
index, curr->ref, MemoryOrder::Unordered, curr->type, curr->signed_));
index, curr->ref, curr->order, curr->type, curr->signed_));
}

void visitArrayRMW(ArrayRMW* curr) {
Expand Down
108 changes: 104 additions & 4 deletions test/lit/passes/heap2local.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4615,8 +4615,10 @@

;; CHECK: (type $struct (shared (struct (field (mut i32)))))
(type $struct (shared (struct (field (mut i32)))))
;; CHECK: (type $array (shared (array (mut i32))))
(type $array (shared (array (field (mut i32)))))

;; CHECK: (func $acqrel (type $0)
;; CHECK: (func $acqrel-struct (type $0)
;; CHECK-NEXT: (local $0 (ref null $struct))
;; CHECK-NEXT: (local $1 i32)
;; CHECK-NEXT: (drop
Expand Down Expand Up @@ -4644,7 +4646,7 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $acqrel
(func $acqrel-struct
(local (ref null $struct))
(local.set 0
(struct.new_default $struct)
Expand All @@ -4662,7 +4664,56 @@
)
)

;; CHECK: (func $seqcst (type $0)
;; CHECK: (func $acqrel-array (type $0)
;; CHECK-NEXT: (local $0 (ref null $array))
;; CHECK-NEXT: (local $1 i32)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (block (result (ref null (shared none)))
;; CHECK-NEXT: (local.set $1
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (ref.null (shared none))
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (block (result i32)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (ref.null (shared none))
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (block
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (ref.null (shared none))
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.set $1
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $acqrel-array
(local (ref null $array))
(local.set 0
(array.new_default $array
(i32.const 1)
)
)
;; Same as with the struct. We can optimize.
(drop
(array.atomic.get acqrel $array
(local.get 0)
(i32.const 0)
)
)
(array.atomic.set acqrel $array
(local.get 0)
(i32.const 0)
(i32.const 1)
)
)

;; CHECK: (func $seqcst-struct (type $0)
;; CHECK-NEXT: (local $0 (ref null $struct))
;; CHECK-NEXT: (local $1 i32)
;; CHECK-NEXT: (drop
Expand Down Expand Up @@ -4690,7 +4741,7 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $seqcst
(func $seqcst-struct
(local (ref null $struct))
(local.set 0
(struct.new_default $struct)
Expand All @@ -4707,4 +4758,53 @@
(i32.const 0)
)
)

;; CHECK: (func $seqcst-array (type $0)
;; CHECK-NEXT: (local $0 (ref null $array))
;; CHECK-NEXT: (local $1 i32)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (block (result (ref null (shared none)))
;; CHECK-NEXT: (local.set $1
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (ref.null (shared none))
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (block (result i32)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (ref.null (shared none))
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (block
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (ref.null (shared none))
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.set $1
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $seqcst-array
(local (ref null $array))
(local.set 0
(array.new_default $array
(i32.const 1)
)
)
;; Same as with the struct. We can optimize.
(drop
(array.atomic.get seqcst $array
(local.get 0)
(i32.const 0)
)
)
(array.atomic.set seqcst $array
(local.get 0)
(i32.const 0)
(i32.const 1)
)
)
)
Loading