Mesa (staging/22.0): intel/compiler: make CLUSTER_BROADCAST always deal with integers

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 1d25a226fa9adf73655fe4c8e4f3a4cf3e7c331c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d25a226fa9adf73655fe4c8e4f3a4cf3e7c331c

Author: Iván Briano <ivan.briano at intel.com>
Date:   Tue Feb 15 14:33:28 2022 -0800

intel/compiler: make CLUSTER_BROADCAST always deal with integers

This way we don't run afoul of regioning restrictions around floating
point types.

Cc: 22.0 <mesa-stable>
Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15039>
(cherry picked from commit 81f97905c3be29bbe81104ef149b4ee14c015f60)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 6660c01787f..eb0b8c819ea 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2074,7 +2074,7 @@
         "description": "intel/compiler: make CLUSTER_BROADCAST always deal with integers",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/intel/compiler/brw_fs_lower_regioning.cpp b/src/intel/compiler/brw_fs_lower_regioning.cpp
index 0ddd47c4b1c..e1fe9eaff7b 100644
--- a/src/intel/compiler/brw_fs_lower_regioning.cpp
+++ b/src/intel/compiler/brw_fs_lower_regioning.cpp
@@ -180,7 +180,7 @@ namespace {
               intel_device_info_is_9lp(devinfo)) && type_sz(t) > 4)
             return BRW_REGISTER_TYPE_UD;
          else
-            return t;
+            return brw_int_type(type_sz(t), false);
 
       case SHADER_OPCODE_BROADCAST:
       case SHADER_OPCODE_MOV_INDIRECT: