GPU: Optimize GLStorageBuf::read performance #117521

Merged
Miguel Pozo merged 6 commits from pragma37/blender:pull-eevee-optimize-shadow-statistics-2 into main 2024-02-09 16:11:44 +01:00
Member

Add a separate persistent mapped buffer where the main SSBO can be copied,
so its contents can be read from the CPU without stalling the GPU.

Add a separate persistent mapped buffer where the main SSBO can be copied, so its contents can be read from the CPU without stalling the GPU.
Miguel Pozo added the
Module
EEVEE & Viewport
label 2024-01-25 20:29:27 +01:00
Miguel Pozo added 2 commits 2024-01-25 20:29:40 +01:00
Miguel Pozo requested review from Jeroen Bakker 2024-01-25 20:30:08 +01:00
Miguel Pozo requested review from Clément Foucault 2024-01-25 20:30:08 +01:00
Clément Foucault requested changes 2024-01-26 01:52:06 +01:00
Clément Foucault left a comment
Member

For something like this, I would really like to see a test being written to make sure it is working on all platforms.

For something like this, I would really like to see a test being written to make sure it is working on all platforms.
Miguel Pozo added 1 commit 2024-01-26 16:53:49 +01:00
Author
Member

Do you have any specific test in mind?
There are already SSBO tests and plenty of tests that rely on ssbo reads.

In fact, I've noticed I broke several tests because they expect to be able to just call read without a previous flush call.
I've also seen there's a GPU_BARRIER_BUFFER_UPDATE that's used in some places, but I'm not sure how much sense it makes to leak something like that into the draw code.
In this case it needs a different type of barrier (there's a commented out GPU_BARRIER_CLIENT_MAPPED_BUFFER, but again, I think it would be best to leave this as an implementation detail) and the barrier itself doesn't do anything useful since this implementation needs an internal buffer copy too.

I've updated the PR so the tests work again, but IMO it would make more sense to do something like this:

  • Get rid of GPU_BARRIER_BUFFER_UPDATE and GPU_BARRIER_CLIENT_MAPPED_BUFFER, and use async_flush_to_host instead where needed.
  • Add an async parameter to read (defaults to false) so:
    • If async is false and there's a pending async_flush_to_host it waits for its fence.
    • If async is false and there's not a pending async_flush_to_host, it calls it in-place and waits for its fence.
    • If async is true, it's assumed that the user has called async_flush_to_host before and the fence is ignored.
Do you have any specific test in mind? There are already SSBO tests and plenty of tests that rely on ssbo reads. In fact, I've noticed I broke several tests because they expect to be able to just call read without a previous flush call. I've also seen there's a `GPU_BARRIER_BUFFER_UPDATE` that's used in some places, but I'm not sure how much sense it makes to leak something like that into the draw code. In this case it needs a different type of barrier (there's a commented out `GPU_BARRIER_CLIENT_MAPPED_BUFFER`, but again, I think it would be best to leave this as an implementation detail) and the barrier itself doesn't do anything useful since this implementation needs an internal buffer copy too. I've updated the PR so the tests work again, but IMO it would make more sense to do something like this: - Get rid of `GPU_BARRIER_BUFFER_UPDATE` and `GPU_BARRIER_CLIENT_MAPPED_BUFFER`, and use `async_flush_to_host` instead where needed. - Add an `async` parameter to `read` (defaults to false) so: * If `async` is false and there's a pending `async_flush_to_host` it waits for its fence. * If `async` is false and there's not a pending `async_flush_to_host`, it calls it in-place and waits for its fence. * If `async` is true, it's assumed that the user has called `async_flush_to_host` before and the fence is ignored.
Miguel Pozo added 1 commit 2024-02-08 20:21:01 +01:00
Author
Member

In the end, I just updated the GPU_storagebuf_read comment so it better describes the currently expected behavior.

In the end, I just updated the `GPU_storagebuf_read` comment so it better describes the currently expected behavior.
Clément Foucault reviewed 2024-02-09 13:49:16 +01:00
@ -184,0 +236,4 @@
glDeleteSync(read_fence_);
read_fence_ = 0;
memmove(data, persistent_ptr_, size_in_bytes_);

Why memmove instead of memcpy?

Why `memmove` instead of `memcpy`?
pragma37 marked this conversation as resolved
Clément Foucault approved these changes 2024-02-09 14:38:51 +01:00
Clément Foucault left a comment
Member

Tests passes on my machine. Given you update the PR description, this is good to be merged.

Tests passes on my machine. Given you update the PR description, this is good to be merged.
Clément Foucault reviewed 2024-02-09 14:39:20 +01:00
@ -7,6 +7,7 @@
*/
#include "BLI_string.h"
#include "BLI_time.h"

Uneeded include.

Uneeded include.
pragma37 marked this conversation as resolved
Miguel Pozo added 2 commits 2024-02-09 16:09:48 +01:00
Miguel Pozo merged commit 98231ea880 into main 2024-02-09 16:11:44 +01:00
Miguel Pozo deleted branch pull-eevee-optimize-shadow-statistics-2 2024-02-09 16:11:47 +01:00
Sign in to join this conversation.
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No project
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#117521
No description provided.