From 9b4ea9ff901cdc4cbe29ffdfc74b8c318a21a80f Mon Sep 17 00:00:00 2001
From: Georg Lehmann <dadschoorse@gmail.com>
Date: Wed, 22 Mar 2023 11:32:04 +0100
Subject: [PATCH] aco/vn: hash opsel for VOP12C

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22069>
---
 src/amd/compiler/aco_opt_value_numbering.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/amd/compiler/aco_opt_value_numbering.cpp b/src/amd/compiler/aco_opt_value_numbering.cpp
index a780fc71811..7039eff2dcb 100644
--- a/src/amd/compiler/aco_opt_value_numbering.cpp
+++ b/src/amd/compiler/aco_opt_value_numbering.cpp
@@ -84,9 +84,6 @@ struct InstrHash {
     */
    std::size_t operator()(Instruction* instr) const
    {
-      if (instr->isVOP3())
-         return hash_murmur_32<VALU_instruction>(instr);
-
       if (instr->isDPP16())
          return hash_murmur_32<DPP16_instruction>(instr);
 
@@ -96,10 +93,15 @@ struct InstrHash {
       if (instr->isSDWA())
          return hash_murmur_32<SDWA_instruction>(instr);
 
+      if (instr->isVINTERP_INREG())
+         return hash_murmur_32<VINTERP_inreg_instruction>(instr);
+
+      if (instr->isVALU())
+         return hash_murmur_32<VALU_instruction>(instr);
+
       switch (instr->format) {
       case Format::SMEM: return hash_murmur_32<SMEM_instruction>(instr);
       case Format::VINTRP: return hash_murmur_32<VINTRP_instruction>(instr);
-      case Format::VINTERP_INREG: return hash_murmur_32<VINTERP_inreg_instruction>(instr);
       case Format::DS: return hash_murmur_32<DS_instruction>(instr);
       case Format::SOPP: return hash_murmur_32<SOPP_instruction>(instr);
       case Format::SOPK: return hash_murmur_32<SOPK_instruction>(instr);