Skip to content

source-build: build llvm-project. #16757

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

Closed
tmds wants to merge 6 commits into from
Closed

source-build: build llvm-project. #16757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1443ae4
source-build: build llvm-project.
tmds Jun 20, 2023
1ebf66a
Add llvm-project to source-mappings.json.
tmds Jun 20, 2023
246798d
Remove ObjWriter dependency from eng/Version.Details.xml.
tmds Jun 20, 2023
31cfd5f
Update src/VirtualMonoRepo/source-mappings.json
tmds Jun 23, 2023
e46c3d3
Revert "Remove ObjWriter dependency from eng/Version.Details.xml."
premun Jun 23, 2023
fd69619
Add pstl
premun Jun 23, 2023
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
5 changes: 5 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,5 +242,10 @@
<Sha>4234ffac87e305da80597cb46dc0d4a87fc4f7c2</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="8.0.0-preview.6.23316.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
Copy link
Member

@MichaelSimons MichaelSimons Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally this would be defined within the runtime's version.details.xml. Additionally the use of SourceBuildTarball should be updated to just SourceBuild. I am trying to remove the SourceBuildTarball attribute.

Copy link
Member Author

@tmds tmds Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I copied it from the old PR. I will update it.

I have no idea what this does. Can you give a short description how this is used, or point me to some doc?

Copy link
Member Author

@tmds tmds Jun 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally this would be defined within the runtime's version.details.xml.

You want me to make a PR against https://github.com/dotnet/runtime?
and add

    <Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="8.0.0-preview.6.23316.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
      <Uri>https://github.com/dotnet/llvm-project</Uri>
      <Sha>30e9e6bc2e9f04e0a75daf4b8088ee91f66069da</Sha>
    </Dependency>

to its eng/Version.Details.xml?

Copy link
Member

@mthalman mthalman Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like these are already defined:

https://github.com/dotnet/runtime/blob/178425101dd6f697682031a9a953450d82719eb6/eng/Version.Details.xml#L15-L46

Copy link
Member

@MichaelSimons MichaelSimons Jun 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you give a short description how this is used

It does two things.

  1. It indicates that the dependency should be included in the VMR. It specified the digest to include. The version details graph is walked and the first entry wins if there are multiple for a repo.

  2. It tells the source build infra to pull in the intermediate package for the repo when building the repo level source build. The intermediate contents pre-populate the local nuget cache for prebuilt detection.

It looks like these are already defined:

One will need the SourceBuild element added to it.

Copy link
Member Author

@tmds tmds Jun 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One will need the element added to it.

I don't understand what you mean.

got it, the SourceBuild element.

Copy link
Member

@MichaelSimons MichaelSimons Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies, I used angle brackets in my original response and it wasn't rendered. I updated my comment.

<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>30e9e6bc2e9f04e0a75daf4b8088ee91f66069da</Sha>
<SourceBuildTarball RepoName="llvm-project" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
</Dependencies>
1 change: 1 addition & 0 deletions src/SourceBuild/content/repo-projects/dotnet.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<!-- Product Repos -->
<RepositoryReference Include="command-line-api" />
<RepositoryReference Include="diagnostics" />
<RepositoryReference Include="llvm-project" />
<RepositoryReference Include="emsdk" />
<RepositoryReference Include="xliff-tasks" />
<RepositoryReference Include="cecil" />
Expand Down
18 changes: 18 additions & 0 deletions src/SourceBuild/content/repo-projects/llvm-project.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />

<PropertyGroup>
<BuildCommandArgs/>
<BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(StandardSourceBuildArgs) $(BuildCommandArgs)</BuildCommand>
</PropertyGroup>

<ItemGroup>
<RepositoryReference Include="arcade" />
</ItemGroup>

<ItemGroup>
<UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
</Project>
1 change: 1 addition & 0 deletions src/SourceBuild/content/repo-projects/runtime.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
<RepositoryReference Include="cecil" />
<RepositoryReference Include="symreader" />
<RepositoryReference Include="source-build-externals" />
<RepositoryReference Include="llvm-project" />
</ItemGroup>

<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="AddRidToRuntimeJson" />
Expand Down
18 changes: 18 additions & 0 deletions src/VirtualMonoRepo/source-mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,24 @@
"src/SourceBuild/content/**/*"
]
},
{
"name": "llvm-project",
"defaultRemote": "https://github.com/dotnet/llvm-project",
"exclude": [
"bolt",
"clang/docs",
"clang/www",
"flang",
"libclc",
"lldb",
"llvm/docs",
"mlir",
"openmp",
"polly",
"third-party",
"**/tests/**"
]
},
{
"name": "msbuild",
"defaultRemote": "https://github.com/dotnet/msbuild"
Expand Down