This repository was archived by the owner on Jan 23, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Add dir.props files to hardware intrinsics test directories to control test env variables #15637
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Condition="Exists('..\dir.props')" Project="..\dir.props"/> | ||
|
|
||
| <PropertyGroup> | ||
| <CLRTestBatchPreCommands> | ||
| <![CDATA[ | ||
| $(CLRTestBatchPreCommands) | ||
| set COMPlus_EnableAVX=0 | ||
| ]]> | ||
| </CLRTestBatchPreCommands> | ||
| <BashCLRTestPreCommands> | ||
| <![CDATA[ | ||
| $(BashCLRTestPreCommands) | ||
| export COMPlus_EnableAVX=0 | ||
| ]]> | ||
| </BashCLRTestPreCommands> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <LangVersion>7.1</LangVersion> | ||
| </PropertyGroup> | ||
| </Project> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Condition="Exists('..\dir.props')" Project="..\dir.props"/> | ||
|
|
||
| <PropertyGroup> | ||
| <CLRTestBatchPreCommands> | ||
| <![CDATA[ | ||
| $(CLRTestBatchPreCommands) | ||
| set COMPlus_EnableIncompleteISAClass=1 | ||
| ]]> | ||
| </CLRTestBatchPreCommands> | ||
| <BashCLRTestPreCommands> | ||
| <![CDATA[ | ||
| $(BashCLRTestPreCommands) | ||
| export COMPlus_EnableIncompleteISAClass=1 | ||
| ]]> | ||
| </BashCLRTestPreCommands> | ||
| </PropertyGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Condition="Exists('..\dir.props')" Project="..\dir.props"/> | ||
| </Project> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we want to always disable AVX here.
Instead, I think we want to test the following scenarios:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IMO we need to create a comprehensive testing plan for all Hardware Intrinsic where part of it should comprise setting of environment switches for group of tests. Anyway we are going to face combinatorial bomb here. It is related to #15490
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jkotas @tannergooding
I have unsuccessfully looked for solution to the following problem: how to run same group of tests each time with different environment settings?
This could be useful for example in case of all Sse ... Sse42 intrinsics which in majority of cases can be promoted to AVX/AVX2 and AVX512 codegen and we should run the tests with SSE CodeGen enabled, AVX CodeGen enabled and SSE disabled etc etc
Any ideas?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The simplest approach would be to update the netci.groovy script to have new jobs for the required environments (I believe
jitStressModeScenariosis used for this, but I am not positive).A less expensive approach (not requiring 4 new jobs that run in the outer loop) would be to update the test wrapper,
JIT.HardwareIntrinsics.XUnitWrapper, to run just the hardware intrinsic tests with each configuration setting (the wrapper currently configures the environment and calls the generated exe for each test, so it is a logical place to put this logic).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if there is any infrastructure preference on one vs the other (or some other approach), however.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agree.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK I will try both and we can verify than by running them in CI which is the best solution.