Mesa (master): aco: remove can_reorder semantic in get_sync_info_with_hack

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 4ea0ce2f55cde6c27b324d19c513f45f9dc8e38e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ea0ce2f55cde6c27b324d19c513f45f9dc8e38e

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Thu Aug 27 12:11:46 2020 +0100

aco: remove can_reorder semantic in get_sync_info_with_hack

No fossil-db changes.

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8416>

---

 src/amd/compiler/aco_scheduler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/compiler/aco_scheduler.cpp b/src/amd/compiler/aco_scheduler.cpp
index e828e1993e2..0ae110f3209 100644
--- a/src/amd/compiler/aco_scheduler.cpp
+++ b/src/amd/compiler/aco_scheduler.cpp
@@ -342,7 +342,7 @@ memory_sync_info get_sync_info_with_hack(const Instruction* instr)
    if (instr->format == Format::SMEM && !instr->operands.empty() && instr->operands[0].bytes() == 16) {
       // FIXME: currently, it doesn't seem beneficial to omit this due to how our scheduler works
       sync.storage = (storage_class)(sync.storage | storage_buffer);
-      sync.semantics = (memory_semantics)(sync.semantics | semantic_private);
+      sync.semantics = (memory_semantics)((sync.semantics | semantic_private) & ~semantic_can_reorder);
    }
    return sync;
 }