Skip to content

[dxil2spv] Add FileCheck testing#4431

Merged
sudonatalie merged 4 commits intomicrosoft:masterfrom
sudonatalie:filecheck
May 5, 2022
Merged

[dxil2spv] Add FileCheck testing#4431
sudonatalie merged 4 commits intomicrosoft:masterfrom
sudonatalie:filecheck

Conversation

@sudonatalie
Copy link
Copy Markdown
Collaborator

@sudonatalie sudonatalie commented May 2, 2022 •
edited
Loading

Add FileCheck testing to dxil2spv, and a first static vertex shader test case to test #4426. Also includes documentation for how to
add additional tests, and replaces the existing WholeFileTestFixture with regular FileCheck.

@sudonatalie sudonatalie added the dxil2spv Features, bugs, tests for dxil2spv binary label May 2, 2022
@sudonatalie sudonatalie requested review from jaebaek and kuhar May 2, 2022 20:11
kuhar
kuhar reviewed May 2, 2022
View reviewed changes
Copy link
Copy Markdown
Collaborator

@kuhar kuhar left a comment

Choose a reason for hiding this comment

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

Why can't we use LIT and FileCheck directly?

@sudonatalie
Copy link
Copy Markdown
Collaborator Author

sudonatalie commented May 2, 2022

All of the existing SPIR-V codegen tests are currently with effcee, so I was just opting for consistency with that.

@AppVeyorBot
Copy link
Copy Markdown

AppVeyorBot commented May 3, 2022

✅ Build DirectXShaderCompiler 1.0.1577 completed (commit 9b3d7bc98c by @sudonatalie)

@sudonatalie sudonatalie marked this pull request as draft May 3, 2022 14:11
sudonatalie added 3 commits May 4, 2022 20:45
@sudonatalie
[dxil2spv] Add FileCheck-style testing
e75e9bf 
Add FileCheck-style testing to dxil2spv, and a first static vertex
shader test case to test microsoft#4426. Also includes documentation for how to
add additional tests.
@sudonatalie
Switch from effcee to FileCheck
2464dd6
@sudonatalie
Replace WholeFileTest with FileCheck test
4459305
@sudonatalie sudonatalie changed the title [dxil2spv] Add FileCheck-style testing [dxil2spv] Add FileCheck testing May 4, 2022
@sudonatalie sudonatalie marked this pull request as ready for review May 4, 2022 20:49
@AppVeyorBot
Copy link
Copy Markdown

AppVeyorBot commented May 4, 2022

✅ Build DirectXShaderCompiler 1.0.1587 completed (commit df3670bde9 by @sudonatalie)

jaebaek
jaebaek approved these changes May 5, 2022
View reviewed changes
Comment thread tools/clang/unittests/Dxil2Spv/LitTest.cpp Outdated
Comment thread tools/clang/unittests/Dxil2Spv/LitTest.cpp Outdated
kuhar
kuhar approved these changes May 5, 2022
View reviewed changes
Copy link
Copy Markdown
Collaborator

@kuhar kuhar left a comment

Choose a reason for hiding this comment

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

LGTM, just a few nits

Comment thread CMakeLists.txt Outdated
Comment thread tools/clang/test/Dxil2Spv/passthru-cs.ll
Comment thread tools/clang/test/Dxil2Spv/passthru-cs.ll
Comment thread tools/clang/unittests/HLSLTestLib/CMakeLists.txt Outdated
Comment thread tools/clang/unittests/HLSLTestLib/FileCheckerTest.cpp Outdated
Comment thread tools/clang/unittests/HLSLTestLib/FileCheckerTest.cpp
Comment on lines +1119 to +1125
try {
// Configure filesystem.
llvm::sys::fs::MSFileSystem *msf;
HRESULT hr;
if (SUCCEEDED(hr = CreateMSFileSystemForDisk(&msf))) {
llvm::sys::fs::AutoPerThreadSystem pts(msf);
IFTLLVM(pts.error_code());
Copy link
Copy Markdown
Collaborator

@kuhar kuhar May 5, 2022

Choose a reason for hiding this comment

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

I'll use this snippet next time I need to give an overview of C++ error handling techniques. jk, no changes necessary 😛

Comment thread tools/clang/unittests/HLSLTestLib/FileCheckerTest.cpp Outdated
kuhar
kuhar approved these changes May 5, 2022
View reviewed changes
Copy link
Copy Markdown
Collaborator

@kuhar kuhar left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the changes!

@AppVeyorBot
Copy link
Copy Markdown

AppVeyorBot commented May 5, 2022

✅ Build DirectXShaderCompiler 1.0.1588 completed (commit 6e1b2d5ba3 by @sudonatalie)

@sudonatalie sudonatalie merged commit d6cec44 into microsoft:master May 5, 2022
@sudonatalie sudonatalie deleted the filecheck branch May 5, 2022 17:20
@sudonatalie sudonatalie mentioned this pull request Jun 15, 2022
Merged
sudonatalie added a commit to sudonatalie/DirectXShaderCompiler that referenced this pull request Jun 15, 2022
@sudonatalie
[dxil2spv] Remove dxil2spv prototype
770d2d9 
Revert "[dxil2spv] Print missing runtime errors (microsoft#4481)"

This reverts commit 7f8f9ac.

Revert "[dxil2spv] Command line parsing and output file (microsoft#4454)"

This reverts commit 2e49e68.

Revert "[dxil2spv] Add additional error checking (microsoft#4440)"

This reverts commit 3c1918e.

Revert "[dxil2spv] Add FileCheck testing (microsoft#4431)"

This reverts commit d6cec44.

Revert "[dxil2spv] Translate DXIL constants to SPIR-V (microsoft#4426)"

This reverts commit f00b3c2.

Revert "[dxil2spv] Translate SV_Position to BuiltIn::Position (microsoft#4423)"

This reverts commit b292f94.

Revert "[dxil2spv] Translate extractValue and bufferStore (microsoft#4404)"

This reverts commit 1d2a68f.

Revert "[dxil2spv] Translate createHandle and bufferLoad (microsoft#4389)"

This reverts commit 316b849.

Revert "[dxil2spv] Support shl instruction (microsoft#4388)"

This reverts commit 1039a87.

Revert "[dxil2spv] Fix build warning (microsoft#4371)"

This reverts commit 7ecebb3.

Revert "[dxil2spv] Add support for dx.op.threadId (microsoft#4354)"

This reverts commit c248a1e.

Revert "[dxil2spv] Add initial compute shader support (microsoft#4345)"

This reverts commit c701ece.

Revert "[dxil2spv] Add error checking to file tests (microsoft#4344)"

This reverts commit 9f70135.

Revert "[dxil2spv] Add passthrough vertex shader and test (microsoft#4337)"

This reverts commit c99f5a5.

Revert "[dxil2spv] SPIR-V validation and related fixes (microsoft#4328)"

This reverts commit 4958718.

Revert "[dxil2spv] Implement simple entry function creation (microsoft#4323)"

This reverts commit c29a0c7.

Revert "[dxil2spv] Read file directly into llvm::MemoryBuffer (microsoft#4304)"

This reverts commit aa26bfd.

Revert "[dxil2spv] Add stage IO variables (microsoft#4271)"

This reverts commit 2d5f186.

Revert "[dxil2spv] Add CompilerInstance object (microsoft#4229)"

This reverts commit e4cf486.

Revert "[dxil2spv] Add initial testing (microsoft#4222)"

This reverts commit c3a61b1.

Revert "[dxil2spv] Construct minimal SPIR-V module (microsoft#4216)"

This reverts commit e3da12e.

Revert "[dxil2spv] Add basic dxil2spv CI test (microsoft#4209)"

This reverts commit 57d4d2b.

Revert "Add initial dxil2spv executable (microsoft#4199)"

This reverts commit c45db48.
sudonatalie added a commit that referenced this pull request Jun 16, 2022
@sudonatalie
[dxil2spv] Remove dxil2spv prototype (#4512)
20ddfe8 
Revert "[dxil2spv] Print missing runtime errors (#4481)"

This reverts commit 7f8f9ac.

Revert "[dxil2spv] Command line parsing and output file (#4454)"

This reverts commit 2e49e68.

Revert "[dxil2spv] Add additional error checking (#4440)"

This reverts commit 3c1918e.

Revert "[dxil2spv] Add FileCheck testing (#4431)"

This reverts commit d6cec44.

Revert "[dxil2spv] Translate DXIL constants to SPIR-V (#4426)"

This reverts commit f00b3c2.

Revert "[dxil2spv] Translate SV_Position to BuiltIn::Position (#4423)"

This reverts commit b292f94.

Revert "[dxil2spv] Translate extractValue and bufferStore (#4404)"

This reverts commit 1d2a68f.

Revert "[dxil2spv] Translate createHandle and bufferLoad (#4389)"

This reverts commit 316b849.

Revert "[dxil2spv] Support shl instruction (#4388)"

This reverts commit 1039a87.

Revert "[dxil2spv] Fix build warning (#4371)"

This reverts commit 7ecebb3.

Revert "[dxil2spv] Add support for dx.op.threadId (#4354)"

This reverts commit c248a1e.

Revert "[dxil2spv] Add initial compute shader support (#4345)"

This reverts commit c701ece.

Revert "[dxil2spv] Add error checking to file tests (#4344)"

This reverts commit 9f70135.

Revert "[dxil2spv] Add passthrough vertex shader and test (#4337)"

This reverts commit c99f5a5.

Revert "[dxil2spv] SPIR-V validation and related fixes (#4328)"

This reverts commit 4958718.

Revert "[dxil2spv] Implement simple entry function creation (#4323)"

This reverts commit c29a0c7.

Revert "[dxil2spv] Read file directly into llvm::MemoryBuffer (#4304)"

This reverts commit aa26bfd.

Revert "[dxil2spv] Add stage IO variables (#4271)"

This reverts commit 2d5f186.

Revert "[dxil2spv] Add CompilerInstance object (#4229)"

This reverts commit e4cf486.

Revert "[dxil2spv] Add initial testing (#4222)"

This reverts commit c3a61b1.

Revert "[dxil2spv] Construct minimal SPIR-V module (#4216)"

This reverts commit e3da12e.

Revert "[dxil2spv] Add basic dxil2spv CI test (#4209)"

This reverts commit 57d4d2b.

Revert "Add initial dxil2spv executable (#4199)"

This reverts commit c45db48.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@kuhar kuhar kuhar approved these changes

@jaebaek jaebaek jaebaek approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

dxil2spv Features, bugs, tests for dxil2spv binary

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sudonatalie @AppVeyorBot @jaebaek @kuhar