Skip to content
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

Propagate specified entry points to the shader compiler #1591

Merged
merged 1 commit into from Dec 15, 2021

Conversation

kuhar
Copy link
Contributor

@kuhar kuhar commented Dec 13, 2021

Push per-input entry point down the standalone compiler.

Also:

  • Remove the now obsolete -entry-target option.
  • Fix a bug where non-'main' GLSL entry points would be accepted but
    result in empty SPIR-V functions. Disallow non-'main' entry point
    names when compiling GLSL to match glslang.
  • Refactor input stage processing. Introduce a helper function for
    each input kind.

@kuhar kuhar requested a review from a team as a code owner December 13, 2021 23:12
@kuhar
Copy link
Contributor Author

kuhar commented Dec 13, 2021

@amdvlk-admin
Copy link
Collaborator

Test summary for commit 11b26fe

Driver commits used in build
  • CWPACK: amd-master 7387247eb9889ddcabbc1053b9c2052e253b088e
  • METROHASH: amd-master 3c566dd9cda44ca7fd97659e0b53ac953f9037d2
  • PAL: dev 44abc48d199dd28369bf7415eee1751c4bf616d2
  • SPVGEN: dev 580ade71d630a304805e9468ef22ad263c37d137
  • XGL: dev b8ed024d536d1bebb35927a0f4f470dca2f2dfc6
  • LLVM-PROJECT: amd-gfx-gpuopen-dev cdd74831d061bf65fdf5af4a0b6ce99fe2c558a9
CTS tests (Failed: 0/218612)
  • Built with version 1.2.5.2
  • Rhel 8.2, Gfx10
    • Passed: 32354/54653 (59.2%)
    • Failed: 0/54653 (0.0%)
    • Not Supported: 22299/54653 (40.8%)
    • Warnings: 0/54653 (0.0%)
    Ubuntu 18.04, Gfx9
    • Passed: 32194/54653 (58.9%)
    • Failed: 0/54653 (0.0%)
    • Not Supported: 22458/54653 (41.1%)
    • Warnings: 1/54653 (0.0%)
    Ubuntu 20.04, Gfx8
    • Passed: 32530/54653 (59.5%)
    • Failed: 0/54653 (0.0%)
    • Not Supported: 22123/54653 (40.5%)
    • Warnings: 0/54653 (0.0%)
    Ubuntu 20.04, Gfx103
    • Passed: 35511/54653 (65.0%)
    • Failed: 0/54653 (0.0%)
    • Not Supported: 19142/54653 (35.0%)
    • Warnings: 0/54653 (0.0%)

Copy link
Member

@dstutt dstutt left a comment

Choose a reason for hiding this comment

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

LGTM

But I can't see changes to llpcPipelineBuilder.h in my review (but this must have been submitted otherwise compile checks would fail?)

@dstutt
Copy link
Member

dstutt commented Dec 14, 2021

LGTM

But I can't see changes to llpcPipelineBuilder.h in my review (but this must have been submitted otherwise compile checks would fail?)

Ah no, just realised that m_compileInfo -> moduleData wasn't a change of member name. I'll update the review.

dstutt
dstutt previously approved these changes Dec 14, 2021
Copy link
Member

@dstutt dstutt left a comment

Choose a reason for hiding this comment

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

LGTM

Push per-input entry point down the standalone compiler.

Also:
-  Remove the now obsolete `-entry-target` option.
-  Fix a bug where non-'main' GLSL entry points would be accepted but
   result in empty SPIR-V functions. Disallow non-'main' entry point
   names when compiling GLSL to match glslang.
-  Refactor input stage processing. Introduce a helper function for
   each input kind.
@kuhar
Copy link
Contributor Author

kuhar commented Dec 14, 2021

V1. Rebase, no code changes.

@amdvlk-admin
Copy link
Collaborator

Test summary for commit 744b3ad

Driver commits used in build
  • CWPACK: amd-master 7387247eb9889ddcabbc1053b9c2052e253b088e
  • METROHASH: amd-master 3c566dd9cda44ca7fd97659e0b53ac953f9037d2
  • PAL: dev 44abc48d199dd28369bf7415eee1751c4bf616d2
  • SPVGEN: dev 580ade71d630a304805e9468ef22ad263c37d137
  • XGL: dev 5584bc57e9b73e1a4c3b99a7b1227953d699d6b2
  • LLVM-PROJECT: amd-gfx-gpuopen-dev cdd74831d061bf65fdf5af4a0b6ce99fe2c558a9
CTS tests (Failed: 0/218612)
  • Built with version 1.2.5.2
  • Rhel 8.2, Gfx10
    • Passed: 32354/54653 (59.2%)
    • Failed: 0/54653 (0.0%)
    • Not Supported: 22299/54653 (40.8%)
    • Warnings: 0/54653 (0.0%)
    Ubuntu 18.04, Gfx9
    • Passed: 32194/54653 (58.9%)
    • Failed: 0/54653 (0.0%)
    • Not Supported: 22458/54653 (41.1%)
    • Warnings: 1/54653 (0.0%)
    Ubuntu 20.04, Gfx8
    • Passed: 32530/54653 (59.5%)
    • Failed: 0/54653 (0.0%)
    • Not Supported: 22123/54653 (40.5%)
    • Warnings: 0/54653 (0.0%)
    Ubuntu 20.04, Gfx103
    • Passed: 35511/54653 (65.0%)
    • Failed: 0/54653 (0.0%)
    • Not Supported: 19142/54653 (35.0%)
    • Warnings: 0/54653 (0.0%)

@trenouf trenouf merged commit 8d2bca3 into GPUOpen-Drivers:dev Dec 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants