[System.MathF] Bring support for the single-precission Math operations to Mono #7941

migueldeicaza · 2018-04-02T01:49:16Z

This pull request brings support to Mono's class libraries for the new System.MathF type which includes operations for single-floating point.

This is needed to run some new applications like:

https://github.com/aras-p/ToyPathTracer

With this change, it is possible to run this unmodified. With this support, and the -O=float32 option, it is possible to improve the performance from 6.3Mrays/sec to 7.8Mrays/sec on a Mac.

Oddly, this seems to be faster than .NET Core 2.1.4, which is at 4.2Mrays/sec.

…s to Mono

vargaz · 2018-04-02T01:58:36Z

mcs/class/referencesource/mscorlib/system/math.cs

+#if MONO
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static byte Clamp(byte value, byte min, byte max)
+        {


This should use K&R indentation.

I copy pasted this from CoreCLR, I rather not change the style of the copy-pasted code.

I am tentative on this, would much rather see directly used ../external/corefx/src/Common/src/CoreLib/System/Math.cs but we could do it as follow up change

vargaz · 2018-04-02T01:58:53Z

mono/metadata/sysmath.c

@@ -316,3 +316,142 @@ ves_icall_System_Math_SplitFractionDouble (gdouble *v)
 {
 	return modf (*v, v);
 }
+
+gfloat
+ves_icall_System_MathF_Acos (gfloat x)


This should be just float, we don't use gfloat.

We do in that file, just a couple of lines above ;-)

I dont mind updating.

vargaz · 2018-04-02T01:59:58Z

mono/metadata/icall-def.h

@@ -439,6 +439,31 @@ ICALL(MATH_16, "Sqrt", ves_icall_System_Math_Sqrt)
 ICALL(MATH_17, "Tan", ves_icall_System_Math_Tan)
 ICALL(MATH_18, "Tanh", ves_icall_System_Math_Tanh)

+ICALL_TYPE(MATHF, "System.MathF", MATHF_1)
+ICALL(MATHF_1, "Acos", ves_icall_System_MathF_Acos)


These can be HANDLES(..) I think.

What do you mean?

Many but not all lines icall-def.h have HANDLES() around them.
This is how icalls get converted to be coop-friendly.

passes/returns coop handles instead of raw pointers

passes an extra, initialized MonoError*

Check the error at the end.
Eventually every line should either have HANDLES or some comment or other macro explaining why not -- for example, maybe the only one, if no pointers and no errors and performance sensitive, that combination does not want HANDLES.

@vargaz wouldn't HANDLE'izing those functions produce a net loss of perf for something they don't need? IE, none raise exceptions or take ref pointers.

kumpera · 2018-04-02T13:31:31Z

mono/metadata/icall-def.h

+ICALL(MATHF_13, "Floor", ves_icall_System_MathF_Floor)
+ICALL(MATHF_14, "Log", ves_icall_System_MathF_Log)
+ICALL(MATHF_15, "Log10", ves_icall_System_MathF_Log10)
+ICALL(MATHF_23, "ModF(float,float&)", ves_icall_System_MathF_ModF)


This signature doesn't match the managed signature.

Good catch, thanks!

I changed my mind, I kept the .NET signature.

Short version: done

kumpera · 2018-04-02T13:31:47Z

mono/metadata/sysmath.c

+}
+
+float
+ves_icall_System_MathF_ModF (float x, float *d)


This icall must null check d

I changed this to be ref, do we still need the check in that case?

CoreCLR does not have that.

If managed was using a byref instead of a pointer, we won't need it as we emit caller side checks. That doesn't happen with pointers.

Looks like there's it's only used by Truncate and Round with locals, so it's just lousy code on their end but we should be safe.

Added a check, just for sanity's sake.

migueldeicaza · 2018-04-02T15:40:11Z

Mhm, the build breaks elsewhere with a series of errors like this:

/Users/builder/jenkins/workspace/test-mono-pull-request-amd64-osx/external/corefx/src/System.Numerics.Vectors/src/System/Numerics/Matrix3x2.cs(281,26): error CS0436: The type 'MathF' in '/Users/builder/jenkins/workspace/test-mono-pull-request-amd64-osx/mcs/class/System.Numerics/../../../external/corefx/src/Common/src/System/MathF.netstandard.cs' conflicts with the imported type 'MathF' in 'mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089'. Using the type defined in '/Users/builder/jenkins/workspace/test-mono-pull-request-amd64-osx/mcs/class/System.Numerics/../../../external/corefx/src/Common/src/System/MathF.netstandard.cs'.

…ime.Extensions to match .NET Core

luhenry · 2018-04-03T01:08:01Z

@monojenkins build Linux x64

luhenry · 2018-04-03T01:08:09Z

@monojenkins build Linux AArch64 Interpreter

luhenry · 2018-04-03T01:08:37Z

@akoeplinger @marek-safar can you please check the API Diff

akoeplinger · 2018-04-04T00:38:09Z

The API diff looks fine to me.

marek-safar

Please also add external/corefx/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs to corlib_xtest.dll.sources to add tests which test the new APIs

marek-safar · 2018-04-04T14:52:25Z

mcs/class/corlib/System/MathF.mono.cs

+{
+    public static partial class MathF
+    {
+        [MethodImpl(MethodImplOptions.InternalCall)]


It'd be nice to follow Mono coding style

I rather not for code that is copy pasted, makes it simpler to track changes.

marek-safar · 2018-04-04T14:52:51Z

mcs/class/corlib/corlib.dll.sources

@@ -978,6 +978,8 @@ ReferenceSources/Type.cs
 ../referencesource/mscorlib/system/invalidtimezoneexception.cs
 ../referencesource/mscorlib/system/Lazy.cs
 ../referencesource/mscorlib/system/math.cs
+../../../external/corert//src/System.Private.CoreLib/shared/System/MathF.cs


Please use version from ../../../external/corefx/src/Common/src/CoreLib/System/MathF.cs

marek-safar · 2018-04-04T14:57:47Z

mcs/class/referencesource/mscorlib/system/math.cs

+#if MONO
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static byte Clamp(byte value, byte min, byte max)
+        {


I am tentative on this, would much rather see directly used ../external/corefx/src/Common/src/CoreLib/System/Math.cs but we could do it as follow up change

marek-safar · 2018-04-05T10:16:08Z

The System.Runtime.Extensions change for a desktop could be problematic but let's see if anyone hits it

marek-safar · 2018-04-05T10:16:16Z

@monojenkins commit apidiff

Noticed this while looking at Jenkins logs today: ``` 15:00:56 /mnt/jenkins/workspace/test-mono-pull-request-amd64/mcs/class/lib/net_4_x/mscorlib.dll 15:00:56 cant resolve internal call to "System.MathF::ModF(single,single*)" (tested without signature also) ``` We need to use `single` in the icall def instead of `float`. It was introduced by mono#7941

Noticed this while looking at Jenkins logs today: ``` 15:00:56 /mnt/jenkins/workspace/test-mono-pull-request-amd64/mcs/class/lib/net_4_x/mscorlib.dll 15:00:56 cant resolve internal call to "System.MathF::ModF(single,single*)" (tested without signature also) ``` We need to use `single` in the icall def instead of `float`. It was introduced by #7941

…s to Mono (mono/mono#7941) This pull request brings support to Mono's class libraries for the new `System.MathF` type which includes operations for single-floating point. This is needed to run some new applications like: https://github.com/aras-p/ToyPathTracer With this change, it is possible to run this unmodified. With this support, and the `-O=float32` option, it is possible to improve the performance from 6.3Mrays/sec to 7.8Mrays/sec on a Mac. Oddly, this seems to be faster than .NET Core 2.1.4, which is at 4.2Mrays/sec. * Bump API snapshot submodule Commit migrated from mono/mono@52df0f2

Noticed this while looking at Jenkins logs today: ``` 15:00:56 /mnt/jenkins/workspace/test-mono-pull-request-amd64/mcs/class/lib/net_4_x/mscorlib.dll 15:00:56 cant resolve internal call to "System.MathF::ModF(single,single*)" (tested without signature also) ``` We need to use `single` in the icall def instead of `float`. It was introduced by mono/mono#7941 Commit migrated from mono/mono@d59246b

[System.MathF] Bring support for the single-precission Math operation…

55c379d

…s to Mono

migueldeicaza requested review from akoeplinger, kumpera, marek-safar and vargaz as code owners April 2, 2018 01:49

vargaz reviewed Apr 2, 2018

View reviewed changes

migueldeicaza mentioned this pull request Apr 2, 2018

How do you run/update the numbers on Mono? aras-p/ToyPathTracer#3

Closed

vargaz reviewed Apr 2, 2018

View reviewed changes

Drop use of gfloat and use float instead

aea15c0

vargaz approved these changes Apr 2, 2018

View reviewed changes

kumpera reviewed Apr 2, 2018

View reviewed changes

Fix signature

c0d11d4

migueldeicaza added 2 commits April 2, 2018 12:02

Remove MathF from System.Numerics tests, add forwarder to System.Runt…

56f0dc5

…ime.Extensions to match .NET Core

Also remove MathF from the sources here

fd33f02

marek-safar requested changes Apr 4, 2018

View reviewed changes

Use the CoreFX version of MathF, and bring the MathF test suite

843f25f

marek-safar approved these changes Apr 5, 2018

View reviewed changes

monojenkins added a commit to mono/api-snapshot that referenced this pull request Apr 5, 2018

Apply changes from mono/mono#7941 to API snapshot

5fbad5c

Bump API snapshot submodule

943b118

migueldeicaza requested a review from luhenry as a code owner April 5, 2018 10:17

Merge branch 'master' into mathf

7de08e1

akoeplinger merged commit 52df0f2 into mono:master Apr 5, 2018

akoeplinger mentioned this pull request Apr 6, 2018

[metadata] Fix wrong icall signature for ModF #8080

Merged

Vincenz099 mentioned this pull request Feb 18, 2020

[jit] Enable float32 by default. Unity-Technologies/mono#1258

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[System.MathF] Bring support for the single-precission Math operations to Mono #7941

[System.MathF] Bring support for the single-precission Math operations to Mono #7941

migueldeicaza commented Apr 2, 2018

vargaz Apr 2, 2018

migueldeicaza Apr 2, 2018

marek-safar Apr 4, 2018

vargaz Apr 2, 2018

migueldeicaza Apr 2, 2018

vargaz Apr 2, 2018

migueldeicaza Apr 2, 2018

jaykrell Apr 2, 2018

kumpera Apr 2, 2018

kumpera Apr 2, 2018

migueldeicaza Apr 2, 2018

migueldeicaza Apr 2, 2018

migueldeicaza Apr 2, 2018

kumpera Apr 2, 2018

migueldeicaza Apr 2, 2018

kumpera Apr 2, 2018

kumpera Apr 2, 2018

migueldeicaza Apr 2, 2018

migueldeicaza commented Apr 2, 2018

luhenry commented Apr 3, 2018

luhenry commented Apr 3, 2018

luhenry commented Apr 3, 2018

akoeplinger commented Apr 4, 2018

marek-safar left a comment

marek-safar Apr 4, 2018

migueldeicaza Apr 5, 2018

marek-safar Apr 4, 2018

migueldeicaza Apr 5, 2018

marek-safar Apr 4, 2018

marek-safar commented Apr 5, 2018

marek-safar commented Apr 5, 2018

[System.MathF] Bring support for the single-precission Math operations to Mono #7941

[System.MathF] Bring support for the single-precission Math operations to Mono #7941

Conversation

migueldeicaza commented Apr 2, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

migueldeicaza commented Apr 2, 2018

luhenry commented Apr 3, 2018

luhenry commented Apr 3, 2018

luhenry commented Apr 3, 2018

akoeplinger commented Apr 4, 2018

marek-safar left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marek-safar commented Apr 5, 2018

marek-safar commented Apr 5, 2018