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

migueldeicaza · Apr 2, 2018

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.

vargaz · Apr 2, 2018

vargaz reviewed Apr 2, 2018

View changes

vargaz · Apr 2, 2018

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 · Apr 2, 2018

vargaz reviewed Apr 2, 2018

View changes

vargaz · Apr 2, 2018

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 · Apr 2, 2018

vargaz reviewed Apr 2, 2018

View changes

vargaz · Apr 2, 2018

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.

vargaz · Apr 2, 2018

vargaz approved these changes Apr 2, 2018

View changes

kumpera · Apr 2, 2018

kumpera reviewed Apr 2, 2018

View changes

kumpera · Apr 2, 2018

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 · Apr 2, 2018

kumpera reviewed Apr 2, 2018

View changes

kumpera · Apr 2, 2018

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 · Apr 2, 2018

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'.

luhenry · Apr 3, 2018

@monojenkins build Linux x64

luhenry · Apr 3, 2018

@monojenkins build Linux AArch64 Interpreter

luhenry · Apr 3, 2018

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

akoeplinger · Apr 4, 2018

The API diff looks fine to me.

marek-safar · Apr 4, 2018

marek-safar requested changes Apr 4, 2018

View changes

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 · Apr 4, 2018

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 · Apr 4, 2018

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 · Apr 4, 2018

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 · Apr 5, 2018

marek-safar approved these changes Apr 5, 2018

View changes

marek-safar · Apr 5, 2018

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

marek-safar · Apr 5, 2018

@monojenkins commit apidiff

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

Loading status checks…

55c379d

migueldeicaza requested review from akoeplinger, kumpera, marek-safar and vargaz as code owners Apr 2, 2018

migueldeicaza referenced this pull request Apr 2, 2018
Closed
How do you run/update the numbers on Mono? #3

Drop use of gfloat and use float instead

Loading status checks…

aea15c0

Fix signature

Loading status checks…

c0d11d4

migueldeicaza added some commits Apr 2, 2018

Remove MathF from System.Numerics tests, add forwarder to System.Runt…
…ime.Extensions to match .NET Core

Loading status checks…

56f0dc5

Also remove MathF from the sources here

Loading status checks…

fd33f02

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

Loading status checks…

843f25f

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

Loading status checks…

943b118

migueldeicaza requested a review from luhenry as a code owner Apr 5, 2018

Merge branch 'master' into mathf

Loading status checks…

7de08e1

akoeplinger referenced this pull request Apr 6, 2018
Merged
[metadata] Fix wrong icall signature for ModF #8080

mono/mono

Join GitHub today

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

Conversation

migueldeicaza commented Apr 2, 2018

migueldeicaza requested review from akoeplinger, kumpera, marek-safar and vargaz as code owners Apr 2, 2018

vargaz reviewed Apr 2, 2018 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

vargaz reviewed Apr 2, 2018 View changes

This comment has been minimized.

This comment has been minimized.

migueldeicaza referenced this pull request Apr 2, 2018

vargaz reviewed Apr 2, 2018 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

vargaz approved these changes Apr 2, 2018 View changes

kumpera reviewed Apr 2, 2018 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

kumpera reviewed Apr 2, 2018 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

migueldeicaza commented Apr 2, 2018

migueldeicaza added some commits Apr 2, 2018

This comment has been minimized.

luhenry commented Apr 3, 2018

This comment has been minimized.

luhenry commented Apr 3, 2018

This comment has been minimized.

luhenry commented Apr 3, 2018

This comment has been minimized.

akoeplinger commented Apr 4, 2018

marek-safar requested changes Apr 4, 2018 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

marek-safar approved these changes Apr 5, 2018 View changes

This comment has been minimized.

marek-safar commented Apr 5, 2018

This comment has been minimized.

marek-safar commented Apr 5, 2018

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

migueldeicaza requested a review from luhenry as a code owner Apr 5, 2018

Hide details View details akoeplinger merged commit 52df0f2 into mono:master Apr 5, 2018 3 of 23 checks passed

3 of 23 checks passed

akoeplinger added a commit to akoeplinger/mono that referenced this pull request Apr 6, 2018

akoeplinger referenced this pull request Apr 6, 2018

akoeplinger added a commit that referenced this pull request Apr 6, 2018

vargaz reviewed Apr 2, 2018

View changes

vargaz reviewed Apr 2, 2018

View changes

vargaz reviewed Apr 2, 2018

View changes

vargaz approved these changes Apr 2, 2018

View changes

kumpera reviewed Apr 2, 2018

View changes

kumpera reviewed Apr 2, 2018

View changes

marek-safar requested changes Apr 4, 2018

View changes

marek-safar approved these changes Apr 5, 2018

View changes

akoeplinger merged commit `52df0f2` into mono:master Apr 5, 2018
3 of 23 checks passed