Skip to content

[std] Improve bswap #2077

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 6 commits into from
Sep 29, 2021
Merged

[std] Improve bswap #2077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2b068dd
improve bswap
MaxGraey Sep 18, 2021
86ca700
fix
MaxGraey Sep 18, 2021
010da62
upd fixture
MaxGraey Sep 18, 2021
5821266
refactoring
MaxGraey Sep 18, 2021
6201cdc
better
MaxGraey Sep 18, 2021
01a04f7
refactor
MaxGraey Sep 18, 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
37 changes: 22 additions & 15 deletions std/assembly/polyfills.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,46 @@
export function bswap<T extends number>(value: T): T {
if (isInteger<T>()) {
if (sizeof<T>() == 1) {
return value;
}
if (sizeof<T>() == 2) {
return <T>((value << 8) | ((value >>> 8) & <T>0x00FF));
return <T>(<u16>value << 8 | (<u16>value >> 8));
}
if (sizeof<T>() == 4) {
return <T>(
rotl<u32>(value & 0xFF00FF00, 8) |
rotr<u32>(value & 0x00FF00FF, 8)
rotl(<u32>value & 0xFF00FF00, 8) |
rotr(<u32>value & 0x00FF00FF, 8)
);
}
if (sizeof<T>() == 8) {
let a = (<u64>value >> 8) & 0x00FF00FF00FF00FF;
let b = (<u64>value & 0x00FF00FF00FF00FF) << 8;
let v = a | b;

a = (v >> 16) & 0x0000FFFF0000FFFF;
a = (v >>> 16) & 0x0000FFFF0000FFFF;
b = (v & 0x0000FFFF0000FFFF) << 16;

return <T>rotr<u64>(a | b, 32);
return <T>rotr(a | b, 32);
}
return value;
}
assert(false);
return value;
ERROR("Unsupported generic type");
}

export function bswap16<T extends number>(value: T): T {
if (isInteger<T>() && sizeof<T>() <= 4) {
if (isInteger<T>()) {
if (sizeof<T>() == 1) {
return value;
}
if (sizeof<T>() == 2) {
return <T>((value << 8) | ((value >>> 8) & <T>0x00FF));
} else if (sizeof<T>() == 4) {
return <T>(((value << 8) & <T>0xFF00) | ((value >>> 8) & <T>0x00FF) | (value & <T>0xFFFF0000));
return <T>(<u16>value << 8 | (<u16>value >> 8));
}
if (sizeof<T>() == 4) {
return <T>(
(((<u32>value & 0xFF) << 8)) |
((<u32>value >> 8) & 0xFF) |
(<u32>value & 0xFFFF0000)
);
}
return value;
}
assert(false);
return value;
ERROR("Unsupported generic type");
}
4 changes: 4 additions & 0 deletions tests/compiler/std/array.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5179,6 +5179,10 @@
i32.const 1
drop
i32.const 8
i32.const 1
i32.eq
drop
i32.const 8
i32.const 2
i32.eq
drop
Expand Down
14 changes: 12 additions & 2 deletions tests/compiler/std/dataview.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2498,6 +2498,10 @@
i32.const 1
drop
i32.const 4
i32.const 1
i32.eq
drop
i32.const 4
i32.const 2
i32.eq
drop
Expand Down Expand Up @@ -2561,6 +2565,10 @@
i32.const 1
drop
i32.const 8
i32.const 1
i32.eq
drop
i32.const 8
i32.const 2
i32.eq
drop
Expand Down Expand Up @@ -2666,6 +2674,10 @@
i32.const 1
drop
i32.const 2
i32.const 1
i32.eq
drop
i32.const 2
i32.const 2
i32.eq
drop
Expand All @@ -2681,8 +2693,6 @@
i32.const 15
i32.and
i32.shr_u
i32.const 255
i32.and
i32.or
return
)
Expand Down
106 changes: 56 additions & 50 deletions tests/compiler/std/polyfills.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,7 @@
i32.const 1
drop
i32.const 1
i32.const 2
i32.eq
drop
i32.const 1
i32.const 4
i32.eq
drop
i32.const 1
i32.const 8
i32.eq
drop
local.get $0
Expand All @@ -35,15 +27,7 @@
i32.const 1
drop
i32.const 1
i32.const 2
i32.eq
drop
i32.const 1
i32.const 4
i32.eq
drop
i32.const 1
i32.const 8
i32.eq
drop
local.get $0
Expand All @@ -53,6 +37,10 @@
i32.const 1
drop
i32.const 2
i32.const 1
i32.eq
drop
i32.const 2
i32.const 2
i32.eq
drop
Expand All @@ -68,15 +56,17 @@
i32.const 15
i32.and
i32.shr_u
i32.const 255
i32.and
i32.or
return
)
(func $~lib/polyfills/bswap<i16> (param $0 i32) (result i32)
i32.const 1
drop
i32.const 2
i32.const 1
i32.eq
drop
i32.const 2
i32.const 2
i32.eq
drop
Expand All @@ -86,20 +76,23 @@
i32.and
i32.shl
local.get $0
i32.extend16_s
i32.const 65535
i32.and
i32.const 8
i32.const 15
i32.and
i32.shr_u
i32.const 255
i32.and
i32.or
return
)
(func $~lib/polyfills/bswap<u32> (param $0 i32) (result i32)
i32.const 1
drop
i32.const 4
i32.const 1
i32.eq
drop
i32.const 4
i32.const 2
i32.eq
drop
Expand All @@ -124,6 +117,10 @@
i32.const 1
drop
i32.const 4
i32.const 1
i32.eq
drop
i32.const 4
i32.const 2
i32.eq
drop
Expand Down Expand Up @@ -151,6 +148,10 @@
i32.const 1
drop
i32.const 8
i32.const 1
i32.eq
drop
i32.const 8
i32.const 2
i32.eq
drop
Expand Down Expand Up @@ -204,6 +205,10 @@
i32.const 1
drop
i32.const 8
i32.const 1
i32.eq
drop
i32.const 8
i32.const 2
i32.eq
drop
Expand Down Expand Up @@ -254,6 +259,10 @@
i32.const 1
drop
i32.const 4
i32.const 1
i32.eq
drop
i32.const 4
i32.const 2
i32.eq
drop
Expand All @@ -278,6 +287,10 @@
i32.const 1
drop
i32.const 4
i32.const 1
i32.eq
drop
i32.const 4
i32.const 2
i32.eq
drop
Expand All @@ -300,40 +313,30 @@
)
(func $~lib/polyfills/bswap16<u8> (param $0 i32) (result i32)
i32.const 1
i32.const 4
i32.le_u
drop
i32.const 1
i32.const 2
i32.eq
drop
i32.const 1
i32.const 4
i32.eq
drop
local.get $0
return
)
(func $~lib/polyfills/bswap16<i8> (param $0 i32) (result i32)
i32.const 1
i32.const 4
i32.le_u
drop
i32.const 1
i32.const 2
i32.eq
drop
i32.const 1
i32.const 4
i32.eq
drop
local.get $0
return
)
(func $~lib/polyfills/bswap16<u16> (param $0 i32) (result i32)
i32.const 1
drop
i32.const 2
i32.const 4
i32.le_u
i32.const 1
i32.eq
drop
i32.const 2
i32.const 2
Expand All @@ -351,15 +354,15 @@
i32.const 15
i32.and
i32.shr_u
i32.const 255
i32.and
i32.or
return
)
(func $~lib/polyfills/bswap16<i16> (param $0 i32) (result i32)
i32.const 1
drop
i32.const 2
i32.const 4
i32.le_u
i32.const 1
i32.eq
drop
i32.const 2
i32.const 2
Expand All @@ -371,20 +374,21 @@
i32.and
i32.shl
local.get $0
i32.extend16_s
i32.const 65535
i32.and
i32.const 8
i32.const 15
i32.and
i32.shr_u
i32.const 255
i32.and
i32.or
return
)
(func $~lib/polyfills/bswap16<u32> (param $0 i32) (result i32)
i32.const 1
drop
i32.const 4
i32.const 4
i32.le_u
i32.const 1
i32.eq
drop
i32.const 4
i32.const 2
Expand All @@ -395,10 +399,10 @@
i32.eq
drop
local.get $0
i32.const 255
i32.and
i32.const 8
i32.shl
i32.const 65280
i32.and
local.get $0
i32.const 8
i32.shr_u
Expand All @@ -412,9 +416,11 @@
return
)
(func $~lib/polyfills/bswap16<i32> (param $0 i32) (result i32)
i32.const 1
drop
i32.const 4
i32.const 4
i32.le_u
i32.const 1
i32.eq
drop
i32.const 4
i32.const 2
Expand All @@ -425,10 +431,10 @@
i32.eq
drop
local.get $0
i32.const 255
i32.and
i32.const 8
i32.shl
i32.const 65280
i32.and
local.get $0
i32.const 8
i32.shr_u
Expand Down
Loading