From 75e13ac70575b7f8870c6c13ac8fa3af3e689c49 Mon Sep 17 00:00:00 2001
From: Caio Oliveira <caio.oliveira@intel.com>
Date: Sat, 10 Feb 2024 18:47:28 -0800
Subject: [PATCH] intel/elk: Remove Gfx12.5 URB message

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27629>
---
 src/intel/compiler/elk/elk_disasm.c      | 5 ++---
 src/intel/compiler/elk/elk_eu.h          | 7 -------
 src/intel/compiler/elk/elk_eu_defines.h  | 1 -
 src/intel/compiler/elk/elk_eu_validate.c | 5 -----
 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/intel/compiler/elk/elk_disasm.c b/src/intel/compiler/elk/elk_disasm.c
index 48a40f5c8c0..ef60a8eaeb2 100644
--- a/src/intel/compiler/elk/elk_disasm.c
+++ b/src/intel/compiler/elk/elk_disasm.c
@@ -526,8 +526,7 @@ static const char *const gfx7_urb_opcode[] = {
    [GFX8_URB_OPCODE_ATOMIC_ADD] = "atomic add",  /* Gfx8+ */
    [GFX8_URB_OPCODE_SIMD8_WRITE] = "SIMD8 write", /* Gfx8+ */
    [GFX8_URB_OPCODE_SIMD8_READ] = "SIMD8 read",  /* Gfx8+ */
-   [GFX125_URB_OPCODE_FENCE] = "fence",  /* Gfx12.5+ */
-   /* [10-15] - reserved */
+   /* [9-15] - reserved */
 };
 
 static const char *const urb_swizzle[4] = {
@@ -1975,7 +1974,7 @@ elk_disassemble_inst(FILE *file, const struct elk_isa_info *isa,
                    urb_opcode == GFX8_URB_OPCODE_SIMD8_READ) {
                   if (elk_inst_urb_channel_mask_present(devinfo, inst))
                      string(file, " masked");
-               } else if (urb_opcode != GFX125_URB_OPCODE_FENCE) {
+               } else {
                   err |= control(file, "urb swizzle", urb_swizzle,
                                  elk_inst_urb_swizzle_control(devinfo, inst),
                                  &space);
diff --git a/src/intel/compiler/elk/elk_eu.h b/src/intel/compiler/elk/elk_eu.h
index c4e119b665f..91b63be082c 100644
--- a/src/intel/compiler/elk/elk_eu.h
+++ b/src/intel/compiler/elk/elk_eu.h
@@ -372,13 +372,6 @@ elk_urb_desc_msg_type(ASSERTED const struct intel_device_info *devinfo,
    return GET_BITS(desc, 3, 0);
 }
 
-static inline uint32_t
-elk_urb_fence_desc(const struct intel_device_info *devinfo)
-{
-   assert(devinfo->has_lsc);
-   return elk_urb_desc(devinfo, GFX125_URB_OPCODE_FENCE, false, false, 0);
-}
-
 /**
  * Construct a message descriptor immediate with the specified sampler
  * function controls.
diff --git a/src/intel/compiler/elk/elk_eu_defines.h b/src/intel/compiler/elk/elk_eu_defines.h
index df6f6fc388e..fd983ac1757 100644
--- a/src/intel/compiler/elk/elk_eu_defines.h
+++ b/src/intel/compiler/elk/elk_eu_defines.h
@@ -828,7 +828,6 @@ enum elk_message_target {
 #define GFX8_URB_OPCODE_ATOMIC_ADD  6
 #define GFX8_URB_OPCODE_SIMD8_WRITE 7
 #define GFX8_URB_OPCODE_SIMD8_READ  8
-#define GFX125_URB_OPCODE_FENCE     9
 
 #define ELK_URB_SWIZZLE_NONE          0
 #define ELK_URB_SWIZZLE_INTERLEAVE    1
diff --git a/src/intel/compiler/elk/elk_eu_validate.c b/src/intel/compiler/elk/elk_eu_validate.c
index 708d2c51a08..9a178c3c1e6 100644
--- a/src/intel/compiler/elk/elk_eu_validate.c
+++ b/src/intel/compiler/elk/elk_eu_validate.c
@@ -2380,11 +2380,6 @@ send_descriptor_restrictions(const struct elk_isa_info *isa,
                   "URB SIMD8 messages only valid on gfx >= 8");
          break;
 
-      case GFX125_URB_OPCODE_FENCE:
-         ERROR_IF(devinfo->verx10 < 125,
-                  "URB fence message only valid on gfx >= 12.5");
-         break;
-
       default:
          ERROR_IF(true, "Invalid URB message");
          break;