Mesa (staging/20.3): intel/compiler: Rotate instructions ROR and ROL cannot have source modifiers

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: 43697f6c5fc94c8f0a45b9d73c47e26ab2dd9083
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=43697f6c5fc94c8f0a45b9d73c47e26ab2dd9083

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Jul 30 11:33:03 2020 -0700

intel/compiler: Rotate instructions ROR and ROL cannot have source modifiers

I checked the Bspec for both Gen11 and Gen12, and it appears that rotate
instructions cannot have source modifiers or saturate modifer.  Saturate
was already handled.

Fixes: 1e92e83856b ("intel/compiler: Emit ROR and ROL instruction")
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Reviewed-by: Sagar Ghuge <sagar.ghuge at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7650>
(cherry picked from commit 6edc2a3d40406f5b0a5edd5bcccd3232ad50a61f)

---

 .pick_status.json                 | 2 +-
 src/intel/compiler/brw_shader.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 85306b07c1b..87bdb7e30c6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -274,7 +274,7 @@
         "description": "intel/compiler: Rotate instructions ROR and ROL cannot have source modifiers",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "1e92e83856b1ef8a827a63359d59ed7883ed4994"
     },
diff --git a/src/intel/compiler/brw_shader.cpp b/src/intel/compiler/brw_shader.cpp
index dbe28748508..cfb2cf54f9c 100644
--- a/src/intel/compiler/brw_shader.cpp
+++ b/src/intel/compiler/brw_shader.cpp
@@ -937,6 +937,8 @@ backend_instruction::can_do_source_mods() const
    case BRW_OPCODE_CBIT:
    case BRW_OPCODE_FBH:
    case BRW_OPCODE_FBL:
+   case BRW_OPCODE_ROL:
+   case BRW_OPCODE_ROR:
    case BRW_OPCODE_SUBB:
    case SHADER_OPCODE_BROADCAST:
    case SHADER_OPCODE_CLUSTER_BROADCAST: