Skip to content

Optimize shadow stack pass #1667

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 4 commits into from
Feb 22, 2021
Merged

Optimize shadow stack pass #1667

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a614ec7
Optimize shadow stack pass
dcodeIO Feb 4, 2021
34d6186
update fixtures
dcodeIO Feb 4, 2021
8efa9e6
Merge branch 'master' into optimize-shadowstack
dcodeIO Feb 21, 2021
7c3c739
matchTostack -> matchPattern
dcodeIO Feb 22, 2021
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
Prev Previous commit
Next Next commit
Merge branch 'master' into optimize-shadowstack
  • Loading branch information
@dcodeIO
dcodeIO committed Feb 21, 2021
commit 8efa9e619699ea418208fec5984ebe6fac229ce4
137 changes: 25 additions & 112 deletions tests/compiler/extends-baseaggregate.optimized.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
(module
(type $i32_i32_=>_none (func (param i32 i32)))
(type $none_=>_none (func))
(type $i32_=>_none (func (param i32)))
(type $i32_i32_=>_none (func (param i32 i32)))
(type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
(type $i32_=>_none (func (param i32)))
(type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
(type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
(type $none_=>_i32 (func (result i32)))
Expand Down Expand Up @@ -1975,103 +1975,6 @@
end
end
)
(func $~lib/array/ensureSize (param $0 i32)
(local $1 i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
(local $5 i32)
(local $6 i32)
local.get $0
i32.const 1176
i32.load
local.tee $4
i32.const 2
i32.shr_u
i32.gt_u
if
local.get $0
i32.const 268435455
i32.gt_u
if
i32.const 1616
i32.const 1664
i32.const 14
i32.const 48
call $~lib/builtins/abort
unreachable
end
i32.const 1168
i32.load
local.tee $5
local.set $1
block $__inlined_func$~lib/rt/itcms/__renew
local.get $0
i32.const 2
i32.shl
local.tee $6
local.tee $2
local.get $5
i32.const 20
i32.sub
local.tee $3
i32.load
i32.const -4
i32.and
i32.const 16
i32.sub
i32.le_u
if
local.get $3
local.get $2
i32.store offset=16
local.get $1
local.set $0
br $__inlined_func$~lib/rt/itcms/__renew
end
local.get $2
local.get $3
i32.load offset=12
call $~lib/rt/itcms/__new
local.tee $0
local.get $1
local.get $2
local.get $3
i32.load offset=16
local.tee $1
local.get $1
local.get $2
i32.gt_u
select
call $~lib/memory/memory.copy
end
local.get $0
local.get $4
i32.add
local.get $6
local.get $4
i32.sub
call $~lib/memory/memory.fill
local.get $0
local.get $5
i32.ne
if
i32.const 1168
local.get $0
i32.store
i32.const 1172
local.get $0
i32.store
i32.const 1168
local.get $0
i32.const 0
call $~lib/rt/itcms/__link
end
i32.const 1176
local.get $6
i32.store
end
)
(func $~lib/rt/__visit_members (param $0 i32)
(local $1 i32)
(local $2 i32)
Expand Down Expand Up @@ -2145,9 +2048,32 @@
end
)
(func $~start
call $start:extends-baseaggregate
)
(func $~stack_check
global.get $~lib/memory/__stack_pointer
i32.const 1772
i32.lt_s
if
i32.const 18176
i32.const 18224
i32.const 1
i32.const 1
call $~lib/builtins/abort
unreachable
end
)
(func $start:extends-baseaggregate
(local $0 i32)
(local $1 i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
(local $5 i32)
(local $6 i32)
(local $7 i32)
(local $8 i32)
(local $9 i32)
global.get $~lib/memory/__stack_pointer
i32.const 8
i32.sub
Expand Down Expand Up @@ -2351,17 +2277,4 @@
i32.add
global.set $~lib/memory/__stack_pointer
)
(func $~stack_check
global.get $~lib/memory/__stack_pointer
i32.const 1772
i32.lt_s
if
i32.const 18176
i32.const 18224
i32.const 1
i32.const 1
call $~lib/builtins/abort
unreachable
end
)
)
8 changes: 8 additions & 0 deletions tests/compiler/infer-array.optimized.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2027,6 +2027,14 @@
global.get $~lib/memory/__stack_pointer
i64.const 0
i64.store offset=8
memory.size
i32.const 16
i32.shl
i32.const 18596
i32.sub
i32.const 1
i32.shr_u
global.set $~lib/rt/itcms/threshold
i32.const 1200
call $~lib/rt/itcms/initLazy
global.set $~lib/rt/itcms/pinSpace
Expand Down
8 changes: 8 additions & 0 deletions tests/compiler/infer-array.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3885,6 +3885,14 @@
global.get $~lib/memory/__stack_pointer
i64.const 0
i64.store offset=8
memory.size
i32.const 16
i32.shl
global.get $~lib/memory/__heap_base
i32.sub
i32.const 1
i32.shr_u
global.set $~lib/rt/itcms/threshold
i32.const 176
call $~lib/rt/itcms/initLazy
global.set $~lib/rt/itcms/pinSpace
Expand Down
20 changes: 14 additions & 6 deletions tests/compiler/resolve-elementaccess.optimized.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3386,6 +3386,14 @@
global.get $~lib/memory/__stack_pointer
i64.const 0
i64.store offset=8
memory.size
i32.const 16
i32.shl
i32.const 19780
i32.sub
i32.const 1
i32.shr_u
global.set $~lib/rt/itcms/threshold
i32.const 1280
call $~lib/rt/itcms/initLazy
global.set $~lib/rt/itcms/pinSpace
Expand Down Expand Up @@ -3534,13 +3542,13 @@
global.get $resolve-elementaccess/arr
local.tee $0
i32.store
local.get $0
global.get $~lib/memory/__stack_pointer
global.get $resolve-elementaccess/arr
local.tee $1
local.tee $0
i32.store offset=4
local.get $0
i32.const 0
local.get $1
local.get $0
i32.const 0
call $~lib/typedarray/Float32Array#__get
f32.const 10
Expand Down Expand Up @@ -3727,13 +3735,13 @@
global.get $resolve-elementaccess/buf
local.tee $0
i32.store
local.get $0
global.get $~lib/memory/__stack_pointer
global.get $resolve-elementaccess/buf
local.tee $1
local.tee $0
i32.store offset=4
local.get $0
i32.const 0
local.get $1
local.get $0
i32.const 0
call $~lib/typedarray/Uint8Array#__get
i32.const 10
Expand Down
8 changes: 8 additions & 0 deletions tests/compiler/resolve-elementaccess.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5785,6 +5785,14 @@
global.get $~lib/memory/__stack_pointer
i64.const 0
i64.store offset=8
memory.size
i32.const 16
i32.shl
global.get $~lib/memory/__heap_base
i32.sub
i32.const 1
i32.shr_u
global.set $~lib/rt/itcms/threshold
i32.const 256
call $~lib/rt/itcms/initLazy
global.set $~lib/rt/itcms/pinSpace
Expand Down
8 changes: 8 additions & 0 deletions tests/compiler/resolve-function-expression.optimized.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1846,6 +1846,14 @@
call $~lib/builtins/abort
unreachable
end
memory.size
i32.const 16
i32.shl
i32.const 18388
i32.sub
i32.const 1
i32.shr_u
global.set $~lib/rt/itcms/threshold
i32.const 1568
call $~lib/rt/itcms/initLazy
global.set $~lib/rt/itcms/pinSpace
Expand Down
8 changes: 8 additions & 0 deletions tests/compiler/resolve-propertyaccess.optimized.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2048,6 +2048,14 @@
global.get $~lib/memory/__stack_pointer
i32.const 0
i32.store offset=8
memory.size
i32.const 16
i32.shl
i32.const 18644
i32.sub
i32.const 1
i32.shr_u
global.set $~lib/rt/itcms/threshold
i32.const 1392
call $~lib/rt/itcms/initLazy
global.set $~lib/rt/itcms/pinSpace
Expand Down
8 changes: 8 additions & 0 deletions tests/compiler/resolve-propertyaccess.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3054,6 +3054,14 @@
global.get $~lib/memory/__stack_pointer
i32.const 0
i32.store offset=8
memory.size
i32.const 16
i32.shl
global.get $~lib/memory/__heap_base
i32.sub
i32.const 1
i32.shr_u
global.set $~lib/rt/itcms/threshold
i32.const 368
call $~lib/rt/itcms/initLazy
global.set $~lib/rt/itcms/pinSpace
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.