[LoongArch64] add coreclr-libraries directory. #62888

shushanhf · 2021-12-16T05:11:52Z

[LoongArch64] add coreclr-libraries directory.

update from runtime.

ghost · 2021-12-16T05:11:56Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, to please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

ghost · 2021-12-16T05:11:57Z

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

src/libraries/System.Private.CoreLib/src/System/Reflection/ImageFileMachine.cs

src/libraries/System.Private.CoreLib/src/System/Reflection/ProcessorArchitecture.cs

src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/CheckArchitectureTests.cs

src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/Machine.cs

ghost · 2021-12-16T05:24:06Z

Tagging subscribers to this area: @dotnet/area-system-runtime
See info in area-owners.md if you want to be subscribed.

Issue Details

[LoongArch64] add coreclr-libraries directory.

Author:	shushanhf
Assignees:	-
Labels:	`area-System.Runtime`, `new-api-needs-documentation`, `community-contribution`
Milestone:	-

....InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.cs

huoyaoyuan · 2021-12-16T12:13:42Z

Notes for updating libraries:

The reference source should also be updated together with implementation when any public api changes. For other libraries the ref source is under the ref folder besides the src directory. It can be also accessed from the corresponding Visual Studio solution. For CoreLib, the ref source is mostly under libraries/System.Runtime/src.

When updating the CoreCLR version of CoreLib, don't forget Mono (under src\mono\System.Private.CoreLib) and NativeAOT (under src\coreclr\nativeaot\System.Private.CoreLib, merged recently) versions.

src/coreclr/System.Private.CoreLib/src/System/Reflection/AssemblyName.CoreCLR.cs

jkotas · 2021-12-16T14:05:29Z

src/libraries/System.Private.CoreLib/src/System/Reflection/AssemblyName.cs

            {
                int x = (((int)_flags) & 0x70) >> 4;
-                if (x > 5)
+                if (x > 6)


The changes in this file should be reverted.

src/libraries/System.Runtime/ref/System.Runtime.cs

jkotas · 2021-12-16T14:13:51Z

I see that you are always squashing your changes into the single commit. Could you please push new commits instead of squashing? We prefer that the changes done based on codereview feedback are done as separate commits to make it easy to see what changed. We will squash all changes as part of the merge.

More details are about our PR process are in https://github.com/dotnet/runtime/blob/main/docs/pr-guide.md#quick-code-review-rules

src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/Machine.cs

shushanhf · 2021-12-17T00:33:29Z

Notes for updating libraries:

The reference source should also be updated together with implementation when any public api changes. For other libraries the ref source is under the ref folder besides the src directory. It can be also accessed from the corresponding Visual Studio solution. For CoreLib, the ref source is mostly under libraries/System.Runtime/src.

When updating the CoreCLR version of CoreLib, don't forget Mono (under src\mono\System.Private.CoreLib) and NativeAOT (under src\coreclr\nativeaot\System.Private.CoreLib, merged recently) versions.

Thanks for your review and suggestion~

shushanhf · 2021-12-17T00:38:21Z

I see that you are always squashing your changes into the single commit. Could you please push new commits instead of squashing? We prefer that the changes done based on codereview feedback are done as separate commits to make it easy to see what changed. We will squash all changes as part of the merge.

More details are about our PR process are in https://github.com/dotnet/runtime/blob/main/docs/pr-guide.md#quick-code-review-rules

Thanks !
I will update based on the previous patch.

…lection. (#59561)

shushanhf · 2021-12-21T01:46:21Z

Now this PR can be compiled sucessfully by the CI on the native mode.

What should I do next ?

shushanhf · 2022-01-05T02:47:29Z

@shushanhf This API was approved so this PR is getting close to getting merged.

Could you please resolve the merge conflicts?

Is this PR ok now ?

jkotas · 2022-01-05T02:50:54Z

Is this PR ok now ?

No, it has a bunch of conflicts. You should see "This branch has conflicts that must be resolved".

You need to merge from current main to get these conflicts resolved.

shushanhf · 2022-01-05T02:59:03Z

Is this PR ok now ?

No, it has a bunch of conflicts. You should see "This branch has conflicts that must be resolved".

You need to merge from current main to get these conflicts resolved.

I have a question that needs your help:
How to rebase the PR's patch to the latest main branch ?

shushanhf · 2022-01-05T03:10:28Z

Is this PR ok now ?

No, it has a bunch of conflicts. You should see "This branch has conflicts that must be resolved".
You need to merge from current main to get these conflicts resolved.

I have a question that needs your help: How to rebase the PR's patch to the latest main branch ?

If I merge the main directly to this PR and resolv the conflicts, then I push to this PR, is it OK?

jkotas · 2022-01-05T03:15:10Z

Yep

shushanhf · 2022-01-05T03:16:14Z

Yep

OK, thanks.
I will update now.

Conflicts: src/libraries/Common/src/Interop/Unix/System.Native/Interop.ProcessorArchitecture.cs src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.cs src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/RuntimeInformation.Unix.cs src/native/libs/System.Native/pal_runtimeinformation.c

shushanhf · 2022-01-05T04:05:37Z

Yep

OK, thanks.
I will update now.

Yep

Should this file be modified ？

diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/RuntimeInformation.ProcessArchitecture.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/RuntimeInformation.ProcessArchitecture.cs
index 298d039..0da595b 100644
--- a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/RuntimeInformation.ProcessArchitecture.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/RuntimeInformation.ProcessArchitecture.cs
@@ -18,6 +18,8 @@ public static Architecture ProcessArchitecture
             => Architecture.Wasm;
 #elif TARGET_S390X
             => Architecture.S390x;
+#elif TARGET_LOONGARCH64
+            => Architecture.LoongArch64;
 #else
 #error Unknown Architecture
 #endif

If need, I will update it.

...es/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/ManagedTextSection.cs

…/PortableExecutable/ManagedTextSection.cs

src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Architecture.cs

src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

…ate.CoreLib.Shared.projitems`.

jkotas · 2022-01-06T06:52:55Z

The last build break is: "The generated CompatibilityMap differs from runtime.compatibility.json and UpdateRuntimeFiles was not specified. Please specify UpdateRuntimeFiles=true to commit the changes."

Could you please run the build with /p:UpdateRuntimeFiles=true and commit the result? It should fix it.

shushanhf · 2022-01-06T07:10:35Z

The last build break is: "The generated CompatibilityMap differs from runtime.compatibility.json and UpdateRuntimeFiles was not specified. Please specify UpdateRuntimeFiles=true to commit the changes."

Could you please run the build with /p:UpdateRuntimeFiles=true and commit the result? It should fix it.

Thanaks ~
I will do it now.

shushanhf · 2022-01-06T09:43:32Z

The last build break is: "The generated CompatibilityMap differs from runtime.compatibility.json and UpdateRuntimeFiles was not specified. Please specify UpdateRuntimeFiles=true to commit the changes."

Could you please run the build with /p:UpdateRuntimeFiles=true and commit the result? It should fix it.

Hi, @jkotas

Running the command ./build.sh libs -lc release with the following patch,

qiao@deb-x64:~/work_qiao/runtime$ git diff
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
index 1351a67f30f..5c3e395a0fc 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -75,7 +75,7 @@
                           RuntimeJson="runtime.json"
                           CompatibilityMap="runtime.compatibility.json"
                           RuntimeDirectedGraph="$(OutputPath)runtime.json.dgml"
-                          UpdateRuntimeFiles="$(UpdateRuntimeFiles)" />
+                          UpdateRuntimeFiles="True" />
   </Target>
 
 </Project>

Is this right ?

I didn't meet the error https://github.com/dotnet/runtime/pull/62888/files#annotation_2513131987
by the command ./build.sh libs -lc release.
How to test and reproduce the error ?
Thanks

cd src/libraries/Microsoft.NETCore.Platforms/src dotnet build -c Release Microsoft.NETCore.Platforms.csproj /p:UpdateRuntimeFiles=true /t:UpdateRuntimeJson

jkotas · 2022-01-07T01:35:37Z

I have run:

cd src/libraries/Microsoft.NETCore.Platforms/src
dotnet build -c Release Microsoft.NETCore.Platforms.csproj /p:UpdateRuntimeFiles=true /t:UpdateRuntimeJson

and pushed up the result. It should fix the build break.

shushanhf · 2022-01-07T01:40:45Z

I have run:

cd src/libraries/Microsoft.NETCore.Platforms/src
dotnet build -c Release Microsoft.NETCore.Platforms.csproj /p:UpdateRuntimeFiles=true /t:UpdateRuntimeJson

and pushed up the result. It should fix the build break.

Thanks,

shushanhf · 2022-01-07T01:43:53Z

build -c Release Microsoft.NETCore.Platforms.csproj /p:UpdateRuntimeFiles=true /t:UpdateRuntimeJson

@jkotas
Thanks for you!

I runned the command and the results is :

qiao@deb-x64:~/work_qiao/runtime/src/libraries/Microsoft.NETCore.Platforms/src$ ~/work_qiao/runtime/.dotnet/dotnet build -c Release Microsoft.NETCore.Platforms.csproj /p:UpdateRuntimeFiles=true /t:UpdateRuntimeJson
Microsoft (R) Build Engine version 17.0.0+c9eb9dd64 for .NET
Copyright (C) Microsoft Corporation. All rights reserved.

  Determining projects to restore...
  Restored /data2_users/work_qiao/runtime/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj (in 217 ms).

Build succeeded.
    0 Warning(s)
    0 Error(s)

Time Elapsed 00:00:04.42

and the modified files are:

qiao@deb-x64:~/work_qiao/runtime$ git st .
On branch main_loongarch64_5
Your branch is up to date with 'origin/main_loongarch64_5'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
	modified:   src/libraries/Microsoft.NETCore.Platforms/src/runtime.json

and the corresponding differences liking the 712e19f

jkotas · 2022-01-07T03:20:02Z

Closing&reopening to trigger the CI

shushanhf added 8 commits April 27, 2021 16:32

Merge pull request #1 from dotnet/main

47d106f

update from runtime.

Merge branch 'dotnet:main' into master

411b59e

Merge branch 'dotnet:main' into master

7eed4eb

Merge branch 'dotnet:main' into master

0d7c9e4

Merge branch 'dotnet:main' into master

2c534c5

Merge branch 'dotnet:main' into master

6e14d76

Merge branch 'dotnet:main' into master

359875d

Merge branch 'dotnet:main' into main

192b095

ghost added community-contribution Indicates that the PR has been added by a community member new-api-needs-documentation labels Dec 16, 2021