[NativeAOT-LLVM] Merge apr 24 #2543
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,7 @@ if (!(gcm cmake -ErrorAction SilentlyContinue)) | |
| if (!$NoClone) | ||
| { | ||
| $LlvmProjectTag = "llvmorg-17.0.4" | ||
| $DepthOption = if ($CI) {"--depth","1"} else {} | ||
| git clone https://github.com/llvm/llvm-project --branch $LlvmProjectTag $DepthOption | ||
| } | ||
| elseif (!(Test-Path llvm-project)) | ||
|
|
@@ -72,7 +72,7 @@ foreach ($Config in $Configs) | |
| } | ||
| else | ||
| { | ||
| $LlvmCmakeConfigEnvVarName = if ($Config -eq "Release") {"LLVM_CMAKE_CONFIG_RELEASE"} else {"LLVM_CMAKE_CONFIG_DEBUG"} | ||
| } | ||
|
|
||
| Write-Host "Setting $LlvmCmakeConfigEnvVarName to '$LlvmCmakeConfigPath'" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,12 +29,12 @@ steps: | |
| - ${{ if eq(parameters.platform, 'browser_wasm_win') }}: | ||
| - script: | | ||
| call $(Build.SourcesDirectory)\wasm-tools\emsdk\emsdk_env | ||
| $(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) ${{ parameters.archType }} tree nativeaot /p:LibrariesConfiguration=${{ parameters.librariesConfiguration }} | ||
| displayName: Build WebAssembly tests | ||
| - ${{ elseif eq(parameters.platform, 'wasi_wasm_win') }}: | ||
| - script: | | ||
| call $(Build.SourcesDirectory)\wasm-tools\emsdk\emsdk_env | ||
| $(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) ${{ parameters.archType }} wasi tree nativeaot /p:LibrariesConfiguration=${{ parameters.librariesConfiguration }} | ||
| displayName: Build WebAssembly tests | ||
|
|
||
| - ${{ elseif eq(parameters.osGroup, 'windows') }}: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -153,11 +153,7 @@ endif(NOT CLR_CMAKE_TARGET_ARCH_WASM) | |
|
|
||
| if(NOT CLR_CROSS_COMPONENTS_BUILD) | ||
| # NativeAOT only buildable for a subset of CoreCLR-supported configurations | ||
| if(CLR_CMAKE_HOST_ARCH_ARM64 OR CLR_CMAKE_HOST_ARCH_AMD64 OR CLR_CMAKE_HOST_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_WASM OR (CLR_CMAKE_HOST_ARCH_I386 AND CLR_CMAKE_HOST_WIN32)) | ||
| add_subdirectory(nativeaot) | ||
| endif() | ||
| endif(NOT CLR_CROSS_COMPONENTS_BUILD) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,10 +26,6 @@ | |
| #endif | ||
| #endif // TARGET_WINDOWS | ||
|
|
||
| #ifdef UNICODE | ||
| #define MAKE_TARGET_DLLNAME(name) MAKE_TARGET_DLLNAME_W(name) | ||
| #else | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7621,11 +7621,7 @@ void Compiler::compInitVarScopeMap() | |
| compVarScopeMap = new (getAllocator()) VarNumToScopeDscMap(getAllocator()); | ||
|
|
||
| // 599 prime to limit huge allocations; for ex: duplicated scopes on single var. | ||
| compVarScopeMap->Reallocate(min(info.compVarScopesCount, 599u)); | ||
|
|
||
| for (unsigned i = 0; i < info.compVarScopesCount; ++i) | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -499,19 +499,13 @@ class LclVarDsc | |
| // The constructor. Most things can just be zero'ed. | ||
| // | ||
| // Initialize the ArgRegs to REG_STK. | ||
| LclVarDsc() : | ||
| #if defined(TARGET_WASM) | ||
| lvLlvmArgNum(BAD_LLVM_ARG_NUM), | ||
| lvCorInfoType(CORINFO_TYPE_UNDEF), | ||
| lvHasLocalAddr(0), | ||
| #endif // TARGET_WASM | ||
| _lvArgReg(REG_STK) | ||
| #if FEATURE_MULTIREG_ARGS | ||
| , _lvOtherArgReg(REG_STK) | ||
| #endif // FEATURE_MULTIREG_ARGS | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2354,14 +2354,10 @@ PhaseStatus Compiler::fgAddInternal() | |
| // Merge return points if required or beneficial | ||
| MergedReturns merger(this); | ||
|
|
||
| #ifdef TARGET_WASM | ||
| m_llvm->AddUnhandledExceptionHandler(); | ||
| #endif // TARGET_WASM | ||
|
|
||
| // Add the synchronized method enter/exit calls and try/finally protection. Note | ||
| // that this must happen before the one BBJ_RETURN block is created below, so the | ||
| // BBJ_RETURN block gets placed at the top-level, not within an EH region. (Otherwise, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2081,8 +2081,7 @@ void CallArgs::Remove(CallArg* arg) | |
| assert(!"Did not find arg to remove in CallArgs::Remove"); | ||
| } | ||
|
|
||
| #ifdef TARGET_WASM | ||
| //------------------------------------------------------------------------ | ||
| // MoveLateToEarly: Sets all late nodes as the early nodes | ||
| // | ||
|
|
@@ -2103,7 +2102,6 @@ void CallArgs::MoveLateToEarly() | |
| m_lateHead = nullptr; | ||
| } | ||
| #endif | ||
| #ifdef TARGET_XARCH | ||
| //--------------------------------------------------------------- | ||
| // NeedsVzeroupper: Determines if the call needs a vzeroupper emitted before it is invoked | ||
|
|
@@ -2172,7 +2170,6 @@ bool GenTreeCall::NeedsVzeroupper(Compiler* comp) | |
| return needsVzeroupper; | ||
| } | ||
| #endif // TARGET_XARCH | ||
|
|
||
| //--------------------------------------------------------------- | ||
| // GetOtherRegMask: Get the reg mask of gtOtherRegs of call node | ||
|
|
@@ -4744,8 +4741,6 @@ bool genCreateAddrMode(Compiler* compiler, | |
| constant, or we have gone through a GT_NOP or GT_COMMA node. We never come back | ||
| here if we find a scaled index. | ||
| */ | ||
| assert(mul == 0); | ||
|
|
||
| /* Special case: keep constants as 'op2' */ | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was this always incorrect or did something change (I am guessing the former)? Does
Include="$(CoreCLRNativeArtifactsPath)src\es6\*.js"below need the same fix?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For a reason I don't remember anymore I have crafted it this way https://github.com/dotnet/runtimelab/pull/2453/files#diff-e39b13480e09094a7907aaf2c25d8bec6025771736925298c71182d6332f0956. If the correct approach is to use
LibrariesNativeArtifactsPath, then we can drop definition ofCoreCLRNativeArtifactsPathThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for pointing to that commit - it actually looks wrong to me to use
LibrariesNativeArtifactsPathhere now, since it picks up the configuration (Debug/Release) from libraries, while these are runtime files and so should pick up CoreCLR's configuration (as the before-merge code does).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you want me to revert this and confirm the error ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be useful to understand what the bug here is, yes.