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.

Sign up for GitHub

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

Jump to bottom

Backport #8259 to release/17.x #8270

Merged
merged 4 commits into from
Jun 24, 2024
Merged

Backport #8259 to release/17.x #8270

merged 4 commits into from
Jun 24, 2024

Conversation

steven-johnson
Copy link
Contributor

  • Fix Vulkan SIMT mappings for GPU loop vars. Previous refactoring accidentally used the fully qualified var name rather than the categorized vulkan intrinsic name.

  • Avoid formatting the GPU kernel to a string for Vulkan (since it's binary SPIR-V needs to remain intact).

@derek-gerstmann @steven-johnson
[vulkan] Fix Vulkan SIMT mappings for GPU loop vars. (#8259)
d2d02f7 
* Fix Vulkan SIMT mappings for GPU loop vars. Previous refactoring
accidentally used the fully qualified var name rather than the
categorized vulkan intrinsic name.

* Avoid formatting the GPU kernel to a string for Vulkan (since it's binary SPIR-V needs to remain intact).

---------

Co-authored-by: Derek Gerstmann <dgerstmann@adobe.com>
Co-authored-by: Steven Johnson <srj@google.com>
derek-gerstmann
derek-gerstmann approved these changes Jun 6, 2024
View reviewed changes
Copy link
Contributor

@derek-gerstmann derek-gerstmann left a comment

Choose a reason for hiding this comment

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

Thanks for backporting this!

@steven-johnson
Copy link
Contributor Author

Looks like there are Vulkan failures -- any clues? Are there more fixes I missed?

@derek-gerstmann
Copy link
Contributor

Sorry! Yes, I saw this as well, but haven't been able to reproduce this on my Linux machine. Still investigating.

@derek-gerstmann
Copy link
Contributor

We should also grab: #8130

@derek-gerstmann @steven-johnson
[vulkan] Add conform API methods to memory allocator to fix block all…
a2047d7 
…ocations (#8130)

* Add conform API methods to block and region allocator classes
Override conform requests for Vulkan memory allocator
Cleanup memory requirement constraints for Vulkan
Add conform test cases to block_allocator runtime test.

* Clang format/tidy pas

* Fix unsigned int comparisons

* Clang format pass

* Fix other unsigned int comparisons

* Fix mismatched template types for max()

* Fix whitespace for clang format

---------

Co-authored-by: Derek Gerstmann <dgerstmann@adobe.com>
@steven-johnson
Copy link
Contributor Author

PTAL -- lots of conflicts in the cherry pick so hopefully I did it right

@derek-gerstmann
Copy link
Contributor

It looks like a few things from main got left behind in src/runtime/internal. I'll add those to this PR.

@derek-gerstmann
Copy link
Contributor

I inspected buildbot-4 and it only had v1.2 of the Vulkan SDK installed, but the build target we're using is generating code for SDK v1.3. I've upgraded that machine, but the other linux workers will likely need to get upgraded too.

@steven-johnson
Copy link
Contributor Author

the other linux workers will likely need to get upgraded too.

Tell me the process to upgrade and I'll handle it

@derek-gerstmann
Copy link
Contributor

derek-gerstmann commented Jun 7, 2024 •
edited
Loading

The packaging has changed since we originally setup the machines, and now everything is bundled under the vulkan-sdk for Ubuntu:

https://vulkan.lunarg.com/doc/view/latest/linux/getting_started_ubuntu.html

I just needed:

  • Ubuntu 20.04 (Focal Fossa)
wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-focal.list http://packages.lunarg.com/vulkan/lunarg-vulkan-focal.list
sudo apt update
sudo apt install vulkan-sdk

That should make vulkaninfo report SDK v1.3.x

@steven-johnson steven-johnson merged commit c4dbb06 into release/17.x Jun 24, 2024
11 checks passed
@steven-johnson steven-johnson deleted the srjj/backport-vulkan-fixes branch June 24, 2024 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@derek-gerstmann derek-gerstmann derek-gerstmann approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@steven-johnson @derek-gerstmann