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.

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
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
39 changes: 23 additions & 16 deletions std/assembly/polyfills.ts
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>((value << 8) | ((value >>> 8) & 0x00FF));
}
if (sizeof<T>() == 4) {
return <T>(
rotl<u32>(value & 0xFF00FF00, 8) |
rotr<u32>(value & 0x00FF00FF, 8)
rotl(value & 0xFF00FF00, 8) |
rotr(value & 0x00FF00FF, 8)
);
}
if (sizeof<T>() == 8) {
let a = (<u64>value >> 8) & 0x00FF00FF00FF00FF;
let b = (<u64>value & 0x00FF00FF00FF00FF) << 8;
let a = (value >>> 8) & 0x00FF00FF00FF00FF;
let b = (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 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>((value << 8) | ((value >>> 8) & 0x00FF));
}
if (sizeof<T>() == 4) {
return <T>(
((value << 8) & 0xFF00) |
((value >>> 8) & 0x00FF) |
(value & 0xFFFF0000)
);
}
return value;
}
assert(false);
return value;
ERROR("Unsupported generic type");
}
4 changes: 4 additions & 0 deletions tests/compiler/std/array.untouched.wat
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
12 changes: 12 additions & 0 deletions tests/compiler/std/dataview.untouched.wat
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 Down
84 changes: 48 additions & 36 deletions tests/compiler/std/polyfills.untouched.wat
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 @@ -77,6 +65,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 @@ -100,6 +92,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 @@ -124,6 +120,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 +151,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 +208,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 +262,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 +290,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 +316,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 @@ -357,9 +363,11 @@
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 @@ -382,9 +390,11 @@
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 Down Expand Up @@ -412,9 +422,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 Down
4 changes: 4 additions & 0 deletions tests/compiler/std/typedarray.untouched.wat
Original file line number Diff line number Diff line change
Expand Up @@ -13253,6 +13253,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