Skip to content

Implement IFloat.scale for vectors, matrices #7545

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
jhelferty-nv merged 5 commits into from
Jun 30, 2025
Merged

Implement IFloat.scale for vectors, matrices #7545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bba7199
Test for IFloat.scale usage
jhelferty-nv Jun 26, 2025
bec1629
Generic implementation of IFloat.scale()
jhelferty-nv Jun 26, 2025
79e09e9
Implement IFloat.scale for matrix
jhelferty-nv Jun 27, 2025
4cdc034
Avoid explicitly constructing a matrix
jhelferty-nv Jun 28, 2025
ac99fe1
Remove intrinsicOp from IFloat.scale impls
jhelferty-nv Jun 30, 2025
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
7 changes: 3 additions & 4 deletions source/slang/core.meta.slang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,7 +1185,7 @@ ${{{{
__intrinsic_op($(kIROp_FRem)) This mod(This other);
__intrinsic_op($(kIROp_Neg)) This neg();
__intrinsic_op($(kIROp_FloatCast)) float toFloat();
__intrinsic_op($(kIROp_Mul)) This scale<T:__BuiltinFloatingPointType>(T s) { return __mul(this, __realCast<This>(s)); }
[__unsafeForceInlineEarly] This scale<T:__BuiltinFloatingPointType>(T s) { return __mul(this, __realCast<This>(s)); }
typedef $(kBaseTypes[tt].name) Differential;

[__unsafeForceInlineEarly]
Expand Down Expand Up @@ -2020,7 +2020,7 @@ extension vector<T,N> : IFloat
__intrinsic_op($(kIROp_Div)) This div(This other);
__intrinsic_op($(kIROp_FRem)) This mod(This other);
__intrinsic_op($(kIROp_Neg)) This neg();
__intrinsic_op($(kIROp_Mul)) This scale<T1:__BuiltinFloatingPointType>(T1 s);
[__unsafeForceInlineEarly] This scale<T1:__BuiltinFloatingPointType>(T1 s) { return this.mul(__realCast<T>(s)); }
[__unsafeForceInlineEarly] float toFloat() { return __realCast<float>(this[0]); }

[OverloadRank(-1)]
Expand Down Expand Up @@ -2088,8 +2088,7 @@ extension matrix<T,N,M,L> : IFloat
[TreatAsDifferentiable] __intrinsic_op($(kIROp_Div)) This div(This other);
[TreatAsDifferentiable] __intrinsic_op($(kIROp_FRem)) This mod(This other);
[TreatAsDifferentiable] __intrinsic_op($(kIROp_Neg)) This neg();
[TreatAsDifferentiable] __intrinsic_op($(kIROp_Mul)) This scale<T1:__BuiltinFloatingPointType>(T1 s);
[TreatAsDifferentiable][__unsafeForceInlineEarly] This scale<T1:__BuiltinFloatingPointType>(T1 s);
[TreatAsDifferentiable][__unsafeForceInlineEarly] This scale<T1:__BuiltinFloatingPointType>(T1 s) { return this.mul(__realCast<T>(s)); }
[TreatAsDifferentiable][__unsafeForceInlineEarly] float toFloat() { return __realCast<float>(this[0][0]); }

[OverloadRank(-1)]
Expand Down
26 changes: 26 additions & 0 deletions tests/bugs/gh-7156-ifloat-scale.slang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -compute -output-using-type
//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-hlsl -compute -output-using-type
//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-metal -compute -output-using-type
//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-wgpu -compute -output-using-type

// CHECK: 1210.0

//TEST_INPUT:ubuffer(data=[0 0 0], stride=4):out,name=outputBuffer
RWStructuredBuffer<float> outputBuffer;

// Use of IFloat.scale used to cause an internal compiler error
func double_it<T: IFloat>(value: T) -> T {
return value.scale(2.0);
}

[numthreads(1, 1, 1)]
[shader("compute")]
void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
{
let mat = matrix<float,4,4>(1,0,0,1, 0,1,1,0, 0,0,1,0, 0,0,0,1);
let vi = vector<float,4>(100,100,100,100);
let dm = double_it(mat);
let dm_sum = dot(dm[0], vi) + dot(dm[1], vi) + dot(dm[2], vi) + dot(dm[3], vi);
outputBuffer[dispatchThreadID.x] = double_it(float2(1.0, 2.0)).x + double_it(4.0) + dm_sum;
}

Loading