Skip to content

Remove some uses of dynamic from HardwareIntrinsic test code #118273

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 3 commits into from
Aug 5, 2025
Merged

Remove some uses of dynamic from HardwareIntrinsic test code #118273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87e07fa
Remove some uses of dynamic from HardwareIntrinsic test code
snickolls-arm Jul 31, 2025
0a4fb2b
Use ulong.CreateChecked over Convert.ToUInt64
snickolls-arm Aug 5, 2025
6fe325a
Merge branch 'main' into fix-advsimd-nativeaot
amanasifkhalid Aug 5, 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
2 changes: 0 additions & 2 deletions src/tests/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- https://github.com/dotnet/runtime/issues/118234 -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>Embedded</DebugType>
Expand Down
2 changes: 0 additions & 2 deletions src/tests/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_ro.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- https://github.com/dotnet/runtime/issues/118234 -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>Embedded</DebugType>
Expand Down
36 changes: 17 additions & 19 deletions src/tests/JIT/HardwareIntrinsics/Arm/Shared/Helpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7789,35 +7789,33 @@ public static W MultiplyAddWidening<W, N>(W op1, N op2, N op3)
where W : IBinaryInteger<W>
where N : IBinaryInteger<N>
{
dynamic a = op2;
dynamic b = op3;
W product = (W)((W)a * (W)b);
W r = (W)(op1 + product);
return r;
W a = W.CreateChecked(op2);
W b = W.CreateChecked(op3);
W product = W.CreateTruncating(a * b);
return W.CreateTruncating(op1 + product);
}

public static W MultiplySubtractWidening<W, N>(W op1, N op2, N op3)
where W : IBinaryInteger<W>
where N : IBinaryInteger<N>
{
dynamic a = op2;
dynamic b = op3;
W product = (W)((W)a * (W)b);
W r = (W)(op1 - product);
return r;
W a = W.CreateChecked(op2);
W b = W.CreateChecked(op3);
W product = W.CreateTruncating(a * b);
return W.CreateTruncating(op1 - product);
}

public static N AddRoundedHighNarrowing<W, N>(W op1, W op2)
where W : IBinaryInteger<W>
where N : IBinaryInteger<N>
{
int halfsize = default(N).GetByteCount() * 8;
dynamic a = op1;
dynamic b = op2;
ulong sum = (ulong)a + (ulong)b;
ulong a = ulong.CreateChecked(op1);
ulong b = ulong.CreateChecked(op2);
ulong sum = a + b;
ulong bias = 1UL << (halfsize - 1);
dynamic result = sum + bias;
return (N)(result >> halfsize);
ulong result = (sum + bias) >> halfsize;
return N.CreateTruncating(result);
}

public static N AddRoundedHighNarrowingEven<W, N>(W op1, W op2, int i)
Expand All @@ -7839,12 +7837,12 @@ public static N SubtractRoundedHighNarrowing<W, N>(W op1, W op2)
where N : IBinaryInteger<N>
{
int halfsize = default(N).GetByteCount() * 8;
dynamic a = op1;
dynamic b = op2;
ulong a = ulong.CreateChecked(op1);
ulong b = ulong.CreateChecked(op2);
ulong sum = (ulong)a - (ulong)b;
ulong bias = 1UL << (halfsize - 1);
dynamic result = sum + bias;
return (N)(result >> halfsize);
ulong result = (sum + bias) >> halfsize;
return N.CreateTruncating(result);
}

public static N SubtractRoundedHighNarrowingEven<W, N>(W op1, W op2, int i)
Expand Down