-
Notifications
You must be signed in to change notification settings - Fork 854
[SM 6.10][LinAlg] Fixes float truncation and coordinate calculation in LinAlg exec tests #8420
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.
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
Open
anupamachandra
wants to merge
1
commit into
microsoft:main
Choose a base branch
from
anupamachandra:anupamac/linalg-exectest-fixes-01
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+7
−2
Open
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 hidden or 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 |
|---|---|---|
|
|
@@ -505,7 +505,7 @@ static void runSplatStore(ID3D12Device *Device, | |
| const size_t BufferSize = Params.totalBytes(); | ||
|
|
||
| std::stringstream ExtraDefs; | ||
| ExtraDefs << "-DFILL_VALUE=" << FillValue; | ||
| ExtraDefs << std::showpoint << "-DFILL_VALUE=" << FillValue; | ||
|
|
||
| std::string Args = buildCompilerArgs(Params, ExtraDefs.str().c_str()); | ||
|
|
||
|
|
@@ -624,7 +624,7 @@ static const char ElementAccessShader[] = R"( | |
| // flatten the 2D index into a 1D index then scale by element size | ||
| // Always store row-major and work it out in the test runner | ||
| uint coordToByteOffset(uint2 coord) { | ||
| return (coord.y * M_DIM + coord.x) * ELEM_SIZE; | ||
| return (coord.x * N_DIM + coord.y) * ELEM_SIZE; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good catch. It sure can be confusing for |
||
| } | ||
|
|
||
| [WaveSize(4, 64)] | ||
|
|
@@ -935,6 +935,7 @@ static void runMatMatMul(ID3D12Device *Device, | |
| const size_t BufferSize = Params.totalBytes(); | ||
|
|
||
| std::stringstream ExtraDefs; | ||
| ExtraDefs << std::showpoint; | ||
| ExtraDefs << " -DK_DIM=" << K; | ||
| ExtraDefs << " -DA_FILL=" << AFill; | ||
| ExtraDefs << " -DB_FILL=" << BFill; | ||
|
|
@@ -1017,6 +1018,7 @@ static void runMatMatMulAccum(ID3D12Device *Device, | |
| const size_t BufferSize = Params.totalBytes(); | ||
|
|
||
| std::stringstream ExtraDefs; | ||
| ExtraDefs << std::showpoint; | ||
| ExtraDefs << " -DK_DIM=" << K; | ||
| ExtraDefs << " -DA_FILL=" << AFill; | ||
| ExtraDefs << " -DB_FILL=" << BFill; | ||
|
|
@@ -1094,6 +1096,7 @@ static void runMatAccum(ID3D12Device *Device, | |
| const size_t BufferSize = Params.totalBytes(); | ||
|
|
||
| std::stringstream ExtraDefs; | ||
| ExtraDefs << std::showpoint; | ||
| ExtraDefs << " -DLHS_FILL=" << LHSFill; | ||
| ExtraDefs << " -DRHS_FILL=" << RHSFill; | ||
|
|
||
|
|
@@ -1551,6 +1554,7 @@ static void runStoreMemory(ID3D12Device *Device, | |
| const size_t BufferSize = Params.totalBytes(); | ||
|
|
||
| std::stringstream ExtraDefs; | ||
| ExtraDefs << std::showpoint; | ||
| ExtraDefs << " -DOFFSET=" << 0; | ||
| ExtraDefs << " -DFILL_VALUE=" << FillValue; | ||
|
|
||
|
|
@@ -1631,6 +1635,7 @@ static void runAccumulateMemory(ID3D12Device *Device, | |
| const size_t BufferSize = Params.totalBytes(); | ||
|
|
||
| std::stringstream ExtraDefs; | ||
| ExtraDefs << std::showpoint; | ||
| ExtraDefs << " -DOFFSET=" << 0; | ||
| ExtraDefs << " -DFILL_VALUE=" << FillValue; | ||
|
|
||
|
|
||
Oops, something went wrong.
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 ran into this with WARP too before seeing this text in the DXIL section of the spec:
So even if it is a 42 integer value, the driver should be converting it to a float in the fill instruction anyway.
Uh oh!
There was an error while loading. Please reload this page.
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.
That sounds right, however shouldn't we also suffix the value with
Fto ensure that it is always interpreted as float in the shader? Otherwise, there might be a difference depending on conforming literals (pre-HLSL 202x).