lambdas via compile-time specialization

see m4rs-mt#463
PC-Crashes · May 21, 2021 · 076f147 · 076f147
1 parent 28d2613
commit 076f147
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 3 deletions.
diff --git a/Src/ILGPU.Tests.CPU/ILGPU.Tests.CPU.csproj b/Src/ILGPU.Tests.CPU/ILGPU.Tests.CPU.csproj
@@ -26,6 +26,10 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="1.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>

diff --git a/Src/ILGPU.Tests.Cuda/ILGPU.Tests.Cuda.csproj b/Src/ILGPU.Tests.Cuda/ILGPU.Tests.Cuda.csproj
@@ -26,6 +26,10 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="1.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>

diff --git a/Src/ILGPU.Tests.OpenCL/ILGPU.Tests.OpenCL.csproj b/Src/ILGPU.Tests.OpenCL/ILGPU.Tests.OpenCL.csproj
@@ -26,6 +26,10 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="1.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>

diff --git a/Src/ILGPU.Tests/ClassValues.cs b/Src/ILGPU.Tests/ClassValues.cs
@@ -0,0 +1,37 @@
+using System;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace ILGPU.Tests
+{
+    public abstract class ClassValues : TestBase
+    {
+        protected ClassValues(
+            ITestOutputHelper output,
+            TestContext testContext)
+            : base(output, testContext)
+        { }
+
+        private static void ThisIndependentLambdaKernel(
+            Index1D index, ArrayView<int> data, Func<int, int> op)
+        {
+            data[index] = op(1);
+        }
+
+        private static int Inc(int v) => v + 1;
+        [Fact]
+        public void ThisIndependentLambda()
+        {
+            Action<Index1D, ArrayView<int>> kernel =
+                (i, v) => ThisIndependentLambdaKernel(i, v, Inc);
+
+            using var output = Accelerator.Allocate1D<int>(1);
+            Execute(kernel.Method, new Index1D(1), output.View);
+
+            var expected = new [] { 2 };
+            Verify(output.View, expected);
+        }
+    }
+}
+
+#pragma warning restore xUnit1026 // Theory methods should use all of their parameters
diff --git a/Src/ILGPU.Tests/Configurations.txt b/Src/ILGPU.Tests/Configurations.txt
@@ -1,5 +1,6 @@
 ArrayViews: Debug, Release, O2
 Arrays: Debug, Release, O2
+ClassValues: Debug, Release, O2
 DebugTests: Debug, Release, O2
 DisassemblerTests: Debug, Release, O2
 EnumValues: Debug, Release, O2

diff --git a/Src/ILGPU.Tests/ILGPU.Tests.csproj b/Src/ILGPU.Tests/ILGPU.Tests.csproj
@@ -40,6 +40,10 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="1.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="xunit" Version="2.4.1" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
     <PackageReference Include="T4.Build" Version="0.2.0" PrivateAssets="All" />

diff --git a/Src/ILGPU/Frontend/CodeGenerator/Calls.cs b/Src/ILGPU/Frontend/CodeGenerator/Calls.cs
@@ -93,7 +93,7 @@ private MethodInfo ResolveVirtualCallTarget(
             const BindingFlags ConstraintMethodFlags = BindingFlags.Instance |
                 BindingFlags.Public | BindingFlags.NonPublic;
 
-            if (!target.IsVirtual)
+            if (!target.IsVirtual || target.DeclaringType.IsSealed)
                 return target;
             if (constrainedType == null)
             {

diff --git a/Src/ILGPU/Frontend/CodeGenerator/CodeGenerator.cs b/Src/ILGPU/Frontend/CodeGenerator/CodeGenerator.cs
@@ -79,7 +79,6 @@ public CodeGenerator(
         private void SetupVariables()
         {
             var builder = EntryBlock.Builder;
-            LambdaArgumentOffset = Method.IsNotCapturingLambda() ? 1 : 0;
 
             // Check for SSA variables
             for (int i = 0, e = DisassembledMethod.Count; i < e; ++i)
@@ -101,7 +100,7 @@ private void SetupVariables()
             }
 
             // Initialize params
-            if (!Method.IsStatic && !Method.IsNotCapturingLambda())
+            if (!Method.IsStatic)
             {
                 var declaringType = builder.CreateType(Method.DeclaringType);
                 declaringType = builder.CreatePointerType(

diff --git a/Src/ILGPU/Frontend/CodeGenerator/Driver.cs b/Src/ILGPU/Frontend/CodeGenerator/Driver.cs
@@ -41,6 +41,7 @@ private bool TryGenerateCode(ILInstruction instruction)
                     MakeTrap();
                     return true;
                 case ILInstructionType.LdToken:
+                case ILInstructionType.LdFn:
                     MakeLoadToken(instruction.Argument);
                     return true;
 

diff --git a/Src/ILGPU/Frontend/CodeGenerator/Objects.cs b/Src/ILGPU/Frontend/CodeGenerator/Objects.cs
@@ -61,6 +61,17 @@ private void MakeNewObject(MethodBase method)
                 throw Location.GetInvalidOperationException();
 
             var type = constructor.DeclaringType;
+            if (typeof(Delegate).IsAssignableFrom(type))
+            {
+                var func = Block.Pop();
+                var instancePtr = Block.Pop();
+                if (!(instancePtr is NullValue))
+                    throw Location.GetNotSupportedException("Only delegates pointing to static methods are supported");
+
+                Block.Push(func);
+                return;
+            }
+
             var typeNode = Builder.CreateType(type);
             var alloca = CreateTempAlloca(typeNode);
 

diff --git a/Src/ILGPU/Frontend/DisassemblerDriver.cs b/Src/ILGPU/Frontend/DisassemblerDriver.cs
@@ -682,6 +682,9 @@ private bool TryDisasembleInstruction(ILOpCode opCode)
                 case ILOpCode.Ldtoken:
                     AppendInstruction(ILInstructionType.LdToken, 0, 1, AssociatedModule.ResolveMember(ReadIntArg(), TypeGenericArguments, MethodGenericArguments));
                     return true;
+                case ILOpCode.Ldftn:
+                    AppendInstruction(ILInstructionType.LdFn, 0, 1, AssociatedModule.ResolveMethod(ReadIntArg(), TypeGenericArguments, MethodGenericArguments));
+                    return true;
 
                 default:
                     return false;

diff --git a/Src/ILGPU/Frontend/ILInstruction.cs b/Src/ILGPU/Frontend/ILInstruction.cs
@@ -341,6 +341,10 @@ public enum ILInstructionType
         /// <summary>LoadToken</summary>
         ///
         LdToken,
+        ///
+        /// <summary>LoadFunction</summary>
+        ///
+        LdFn,
     }
 
     /// <summary>

diff --git a/Src/ILGPU/ILGPU.csproj b/Src/ILGPU/ILGPU.csproj
@@ -37,6 +37,10 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
         <PackageReference Include="System.Memory" Version="4.5.4" />
         <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />