NativeAOT-LLVM: Upgrade to LLVM v15 and opaque pointers #2139

yowl · 2022-12-23T14:37:27Z

This PR upgrades emsdk, and LLVM. LLVM is moving to opaque pointers where the pointers have no types. E.g. i8* becomes ptr . LLVM loads need the type specified. All the bitcast noops are gone from the clrjit module. I didn't do the the IL module as it's going.

Note, there are some changes to the setup instructions for LLVM as it now requires the cmake tarball downloaded and installed.

Closes: #2138

upgrade llvm use LLVM opaque pointers in the clrjit module only. add nuget ref for LLVMSharp v15

yowl · 2022-12-23T14:38:53Z

cc @dotnet/nativeaot-llvm

yowl · 2022-12-23T14:40:57Z

I added a nuget.config for the Ilc solution to enable LLVMSharp v15 as its not in the normal feeds.

SingleAccretion · 2022-12-23T14:48:56Z

docs/workflow/building/coreclr/nativeaot.md

- Configure the LLVM source to use the same runtime as the Jit: `cmake -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=Debug -D LLVM_USE_CRT_DEBUG=MTd path-to-the-build-directory` or if building for the Release configuration `cmake -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=Release -D LLVM_USE_CRT_RELEASE=MT path-to-the-build-directory`
+- Download the LLVM 15.0.6 source from https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/lldb-15.0.6.src.tar.xz
+- Extract it and create a subdirectory in the `llvm-15.0.6.src` folder (`path-to-the-build-directory`).  Do not create at the root of a drive.
+- Download the CMake 15.0.6 source from https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/cmake-15.0.6.src.tar.xz


Hmm, custom CMake is quite an unusual requirement. Why is it needed?

I hit this problem: llvm/llvm-project#57573 (comment)

Sad. I suppose there is nothing we can do then.

but I've not fixed then yml scripts... better do that.

SingleAccretion · 2022-12-23T14:49:56Z

src/coreclr/jit/llvmcodegen.cpp

@@ -552,10 +552,10 @@ Value* Llvm::consumeValue(GenTree* node, Type* targetLlvmType)
            return _builder.CreatePtrToInt(nodeValue, Type::getInt32Ty(_llvmContext));
        }

-        // i32* e.g symbols, to i8*
+        // all pointers are opaque
        if (nodeValue->getType()->isPointerTy() && targetLlvmType->isPointerTy())


Can this just be deleted then? Since all pointer types are (at the moment at least, since we don't use address spaces) are, presumably, equal?

yes, it can, thanks

SingleAccretion · 2022-12-23T14:52:04Z

src/coreclr/jit/llvmcodegen.cpp

    if (lclAddr->OperIs(GT_LCL_FLD_ADDR))
    {
-        Value* bytePtr = castIfNecessary(getLocalAddr(lclNum), Type::getInt8PtrTy(_llvmContext));
-        mapGenTreeToValue(lclAddr, gepOrAddr(bytePtr, lclAddr->GetLclOffs()));
+        mapGenTreeToValue(lclAddr, gepOrAddr(localAddr, lclAddr->GetLclOffs()));


I think we can delete the branch (if (lclAddr->OperIs...) now, since it will work for both LCL_VAR_ADDR and LCL_FLD_ADDR.

Thanks, looks like it.

src/coreclr/tools/aot/ILCompiler.LLVM/ILCompiler.LLVM.csproj

src/coreclr/tools/aot/nuget.config

with the update to emsdk, we need a warning surpressed.

yowl · 2022-12-29T00:19:23Z

Still got zlib problems, will try cherry picking dotnet/runtime#73082

- zlib updated to v1.2.12 - zlib-intel updated to v1.2.12_jtk.1 Also required additional minor tweaks (documented in zlib-version.txt and zlib-intel-version.txt) to get the build to work.

yowl · 2022-12-30T15:18:34Z

I'm going to leave this as I can't find a way to build zlib with the latest emscripten, hopefully a merge from runtime will fix it in the future.

…types

This reverts commit 925a66a.

yowl · 2023-01-05T03:00:59Z

Changing the correct cmakelist.txt helped.

SingleAccretion

Overall this is a great change! Opaque pointers will make things faster and simpler for us.

docs/workflow/building/coreclr/nativeaot.md

SingleAccretion · 2023-01-05T11:34:23Z

src/coreclr/jit/llvmcodegen.cpp

@@ -1254,7 +1239,8 @@ void Llvm::buildCnsInt(GenTree* node)
            {
                const char* symbolName = GetMangledSymbolName((void*)(node->AsIntCon()->IconValue()));
                AddCodeReloc((void*)node->AsIntCon()->IconValue());
-                mapGenTreeToValue(node, _builder.CreateLoad(getOrCreateExternalSymbol(symbolName)));
+                mapGenTreeToValue(node, _builder.CreateLoad(Type::getInt8PtrTy(_llvmContext),


getInt8PtrTy

Shouldn't we be always using PointerType::getUnqual from now on?

Yes thanks, fixed.

SingleAccretion · 2023-01-05T11:37:41Z

src/coreclr/jit/llvmcodegen.cpp

@@ -1722,13 +1706,13 @@ void Llvm::storeObjAtAddress(Value* baseAddress, Value* data, StructDesc* struct
            {
                // We can't be sure the address is on the heap, it could be the result of pointer arithmetic on a local var.
                emitHelperCall(CORINFO_HELP_CHECKED_ASSIGN_REF,
-                               {address, castIfNecessary(fieldData, Type::getInt8PtrTy(_llvmContext))});
+                               {address, castIfNecessary(fieldData, llvm::PointerType::getUnqual(_llvmContext))});


Hmm, when is fieldData not a pointer here?

E.g. Its the RhpCheckedAssignRef for S_P_TypeLoader_Internal_TypeSystem_Instantiation___cctor :

Generating: [000043] ------------ t43 = LCL_VAR int V01 tmp1 u:1 (last use) /--* t43 int Generating: N005 ( 3, 2) [000007] n----------- t7 = * OBJ struct<Internal.TypeSystem.Instantiation, 4> %16 = load i32, ptr %0, align 4, !dbg !5 /--* t10 byref +--* t7 struct Generating: N004 ( 22, 8) [000012] -ACXG------- * STORE_OBJ struct<Internal.TypeSystem.Instantiation, 4> (copy)

Instantiation is

public struct Instantiation : IEquatable<Instantiation> { private TypeDesc[] _genericParameters;

So is this because of the LLVM struct representation of an i32 I guess

I see. Bit unexpected (one would think the struct would be normalized to ptr), but also pre-existing so nothing to do.

SingleAccretion · 2023-01-05T11:38:53Z

src/coreclr/jit/llvmcodegen.cpp

+        Value* srcAddress =
+            _builder.CreateGEP(Type::getInt8Ty(_llvmContext), baseAddress, _builder.getInt32(bytesStored));


Can this use gepOrAddr?

yes, changed

SingleAccretion · 2023-01-05T11:39:20Z

src/coreclr/tools/aot/ILCompiler.LLVM/Compiler/LLVMCodegenCompilation.cs

+                    // S_P_CoreLib_System_Globalization_UmAlQuraCalendar___cctor
                    var mangledName = NodeFactory.NameMangler.GetMangledMethodName(method).ToString();
+                    // if (mangledName == "S_P_CoreLib_System_Globalization_UmAlQuraCalendar___cctor")
+                    // {
                    var sig = method.Signature;


Suggested change

// S_P_CoreLib_System_Globalization_UmAlQuraCalendar___cctor

var mangledName = NodeFactory.NameMangler.GetMangledMethodName(method).ToString();

// if (mangledName == "S_P_CoreLib_System_Globalization_UmAlQuraCalendar___cctor")

// {

var sig = method.Signature;

var mangledName = NodeFactory.NameMangler.GetMangledMethodName(method).ToString();

var sig = method.Signature;

right, removed that debug stuff

SingleAccretion · 2023-01-05T11:39:30Z

src/coreclr/tools/aot/ILCompiler.LLVM/Compiler/LLVMCodegenCompilation.cs

+                    // }
+                    // else ILImporter.CompileMethod(this, methodCodeNodeNeedingCode);


Suggested change

// }

// else ILImporter.CompileMethod(this, methodCodeNodeNeedingCode);

SingleAccretion · 2023-01-05T11:44:08Z

src/coreclr/tools/aot/ILCompiler.LLVM/Compiler/LLVMCodegenCompilation.cs

@@ -60,6 +65,8 @@ public sealed class LLVMCodegenCompilation : RyuJitCompilation
            DIBuilder = Module.CreateDIBuilder();
            DebugMetadataMap = new Dictionary<string, DebugMetadata>();
            ILImporter.Context = Module.Context;
+            LLVMContextSetOpaquePointers(Module.Context, false);


I am curious how this works linking wise. Does the Jit module still produce declarations/definitions of functions using precise pointer types, or...?

In the Jit module

declare i8 @S_P_CoreLib_System_Runtime_CompilerServices_RuntimeHelpers__Equals(ptr)

In the IL module

define i8 @S_P_CoreLib_System_Runtime_CompilerServices_RuntimeHelpers__Equals(i8* %0)

This is used in Object__Equals from the Jit module. You can run wasm2wat on the final wasm and you see:

(func $Object__Equals (type 1) (param i32) (result i32) (local i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32) local.get 0 i32.load local.set 1 i32.const 4 local.set 2 local.get 0 local.get 2 i32.add local.set 3 local.get 3 i32.load local.set 4 i32.const 8 local.set 5 local.get 0 local.get 5 i32.add local.set 6 i32.const 8 local.set 7 local.get 0 local.get 7 i32.add local.set 8 local.get 8 local.get 1 i32.store i32.const 12 local.set 9 local.get 0 local.get 9 i32.add local.set 10 local.get 10 local.get 4 i32.store local.get 6 call $S_P_CoreLib_System_Runtime_CompilerServices_RuntimeHelpers__Equals

As Wasm just uses i32 for the pointers, I guess the linker doesn't really care.

I see. Presumably means we can drop all of GetParameterType/GetArgTypeIncludingParameterized (in a follow up change) as well.

The wat for $S_P_CoreLib_System_Runtime_CompilerServices_RuntimeHelpers__Equals

func $S_P_CoreLib_System_Runtime_CompilerServices_RuntimeHelpers__Equals (type 1) (param i32) (result i32)

Where type 1 is

(type (;1;) (func (param i32) (result i32)))

Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>

remove debug code

SingleAccretion

yowl · 2023-01-05T19:46:36Z

Our "normal"

    WaitSubsystemTests.DoubleSetOnEventWithTimedOutWaiterShouldNotStayInWaitersList
    WaitSubsystemTests.ManualResetEventTest
    WaitSubsystemTests.AutoResetEventTest
    WaitSubsystemTests.SemaphoreTest
    WaitSubsystemTests.MutexTest
    WaitSubsystemTests.WaitDurationTest

Failures, retrying

yowl · 2023-01-05T21:53:09Z

hurrah!

yowl · 2023-01-05T23:12:44Z

Thanks for the packages and the reviews!

yowl added 2 commits December 22, 2022 18:49

wip - to opaque pointers

8e16b2d

upgrade emscripten

51963c5

upgrade llvm use LLVM opaque pointers in the clrjit module only. add nuget ref for LLVMSharp v15

SingleAccretion reviewed Dec 23, 2022

View reviewed changes

set the commit to 3.1.23

cf55153

SingleAccretion reviewed Dec 23, 2022

View reviewed changes

yowl added 3 commits December 23, 2022 10:14

feedback: remove redundant pointer type check

44176b3

feedback: remove GT_LCL_FLD_ADDR test for buildLocalVarAddr

4f6825e

update llvm install for v15 changes

84a7aee

jkotas added the area-NativeAOT-LLVM LLVM generation for Native AOT compilation (including Web Assembly) label Dec 23, 2022

jkotas reviewed Dec 23, 2022

View reviewed changes

src/coreclr/tools/aot/ILCompiler.LLVM/ILCompiler.LLVM.csproj Show resolved Hide resolved

jkotas reviewed Dec 23, 2022

View reviewed changes

src/coreclr/tools/aot/nuget.config Outdated Show resolved Hide resolved

cmake extract to cmake

ae56db6

yowl force-pushed the llvm15 branch from 8d53875 to ae56db6 Compare December 23, 2022 20:34

yowl marked this pull request as draft December 23, 2022 21:41

delete nuget - packages now in public feed.

bd1d07e

yowl closed this Dec 28, 2022

yowl reopened this Dec 28, 2022

yowl added 2 commits December 28, 2022 14:59

Update CMakeLists.txt

12dd12a

with the update to emsdk, we need a warning surpressed.

Merge branch 'feature/NativeAOT-LLVM' into llvm15

194d573

yowl added 4 commits December 28, 2022 19:38

add newline, straws clutching

147285f

move compile option before target

7461f58

revert option

8632671

Update zlib, zlib-intel dependencies (#73082)

925a66a

- zlib updated to v1.2.12 - zlib-intel updated to v1.2.12_jtk.1 Also required additional minor tweaks (documented in zlib-version.txt and zlib-intel-version.txt) to get the build to work.

yowl added 2 commits January 4, 2023 11:34

disable zlib warnings -Wno-deprecated-non-prototype -Wno-strict-proto…

ac4a4ae

…types

Merge remote-tracking branch 'origin/feature/NativeAOT-LLVM' into llvm15

3985e6e

yowl added 5 commits January 4, 2023 13:36

disable deprecated-non-prototype in System.IO.Compression.Native

6d39386

revert zlib makefile change as not used for wasm

4a02e60

revert unwanted change

bc12cc6

Revert "Update zlib, zlib-intel dependencies (#73082)"

4043a18

This reverts commit 925a66a.

revert changes to zlib/CMakeLists.txt

b9b1baa

yowl marked this pull request as ready for review January 5, 2023 03:00

SingleAccretion reviewed Jan 5, 2023

View reviewed changes

yowl and others added 5 commits January 5, 2023 08:52

Update docs/workflow/building/coreclr/nativeaot.md

c9f160d

Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>

Update docs/workflow/building/coreclr/nativeaot.md

6e7359c

Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>

feedback: load symbol as opaque pointer :

496d53b

Merge branch 'llvm15' of https://github.com/yowl/runtimelab into llvm15

d024452

use gepOrAddr

468527e

remove debug code

SingleAccretion approved these changes Jan 5, 2023

View reviewed changes

yowl closed this Jan 5, 2023

yowl reopened this Jan 5, 2023

yowl mentioned this pull request Jan 5, 2023

NativeAOT-LLVM: LLVM structs over single pointers, should be ptr #2151

Open

jkotas merged commit 7ff68f1 into dotnet:feature/NativeAOT-LLVM Jan 5, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NativeAOT-LLVM: Upgrade to LLVM v15 and opaque pointers #2139

NativeAOT-LLVM: Upgrade to LLVM v15 and opaque pointers #2139

yowl commented Dec 23, 2022 •

edited

Loading

yowl commented Dec 23, 2022

yowl commented Dec 23, 2022

SingleAccretion Dec 23, 2022

yowl Dec 23, 2022

SingleAccretion Dec 23, 2022

yowl Dec 23, 2022

SingleAccretion Dec 23, 2022

yowl Dec 23, 2022

SingleAccretion Dec 23, 2022

yowl Dec 23, 2022

yowl commented Dec 29, 2022 •

edited

Loading

yowl commented Dec 30, 2022

yowl commented Jan 5, 2023

SingleAccretion left a comment

SingleAccretion Jan 5, 2023

yowl Jan 5, 2023

SingleAccretion Jan 5, 2023

yowl Jan 5, 2023

SingleAccretion Jan 5, 2023

SingleAccretion Jan 5, 2023 •

edited

Loading

yowl Jan 5, 2023

SingleAccretion Jan 5, 2023

yowl Jan 5, 2023

SingleAccretion Jan 5, 2023

yowl Jan 5, 2023

SingleAccretion Jan 5, 2023

yowl Jan 5, 2023

SingleAccretion Jan 5, 2023

yowl Jan 5, 2023

SingleAccretion left a comment

yowl commented Jan 5, 2023

yowl commented Jan 5, 2023

yowl commented Jan 5, 2023

		Value* srcAddress =
		_builder.CreateGEP(Type::getInt8Ty(_llvmContext), baseAddress, _builder.getInt32(bytesStored));

		// }
		// else ILImporter.CompileMethod(this, methodCodeNodeNeedingCode);

NativeAOT-LLVM: Upgrade to LLVM v15 and opaque pointers #2139

NativeAOT-LLVM: Upgrade to LLVM v15 and opaque pointers #2139

Conversation

yowl commented Dec 23, 2022 • edited Loading

yowl commented Dec 23, 2022

yowl commented Dec 23, 2022

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

yowl commented Dec 29, 2022 • edited Loading

yowl commented Dec 30, 2022

yowl commented Jan 5, 2023

SingleAccretion 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

SingleAccretion Jan 5, 2023 • edited Loading

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

SingleAccretion left a comment

Choose a reason for hiding this comment

yowl commented Jan 5, 2023

yowl commented Jan 5, 2023

yowl commented Jan 5, 2023

yowl commented Dec 23, 2022 •

edited

Loading

yowl commented Dec 29, 2022 •

edited

Loading

SingleAccretion Jan 5, 2023 •

edited

Loading