From 1c3e584dfa2de6b8e9d5c367685771737cd5aa23 Mon Sep 17 00:00:00 2001
From: Jordan Justen <jordan.l.justen@intel.com>
Date: Thu, 21 Apr 2022 02:48:58 -0700
Subject: [PATCH] nir/divergence: handle more *_intel intrinsics
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

v2: fix topo/btd (Lionel)

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16421>
---
 src/compiler/nir/nir_divergence_analysis.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c
index 37683da..8f46d4e 100644
--- a/src/compiler/nir/nir_divergence_analysis.c
+++ b/src/compiler/nir/nir_divergence_analysis.c
@@ -164,6 +164,8 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr)
    case nir_intrinsic_load_global_const_block_intel:
    case nir_intrinsic_load_reloc_const_intel:
    case nir_intrinsic_load_global_block_intel:
+   case nir_intrinsic_load_btd_global_arg_addr_intel:
+   case nir_intrinsic_load_btd_local_arg_addr_intel:
       is_divergent = false;
       break;
 
@@ -566,6 +568,8 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr)
    case nir_intrinsic_load_rt_arg_scratch_offset_amd:
    case nir_intrinsic_load_intersection_opaque_amd:
    case nir_intrinsic_load_vector_arg_amd:
+   case nir_intrinsic_load_btd_stack_id_intel:
+   case nir_intrinsic_load_topology_id_intel:
       is_divergent = true;
       break;
 
-- 
2.7.4