Skip to content

Add conditional dependency on LLVM packages for Mono#2140

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
steveisok merged 15 commits into from
Feb 10, 2020
Merged

Add conditional dependency on LLVM packages for Mono #2140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
100c720
Add conditional dependency on LLVM packages for Mono
Jan 22, 2020
b8a7b73
Enable LLVM CI
Jan 24, 2020
5180448
Construct path manually
Jan 27, 2020
6201ac9
Bump LLVM
Jan 27, 2020
bdb0ba3
Update src/mono/mono.proj
directhex Jan 29, 2020
80e8527
Update src/mono/mono.proj
directhex Jan 29, 2020
d51f23f
Don't GeneratePathProperty since it doesn't work in Restore task
Jan 29, 2020
f5feb5d
Create MonoLLVMDir property and use it
Jan 29, 2020
1ca5b70
Cleanup
Jan 30, 2020
7388fdb
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Jan 31, 2020
068bb0f
Try to differentiate LLVM artifacts
Jan 31, 2020
dd588f6
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Feb 5, 2020
19063f1
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Feb 5, 2020
498e203
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
directhex Feb 7, 2020
fbf521f
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
directhex Feb 10, 2020
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
24 changes: 24 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,5 +158,29 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>572e952eae1d4fc6e83300031c5f7c401014ff34</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
7 changes: 7 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,13 @@
<MicrosoftPrivateIntellisenseVersion>3.0.0-preview9-190909-1</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<ILLinkTasksVersion>0.1.6-prerelease.19567.1</ILLinkTasksVersion>
<!-- Mono LLVM -->
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
</PropertyGroup>
<!-- Package names -->
<PropertyGroup>
Expand Down
22 changes: 17 additions & 5 deletions eng/pipelines/mono/templates/build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ parameters:
variables: {}
pool: ''
condition: true
llvm: false

### Product build
jobs:
Expand All@@ -21,11 +22,19 @@ jobs:
helixType: 'build/product/'
enableMicrobuild: true
pool: ${{ parameters.pool }}
llvm: ${{ parameters.llvm }}
condition: ${{ parameters.condition }}

# Compute job name from template parameters
name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
${{ if ne(parameters.llvm, true) }}:
name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

# if LLVM enabled, set a variable we can consume
${{ if eq(parameters.llvm, true) }}:
name: ${{ format('mono_llvm_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono LLVM Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}


# Run all steps in the container.
# Note that the containers are defined in platform-matrix.yml
Expand DownExpand Up@@ -58,10 +67,10 @@ jobs:

# Build
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product

# Publish product output directory for consumption by tests.
Expand All@@ -80,6 +89,9 @@ jobs:
displayName: Publish Logs
inputs:
pathtoPublish: $(Build.SourcesDirectory)/artifacts/log
artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if ne(parameters.llvm, true) }}:
artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if eq(parameters.llvm, true) }}:
artifactName: 'BuildLogs_Mono_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
continueOnError: true
condition: always()
7 changes: 6 additions & 1 deletion eng/pipelines/mono/templates/xplat-pipeline-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ parameters:
liveLibrariesBuildConfig: ''
strategy: ''
pool: ''
llvm: false

# arcade-specific parameters
condition: true
Expand All@@ -33,6 +34,7 @@ jobs:
container: ${{ parameters.container }}
strategy: ${{ parameters.strategy }}
pool: ${{ parameters.pool }}
llvm: ${{ parameters.llvm }}

# arcade-specific parameters
condition: and(succeeded(), ${{ parameters.condition }})
Expand All@@ -45,7 +47,10 @@ jobs:

variables:
- name: buildProductArtifactName
value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if ne(parameters.llvm, true) }}:
value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if eq(parameters.llvm, true) }}:
value: 'MonoProduct_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'

- name: buildProductRootFolderPath
value: '$(Build.SourcesDirectory)/artifacts/bin/mono/$(osGroup).$(archType).$(buildConfigUpper)'
Expand Down
56 changes: 56 additions & 0 deletions eng/pipelines/runtime.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -252,6 +252,62 @@ jobs:
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono LLVM debug
# Only when libraries or mono changed
Comment thread
directhex marked this conversation as resolved.
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: debug
platforms:
# - OSX_x64
- Linux_x64
# - Linux_arm
# - Linux_arm64
# - Linux_musl_x64
# - Linux_musl_arm64
# - Windows_NT_x64
# - Windows_NT_x86
# - Windows_NT_arm
# - Windows_NT_arm64
jobParameters:
llvm: true
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono LLVM release
# Only when libraries or mono changed
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: release
platforms:
# - OSX_x64
- Linux_x64
# - Linux_arm
# - Linux_arm64
# - Linux_musl_x64
# - Linux_musl_arm64
# - Windows_NT_x64
# - Windows_NT_x86
# - Windows_NT_arm
# - Windows_NT_arm64
jobParameters:
llvm: true
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build libraries using live CoreLib
# These set of libraries are built always no matter what changed
Expand Down
53 changes: 51 additions & 2 deletions src/mono/llvm/Makefile.am
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,51 @@
# temporary Makefile until we can fully move netcore mono to new repo
all:
if ENABLE_LLVM

if HOST_WIN32
llvm_config=llvm-config.exe
else
llvm_config=llvm-config
endif

if HAVE_STATIC_ZLIB
llvm_extra_libs = $(STATIC_ZLIB_PATH)
else
if HAVE_SYS_ZLIB
llvm_extra_libs=-lz
else
llvm_extra_libs=
endif
endif

if INTERNAL_LLVM_ASSERTS
ENABLE_ASSERTS=On
else
ENABLE_ASSERTS=Off
endif

all-local: llvm_config.mk

clean-local: clean-llvm-config

$(mono_build_root)/llvm/llvm_config.mk: $(top_srcdir)/llvm/Makefile.am
$(top_srcdir)/llvm/build_llvm_config.sh "$(EXTERNAL_LLVM_CONFIG)" "$(LLVM_CODEGEN_LIBS)" "$(llvm_extra_libs)" | tee $@

llvm_config.mk: $(mono_build_root)/llvm/llvm_config.mk

clean-llvm-config:
- rm -rf llvm_config.mk

else
all-local:

clean-local:
endif

# Override this so we don't try to re-copy llvm when we install mono
install:

if TARGET_WASM
LLVM_TARGET=wasm32
else
LLVM_TARGET=
endif

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all \x3Cpre>\x3Ccode> blocks (function() { function addCopyButtons() { document.querySelectorAll('pre code').forEach(function(codeBlock) { if (codeBlock.parentElement.hasAttribute('data-copy-added')) return; codeBlock.parentElement.setAttribute('data-copy-added', 'true'); var btn = document.createElement('button'); btn.textContent = 'Copy'; btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;'; btn.onmouseover = function() { this.style.opacity = '1'; }; btn.onmouseout = function() { this.style.opacity = '0.7'; }; btn.onclick = function() { navigator.clipboard.writeText(codeBlock.textContent).then(function() { btn.textContent = 'Copied!'; setTimeout(function() { btn.textContent = 'Copy'; }, 1500); }); }; codeBlock.parentElement.style.position = 'relative'; codeBlock.parentElement.appendChild(btn); }); } addCopyButtons(); // Re-run on dynamic content var observer = new MutationObserver(addCopyButtons); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + ' Add conditional dependency on LLVM packages for Mono by directhex · Pull Request #2140 · dotnet/runtime · GitHub
Skip to content

Add conditional dependency on LLVM packages for Mono#2140

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
steveisok merged 15 commits into from
Feb 10, 2020
Merged

Add conditional dependency on LLVM packages for Mono #2140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
100c720
Add conditional dependency on LLVM packages for Mono
Jan 22, 2020
b8a7b73
Enable LLVM CI
Jan 24, 2020
5180448
Construct path manually
Jan 27, 2020
6201ac9
Bump LLVM
Jan 27, 2020
bdb0ba3
Update src/mono/mono.proj
directhex Jan 29, 2020
80e8527
Update src/mono/mono.proj
directhex Jan 29, 2020
d51f23f
Don't GeneratePathProperty since it doesn't work in Restore task
Jan 29, 2020
f5feb5d
Create MonoLLVMDir property and use it
Jan 29, 2020
1ca5b70
Cleanup
Jan 30, 2020
7388fdb
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Jan 31, 2020
068bb0f
Try to differentiate LLVM artifacts
Jan 31, 2020
dd588f6
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Feb 5, 2020
19063f1
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Feb 5, 2020
498e203
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
directhex Feb 7, 2020
fbf521f
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
directhex Feb 10, 2020
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
24 changes: 24 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,5 +158,29 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>572e952eae1d4fc6e83300031c5f7c401014ff34</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
7 changes: 7 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,13 @@
<MicrosoftPrivateIntellisenseVersion>3.0.0-preview9-190909-1</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<ILLinkTasksVersion>0.1.6-prerelease.19567.1</ILLinkTasksVersion>
<!-- Mono LLVM -->
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
</PropertyGroup>
<!-- Package names -->
<PropertyGroup>
Expand Down
22 changes: 17 additions & 5 deletions eng/pipelines/mono/templates/build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ parameters:
variables: {}
pool: ''
condition: true
llvm: false

### Product build
jobs:
Expand All@@ -21,11 +22,19 @@ jobs:
helixType: 'build/product/'
enableMicrobuild: true
pool: ${{ parameters.pool }}
llvm: ${{ parameters.llvm }}
condition: ${{ parameters.condition }}

# Compute job name from template parameters
name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
${{ if ne(parameters.llvm, true) }}:
name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

# if LLVM enabled, set a variable we can consume
${{ if eq(parameters.llvm, true) }}:
name: ${{ format('mono_llvm_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono LLVM Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}


# Run all steps in the container.
# Note that the containers are defined in platform-matrix.yml
Expand DownExpand Up@@ -58,10 +67,10 @@ jobs:

# Build
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product

# Publish product output directory for consumption by tests.
Expand All@@ -80,6 +89,9 @@ jobs:
displayName: Publish Logs
inputs:
pathtoPublish: $(Build.SourcesDirectory)/artifacts/log
artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if ne(parameters.llvm, true) }}:
artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if eq(parameters.llvm, true) }}:
artifactName: 'BuildLogs_Mono_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
continueOnError: true
condition: always()
7 changes: 6 additions & 1 deletion eng/pipelines/mono/templates/xplat-pipeline-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ parameters:
liveLibrariesBuildConfig: ''
strategy: ''
pool: ''
llvm: false

# arcade-specific parameters
condition: true
Expand All@@ -33,6 +34,7 @@ jobs:
container: ${{ parameters.container }}
strategy: ${{ parameters.strategy }}
pool: ${{ parameters.pool }}
llvm: ${{ parameters.llvm }}

# arcade-specific parameters
condition: and(succeeded(), ${{ parameters.condition }})
Expand All@@ -45,7 +47,10 @@ jobs:

variables:
- name: buildProductArtifactName
value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if ne(parameters.llvm, true) }}:
value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if eq(parameters.llvm, true) }}:
value: 'MonoProduct_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'

- name: buildProductRootFolderPath
value: '$(Build.SourcesDirectory)/artifacts/bin/mono/$(osGroup).$(archType).$(buildConfigUpper)'
Expand Down
56 changes: 56 additions & 0 deletions eng/pipelines/runtime.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -252,6 +252,62 @@ jobs:
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono LLVM debug
# Only when libraries or mono changed
Comment thread
directhex marked this conversation as resolved.
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: debug
platforms:
# - OSX_x64
- Linux_x64
# - Linux_arm
# - Linux_arm64
# - Linux_musl_x64
# - Linux_musl_arm64
# - Windows_NT_x64
# - Windows_NT_x86
# - Windows_NT_arm
# - Windows_NT_arm64
jobParameters:
llvm: true
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono LLVM release
# Only when libraries or mono changed
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: release
platforms:
# - OSX_x64
- Linux_x64
# - Linux_arm
# - Linux_arm64
# - Linux_musl_x64
# - Linux_musl_arm64
# - Windows_NT_x64
# - Windows_NT_x86
# - Windows_NT_arm
# - Windows_NT_arm64
jobParameters:
llvm: true
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build libraries using live CoreLib
# These set of libraries are built always no matter what changed
Expand Down
53 changes: 51 additions & 2 deletions src/mono/llvm/Makefile.am
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,51 @@
# temporary Makefile until we can fully move netcore mono to new repo
all:
if ENABLE_LLVM

if HOST_WIN32
llvm_config=llvm-config.exe
else
llvm_config=llvm-config
endif

if HAVE_STATIC_ZLIB
llvm_extra_libs = $(STATIC_ZLIB_PATH)
else
if HAVE_SYS_ZLIB
llvm_extra_libs=-lz
else
llvm_extra_libs=
endif
endif

if INTERNAL_LLVM_ASSERTS
ENABLE_ASSERTS=On
else
ENABLE_ASSERTS=Off
endif

all-local: llvm_config.mk

clean-local: clean-llvm-config

$(mono_build_root)/llvm/llvm_config.mk: $(top_srcdir)/llvm/Makefile.am
$(top_srcdir)/llvm/build_llvm_config.sh "$(EXTERNAL_LLVM_CONFIG)" "$(LLVM_CODEGEN_LIBS)" "$(llvm_extra_libs)" | tee $@

llvm_config.mk: $(mono_build_root)/llvm/llvm_config.mk

clean-llvm-config:
- rm -rf llvm_config.mk

else
all-local:

clean-local:
endif

# Override this so we don't try to re-copy llvm when we install mono
install:

if TARGET_WASM
LLVM_TARGET=wasm32
else
LLVM_TARGET=
endif

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add conditional dependency on LLVM packages for Mono by directhex · Pull Request #2140 · dotnet/runtime · GitHub
Skip to content

Add conditional dependency on LLVM packages for Mono#2140

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
steveisok merged 15 commits into from
Feb 10, 2020
Merged

Add conditional dependency on LLVM packages for Mono #2140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
100c720
Add conditional dependency on LLVM packages for Mono
Jan 22, 2020
b8a7b73
Enable LLVM CI
Jan 24, 2020
5180448
Construct path manually
Jan 27, 2020
6201ac9
Bump LLVM
Jan 27, 2020
bdb0ba3
Update src/mono/mono.proj
directhex Jan 29, 2020
80e8527
Update src/mono/mono.proj
directhex Jan 29, 2020
d51f23f
Don't GeneratePathProperty since it doesn't work in Restore task
Jan 29, 2020
f5feb5d
Create MonoLLVMDir property and use it
Jan 29, 2020
1ca5b70
Cleanup
Jan 30, 2020
7388fdb
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Jan 31, 2020
068bb0f
Try to differentiate LLVM artifacts
Jan 31, 2020
dd588f6
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Feb 5, 2020
19063f1
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Feb 5, 2020
498e203
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
directhex Feb 7, 2020
fbf521f
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
directhex Feb 10, 2020
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
24 changes: 24 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,5 +158,29 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>572e952eae1d4fc6e83300031c5f7c401014ff34</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
7 changes: 7 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,13 @@
<MicrosoftPrivateIntellisenseVersion>3.0.0-preview9-190909-1</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<ILLinkTasksVersion>0.1.6-prerelease.19567.1</ILLinkTasksVersion>
<!-- Mono LLVM -->
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
</PropertyGroup>
<!-- Package names -->
<PropertyGroup>
Expand Down
22 changes: 17 additions & 5 deletions eng/pipelines/mono/templates/build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ parameters:
variables: {}
pool: ''
condition: true
llvm: false

### Product build
jobs:
Expand All@@ -21,11 +22,19 @@ jobs:
helixType: 'build/product/'
enableMicrobuild: true
pool: ${{ parameters.pool }}
llvm: ${{ parameters.llvm }}
condition: ${{ parameters.condition }}

# Compute job name from template parameters
name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
${{ if ne(parameters.llvm, true) }}:
name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

# if LLVM enabled, set a variable we can consume
${{ if eq(parameters.llvm, true) }}:
name: ${{ format('mono_llvm_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono LLVM Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}


# Run all steps in the container.
# Note that the containers are defined in platform-matrix.yml
Expand DownExpand Up@@ -58,10 +67,10 @@ jobs:

# Build
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product

# Publish product output directory for consumption by tests.
Expand All@@ -80,6 +89,9 @@ jobs:
displayName: Publish Logs
inputs:
pathtoPublish: $(Build.SourcesDirectory)/artifacts/log
artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if ne(parameters.llvm, true) }}:
artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if eq(parameters.llvm, true) }}:
artifactName: 'BuildLogs_Mono_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
continueOnError: true
condition: always()
7 changes: 6 additions & 1 deletion eng/pipelines/mono/templates/xplat-pipeline-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ parameters:
liveLibrariesBuildConfig: ''
strategy: ''
pool: ''
llvm: false

# arcade-specific parameters
condition: true
Expand All@@ -33,6 +34,7 @@ jobs:
container: ${{ parameters.container }}
strategy: ${{ parameters.strategy }}
pool: ${{ parameters.pool }}
llvm: ${{ parameters.llvm }}

# arcade-specific parameters
condition: and(succeeded(), ${{ parameters.condition }})
Expand All@@ -45,7 +47,10 @@ jobs:

variables:
- name: buildProductArtifactName
value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if ne(parameters.llvm, true) }}:
value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if eq(parameters.llvm, true) }}:
value: 'MonoProduct_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'

- name: buildProductRootFolderPath
value: '$(Build.SourcesDirectory)/artifacts/bin/mono/$(osGroup).$(archType).$(buildConfigUpper)'
Expand Down
56 changes: 56 additions & 0 deletions eng/pipelines/runtime.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -252,6 +252,62 @@ jobs:
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono LLVM debug
# Only when libraries or mono changed
Comment thread
directhex marked this conversation as resolved.
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: debug
platforms:
# - OSX_x64
- Linux_x64
# - Linux_arm
# - Linux_arm64
# - Linux_musl_x64
# - Linux_musl_arm64
# - Windows_NT_x64
# - Windows_NT_x86
# - Windows_NT_arm
# - Windows_NT_arm64
jobParameters:
llvm: true
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono LLVM release
# Only when libraries or mono changed
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: release
platforms:
# - OSX_x64
- Linux_x64
# - Linux_arm
# - Linux_arm64
# - Linux_musl_x64
# - Linux_musl_arm64
# - Windows_NT_x64
# - Windows_NT_x86
# - Windows_NT_arm
# - Windows_NT_arm64
jobParameters:
llvm: true
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build libraries using live CoreLib
# These set of libraries are built always no matter what changed
Expand Down
53 changes: 51 additions & 2 deletions src/mono/llvm/Makefile.am
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,51 @@
# temporary Makefile until we can fully move netcore mono to new repo
all:
if ENABLE_LLVM

if HOST_WIN32
llvm_config=llvm-config.exe
else
llvm_config=llvm-config
endif

if HAVE_STATIC_ZLIB
llvm_extra_libs = $(STATIC_ZLIB_PATH)
else
if HAVE_SYS_ZLIB
llvm_extra_libs=-lz
else
llvm_extra_libs=
endif
endif

if INTERNAL_LLVM_ASSERTS
ENABLE_ASSERTS=On
else
ENABLE_ASSERTS=Off
endif

all-local: llvm_config.mk

clean-local: clean-llvm-config

$(mono_build_root)/llvm/llvm_config.mk: $(top_srcdir)/llvm/Makefile.am
$(top_srcdir)/llvm/build_llvm_config.sh "$(EXTERNAL_LLVM_CONFIG)" "$(LLVM_CODEGEN_LIBS)" "$(llvm_extra_libs)" | tee $@

llvm_config.mk: $(mono_build_root)/llvm/llvm_config.mk

clean-llvm-config:
- rm -rf llvm_config.mk

else
all-local:

clean-local:
endif

# Override this so we don't try to re-copy llvm when we install mono
install:

if TARGET_WASM
LLVM_TARGET=wasm32
else
LLVM_TARGET=
endif

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add conditional dependency on LLVM packages for Mono by directhex · Pull Request #2140 · dotnet/runtime · GitHub
Skip to content

Add conditional dependency on LLVM packages for Mono#2140

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
steveisok merged 15 commits into from
Feb 10, 2020
Merged

Add conditional dependency on LLVM packages for Mono #2140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
100c720
Add conditional dependency on LLVM packages for Mono
Jan 22, 2020
b8a7b73
Enable LLVM CI
Jan 24, 2020
5180448
Construct path manually
Jan 27, 2020
6201ac9
Bump LLVM
Jan 27, 2020
bdb0ba3
Update src/mono/mono.proj
directhex Jan 29, 2020
80e8527
Update src/mono/mono.proj
directhex Jan 29, 2020
d51f23f
Don't GeneratePathProperty since it doesn't work in Restore task
Jan 29, 2020
f5feb5d
Create MonoLLVMDir property and use it
Jan 29, 2020
1ca5b70
Cleanup
Jan 30, 2020
7388fdb
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Jan 31, 2020
068bb0f
Try to differentiate LLVM artifacts
Jan 31, 2020
dd588f6
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Feb 5, 2020
19063f1
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Feb 5, 2020
498e203
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
directhex Feb 7, 2020
fbf521f
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
directhex Feb 10, 2020
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
24 changes: 24 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,5 +158,29 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>572e952eae1d4fc6e83300031c5f7c401014ff34</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
7 changes: 7 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,13 @@
<MicrosoftPrivateIntellisenseVersion>3.0.0-preview9-190909-1</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<ILLinkTasksVersion>0.1.6-prerelease.19567.1</ILLinkTasksVersion>
<!-- Mono LLVM -->
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
</PropertyGroup>
<!-- Package names -->
<PropertyGroup>
Expand Down
22 changes: 17 additions & 5 deletions eng/pipelines/mono/templates/build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ parameters:
variables: {}
pool: ''
condition: true
llvm: false

### Product build
jobs:
Expand All@@ -21,11 +22,19 @@ jobs:
helixType: 'build/product/'
enableMicrobuild: true
pool: ${{ parameters.pool }}
llvm: ${{ parameters.llvm }}
condition: ${{ parameters.condition }}

# Compute job name from template parameters
name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
${{ if ne(parameters.llvm, true) }}:
name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

# if LLVM enabled, set a variable we can consume
${{ if eq(parameters.llvm, true) }}:
name: ${{ format('mono_llvm_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono LLVM Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}


# Run all steps in the container.
# Note that the containers are defined in platform-matrix.yml
Expand DownExpand Up@@ -58,10 +67,10 @@ jobs:

# Build
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product

# Publish product output directory for consumption by tests.
Expand All@@ -80,6 +89,9 @@ jobs:
displayName: Publish Logs
inputs:
pathtoPublish: $(Build.SourcesDirectory)/artifacts/log
artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if ne(parameters.llvm, true) }}:
artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if eq(parameters.llvm, true) }}:
artifactName: 'BuildLogs_Mono_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
continueOnError: true
condition: always()
7 changes: 6 additions & 1 deletion eng/pipelines/mono/templates/xplat-pipeline-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ parameters:
liveLibrariesBuildConfig: ''
strategy: ''
pool: ''
llvm: false

# arcade-specific parameters
condition: true
Expand All@@ -33,6 +34,7 @@ jobs:
container: ${{ parameters.container }}
strategy: ${{ parameters.strategy }}
pool: ${{ parameters.pool }}
llvm: ${{ parameters.llvm }}

# arcade-specific parameters
condition: and(succeeded(), ${{ parameters.condition }})
Expand All@@ -45,7 +47,10 @@ jobs:

variables:
- name: buildProductArtifactName
value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if ne(parameters.llvm, true) }}:
value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if eq(parameters.llvm, true) }}:
value: 'MonoProduct_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'

- name: buildProductRootFolderPath
value: '$(Build.SourcesDirectory)/artifacts/bin/mono/$(osGroup).$(archType).$(buildConfigUpper)'
Expand Down
56 changes: 56 additions & 0 deletions eng/pipelines/runtime.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -252,6 +252,62 @@ jobs:
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono LLVM debug
# Only when libraries or mono changed
Comment thread
directhex marked this conversation as resolved.
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: debug
platforms:
# - OSX_x64
- Linux_x64
# - Linux_arm
# - Linux_arm64
# - Linux_musl_x64
# - Linux_musl_arm64
# - Windows_NT_x64
# - Windows_NT_x86
# - Windows_NT_arm
# - Windows_NT_arm64
jobParameters:
llvm: true
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono LLVM release
# Only when libraries or mono changed
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: release
platforms:
# - OSX_x64
- Linux_x64
# - Linux_arm
# - Linux_arm64
# - Linux_musl_x64
# - Linux_musl_arm64
# - Windows_NT_x64
# - Windows_NT_x86
# - Windows_NT_arm
# - Windows_NT_arm64
jobParameters:
llvm: true
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build libraries using live CoreLib
# These set of libraries are built always no matter what changed
Expand Down
53 changes: 51 additions & 2 deletions src/mono/llvm/Makefile.am
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,51 @@
# temporary Makefile until we can fully move netcore mono to new repo
all:
if ENABLE_LLVM

if HOST_WIN32
llvm_config=llvm-config.exe
else
llvm_config=llvm-config
endif

if HAVE_STATIC_ZLIB
llvm_extra_libs = $(STATIC_ZLIB_PATH)
else
if HAVE_SYS_ZLIB
llvm_extra_libs=-lz
else
llvm_extra_libs=
endif
endif

if INTERNAL_LLVM_ASSERTS
ENABLE_ASSERTS=On
else
ENABLE_ASSERTS=Off
endif

all-local: llvm_config.mk

clean-local: clean-llvm-config

$(mono_build_root)/llvm/llvm_config.mk: $(top_srcdir)/llvm/Makefile.am
$(top_srcdir)/llvm/build_llvm_config.sh "$(EXTERNAL_LLVM_CONFIG)" "$(LLVM_CODEGEN_LIBS)" "$(llvm_extra_libs)" | tee $@

llvm_config.mk: $(mono_build_root)/llvm/llvm_config.mk

clean-llvm-config:
- rm -rf llvm_config.mk

else
all-local:

clean-local:
endif

# Override this so we don't try to re-copy llvm when we install mono
install:

if TARGET_WASM
LLVM_TARGET=wasm32
else
LLVM_TARGET=
endif

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Add conditional dependency on LLVM packages for Mono by directhex · Pull Request #2140 · dotnet/runtime · GitHub
Skip to content

Add conditional dependency on LLVM packages for Mono#2140

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
steveisok merged 15 commits into from
Feb 10, 2020
Merged

Add conditional dependency on LLVM packages for Mono #2140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
100c720
Add conditional dependency on LLVM packages for Mono
Jan 22, 2020
b8a7b73
Enable LLVM CI
Jan 24, 2020
5180448
Construct path manually
Jan 27, 2020
6201ac9
Bump LLVM
Jan 27, 2020
bdb0ba3
Update src/mono/mono.proj
directhex Jan 29, 2020
80e8527
Update src/mono/mono.proj
directhex Jan 29, 2020
d51f23f
Don't GeneratePathProperty since it doesn't work in Restore task
Jan 29, 2020
f5feb5d
Create MonoLLVMDir property and use it
Jan 29, 2020
1ca5b70
Cleanup
Jan 30, 2020
7388fdb
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Jan 31, 2020
068bb0f
Try to differentiate LLVM artifacts
Jan 31, 2020
dd588f6
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Feb 5, 2020
19063f1
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Feb 5, 2020
498e203
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
directhex Feb 7, 2020
fbf521f
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
directhex Feb 10, 2020
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
24 changes: 24 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,5 +158,29 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>572e952eae1d4fc6e83300031c5f7c401014ff34</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
7 changes: 7 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,13 @@
<MicrosoftPrivateIntellisenseVersion>3.0.0-preview9-190909-1</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<ILLinkTasksVersion>0.1.6-prerelease.19567.1</ILLinkTasksVersion>
<!-- Mono LLVM -->
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
</PropertyGroup>
<!-- Package names -->
<PropertyGroup>
Expand Down
22 changes: 17 additions & 5 deletions eng/pipelines/mono/templates/build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ parameters:
variables: {}
pool: ''
condition: true
llvm: false

### Product build
jobs:
Expand All@@ -21,11 +22,19 @@ jobs:
helixType: 'build/product/'
enableMicrobuild: true
pool: ${{ parameters.pool }}
llvm: ${{ parameters.llvm }}
condition: ${{ parameters.condition }}

# Compute job name from template parameters
name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
${{ if ne(parameters.llvm, true) }}:
name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

# if LLVM enabled, set a variable we can consume
${{ if eq(parameters.llvm, true) }}:
name: ${{ format('mono_llvm_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono LLVM Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}


# Run all steps in the container.
# Note that the containers are defined in platform-matrix.yml
Expand DownExpand Up@@ -58,10 +67,10 @@ jobs:

# Build
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product

# Publish product output directory for consumption by tests.
Expand All@@ -80,6 +89,9 @@ jobs:
displayName: Publish Logs
inputs:
pathtoPublish: $(Build.SourcesDirectory)/artifacts/log
artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if ne(parameters.llvm, true) }}:
artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if eq(parameters.llvm, true) }}:
artifactName: 'BuildLogs_Mono_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
continueOnError: true
condition: always()
7 changes: 6 additions & 1 deletion eng/pipelines/mono/templates/xplat-pipeline-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ parameters:
liveLibrariesBuildConfig: ''
strategy: ''
pool: ''
llvm: false

# arcade-specific parameters
condition: true
Expand All@@ -33,6 +34,7 @@ jobs:
container: ${{ parameters.container }}
strategy: ${{ parameters.strategy }}
pool: ${{ parameters.pool }}
llvm: ${{ parameters.llvm }}

# arcade-specific parameters
condition: and(succeeded(), ${{ parameters.condition }})
Expand All@@ -45,7 +47,10 @@ jobs:

variables:
- name: buildProductArtifactName
value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if ne(parameters.llvm, true) }}:
value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if eq(parameters.llvm, true) }}:
value: 'MonoProduct_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'

- name: buildProductRootFolderPath
value: '$(Build.SourcesDirectory)/artifacts/bin/mono/$(osGroup).$(archType).$(buildConfigUpper)'
Expand Down
56 changes: 56 additions & 0 deletions eng/pipelines/runtime.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -252,6 +252,62 @@ jobs:
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono LLVM debug
# Only when libraries or mono changed
Comment thread
directhex marked this conversation as resolved.
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: debug
platforms:
# - OSX_x64
- Linux_x64
# - Linux_arm
# - Linux_arm64
# - Linux_musl_x64
# - Linux_musl_arm64
# - Windows_NT_x64
# - Windows_NT_x86
# - Windows_NT_arm
# - Windows_NT_arm64
jobParameters:
llvm: true
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono LLVM release
# Only when libraries or mono changed
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: release
platforms:
# - OSX_x64
- Linux_x64
# - Linux_arm
# - Linux_arm64
# - Linux_musl_x64
# - Linux_musl_arm64
# - Windows_NT_x64
# - Windows_NT_x86
# - Windows_NT_arm
# - Windows_NT_arm64
jobParameters:
llvm: true
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build libraries using live CoreLib
# These set of libraries are built always no matter what changed
Expand Down
53 changes: 51 additions & 2 deletions src/mono/llvm/Makefile.am
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,51 @@
# temporary Makefile until we can fully move netcore mono to new repo
all:
if ENABLE_LLVM

if HOST_WIN32
llvm_config=llvm-config.exe
else
llvm_config=llvm-config
endif

if HAVE_STATIC_ZLIB
llvm_extra_libs = $(STATIC_ZLIB_PATH)
else
if HAVE_SYS_ZLIB
llvm_extra_libs=-lz
else
llvm_extra_libs=
endif
endif

if INTERNAL_LLVM_ASSERTS
ENABLE_ASSERTS=On
else
ENABLE_ASSERTS=Off
endif

all-local: llvm_config.mk

clean-local: clean-llvm-config

$(mono_build_root)/llvm/llvm_config.mk: $(top_srcdir)/llvm/Makefile.am
$(top_srcdir)/llvm/build_llvm_config.sh "$(EXTERNAL_LLVM_CONFIG)" "$(LLVM_CODEGEN_LIBS)" "$(llvm_extra_libs)" | tee $@

llvm_config.mk: $(mono_build_root)/llvm/llvm_config.mk

clean-llvm-config:
- rm -rf llvm_config.mk

else
all-local:

clean-local:
endif

# Override this so we don't try to re-copy llvm when we install mono
install:

if TARGET_WASM
LLVM_TARGET=wasm32
else
LLVM_TARGET=
endif

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add conditional dependency on LLVM packages for Mono by directhex · Pull Request #2140 · dotnet/runtime · GitHub
Skip to content

Add conditional dependency on LLVM packages for Mono#2140

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
steveisok merged 15 commits into from
Feb 10, 2020
Merged

Add conditional dependency on LLVM packages for Mono #2140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
100c720
Add conditional dependency on LLVM packages for Mono
Jan 22, 2020
b8a7b73
Enable LLVM CI
Jan 24, 2020
5180448
Construct path manually
Jan 27, 2020
6201ac9
Bump LLVM
Jan 27, 2020
bdb0ba3
Update src/mono/mono.proj
directhex Jan 29, 2020
80e8527
Update src/mono/mono.proj
directhex Jan 29, 2020
d51f23f
Don't GeneratePathProperty since it doesn't work in Restore task
Jan 29, 2020
f5feb5d
Create MonoLLVMDir property and use it
Jan 29, 2020
1ca5b70
Cleanup
Jan 30, 2020
7388fdb
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Jan 31, 2020
068bb0f
Try to differentiate LLVM artifacts
Jan 31, 2020
dd588f6
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Feb 5, 2020
19063f1
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Feb 5, 2020
498e203
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
directhex Feb 7, 2020
fbf521f
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
directhex Feb 10, 2020
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
24 changes: 24 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,5 +158,29 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>572e952eae1d4fc6e83300031c5f7c401014ff34</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
7 changes: 7 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,13 @@
<MicrosoftPrivateIntellisenseVersion>3.0.0-preview9-190909-1</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<ILLinkTasksVersion>0.1.6-prerelease.19567.1</ILLinkTasksVersion>
<!-- Mono LLVM -->
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
</PropertyGroup>
<!-- Package names -->
<PropertyGroup>
Expand Down
22 changes: 17 additions & 5 deletions eng/pipelines/mono/templates/build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ parameters:
variables: {}
pool: ''
condition: true
llvm: false

### Product build
jobs:
Expand All@@ -21,11 +22,19 @@ jobs:
helixType: 'build/product/'
enableMicrobuild: true
pool: ${{ parameters.pool }}
llvm: ${{ parameters.llvm }}
condition: ${{ parameters.condition }}

# Compute job name from template parameters
name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
${{ if ne(parameters.llvm, true) }}:
name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

# if LLVM enabled, set a variable we can consume
${{ if eq(parameters.llvm, true) }}:
name: ${{ format('mono_llvm_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono LLVM Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}


# Run all steps in the container.
# Note that the containers are defined in platform-matrix.yml
Expand DownExpand Up@@ -58,10 +67,10 @@ jobs:

# Build
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product

# Publish product output directory for consumption by tests.
Expand All@@ -80,6 +89,9 @@ jobs:
displayName: Publish Logs
inputs:
pathtoPublish: $(Build.SourcesDirectory)/artifacts/log
artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if ne(parameters.llvm, true) }}:
artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if eq(parameters.llvm, true) }}:
artifactName: 'BuildLogs_Mono_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
continueOnError: true
condition: always()
7 changes: 6 additions & 1 deletion eng/pipelines/mono/templates/xplat-pipeline-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ parameters:
liveLibrariesBuildConfig: ''
strategy: ''
pool: ''
llvm: false

# arcade-specific parameters
condition: true
Expand All@@ -33,6 +34,7 @@ jobs:
container: ${{ parameters.container }}
strategy: ${{ parameters.strategy }}
pool: ${{ parameters.pool }}
llvm: ${{ parameters.llvm }}

# arcade-specific parameters
condition: and(succeeded(), ${{ parameters.condition }})
Expand All@@ -45,7 +47,10 @@ jobs:

variables:
- name: buildProductArtifactName
value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if ne(parameters.llvm, true) }}:
value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if eq(parameters.llvm, true) }}:
value: 'MonoProduct_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'

- name: buildProductRootFolderPath
value: '$(Build.SourcesDirectory)/artifacts/bin/mono/$(osGroup).$(archType).$(buildConfigUpper)'
Expand Down
56 changes: 56 additions & 0 deletions eng/pipelines/runtime.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -252,6 +252,62 @@ jobs:
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono LLVM debug
# Only when libraries or mono changed
Comment thread
directhex marked this conversation as resolved.
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: debug
platforms:
# - OSX_x64
- Linux_x64
# - Linux_arm
# - Linux_arm64
# - Linux_musl_x64
# - Linux_musl_arm64
# - Windows_NT_x64
# - Windows_NT_x86
# - Windows_NT_arm
# - Windows_NT_arm64
jobParameters:
llvm: true
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono LLVM release
# Only when libraries or mono changed
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: release
platforms:
# - OSX_x64
- Linux_x64
# - Linux_arm
# - Linux_arm64
# - Linux_musl_x64
# - Linux_musl_arm64
# - Windows_NT_x64
# - Windows_NT_x86
# - Windows_NT_arm
# - Windows_NT_arm64
jobParameters:
llvm: true
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build libraries using live CoreLib
# These set of libraries are built always no matter what changed
Expand Down
53 changes: 51 additions & 2 deletions src/mono/llvm/Makefile.am
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,51 @@
# temporary Makefile until we can fully move netcore mono to new repo
all:
if ENABLE_LLVM

if HOST_WIN32
llvm_config=llvm-config.exe
else
llvm_config=llvm-config
endif

if HAVE_STATIC_ZLIB
llvm_extra_libs = $(STATIC_ZLIB_PATH)
else
if HAVE_SYS_ZLIB
llvm_extra_libs=-lz
else
llvm_extra_libs=
endif
endif

if INTERNAL_LLVM_ASSERTS
ENABLE_ASSERTS=On
else
ENABLE_ASSERTS=Off
endif

all-local: llvm_config.mk

clean-local: clean-llvm-config

$(mono_build_root)/llvm/llvm_config.mk: $(top_srcdir)/llvm/Makefile.am
$(top_srcdir)/llvm/build_llvm_config.sh "$(EXTERNAL_LLVM_CONFIG)" "$(LLVM_CODEGEN_LIBS)" "$(llvm_extra_libs)" | tee $@

llvm_config.mk: $(mono_build_root)/llvm/llvm_config.mk

clean-llvm-config:
- rm -rf llvm_config.mk

else
all-local:

clean-local:
endif

# Override this so we don't try to re-copy llvm when we install mono
install:

if TARGET_WASM
LLVM_TARGET=wasm32
else
LLVM_TARGET=
endif

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add conditional dependency on LLVM packages for Mono by directhex · Pull Request #2140 · dotnet/runtime · GitHub
Skip to content

Add conditional dependency on LLVM packages for Mono#2140

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
steveisok merged 15 commits into from
Feb 10, 2020
Merged

Add conditional dependency on LLVM packages for Mono #2140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
100c720
Add conditional dependency on LLVM packages for Mono
Jan 22, 2020
b8a7b73
Enable LLVM CI
Jan 24, 2020
5180448
Construct path manually
Jan 27, 2020
6201ac9
Bump LLVM
Jan 27, 2020
bdb0ba3
Update src/mono/mono.proj
directhex Jan 29, 2020
80e8527
Update src/mono/mono.proj
directhex Jan 29, 2020
d51f23f
Don't GeneratePathProperty since it doesn't work in Restore task
Jan 29, 2020
f5feb5d
Create MonoLLVMDir property and use it
Jan 29, 2020
1ca5b70
Cleanup
Jan 30, 2020
7388fdb
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Jan 31, 2020
068bb0f
Try to differentiate LLVM artifacts
Jan 31, 2020
dd588f6
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Feb 5, 2020
19063f1
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Feb 5, 2020
498e203
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
directhex Feb 7, 2020
fbf521f
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
directhex Feb 10, 2020
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
24 changes: 24 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,5 +158,29 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>572e952eae1d4fc6e83300031c5f7c401014ff34</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
7 changes: 7 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,13 @@
<MicrosoftPrivateIntellisenseVersion>3.0.0-preview9-190909-1</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<ILLinkTasksVersion>0.1.6-prerelease.19567.1</ILLinkTasksVersion>
<!-- Mono LLVM -->
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
</PropertyGroup>
<!-- Package names -->
<PropertyGroup>
Expand Down
22 changes: 17 additions & 5 deletions eng/pipelines/mono/templates/build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ parameters:
variables: {}
pool: ''
condition: true
llvm: false

### Product build
jobs:
Expand All@@ -21,11 +22,19 @@ jobs:
helixType: 'build/product/'
enableMicrobuild: true
pool: ${{ parameters.pool }}
llvm: ${{ parameters.llvm }}
condition: ${{ parameters.condition }}

# Compute job name from template parameters
name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
${{ if ne(parameters.llvm, true) }}:
name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

# if LLVM enabled, set a variable we can consume
${{ if eq(parameters.llvm, true) }}:
name: ${{ format('mono_llvm_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono LLVM Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}


# Run all steps in the container.
# Note that the containers are defined in platform-matrix.yml
Expand DownExpand Up@@ -58,10 +67,10 @@ jobs:

# Build
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product

# Publish product output directory for consumption by tests.
Expand All@@ -80,6 +89,9 @@ jobs:
displayName: Publish Logs
inputs:
pathtoPublish: $(Build.SourcesDirectory)/artifacts/log
artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if ne(parameters.llvm, true) }}:
artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if eq(parameters.llvm, true) }}:
artifactName: 'BuildLogs_Mono_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
continueOnError: true
condition: always()
7 changes: 6 additions & 1 deletion eng/pipelines/mono/templates/xplat-pipeline-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ parameters:
liveLibrariesBuildConfig: ''
strategy: ''
pool: ''
llvm: false

# arcade-specific parameters
condition: true
Expand All@@ -33,6 +34,7 @@ jobs:
container: ${{ parameters.container }}
strategy: ${{ parameters.strategy }}
pool: ${{ parameters.pool }}
llvm: ${{ parameters.llvm }}

# arcade-specific parameters
condition: and(succeeded(), ${{ parameters.condition }})
Expand All@@ -45,7 +47,10 @@ jobs:

variables:
- name: buildProductArtifactName
value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if ne(parameters.llvm, true) }}:
value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if eq(parameters.llvm, true) }}:
value: 'MonoProduct_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'

- name: buildProductRootFolderPath
value: '$(Build.SourcesDirectory)/artifacts/bin/mono/$(osGroup).$(archType).$(buildConfigUpper)'
Expand Down
56 changes: 56 additions & 0 deletions eng/pipelines/runtime.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -252,6 +252,62 @@ jobs:
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono LLVM debug
# Only when libraries or mono changed
Comment thread
directhex marked this conversation as resolved.
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: debug
platforms:
# - OSX_x64
- Linux_x64
# - Linux_arm
# - Linux_arm64
# - Linux_musl_x64
# - Linux_musl_arm64
# - Windows_NT_x64
# - Windows_NT_x86
# - Windows_NT_arm
# - Windows_NT_arm64
jobParameters:
llvm: true
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono LLVM release
# Only when libraries or mono changed
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: release
platforms:
# - OSX_x64
- Linux_x64
# - Linux_arm
# - Linux_arm64
# - Linux_musl_x64
# - Linux_musl_arm64
# - Windows_NT_x64
# - Windows_NT_x86
# - Windows_NT_arm
# - Windows_NT_arm64
jobParameters:
llvm: true
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build libraries using live CoreLib
# These set of libraries are built always no matter what changed
Expand Down
53 changes: 51 additions & 2 deletions src/mono/llvm/Makefile.am
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,51 @@
# temporary Makefile until we can fully move netcore mono to new repo
all:
if ENABLE_LLVM

if HOST_WIN32
llvm_config=llvm-config.exe
else
llvm_config=llvm-config
endif

if HAVE_STATIC_ZLIB
llvm_extra_libs = $(STATIC_ZLIB_PATH)
else
if HAVE_SYS_ZLIB
llvm_extra_libs=-lz
else
llvm_extra_libs=
endif
endif

if INTERNAL_LLVM_ASSERTS
ENABLE_ASSERTS=On
else
ENABLE_ASSERTS=Off
endif

all-local: llvm_config.mk

clean-local: clean-llvm-config

$(mono_build_root)/llvm/llvm_config.mk: $(top_srcdir)/llvm/Makefile.am
$(top_srcdir)/llvm/build_llvm_config.sh "$(EXTERNAL_LLVM_CONFIG)" "$(LLVM_CODEGEN_LIBS)" "$(llvm_extra_libs)" | tee $@

llvm_config.mk: $(mono_build_root)/llvm/llvm_config.mk

clean-llvm-config:
- rm -rf llvm_config.mk

else
all-local:

clean-local:
endif

# Override this so we don't try to re-copy llvm when we install mono
install:

if TARGET_WASM
LLVM_TARGET=wasm32
else
LLVM_TARGET=
endif

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Add conditional dependency on LLVM packages for Mono by directhex · Pull Request #2140 · dotnet/runtime · GitHub
Skip to content

Add conditional dependency on LLVM packages for Mono#2140

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
steveisok merged 15 commits into from
Feb 10, 2020
Merged

Add conditional dependency on LLVM packages for Mono #2140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
100c720
Add conditional dependency on LLVM packages for Mono
Jan 22, 2020
b8a7b73
Enable LLVM CI
Jan 24, 2020
5180448
Construct path manually
Jan 27, 2020
6201ac9
Bump LLVM
Jan 27, 2020
bdb0ba3
Update src/mono/mono.proj
directhex Jan 29, 2020
80e8527
Update src/mono/mono.proj
directhex Jan 29, 2020
d51f23f
Don't GeneratePathProperty since it doesn't work in Restore task
Jan 29, 2020
f5feb5d
Create MonoLLVMDir property and use it
Jan 29, 2020
1ca5b70
Cleanup
Jan 30, 2020
7388fdb
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Jan 31, 2020
068bb0f
Try to differentiate LLVM artifacts
Jan 31, 2020
dd588f6
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Feb 5, 2020
19063f1
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
Feb 5, 2020
498e203
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
directhex Feb 7, 2020
fbf521f
Merge remote-tracking branch 'origin/master' into mono-llvm-enablement
directhex Feb 10, 2020
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
24 changes: 24 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,5 +158,29 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>572e952eae1d4fc6e83300031c5f7c401014ff34</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="6.0.1-alpha.1.20078.4">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>adeaa08e7bbc9aba5d67cb16c2b348be12deb000</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
7 changes: 7 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,13 @@
<MicrosoftPrivateIntellisenseVersion>3.0.0-preview9-190909-1</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<ILLinkTasksVersion>0.1.6-prerelease.19567.1</ILLinkTasksVersion>
<!-- Mono LLVM -->
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
</PropertyGroup>
<!-- Package names -->
<PropertyGroup>
Expand Down
22 changes: 17 additions & 5 deletions eng/pipelines/mono/templates/build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ parameters:
variables: {}
pool: ''
condition: true
llvm: false

### Product build
jobs:
Expand All@@ -21,11 +22,19 @@ jobs:
helixType: 'build/product/'
enableMicrobuild: true
pool: ${{ parameters.pool }}
llvm: ${{ parameters.llvm }}
condition: ${{ parameters.condition }}

# Compute job name from template parameters
name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
${{ if ne(parameters.llvm, true) }}:
name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

# if LLVM enabled, set a variable we can consume
${{ if eq(parameters.llvm, true) }}:
name: ${{ format('mono_llvm_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
displayName: ${{ format('Mono LLVM Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}


# Run all steps in the container.
# Note that the containers are defined in platform-matrix.yml
Expand DownExpand Up@@ -58,10 +67,10 @@ jobs:

# Build
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product

# Publish product output directory for consumption by tests.
Expand All@@ -80,6 +89,9 @@ jobs:
displayName: Publish Logs
inputs:
pathtoPublish: $(Build.SourcesDirectory)/artifacts/log
artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if ne(parameters.llvm, true) }}:
artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if eq(parameters.llvm, true) }}:
artifactName: 'BuildLogs_Mono_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
continueOnError: true
condition: always()
7 changes: 6 additions & 1 deletion eng/pipelines/mono/templates/xplat-pipeline-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ parameters:
liveLibrariesBuildConfig: ''
strategy: ''
pool: ''
llvm: false

# arcade-specific parameters
condition: true
Expand All@@ -33,6 +34,7 @@ jobs:
container: ${{ parameters.container }}
strategy: ${{ parameters.strategy }}
pool: ${{ parameters.pool }}
llvm: ${{ parameters.llvm }}

# arcade-specific parameters
condition: and(succeeded(), ${{ parameters.condition }})
Expand All@@ -45,7 +47,10 @@ jobs:

variables:
- name: buildProductArtifactName
value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if ne(parameters.llvm, true) }}:
value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
${{ if eq(parameters.llvm, true) }}:
value: 'MonoProduct_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'

- name: buildProductRootFolderPath
value: '$(Build.SourcesDirectory)/artifacts/bin/mono/$(osGroup).$(archType).$(buildConfigUpper)'
Expand Down
56 changes: 56 additions & 0 deletions eng/pipelines/runtime.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -252,6 +252,62 @@ jobs:
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono LLVM debug
# Only when libraries or mono changed
Comment thread
directhex marked this conversation as resolved.
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: debug
platforms:
# - OSX_x64
- Linux_x64
# - Linux_arm
# - Linux_arm64
# - Linux_musl_x64
# - Linux_musl_arm64
# - Windows_NT_x64
# - Windows_NT_x86
# - Windows_NT_arm
# - Windows_NT_arm64
jobParameters:
llvm: true
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build Mono LLVM release
# Only when libraries or mono changed
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/mono/templates/build-job.yml
runtimeFlavor: mono
buildConfig: release
platforms:
# - OSX_x64
- Linux_x64
# - Linux_arm
# - Linux_arm64
# - Linux_musl_x64
# - Linux_musl_arm64
# - Windows_NT_x64
# - Windows_NT_x86
# - Windows_NT_arm
# - Windows_NT_arm64
jobParameters:
llvm: true
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build libraries using live CoreLib
# These set of libraries are built always no matter what changed
Expand Down
53 changes: 51 additions & 2 deletions src/mono/llvm/Makefile.am
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,51 @@
# temporary Makefile until we can fully move netcore mono to new repo
all:
if ENABLE_LLVM

if HOST_WIN32
llvm_config=llvm-config.exe
else
llvm_config=llvm-config
endif

if HAVE_STATIC_ZLIB
llvm_extra_libs = $(STATIC_ZLIB_PATH)
else
if HAVE_SYS_ZLIB
llvm_extra_libs=-lz
else
llvm_extra_libs=
endif
endif

if INTERNAL_LLVM_ASSERTS
ENABLE_ASSERTS=On
else
ENABLE_ASSERTS=Off
endif

all-local: llvm_config.mk

clean-local: clean-llvm-config

$(mono_build_root)/llvm/llvm_config.mk: $(top_srcdir)/llvm/Makefile.am
$(top_srcdir)/llvm/build_llvm_config.sh "$(EXTERNAL_LLVM_CONFIG)" "$(LLVM_CODEGEN_LIBS)" "$(llvm_extra_libs)" | tee $@

llvm_config.mk: $(mono_build_root)/llvm/llvm_config.mk

clean-llvm-config:
- rm -rf llvm_config.mk

else
all-local:

clean-local:
endif

# Override this so we don't try to re-copy llvm when we install mono
install:

if TARGET_WASM
LLVM_TARGET=wasm32
else
LLVM_TARGET=
endif

Loading