From 85a5106ca5cd051c6cdc6f6b30f2022af21820b8 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu, 30 Jul 2020 11:33:03 -0700
Subject: [PATCH] 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                 | 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 9ddb4e6c37e..273d3c1bdb1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4090,7 +4090,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 e78f2cbe50a..2920d41044a 100644
--- a/src/intel/compiler/brw_shader.cpp
+++ b/src/intel/compiler/brw_shader.cpp
@@ -924,6 +924,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: