Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Move x86 HW intrinsics files to shared#18427

Merged
maryamariyan merged 7 commits into
dotnet:masterfrom
maryamariyan:hw-intrin
Jun 13, 2018
Merged

Move x86 HW intrinsics files to shared#18427
maryamariyan merged 7 commits into
dotnet:masterfrom
maryamariyan:hw-intrin

Conversation

@maryamariyan
Copy link
Copy Markdown

@maryamariyan maryamariyan commented Jun 12, 2018

Fixes: #15922

<Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Sse42.PlatformNotSupported.cs" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\Ssse3.PlatformNotSupported.cs" />
</ItemGroup>
<ItemGroup Condition="'$(Platform)' == 'arm64'">
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The arm64 HWIntrinsics should probably be moved as well. (CC. @sdmaclea, @CarolEidt, @eerhardt)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

agreed.

@maryamariyan maryamariyan self-assigned this Jun 12, 2018
<PlatformTarget>x64</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
<BaseAddress>0x180000000</BaseAddress>
<DefineConstants>BIT64;AMD64;$(DefineConstants)</DefineConstants>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

So where do these defines get defined for AMD64 now that you have deleted this block?

@jkotas
Copy link
Copy Markdown
Member

jkotas commented Jun 12, 2018

Build breaks...

<Prefer32Bit>false</Prefer32Bit>
<BaseAddress>0x180000000</BaseAddress>
<DefineConstants>BIT64;AMD64;$(DefineConstants)</DefineConstants>
<DefineConstants>BIT64;$(DefineConstants)</DefineConstants>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

You cannot just stop defining AMD64 here. It is used when compiling CoreLib in multiple places.

We want to keep using AMD64 define for x64. It is pretty entrenched for historic reasons - changing it would be uphill battle.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Only $(Platform) should be changed, to make it consistent with rest of world.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why makes changes here at all as part of this change? Why not a separate, targeted change?

@fiigii
Copy link
Copy Markdown

fiigii commented Jun 12, 2018

@maryamariyan Thanks for the work! FYI, I changing some intrinsic APIs in #17637 that may impact your work.

Copy link
Copy Markdown
Member

@eerhardt eerhardt left a comment

Choose a reason for hiding this comment

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

Thanks, @maryamariyan!

Can you move the ARM files in the next PR?

@maryamariyan
Copy link
Copy Markdown
Author

@eerhardt will push up the next PR shortly after merging this

@maryamariyan maryamariyan reopened this Jun 12, 2018
@maryamariyan maryamariyan merged commit 308850c into dotnet:master Jun 13, 2018
dotnet-bot pushed a commit to dotnet/corert that referenced this pull request Jun 13, 2018
* Switch platfom amd64 to x64

* Move x86 intrinsics file to shared

* Adding condition so corert always picks up X.PlatformNotSupported.cs

Related to: #15922

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
jkotas pushed a commit to dotnet/corert that referenced this pull request Jun 13, 2018
* Switch platfom amd64 to x64

* Move x86 intrinsics file to shared

* Adding condition so corert always picks up X.PlatformNotSupported.cs

Related to: #15922

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
dotnet-bot pushed a commit to dotnet/corefx that referenced this pull request Jun 14, 2018
* Switch platfom amd64 to x64

* Move x86 intrinsics file to shared

* Adding condition so corert always picks up X.PlatformNotSupported.cs

Related to: #15922

Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
stephentoub pushed a commit to dotnet/corefx that referenced this pull request Jun 14, 2018
* Switch platfom amd64 to x64

* Move x86 intrinsics file to shared

* Adding condition so corert always picks up X.PlatformNotSupported.cs

Related to: #15922

Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
* Switch platfom amd64 to x64

* Move x86 intrinsics file to shared

* Adding condition so corert always picks up X.PlatformNotSupported.cs

Related to: dotnet/coreclr#15922


Commit migrated from dotnet/coreclr@308850c
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants