encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-09 05:27:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tint: Fix extractBits polyfill

Browse Source 
This CL fix the extractBits polyfill, used for D3D12 backend on windows.
With this patch the related CTS would get pass.

Fixed: tint:1775
Change-Id: I15636bb55af502fff773c19f03b4c3c9e99b63fd
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/112207
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Zhaoming Jiang <zhaoming.jiang@intel.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
Zhaoming Jiang
2022-11-30 23:55:28 +00:00
committed by Dawn LUCI CQ
parent 2e30a374d7
commit a54df5eca5
27 changed files with 68 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/tint/builtins/extractBits/scalar/i32.spvasm.expected.dxc.hlsl
View File

@@ -3,7 +3,8 @@ int tint_extract_bits(int v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << shl) >> shr);
const int shl_result = ((shl < 32u) ? (v << shl) : 0);
return ((shr < 32u) ? (shl_result >> shr) : ((shl_result >> 31u) >> 1u));
}
void f_1() {

3
test/tint/builtins/extractBits/scalar/i32.spvasm.expected.fxc.hlsl
View File

@@ -3,7 +3,8 @@ int tint_extract_bits(int v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << shl) >> shr);
const int shl_result = ((shl < 32u) ? (v << shl) : 0);
return ((shr < 32u) ? (shl_result >> shr) : ((shl_result >> 31u) >> 1u));
}
void f_1() {

3
test/tint/builtins/extractBits/scalar/u32.spvasm.expected.dxc.hlsl
View File

@@ -3,7 +3,8 @@ uint tint_extract_bits(uint v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << shl) >> shr);
const uint shl_result = ((shl < 32u) ? (v << shl) : 0u);
return ((shr < 32u) ? (shl_result >> shr) : ((shl_result >> 31u) >> 1u));
}
void f_1() {

3
test/tint/builtins/extractBits/scalar/u32.spvasm.expected.fxc.hlsl
View File

@@ -3,7 +3,8 @@ uint tint_extract_bits(uint v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << shl) >> shr);
const uint shl_result = ((shl < 32u) ? (v << shl) : 0u);
return ((shr < 32u) ? (shl_result >> shr) : ((shl_result >> 31u) >> 1u));
}
void f_1() {

3
test/tint/builtins/extractBits/vec3/i32.spvasm.expected.dxc.hlsl
View File

@@ -3,7 +3,8 @@ int3 tint_extract_bits(int3 v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << uint3((shl).xxx)) >> uint3((shr).xxx));
const int3 shl_result = ((shl < 32u) ? (v << uint3((shl).xxx)) : (0).xxx);
return ((shr < 32u) ? (shl_result >> uint3((shr).xxx)) : ((shl_result >> (31u).xxx) >> (1u).xxx));
}
void f_1() {

3
test/tint/builtins/extractBits/vec3/i32.spvasm.expected.fxc.hlsl
View File

@@ -3,7 +3,8 @@ int3 tint_extract_bits(int3 v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << uint3((shl).xxx)) >> uint3((shr).xxx));
const int3 shl_result = ((shl < 32u) ? (v << uint3((shl).xxx)) : (0).xxx);
return ((shr < 32u) ? (shl_result >> uint3((shr).xxx)) : ((shl_result >> (31u).xxx) >> (1u).xxx));
}
void f_1() {

3
test/tint/builtins/extractBits/vec3/u32.spvasm.expected.dxc.hlsl
View File

@@ -3,7 +3,8 @@ uint3 tint_extract_bits(uint3 v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << uint3((shl).xxx)) >> uint3((shr).xxx));
const uint3 shl_result = ((shl < 32u) ? (v << uint3((shl).xxx)) : (0u).xxx);
return ((shr < 32u) ? (shl_result >> uint3((shr).xxx)) : ((shl_result >> (31u).xxx) >> (1u).xxx));
}
void f_1() {

3
test/tint/builtins/extractBits/vec3/u32.spvasm.expected.fxc.hlsl
View File

@@ -3,7 +3,8 @@ uint3 tint_extract_bits(uint3 v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << uint3((shl).xxx)) >> uint3((shr).xxx));
const uint3 shl_result = ((shl < 32u) ? (v << uint3((shl).xxx)) : (0u).xxx);
return ((shr < 32u) ? (shl_result >> uint3((shr).xxx)) : ((shl_result >> (31u).xxx) >> (1u).xxx));
}
void f_1() {

3
test/tint/builtins/gen/var/extractBits/12b197.wgsl.expected.dxc.hlsl
View File

@@ -3,7 +3,8 @@ uint3 tint_extract_bits(uint3 v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << uint3((shl).xxx)) >> uint3((shr).xxx));
const uint3 shl_result = ((shl < 32u) ? (v << uint3((shl).xxx)) : (0u).xxx);
return ((shr < 32u) ? (shl_result >> uint3((shr).xxx)) : ((shl_result >> (31u).xxx) >> (1u).xxx));
}
void extractBits_12b197() {

3
test/tint/builtins/gen/var/extractBits/12b197.wgsl.expected.fxc.hlsl
View File

@@ -3,7 +3,8 @@ uint3 tint_extract_bits(uint3 v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << uint3((shl).xxx)) >> uint3((shr).xxx));
const uint3 shl_result = ((shl < 32u) ? (v << uint3((shl).xxx)) : (0u).xxx);
return ((shr < 32u) ? (shl_result >> uint3((shr).xxx)) : ((shl_result >> (31u).xxx) >> (1u).xxx));
}
void extractBits_12b197() {

3
test/tint/builtins/gen/var/extractBits/249874.wgsl.expected.dxc.hlsl
View File

@@ -3,7 +3,8 @@ int tint_extract_bits(int v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << shl) >> shr);
const int shl_result = ((shl < 32u) ? (v << shl) : 0);
return ((shr < 32u) ? (shl_result >> shr) : ((shl_result >> 31u) >> 1u));
}
void extractBits_249874() {

3
test/tint/builtins/gen/var/extractBits/249874.wgsl.expected.fxc.hlsl
View File

@@ -3,7 +3,8 @@ int tint_extract_bits(int v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << shl) >> shr);
const int shl_result = ((shl < 32u) ? (v << shl) : 0);
return ((shr < 32u) ? (shl_result >> shr) : ((shl_result >> 31u) >> 1u));
}
void extractBits_249874() {

3
test/tint/builtins/gen/var/extractBits/631377.wgsl.expected.dxc.hlsl
View File

@@ -3,7 +3,8 @@ uint4 tint_extract_bits(uint4 v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << uint4((shl).xxxx)) >> uint4((shr).xxxx));
const uint4 shl_result = ((shl < 32u) ? (v << uint4((shl).xxxx)) : (0u).xxxx);
return ((shr < 32u) ? (shl_result >> uint4((shr).xxxx)) : ((shl_result >> (31u).xxxx) >> (1u).xxxx));
}
void extractBits_631377() {

3
test/tint/builtins/gen/var/extractBits/631377.wgsl.expected.fxc.hlsl
View File

@@ -3,7 +3,8 @@ uint4 tint_extract_bits(uint4 v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << uint4((shl).xxxx)) >> uint4((shr).xxxx));
const uint4 shl_result = ((shl < 32u) ? (v << uint4((shl).xxxx)) : (0u).xxxx);
return ((shr < 32u) ? (shl_result >> uint4((shr).xxxx)) : ((shl_result >> (31u).xxxx) >> (1u).xxxx));
}
void extractBits_631377() {

3
test/tint/builtins/gen/var/extractBits/a99a8d.wgsl.expected.dxc.hlsl
View File

@@ -3,7 +3,8 @@ int2 tint_extract_bits(int2 v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << uint2((shl).xx)) >> uint2((shr).xx));
const int2 shl_result = ((shl < 32u) ? (v << uint2((shl).xx)) : (0).xx);
return ((shr < 32u) ? (shl_result >> uint2((shr).xx)) : ((shl_result >> (31u).xx) >> (1u).xx));
}
void extractBits_a99a8d() {

3
test/tint/builtins/gen/var/extractBits/a99a8d.wgsl.expected.fxc.hlsl
View File

@@ -3,7 +3,8 @@ int2 tint_extract_bits(int2 v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << uint2((shl).xx)) >> uint2((shr).xx));
const int2 shl_result = ((shl < 32u) ? (v << uint2((shl).xx)) : (0).xx);
return ((shr < 32u) ? (shl_result >> uint2((shr).xx)) : ((shl_result >> (31u).xx) >> (1u).xx));
}
void extractBits_a99a8d() {

3
test/tint/builtins/gen/var/extractBits/ce81f8.wgsl.expected.dxc.hlsl
View File

@@ -3,7 +3,8 @@ uint tint_extract_bits(uint v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << shl) >> shr);
const uint shl_result = ((shl < 32u) ? (v << shl) : 0u);
return ((shr < 32u) ? (shl_result >> shr) : ((shl_result >> 31u) >> 1u));
}
void extractBits_ce81f8() {

3
test/tint/builtins/gen/var/extractBits/ce81f8.wgsl.expected.fxc.hlsl
View File

@@ -3,7 +3,8 @@ uint tint_extract_bits(uint v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << shl) >> shr);
const uint shl_result = ((shl < 32u) ? (v << shl) : 0u);
return ((shr < 32u) ? (shl_result >> shr) : ((shl_result >> 31u) >> 1u));
}
void extractBits_ce81f8() {

3
test/tint/builtins/gen/var/extractBits/e04f5d.wgsl.expected.dxc.hlsl
View File

@@ -3,7 +3,8 @@ int3 tint_extract_bits(int3 v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << uint3((shl).xxx)) >> uint3((shr).xxx));
const int3 shl_result = ((shl < 32u) ? (v << uint3((shl).xxx)) : (0).xxx);
return ((shr < 32u) ? (shl_result >> uint3((shr).xxx)) : ((shl_result >> (31u).xxx) >> (1u).xxx));
}
void extractBits_e04f5d() {

3
test/tint/builtins/gen/var/extractBits/e04f5d.wgsl.expected.fxc.hlsl
View File

@@ -3,7 +3,8 @@ int3 tint_extract_bits(int3 v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << uint3((shl).xxx)) >> uint3((shr).xxx));
const int3 shl_result = ((shl < 32u) ? (v << uint3((shl).xxx)) : (0).xxx);
return ((shr < 32u) ? (shl_result >> uint3((shr).xxx)) : ((shl_result >> (31u).xxx) >> (1u).xxx));
}
void extractBits_e04f5d() {

3
test/tint/builtins/gen/var/extractBits/f28f69.wgsl.expected.dxc.hlsl
View File

@@ -3,7 +3,8 @@ uint2 tint_extract_bits(uint2 v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << uint2((shl).xx)) >> uint2((shr).xx));
const uint2 shl_result = ((shl < 32u) ? (v << uint2((shl).xx)) : (0u).xx);
return ((shr < 32u) ? (shl_result >> uint2((shr).xx)) : ((shl_result >> (31u).xx) >> (1u).xx));
}
void extractBits_f28f69() {

3
test/tint/builtins/gen/var/extractBits/f28f69.wgsl.expected.fxc.hlsl
View File

@@ -3,7 +3,8 @@ uint2 tint_extract_bits(uint2 v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << uint2((shl).xx)) >> uint2((shr).xx));
const uint2 shl_result = ((shl < 32u) ? (v << uint2((shl).xx)) : (0u).xx);
return ((shr < 32u) ? (shl_result >> uint2((shr).xx)) : ((shl_result >> (31u).xx) >> (1u).xx));
}
void extractBits_f28f69() {

3
test/tint/builtins/gen/var/extractBits/fb850f.wgsl.expected.dxc.hlsl
View File

@@ -3,7 +3,8 @@ int4 tint_extract_bits(int4 v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << uint4((shl).xxxx)) >> uint4((shr).xxxx));
const int4 shl_result = ((shl < 32u) ? (v << uint4((shl).xxxx)) : (0).xxxx);
return ((shr < 32u) ? (shl_result >> uint4((shr).xxxx)) : ((shl_result >> (31u).xxxx) >> (1u).xxxx));
}
void extractBits_fb850f() {

3
test/tint/builtins/gen/var/extractBits/fb850f.wgsl.expected.fxc.hlsl
View File

@@ -3,7 +3,8 @@ int4 tint_extract_bits(int4 v, uint offset, uint count) {
const uint e = min(32u, (s + count));
const uint shl = (32u - e);
const uint shr = (shl + s);
return ((v << uint4((shl).xxxx)) >> uint4((shr).xxxx));
const int4 shl_result = ((shl < 32u) ? (v << uint4((shl).xxxx)) : (0).xxxx);
return ((shr < 32u) ? (shl_result >> uint4((shr).xxxx)) : ((shl_result >> (31u).xxxx) >> (1u).xxxx));
}
void extractBits_fb850f() {