From 8e6b831bfe4138308ed50557afee96a440594880 Mon Sep 17 00:00:00 2001
From: Michael Goldstein <mgoldstein322@gmail.com>
Date: Thu, 11 Jul 2024 18:11:02 -0400
Subject: [PATCH] fix bug where num_uops for AMX instructions was not set
 properly

---
 src/trace_read_cpu.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/trace_read_cpu.cc b/src/trace_read_cpu.cc
index 1893052b..b8ef4033 100644
--- a/src/trace_read_cpu.cc
+++ b/src/trace_read_cpu.cc
@@ -513,6 +513,7 @@ inst_info_s *cpu_decoder_c::convert_pinuop_to_t_uop(void *trace_info,
 
       if (pi->m_opcode == XED_CATEGORY_AMX_TILE) {
         write_dest_reg = 1;
+        num_uop = 16;
       }
 
       if (trace_uop[0]->m_mem_type == MEM_LD) {
@@ -563,6 +564,10 @@ inst_info_s *cpu_decoder_c::convert_pinuop_to_t_uop(void *trace_info,
       cur_trace_uop->m_inst_size = pi->m_size;
       cur_trace_uop->m_mul_mem_uops =
         pi->m_has_immediate;  // uncoalesced memory accesses
+      
+      if (pi->m_opcode == XED_CATEGORY_AMX_TILE) {
+        num_uop = 16;
+      }
     }
 
     ///
@@ -786,12 +791,14 @@ inst_info_s *cpu_decoder_c::convert_pinuop_to_t_uop(void *trace_info,
     ASSERT(info);
 
     num_uop = info->m_trace_info.m_num_uop;
+    //std::cout << "start key_addr " << (pi->m_instruction_addr << 3) << std::endl;
     for (ii = 0; ii < num_uop; ++ii) {
       if (ii > 0) {
         key_addr = ((pi->m_instruction_addr << 3) + ii);
+        //std::cout << "key_addr " << key_addr << std::endl;
         info = htable->hash_table_access_create(key_addr, &new_entry);
       }
-      ASSERTM(!new_entry, "Core id %d index %d\n", core_id, ii);
+      ASSERTM(!new_entry, "Core id %d index %d", core_id, ii);
 
       // convert raw instruction trace to MacSim trace format
       convert_info_uop(info, trace_uop[ii]);