commit 43697f6c5fc94c8f0a45b9d73c47e26ab2dd9083
author Ian Romanick <ian.d.romanick@intel.com> Thu Jul 30 11:33:03 2020 -0700
committer Dylan Baker <dylan.c.baker@intel.com> Fri Nov 20 12:37:34 2020 -0800
tree 60815f53516396d73d3639e863e0c4014f44a95b
parent 2d1e15236b0296774b2a64b9536b5925b184462b

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@intel.com>
Reviewed-by: Sagar Ghuge <sagar.ghuge@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7650>
(cherry picked from commit 6edc2a3d40406f5b0a5edd5bcccd3232ad50a61f)

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index 85306b0..87bdb7e 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"
     },

src/intel/compiler/brw_shader.cpp

diff --git a/src/intel/compiler/brw_shader.cpp b/src/intel/compiler/brw_shader.cpp
index dbe2874..cfb2cf5 100644
--- a/src/intel/compiler/brw_shader.cpp
+++ b/src/intel/compiler/brw_shader.cpp
@@ -937,6 +937,8 @@
    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: