Skip to content

[LibraryImportGenerator] Basic stateless value marshaller support #71116

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
elinor-fung merged 8 commits into from
Jun 22, 2022
Merged

[LibraryImportGenerator] Basic stateless value marshaller support #71116

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
281de45
Rename class for v1 shape members
elinor-fung Jun 20, 2022
4c1ffdc
Split out V1 ManualTypeMarshallingHelper
elinor-fung Jun 21, 2022
0fe53e3
Basic support for stateless value marshalling
elinor-fung Jun 22, 2022
c22961d
Update integration tests
elinor-fung Jun 22, 2022
88668e7
Update unit tests
elinor-fung Jun 22, 2022
d59d85f
Separate file for V1 CustomMarshallingTests
elinor-fung Jun 22, 2022
e5b2509
Update src/libraries/System.Runtime.InteropServices/gen/Microsoft.Int…
elinor-fung Jun 22, 2022
6c43487
Separate file for V1 test types
elinor-fung Jun 22, 2022
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
Prev Previous commit
Next Next commit
Separate file for V1 CustomMarshallingTests
  • Loading branch information
@elinor-fung
elinor-fung committed Jun 22, 2022
commit d59d85f18d4147a0d66911e4e2ec66875674691a
157 changes: 157 additions & 0 deletions ...m.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/CustomMarshallingTests.V1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.Marshalling;
using System.Text;
using SharedTypes;

using Xunit;

namespace LibraryImportGenerator.IntegrationTests
{
partial class NativeExportsNE
{
internal partial class V1
{
[LibraryImport(NativeExportsNE_Binary, EntryPoint = "stringcontainer_deepduplicate")]
public static partial void DeepDuplicateStrings(StringContainer_V1 strings, out StringContainer_V1 pStringsOut);

[LibraryImport(NativeExportsNE_Binary, EntryPoint = "stringcontainer_reverse_strings")]
public static partial void ReverseStrings(ref StringContainer_V1 strings);

[LibraryImport(NativeExportsNE_Binary, EntryPoint = "get_long_bytes_as_double")]
public static partial double GetLongBytesAsDouble([MarshalUsing(typeof(DoubleToLongMarshaller_V1))] double d);

[LibraryImport(NativeExportsNE_Binary, EntryPoint = "negate_bools")]
public static partial void NegateBools(
BoolStruct_V1 boolStruct,
out BoolStruct_V1 pBoolStructOut);

[LibraryImport(NativeExportsNE_Binary, EntryPoint = "and_bools_ref")]
[return: MarshalAs(UnmanagedType.U1)]
public static partial bool AndBoolsRef(in BoolStruct_V1 boolStruct);

[LibraryImport(NativeExportsNE_Binary, EntryPoint = "double_int_ref")]
public static partial IntWrapper_V1 DoubleIntRef(IntWrapper_V1 pInt);
}
}

public class CustomMarshallingTests_V1
{
[Fact]
public void NonBlittableStructWithFree()
{
var stringContainer = new StringContainer_V1
{
str1 = "Foo",
str2 = "Bar"
};

NativeExportsNE.V1.DeepDuplicateStrings(stringContainer, out var stringContainer2);

Assert.Equal(stringContainer, stringContainer2);
}

[Fact]
public void MarshalUsing()
{
double d = 1234.56789;

Assert.Equal(d, NativeExportsNE.V1.GetLongBytesAsDouble(d));
}

[Fact]
public void NonBlittableStructWithoutAllocation()
{
var boolStruct = new BoolStruct_V1
{
b1 = true,
b2 = false,
b3 = true
};

NativeExportsNE.V1.NegateBools(boolStruct, out BoolStruct_V1 boolStructNegated);

Assert.Equal(!boolStruct.b1, boolStructNegated.b1);
Assert.Equal(!boolStruct.b2, boolStructNegated.b2);
Assert.Equal(!boolStruct.b3, boolStructNegated.b3);
}

[Fact]
public void GetPinnableReferenceMarshalling()
{
int originalValue = 42;
var wrapper = new IntWrapper_V1 { i = originalValue };

var retVal = NativeExportsNE.V1.DoubleIntRef(wrapper);

Assert.Equal(originalValue * 2, wrapper.i);
Assert.Equal(originalValue * 2, retVal.i);
}

[Fact]
public void NonBlittableStructRef()
{
var stringContainer = new StringContainer_V1
{
str1 = "Foo",
str2 = "Bar"
};

var expected = new StringContainer_V1
{
str1 = ReverseUTF8Bytes(stringContainer.str1),
str2 = ReverseUTF8Bytes(stringContainer.str2)
};

var stringContainerCopy = stringContainer;

NativeExportsNE.V1.ReverseStrings(ref stringContainerCopy);

Assert.Equal(expected, stringContainerCopy);
}

[Theory]
[InlineData(true, true, true)]
[InlineData(true, true, false)]
[InlineData(true, false, true)]
[InlineData(true, false, false)]
[InlineData(false, true, true)]
[InlineData(false, true, false)]
[InlineData(false, false, true)]
[InlineData(false, false, false)]
public void NonBlittableStructIn(bool b1, bool b2, bool b3)
{
var container = new BoolStruct_V1
{
b1 = b1,
b2 = b2,
b3 = b3
};

Assert.Equal(b1 && b2 && b3, NativeExportsNE.V1.AndBoolsRef(container));
}

private static string ReverseChars(string value)
{
if (value == null)
return null;

var chars = value.ToCharArray();
Array.Reverse(chars);
return new string(chars);
}

private static string ReverseUTF8Bytes(string value)
{
if (value == null)
return null;

byte[] bytes = Encoding.UTF8.GetBytes(value);
Array.Reverse(bytes);
return Encoding.UTF8.GetString(bytes);
}
}
}
121 changes: 0 additions & 121 deletions ...stem.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/CustomMarshallingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,6 @@ namespace LibraryImportGenerator.IntegrationTests
{
partial class NativeExportsNE
{
internal partial class V1
{
[LibraryImport(NativeExportsNE_Binary, EntryPoint = "stringcontainer_deepduplicate")]
public static partial void DeepDuplicateStrings(StringContainer_V1 strings, out StringContainer_V1 pStringsOut);

[LibraryImport(NativeExportsNE_Binary, EntryPoint = "stringcontainer_reverse_strings")]
public static partial void ReverseStrings(ref StringContainer_V1 strings);

[LibraryImport(NativeExportsNE_Binary, EntryPoint = "get_long_bytes_as_double")]
public static partial double GetLongBytesAsDouble([MarshalUsing(typeof(DoubleToLongMarshaller_V1))] double d);

[LibraryImport(NativeExportsNE_Binary, EntryPoint = "negate_bools")]
public static partial void NegateBools(
BoolStruct_V1 boolStruct,
out BoolStruct_V1 pBoolStructOut);

[LibraryImport(NativeExportsNE_Binary, EntryPoint = "and_bools_ref")]
[return: MarshalAs(UnmanagedType.U1)]
public static partial bool AndBoolsRef(in BoolStruct_V1 boolStruct);

[LibraryImport(NativeExportsNE_Binary, EntryPoint = "double_int_ref")]
public static partial IntWrapper_V1 DoubleIntRef(IntWrapper_V1 pInt);
}

internal partial class Stateless
{
[LibraryImport(NativeExportsNE_Binary, EntryPoint = "stringcontainer_deepduplicate")]
Expand Down Expand Up @@ -164,103 +140,6 @@ public void NonBlittableStructIn(bool b1, bool b2, bool b3)
Assert.Equal(b1 && b2 && b3, NativeExportsNE.Stateless.AndBoolsRef(container));
}

public class V1
{
[Fact]
public void NonBlittableStructWithFree()
{
var stringContainer = new StringContainer_V1
{
str1 = "Foo",
str2 = "Bar"
};

NativeExportsNE.V1.DeepDuplicateStrings(stringContainer, out var stringContainer2);

Assert.Equal(stringContainer, stringContainer2);
}

[Fact]
public void MarshalUsing()
{
double d = 1234.56789;

Assert.Equal(d, NativeExportsNE.V1.GetLongBytesAsDouble(d));
}

[Fact]
public void NonBlittableStructWithoutAllocation()
{
var boolStruct = new BoolStruct_V1
{
b1 = true,
b2 = false,
b3 = true
};

NativeExportsNE.V1.NegateBools(boolStruct, out BoolStruct_V1 boolStructNegated);

Assert.Equal(!boolStruct.b1, boolStructNegated.b1);
Assert.Equal(!boolStruct.b2, boolStructNegated.b2);
Assert.Equal(!boolStruct.b3, boolStructNegated.b3);
}

[Fact]
public void GetPinnableReferenceMarshalling()
{
int originalValue = 42;
var wrapper = new IntWrapper_V1 { i = originalValue };

var retVal = NativeExportsNE.V1.DoubleIntRef(wrapper);

Assert.Equal(originalValue * 2, wrapper.i);
Assert.Equal(originalValue * 2, retVal.i);
}

[Fact]
public void NonBlittableStructRef()
{
var stringContainer = new StringContainer_V1
{
str1 = "Foo",
str2 = "Bar"
};

var expected = new StringContainer_V1
{
str1 = ReverseUTF8Bytes(stringContainer.str1),
str2 = ReverseUTF8Bytes(stringContainer.str2)
};

var stringContainerCopy = stringContainer;

NativeExportsNE.V1.ReverseStrings(ref stringContainerCopy);

Assert.Equal(expected, stringContainerCopy);
}

[Theory]
[InlineData(true, true, true)]
[InlineData(true, true, false)]
[InlineData(true, false, true)]
[InlineData(true, false, false)]
[InlineData(false, true, true)]
[InlineData(false, true, false)]
[InlineData(false, false, true)]
[InlineData(false, false, false)]
public void NonBlittableStructIn(bool b1, bool b2, bool b3)
{
var container = new BoolStruct_V1
{
b1 = b1,
b2 = b2,
b3 = b3
};

Assert.Equal(b1 && b2 && b3, NativeExportsNE.V1.AndBoolsRef(container));
}
}

[Fact]
public void NonBlittableStructStackallocPinnableNativeMarshalling()
{
Expand Down