github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add countTrailingZeros (#2243)

Browse Source 
Co-authored-by: Teodor Tanasoaia <28601907+teoxoy@users.noreply.github.com>
This commit is contained in:
Mauro Gentile
2023-02-20 20:40:59 +01:00
committed by GitHub
parent 60c0fc0284
commit 810e9d26fc
16 changed files with 232 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/back/glsl/mod.rs
View File

@@ -2996,6 +2996,35 @@ impl<'a, W: Write> Writer<'a, W> {
Mf::Transpose => "transpose",
Mf::Determinant => "determinant",
// bits
Mf::CountTrailingZeros => {
match *ctx.info[arg].ty.inner_with(&self.module.types) {
crate::TypeInner::Vector { size, kind, .. } => {
let s = back::vector_size_str(size);
if let crate::ScalarKind::Uint = kind {
write!(self.out, "min(uvec{s}(findLSB(")?;
self.write_expr(arg, ctx)?;
write!(self.out, ")), uvec{s}(32u))")?;
} else {
write!(self.out, "ivec{s}(min(uvec{s}(findLSB(")?;
self.write_expr(arg, ctx)?;
write!(self.out, ")), uvec{s}(32u)))")?;
}
}
crate::TypeInner::Scalar { kind, .. } => {
if let crate::ScalarKind::Uint = kind {
write!(self.out, "min(uint(findLSB(")?;
self.write_expr(arg, ctx)?;
write!(self.out, ")), 32u)")?;
} else {
write!(self.out, "int(min(uint(findLSB(")?;
self.write_expr(arg, ctx)?;
write!(self.out, ")), 32u))")?;
}
}
_ => unreachable!(),
};
return Ok(());
}
Mf::CountLeadingZeros => {
if self.options.version.supports_integer_functions() {
match *ctx.info[arg].ty.inner_with(&self.module.types) {

37
src/back/hlsl/writer.rs
View File

@@ -2551,6 +2551,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
Unpack2x16float,
Regular(&'static str),
MissingIntOverload(&'static str),
CountTrailingZeros,
CountLeadingZeros,
}
@@ -2614,6 +2615,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
Mf::Transpose => Function::Regular("transpose"),
Mf::Determinant => Function::Regular("determinant"),
// bits
Mf::CountTrailingZeros => Function::CountTrailingZeros,
Mf::CountLeadingZeros => Function::CountLeadingZeros,
Mf::CountOneBits => Function::MissingIntOverload("countbits"),
Mf::ReverseBits => Function::MissingIntOverload("reversebits"),
@@ -2682,6 +2684,41 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
write!(self.out, ")")?;
}
}
Function::CountTrailingZeros => {
match *func_ctx.info[arg].ty.inner_with(&module.types) {
TypeInner::Vector { size, kind, .. } => {
let s = match size {
crate::VectorSize::Bi => ".xx",
crate::VectorSize::Tri => ".xxx",
crate::VectorSize::Quad => ".xxxx",
};
if let ScalarKind::Uint = kind {
write!(self.out, "min((32u){s}, firstbitlow(")?;
self.write_expr(module, arg, func_ctx)?;
write!(self.out, "))")?;
} else {
write!(self.out, "asint(min((32u){s}, asuint(firstbitlow(")?;
self.write_expr(module, arg, func_ctx)?;
write!(self.out, "))))")?;
}
}
TypeInner::Scalar { kind, .. } => {
if let ScalarKind::Uint = kind {
write!(self.out, "min(32u, firstbitlow(")?;
self.write_expr(module, arg, func_ctx)?;
write!(self.out, "))")?;
} else {
write!(self.out, "asint(min(32u, asuint(firstbitlow(")?;
self.write_expr(module, arg, func_ctx)?;
write!(self.out, "))))")?;
}
}
_ => unreachable!(),
}
return Ok(());
}
Function::CountLeadingZeros => {
match *func_ctx.info[arg].ty.inner_with(&module.types) {
TypeInner::Vector { size, kind, .. } => {

1
src/back/msl/writer.rs
View File

@@ -1686,6 +1686,7 @@ impl<W: Write> Writer<W> {
Mf::Transpose => "transpose",
Mf::Determinant => "determinant",
// bits
Mf::CountTrailingZeros => "ctz",
Mf::CountLeadingZeros => "clz",
Mf::CountOneBits => "popcount",
Mf::ReverseBits => "reverse_bits",

43
src/back/spv/block.rs
View File

@@ -874,6 +874,49 @@ impl<'w> BlockContext<'w> {
id,
arg0_id,
)),
Mf::CountTrailingZeros => {
let uint = crate::ScalarValue::Uint(32);
let uint_id = match *arg_ty {
crate::TypeInner::Vector { size, width, .. } => {
let ty = LocalType::Value {
vector_size: Some(size),
kind: crate::ScalarKind::Uint,
width,
pointer_space: None,
}
.into();
self.temp_list.clear();
self.temp_list.resize(
size as _,
self.writer.get_constant_scalar(uint, width),
);
self.writer.get_constant_composite(ty, &self.temp_list)
}
crate::TypeInner::Scalar { width, .. } => {
self.writer.get_constant_scalar(uint, width)
}
_ => unreachable!(),
};
let lsb_id = self.gen_id();
block.body.push(Instruction::ext_inst(
self.writer.gl450_ext_inst_id,
spirv::GLOp::FindILsb,
result_type_id,
lsb_id,
&[arg0_id],
));
MathOp::Custom(Instruction::ext_inst(
self.writer.gl450_ext_inst_id,
spirv::GLOp::UMin,
result_type_id,
id,
&[uint_id, lsb_id],
))
}
Mf::CountLeadingZeros => {
let int = crate::ScalarValue::Sint(31);

1
src/back/wgsl/writer.rs
View File

@@ -1578,6 +1578,7 @@ impl<W: Write> Writer<W> {
Mf::Transpose => Function::Regular("transpose"),
Mf::Determinant => Function::Regular("determinant"),
// bits
Mf::CountTrailingZeros => Function::Regular("countTrailingZeros"),
Mf::CountLeadingZeros => Function::Regular("countLeadingZeros"),
Mf::CountOneBits => Function::Regular("countOneBits"),
Mf::ReverseBits => Function::Regular("reverseBits"),

1
src/front/wgsl/parse/conv.rs
View File

@@ -191,6 +191,7 @@ pub fn map_standard_fun(word: &str) -> Option<crate::MathFunction> {
"transpose" => Mf::Transpose,
"determinant" => Mf::Determinant,
// bits
"countTrailingZeros" => Mf::CountTrailingZeros,
"countLeadingZeros" => Mf::CountLeadingZeros,
"countOneBits" => Mf::CountOneBits,
"reverseBits" => Mf::ReverseBits,

1
src/lib.rs
View File

@@ -1066,6 +1066,7 @@ pub enum MathFunction {
Transpose,
Determinant,
// bits
CountTrailingZeros,
CountLeadingZeros,
CountOneBits,
ReverseBits,

1
src/proc/mod.rs
View File

@@ -279,6 +279,7 @@ impl super::MathFunction {
Self::Transpose => 1,
Self::Determinant => 1,
// bits
Self::CountTrailingZeros => 1,
Self::CountLeadingZeros => 1,
Self::CountOneBits => 1,
Self::ReverseBits => 1,

1
src/proc/typifier.rs
View File

@@ -793,6 +793,7 @@ impl<'a> ResolveContext<'a> {
)),
},
// bits
Mf::CountTrailingZeros |
Mf::CountLeadingZeros |
Mf::CountOneBits |
Mf::ReverseBits |

3
src/valid/expression.rs
View File

@@ -1223,7 +1223,8 @@ impl super::Validator {
_ => return Err(ExpressionError::InvalidArgumentType(fun, 0, arg)),
}
}
Mf::CountLeadingZeros
Mf::CountTrailingZeros
| Mf::CountLeadingZeros
| Mf::CountOneBits
| Mf::ReverseBits
| Mf::FindLsb

8
tests/in/math-functions.wgsl
View File

@@ -10,6 +10,14 @@ fn main() {
let g = refract(v, v, f);
let const_dot = dot(vec2<i32>(), vec2<i32>());
let first_leading_bit_abs = firstLeadingBit(abs(0u));
let ctz_a = countTrailingZeros(0u);
let ctz_b = countTrailingZeros(0);
let ctz_c = countTrailingZeros(0xFFFFFFFFu);
let ctz_d = countTrailingZeros(-1);
let ctz_e = countTrailingZeros(vec2(0u));
let ctz_f = countTrailingZeros(vec2(0));
let ctz_g = countTrailingZeros(vec2(1u));
let ctz_h = countTrailingZeros(vec2(1));
let clz_a = countLeadingZeros(-1);
let clz_b = countLeadingZeros(1u);
let clz_c = countLeadingZeros(vec2(-1));

12
tests/out/glsl/math-functions.main.Vertex.glsl
View File

@@ -14,10 +14,18 @@ void main() {
vec4 g = refract(v, v, 1.0);
int const_dot = ( + ivec2(0, 0).x * ivec2(0, 0).x + ivec2(0, 0).y * ivec2(0, 0).y);
uint first_leading_bit_abs = uint(findMSB(uint(abs(int(0u)))));
uint ctz_a = min(uint(findLSB(0u)), 32u);
int ctz_b = int(min(uint(findLSB(0)), 32u));
uint ctz_c = min(uint(findLSB(4294967295u)), 32u);
int ctz_d = int(min(uint(findLSB(-1)), 32u));
uvec2 ctz_e = min(uvec2(findLSB(uvec2(0u))), uvec2(32u));
ivec2 ctz_f = ivec2(min(uvec2(findLSB(ivec2(0))), uvec2(32u)));
uvec2 ctz_g = min(uvec2(findLSB(uvec2(1u))), uvec2(32u));
ivec2 ctz_h = ivec2(min(uvec2(findLSB(ivec2(1))), uvec2(32u)));
int clz_a = (-1 < 0 ? 0 : 31 - findMSB(-1));
uint clz_b = uint(31 - findMSB(1u));
ivec2 _e20 = ivec2(-1);
ivec2 clz_c = mix(ivec2(31) - findMSB(_e20), ivec2(0), lessThan(_e20, ivec2(0)));
ivec2 _e40 = ivec2(-1);
ivec2 clz_c = mix(ivec2(31) - findMSB(_e40), ivec2(0), lessThan(_e40, ivec2(0)));
uvec2 clz_d = uvec2(ivec2(31) - findMSB(uvec2(1u)));
}

12
tests/out/hlsl/math-functions.hlsl
View File

@@ -10,9 +10,17 @@ void main()
float4 g = refract(v, v, 1.0);
int const_dot = dot(int2(0, 0), int2(0, 0));
uint first_leading_bit_abs = firstbithigh(abs(0u));
uint ctz_a = min(32u, firstbitlow(0u));
int ctz_b = asint(min(32u, asuint(firstbitlow(0))));
uint ctz_c = min(32u, firstbitlow(4294967295u));
int ctz_d = asint(min(32u, asuint(firstbitlow(-1))));
uint2 ctz_e = min((32u).xx, firstbitlow((0u).xx));
int2 ctz_f = asint(min((32u).xx, asuint(firstbitlow((0).xx))));
uint2 ctz_g = min((32u).xx, firstbitlow((1u).xx));
int2 ctz_h = asint(min((32u).xx, asuint(firstbitlow((1).xx))));
int clz_a = (-1 < 0 ? 0 : 31 - firstbithigh(-1));
uint clz_b = asuint(31 - firstbithigh(1u));
int2 _expr20 = (-1).xx;
int2 clz_c = (_expr20 < (0).xx ? (0).xx : (31).xx - firstbithigh(_expr20));
int2 _expr40 = (-1).xx;
int2 clz_c = (_expr40 < (0).xx ? (0).xx : (31).xx - firstbithigh(_expr40));
uint2 clz_d = asuint((31).xx - firstbithigh((1u).xx));
}

8
tests/out/msl/math-functions.msl
View File

@@ -18,6 +18,14 @@ vertex void main_(
int const_dot = ( + const_type_1_.x * const_type_1_.x + const_type_1_.y * const_type_1_.y);
uint _e13 = metal::abs(0u);
uint first_leading_bit_abs = metal::select(31 - metal::clz(_e13), uint(-1), _e13 == 0 || _e13 == -1);
uint ctz_a = metal::ctz(0u);
int ctz_b = metal::ctz(0);
uint ctz_c = metal::ctz(4294967295u);
int ctz_d = metal::ctz(-1);
metal::uint2 ctz_e = metal::ctz(metal::uint2(0u));
metal::int2 ctz_f = metal::ctz(metal::int2(0));
metal::uint2 ctz_g = metal::ctz(metal::uint2(1u));
metal::int2 ctz_h = metal::ctz(metal::int2(1));
int clz_a = metal::clz(-1);
uint clz_b = metal::clz(1u);
metal::int2 clz_c = metal::clz(metal::int2(-1));

118
tests/out/spv/math-functions.spvasm
View File

@@ -1,11 +1,11 @@
; SPIR-V
; Version: 1.1
; Generator: rspirv
; Bound: 54
; Bound: 78
OpCapability Shader
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Vertex %16 "main"
OpEntryPoint Vertex %18 "main"
%2 = OpTypeVoid
%4 = OpTypeFloat 32
%3 = OpConstant %4 1.0
@@ -14,50 +14,74 @@ OpEntryPoint Vertex %16 "main"
%6 = OpConstant %7 0
%9 = OpTypeInt 32 0
%8 = OpConstant %9 0
%10 = OpConstant %7 -1
%11 = OpConstant %9 1
%12 = OpTypeVector %4 4
%13 = OpTypeVector %7 2
%14 = OpConstantComposite %13 %6 %6
%17 = OpTypeFunction %2
%25 = OpConstantComposite %12 %5 %5 %5 %5
%26 = OpConstantComposite %12 %3 %3 %3 %3
%40 = OpConstant %7 31
%47 = OpConstantComposite %13 %40 %40
%49 = OpTypeVector %9 2
%29 = OpConstantNull %7
%16 = OpFunction %2 None %17
%15 = OpLabel
OpBranch %18
%18 = OpLabel
%19 = OpCompositeConstruct %12 %5 %5 %5 %5
%20 = OpExtInst %4 %1 Degrees %3
%21 = OpExtInst %4 %1 Radians %3
%22 = OpExtInst %12 %1 Degrees %19
%23 = OpExtInst %12 %1 Radians %19
%24 = OpExtInst %12 %1 FClamp %19 %25 %26
%27 = OpExtInst %12 %1 Refract %19 %19 %3
%30 = OpCompositeExtract %7 %14 0
%31 = OpCompositeExtract %7 %14 0
%32 = OpIMul %7 %30 %31
%33 = OpIAdd %7 %29 %32
%34 = OpCompositeExtract %7 %14 1
%35 = OpCompositeExtract %7 %14 1
%36 = OpIMul %7 %34 %35
%28 = OpIAdd %7 %33 %36
%37 = OpCopyObject %9 %8
%38 = OpExtInst %9 %1 FindUMsb %37
%39 = OpExtInst %7 %1 FindUMsb %10
%41 = OpISub %7 %40 %39
%42 = OpExtInst %7 %1 FindUMsb %11
%43 = OpISub %7 %40 %42
%44 = OpBitcast %9 %43
%45 = OpCompositeConstruct %13 %10 %10
%46 = OpExtInst %13 %1 FindUMsb %45
%48 = OpISub %13 %47 %46
%50 = OpCompositeConstruct %49 %11 %11
%51 = OpExtInst %13 %1 FindUMsb %50
%52 = OpISub %13 %47 %51
%53 = OpBitcast %49 %52
%10 = OpConstant %9 4294967295
%11 = OpConstant %7 -1
%12 = OpConstant %9 1
%13 = OpConstant %7 1
%14 = OpTypeVector %4 4
%15 = OpTypeVector %7 2
%16 = OpConstantComposite %15 %6 %6
%19 = OpTypeFunction %2
%27 = OpConstantComposite %14 %5 %5 %5 %5
%28 = OpConstantComposite %14 %3 %3 %3 %3
%42 = OpConstant %9 32
%50 = OpTypeVector %9 2
%53 = OpConstantComposite %50 %42 %42
%65 = OpConstant %7 31
%72 = OpConstantComposite %15 %65 %65
%31 = OpConstantNull %7
%18 = OpFunction %2 None %19
%17 = OpLabel
OpBranch %20
%20 = OpLabel
%21 = OpCompositeConstruct %14 %5 %5 %5 %5
%22 = OpExtInst %4 %1 Degrees %3
%23 = OpExtInst %4 %1 Radians %3
%24 = OpExtInst %14 %1 Degrees %21
%25 = OpExtInst %14 %1 Radians %21
%26 = OpExtInst %14 %1 FClamp %21 %27 %28
%29 = OpExtInst %14 %1 Refract %21 %21 %3
%32 = OpCompositeExtract %7 %16 0
%33 = OpCompositeExtract %7 %16 0
%34 = OpIMul %7 %32 %33
%35 = OpIAdd %7 %31 %34
%36 = OpCompositeExtract %7 %16 1
%37 = OpCompositeExtract %7 %16 1
%38 = OpIMul %7 %36 %37
%30 = OpIAdd %7 %35 %38
%39 = OpCopyObject %9 %8
%40 = OpExtInst %9 %1 FindUMsb %39
%43 = OpExtInst %9 %1 FindILsb %8
%41 = OpExtInst %9 %1 UMin %42 %43
%45 = OpExtInst %7 %1 FindILsb %6
%44 = OpExtInst %7 %1 UMin %42 %45
%47 = OpExtInst %9 %1 FindILsb %10
%46 = OpExtInst %9 %1 UMin %42 %47
%49 = OpExtInst %7 %1 FindILsb %11
%48 = OpExtInst %7 %1 UMin %42 %49
%51 = OpCompositeConstruct %50 %8 %8
%54 = OpExtInst %50 %1 FindILsb %51
%52 = OpExtInst %50 %1 UMin %53 %54
%55 = OpCompositeConstruct %15 %6 %6
%57 = OpExtInst %15 %1 FindILsb %55
%56 = OpExtInst %15 %1 UMin %53 %57
%58 = OpCompositeConstruct %50 %12 %12
%60 = OpExtInst %50 %1 FindILsb %58
%59 = OpExtInst %50 %1 UMin %53 %60
%61 = OpCompositeConstruct %15 %13 %13
%63 = OpExtInst %15 %1 FindILsb %61
%62 = OpExtInst %15 %1 UMin %53 %63
%64 = OpExtInst %7 %1 FindUMsb %11
%66 = OpISub %7 %65 %64
%67 = OpExtInst %7 %1 FindUMsb %12
%68 = OpISub %7 %65 %67
%69 = OpBitcast %9 %68
%70 = OpCompositeConstruct %15 %11 %11
%71 = OpExtInst %15 %1 FindUMsb %70
%73 = OpISub %15 %72 %71
%74 = OpCompositeConstruct %50 %12 %12
%75 = OpExtInst %15 %1 FindUMsb %74
%76 = OpISub %15 %72 %75
%77 = OpBitcast %50 %76
OpReturn
OpFunctionEnd

8
tests/out/wgsl/math-functions.wgsl
View File

@@ -9,6 +9,14 @@ fn main() {
let g = refract(v, v, 1.0);
let const_dot = dot(vec2<i32>(0, 0), vec2<i32>(0, 0));
let first_leading_bit_abs = firstLeadingBit(abs(0u));
let ctz_a = countTrailingZeros(0u);
let ctz_b = countTrailingZeros(0);
let ctz_c = countTrailingZeros(4294967295u);
let ctz_d = countTrailingZeros(-1);
let ctz_e = countTrailingZeros(vec2<u32>(0u));
let ctz_f = countTrailingZeros(vec2<i32>(0));
let ctz_g = countTrailingZeros(vec2<u32>(1u));
let ctz_h = countTrailingZeros(vec2<i32>(1));
let clz_a = countLeadingZeros(-1);
let clz_b = countLeadingZeros(1u);
let clz_c = countLeadingZeros(vec2<i32>(-1));