Skip to content

Add Atomics ns + .isLockFree #835

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
merged 21 commits into from
Oct 20, 2019
Merged

Add Atomics ns + .isLockFree #835

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7387b7d
Add atomic.isLockFree
MaxGraey Sep 11, 2019
a929b33
Merge branch 'master' into add-islockfree
MaxGraey Sep 15, 2019
f74e544
Add Atomics namespace (wip)
MaxGraey Sep 15, 2019
871d054
Fixes
MaxGraey Sep 15, 2019
2dfbd91
Merge branch 'master' into add-islockfree
MaxGraey Sep 23, 2019
2666199
Add range & type validations
MaxGraey Sep 23, 2019
8e02733
fix ArrayBufferView
MaxGraey Sep 23, 2019
767e9b9
Merge branch 'master' into add-islockfree
MaxGraey Sep 29, 2019
0e153b5
Simplify checks
MaxGraey Sep 29, 2019
9d5e46c
trigger ci
MaxGraey Sep 29, 2019
05ed8db
improve load using T exends ArrayBufferView
MaxGraey Oct 1, 2019
119e65c
data -> buffer
MaxGraey Oct 1, 2019
76c4ac2
improve definisions
MaxGraey Oct 1, 2019
d125b38
improve defs again
MaxGraey Oct 1, 2019
1afa09b
index fixes + convert to T extends ArrayBufferView rest methods
MaxGraey Oct 1, 2019
cef93b0
use error from util
MaxGraey Oct 1, 2019
68324a5
refactor
MaxGraey Oct 1, 2019
d5fd03a
Merge branch 'master' into add-islockfree
MaxGraey Oct 9, 2019
df36f28
reuse E_INDEXOUTOFRANGE
MaxGraey Oct 9, 2019
339fce9
Merge branch 'master' into add-islockfree
MaxGraey Oct 19, 2019
e9ffe63
Merge branch 'master' into add-islockfree
MaxGraey Oct 19, 2019
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
4 changes: 4 additions & 0 deletions std/assembly/builtins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,10 @@ export namespace atomic {
// @ts-ignore: decorator
@builtin
export declare function fence(): void;

export function isLockFree(size: usize): bool {
return size == 1 || size == 2 || size == 4;
}
}

// @ts-ignore: decorator
Expand Down
2 changes: 2 additions & 0 deletions std/assembly/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,8 @@ declare namespace atomic {
export function notify(ptr: usize, count: i32): i32;
/** Performs a fence operation, preserving synchronization guarantees of higher level languages. */
export function fence(): void;
/** The static Atomics.isLockFree() method is used to determine whether to use locks or atomic operations. It returns true, if the given size is one of the BYTES_PER_ELEMENT */
export function isLockFree(size: usize): bool;
}

/** Describes the result of an atomic wait operation. */
Expand Down
147 changes: 119 additions & 28 deletions tests/compiler/builtins.optimized.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
(type $FUNCSIG$if (func (param f32) (result i32)))
(type $FUNCSIG$id (func (param f64) (result i32)))
(type $FUNCSIG$vii (func (param i32 i32)))
(type $FUNCSIG$ii (func (param i32) (result i32)))
(type $FUNCSIG$viiddddd (func (param i32 i32 f64 f64 f64 f64 f64)))
(type $FUNCSIG$iii (func (param i32 i32) (result i32)))
(type $FUNCSIG$ii (func (param i32) (result i32)))
(type $FUNCSIG$v (func))
(type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32)))
(import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
Expand Down Expand Up @@ -74,15 +74,30 @@
(func $start:builtins~anonymous|0 (; 6 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32)
nop
)
(func $~lib/string/String#get:length (; 7 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
(func $~lib/builtins/atomic.isLockFree (; 7 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
i32.const 1
local.get $0
i32.const 4
i32.eq
i32.const 1
local.get $0
i32.const 2
i32.eq
local.get $0
i32.const 1
i32.eq
select
select
)
(func $~lib/string/String#get:length (; 8 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
local.get $0
i32.const 16
i32.sub
i32.load offset=12
i32.const 1
i32.shr_u
)
(func $~lib/util/string/compareImpl (; 8 ;) (type $FUNCSIG$iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
(func $~lib/util/string/compareImpl (; 9 ;) (type $FUNCSIG$iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
(local $3 i32)
loop $continue|0
local.get $2
Expand Down Expand Up @@ -115,7 +130,7 @@
end
local.get $3
)
(func $~lib/string/String.__eq (; 9 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/string/String.__eq (; 10 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
local.get $0
local.get $1
Expand Down Expand Up @@ -147,13 +162,13 @@
end
i32.const 0
)
(func $start:builtins~anonymous|1 (; 10 ;) (type $FUNCSIG$v)
(func $start:builtins~anonymous|1 (; 11 ;) (type $FUNCSIG$v)
nop
)
(func $start:builtins~anonymous|2 (; 11 ;) (type $FUNCSIG$viiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
(func $start:builtins~anonymous|2 (; 12 ;) (type $FUNCSIG$viiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
nop
)
(func $start:builtins (; 12 ;) (type $FUNCSIG$v)
(func $start:builtins (; 13 ;) (type $FUNCSIG$v)
i32.const 31
global.set $builtins/i
i32.const 0
Expand Down Expand Up @@ -787,6 +802,82 @@
i32.const 8
f64.const 1
f64.store
i32.const 0
call $~lib/builtins/atomic.isLockFree
if
i32.const 0
i32.const 64
i32.const 422
i32.const 0
call $~lib/builtins/abort
unreachable
end
i32.const 1
call $~lib/builtins/atomic.isLockFree
i32.const 1
i32.ne
if
i32.const 0
i32.const 64
i32.const 423
i32.const 0
call $~lib/builtins/abort
unreachable
end
i32.const 2
call $~lib/builtins/atomic.isLockFree
i32.const 1
i32.ne
if
i32.const 0
i32.const 64
i32.const 424
i32.const 0
call $~lib/builtins/abort
unreachable
end
i32.const 3
call $~lib/builtins/atomic.isLockFree
if
i32.const 0
i32.const 64
i32.const 425
i32.const 0
call $~lib/builtins/abort
unreachable
end
i32.const 4
call $~lib/builtins/atomic.isLockFree
i32.const 1
i32.ne
if
i32.const 0
i32.const 64
i32.const 426
i32.const 0
call $~lib/builtins/abort
unreachable
end
i32.const 5
call $~lib/builtins/atomic.isLockFree
if
i32.const 0
i32.const 64
i32.const 427
i32.const 0
call $~lib/builtins/abort
unreachable
end
i32.const 8
call $~lib/builtins/atomic.isLockFree
if
i32.const 0
i32.const 64
i32.const 428
i32.const 0
call $~lib/builtins/abort
unreachable
end
i32.const 104
i32.const 5
f64.const 0
Expand All @@ -802,7 +893,7 @@
if
i32.const 0
i32.const 64
i32.const 437
i32.const 445
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -814,7 +905,7 @@
if
i32.const 0
i32.const 64
i32.const 438
i32.const 446
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -826,7 +917,7 @@
if
i32.const 0
i32.const 64
i32.const 439
i32.const 447
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -838,7 +929,7 @@
if
i32.const 0
i32.const 64
i32.const 440
i32.const 448
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -850,7 +941,7 @@
if
i32.const 0
i32.const 64
i32.const 441
i32.const 449
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -862,7 +953,7 @@
if
i32.const 0
i32.const 64
i32.const 442
i32.const 450
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -874,7 +965,7 @@
if
i32.const 0
i32.const 64
i32.const 443
i32.const 451
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -886,7 +977,7 @@
if
i32.const 0
i32.const 64
i32.const 444
i32.const 452
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -898,7 +989,7 @@
if
i32.const 0
i32.const 64
i32.const 445
i32.const 453
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -910,7 +1001,7 @@
if
i32.const 0
i32.const 64
i32.const 446
i32.const 454
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -922,7 +1013,7 @@
if
i32.const 0
i32.const 64
i32.const 447
i32.const 455
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -934,7 +1025,7 @@
if
i32.const 0
i32.const 64
i32.const 448
i32.const 456
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -946,7 +1037,7 @@
if
i32.const 0
i32.const 64
i32.const 449
i32.const 457
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -958,7 +1049,7 @@
if
i32.const 0
i32.const 64
i32.const 450
i32.const 458
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -970,7 +1061,7 @@
if
i32.const 0
i32.const 64
i32.const 451
i32.const 459
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -982,7 +1073,7 @@
if
i32.const 0
i32.const 64
i32.const 452
i32.const 460
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -994,7 +1085,7 @@
if
i32.const 0
i32.const 64
i32.const 453
i32.const 461
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -1006,7 +1097,7 @@
if
i32.const 0
i32.const 64
i32.const 454
i32.const 462
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -1018,7 +1109,7 @@
if
i32.const 0
i32.const 64
i32.const 455
i32.const 463
i32.const 2
call $~lib/builtins/abort
unreachable
Expand All @@ -1030,13 +1121,13 @@
if
i32.const 0
i32.const 64
i32.const 456
i32.const 464
i32.const 2
call $~lib/builtins/abort
unreachable
end
)
(func $start (; 13 ;) (type $FUNCSIG$v)
(func $start (; 14 ;) (type $FUNCSIG$v)
call $start:builtins
)
)
8 changes: 8 additions & 0 deletions tests/compiler/builtins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,14 @@ f64.store(8, 1.0);
f32.trunc(1.0);
f64.trunc(1.0);

assert(atomic.isLockFree(0) == false);
assert(atomic.isLockFree(1) == true);
assert(atomic.isLockFree(2) == true);
assert(atomic.isLockFree(3) == false);
assert(atomic.isLockFree(4) == true);
assert(atomic.isLockFree(5) == false);
assert(atomic.isLockFree(8) == false);

{
let a = idof<() => void>();
let b = idof<() => void>();
Expand Down
Loading