Mesa (staging/21.3): aco: don't allow SDWA on VOP3P instructions

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 868dccb5aa8c68244fe1df69d9ef5c6bb1c955d4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=868dccb5aa8c68244fe1df69d9ef5c6bb1c955d4

Author: Daniel Schürmann <daniel at schuermann.dev>
Date:   Mon Dec 20 10:46:43 2021 +0100

aco: don't allow SDWA on VOP3P instructions

Reviewed-by: Timur Kristóf <timur.kristof at gmail.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13576>
(cherry picked from commit 1502c22e2c32d6a87dd17bdc76af68b8470cb6ea)

---

 .pick_status.json           | 2 +-
 src/amd/compiler/aco_ir.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 9ddf6e9debd..c9519219a5b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -238,7 +238,7 @@
         "description": "aco: don't allow SDWA on VOP3P instructions",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/compiler/aco_ir.cpp b/src/amd/compiler/aco_ir.cpp
index 156227a345c..eee2eb2e882 100644
--- a/src/amd/compiler/aco_ir.cpp
+++ b/src/amd/compiler/aco_ir.cpp
@@ -187,7 +187,7 @@ can_use_SDWA(chip_class chip, const aco_ptr<Instruction>& instr, bool pre_ra)
    if (!instr->isVALU())
       return false;
 
-   if (chip < GFX8 || instr->isDPP())
+   if (chip < GFX8 || instr->isDPP() || instr->isVOP3P())
       return false;
 
    if (instr->isSDWA())