From ad0743c948117dd8246d8309d84e8fdbc190b3fd Mon Sep 17 00:00:00 2001
From: M Henning <drawoc@darkrefraction.com>
Date: Sat, 16 Sep 2023 13:50:52 -0400
Subject: [PATCH] nak: Remove MemScope::Cluster

because
 * ptxas refuses inputs with .cluster before sm90
 * on sm90 ptxas encodes .cluster as .gpu
 * nvdisasm calls this encoding on sm75 .SM
so I don't think we have an actual .cluster on any released gpus

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
---
 src/nouveau/compiler/nak_encode_sm75.rs | 4 ++--
 src/nouveau/compiler/nak_ir.rs          | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/nouveau/compiler/nak_encode_sm75.rs b/src/nouveau/compiler/nak_encode_sm75.rs
index 580c2b9ccb3..00f262b007d 100644
--- a/src/nouveau/compiler/nak_encode_sm75.rs
+++ b/src/nouveau/compiler/nak_encode_sm75.rs
@@ -1150,7 +1150,7 @@ impl SM75Instr {
                 77..79,
                 match scope {
                     MemScope::CTA => 0_u8,
-                    MemScope::Cluster => 1_u8,
+                    /* SM => 1_u8, */
                     MemScope::GPU => 2_u8,
                     MemScope::System => 3_u8,
                 },
@@ -1561,7 +1561,7 @@ impl SM75Instr {
             76..79,
             match op.scope {
                 MemScope::CTA => 0_u8,
-                MemScope::Cluster => 1_u8,
+                /* SM => 1_u8, */
                 MemScope::GPU => 2_u8,
                 MemScope::System => 3_u8,
             },
diff --git a/src/nouveau/compiler/nak_ir.rs b/src/nouveau/compiler/nak_ir.rs
index 238e922b8cb..586c4d0c4c8 100644
--- a/src/nouveau/compiler/nak_ir.rs
+++ b/src/nouveau/compiler/nak_ir.rs
@@ -1766,7 +1766,6 @@ impl fmt::Display for MemOrder {
 #[derive(Clone, Copy, Eq, Hash, PartialEq)]
 pub enum MemScope {
     CTA,
-    Cluster,
     GPU,
     System,
 }
@@ -1775,7 +1774,6 @@ impl fmt::Display for MemScope {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             MemScope::CTA => write!(f, "CTA"),
-            MemScope::Cluster => write!(f, "SM"),
             MemScope::GPU => write!(f, "GPU"),
             MemScope::System => write!(f, "SYS"),
         }