From 4754bdd200878971c488fdf5de1a7ec436ebad08 Mon Sep 17 00:00:00 2001 From: Michael Allen Goldstein Date: Fri, 8 Mar 2024 11:38:44 -0500 Subject: [PATCH] fix compile error -- SAME ASSERTION FAILURE IS BACK --- def/inst.stat.def | 6 +++--- def/uoplatency_x86.def | 2 ++ def/uoplatency_x86_coffee_lake.def | 2 ++ def/uoplatency_x86_skylake.def | 2 ++ def/uoplatency_x86_skylake_x.def | 2 ++ src/trace_read_cpu.cc | 4 ++-- src/uop.h | 2 +- 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/def/inst.stat.def b/def/inst.stat.def index 79b15c2e..9ccb7feb 100644 --- a/def/inst.stat.def +++ b/def/inst.stat.def @@ -82,7 +82,7 @@ DEF_STAT( CHILD_UOP_READ, COUNT, NO_RATIO, PER_CORE) DEF_STAT(OP_CAT_XED_CATEGORY_AVX512_BITALG, COUNT, NO_RATIO, PER_CORE) DEF_STAT(OP_CAT_XED_CATEGORY_AVX512_VBMI, COUNT, NO_RATIO, PER_CORE) DEF_STAT(OP_CAT_XED_CATEGORY_AVX512_VP2INTERSECT, COUNT, NO_RATIO, PER_CORE) - DEF_STAT(OP_CAT_XED-cATEGORY_AVX_IFMA, COUNT, NO_RATIO, PER_CORE) + DEF_STAT(OP_CAT_XED_CATEGORY_AVX_IFMA, COUNT, NO_RATIO, PER_CORE) DEF_STAT(OP_CAT_XED_CATEGORY_BINARY, COUNT, NO_RATIO, PER_CORE) DEF_STAT(OP_CAT_XED_CATEGORY_BITBYTE, COUNT, NO_RATIO, PER_CORE) DEF_STAT(OP_CAT_XED_CATEGORY_BLEND, COUNT, NO_RATIO, PER_CORE) @@ -115,8 +115,8 @@ DEF_STAT( CHILD_UOP_READ, COUNT, NO_RATIO, PER_CORE) DEF_STAT(OP_CAT_XED_CATEGORY_INTERRUPT, COUNT, NO_RATIO, PER_CORE) DEF_STAT(OP_CAT_XED_CATEGORY_IO, COUNT, NO_RATIO, PER_CORE) DEF_STAT(OP_CAT_XED_CATEGORY_IOSTRINGOP, COUNT, NO_RATIO, PER_CORE) - DEF_STAT(OP_CAT_XED-CATEGORY_KEYLOCKER, COUNT, NO_RATIO, PER_CORE) - DEF_STAT(OP_CAT_XED-CATEGORY_KEYLOCKER_WIDE, COUNT, NO_RATIO, PER_CORE) + DEF_STAT(OP_CAT_XED_CATEGORY_KEYLOCKER, COUNT, NO_RATIO, PER_CORE) + DEF_STAT(OP_CAT_XED_CATEGORY_KEYLOCKER_WIDE, COUNT, NO_RATIO, PER_CORE) DEF_STAT(OP_CAT_XED_CATEGORY_KMASK, COUNT, NO_RATIO, PER_CORE) DEF_STAT(OP_CAT_XED_CATEGORY_LEGACY, COUNT, NO_RATIO, PER_CORE) DEF_STAT(OP_CAT_XED_CATEGORY_LOGICAL, COUNT, NO_RATIO, PER_CORE) diff --git a/def/uoplatency_x86.def b/def/uoplatency_x86.def index 08247316..5edc3bbc 100644 --- a/def/uoplatency_x86.def +++ b/def/uoplatency_x86.def @@ -76,3 +76,5 @@ DEFUOP( UOP_FBIT, 2) DEFUOP( UOP_FCMOV, 1) DEFUOP( UOP_SSE, 1) + +DEFUOP( UOP_AMX_COMPUTE, 9999) \ No newline at end of file diff --git a/def/uoplatency_x86_coffee_lake.def b/def/uoplatency_x86_coffee_lake.def index 06090eb7..8875a362 100644 --- a/def/uoplatency_x86_coffee_lake.def +++ b/def/uoplatency_x86_coffee_lake.def @@ -76,3 +76,5 @@ DEFUOP( UOP_FBIT, 2) DEFUOP( UOP_FCMOV, 1) DEFUOP( UOP_SSE, 1) + +DEFUOP( UOP_AMX_COMPUTE, 9999) diff --git a/def/uoplatency_x86_skylake.def b/def/uoplatency_x86_skylake.def index ef71bc7b..9d36ee06 100644 --- a/def/uoplatency_x86_skylake.def +++ b/def/uoplatency_x86_skylake.def @@ -76,3 +76,5 @@ DEFUOP( UOP_FBIT, 2) DEFUOP( UOP_FCMOV, 1) DEFUOP( UOP_SSE, 1) + +DEFUOP( UOP_AMX_COMPUTE, 9999) \ No newline at end of file diff --git a/def/uoplatency_x86_skylake_x.def b/def/uoplatency_x86_skylake_x.def index 0faad312..a94eef67 100644 --- a/def/uoplatency_x86_skylake_x.def +++ b/def/uoplatency_x86_skylake_x.def @@ -76,3 +76,5 @@ DEFUOP( UOP_FBIT, 2) DEFUOP( UOP_FCMOV, 1) DEFUOP( UOP_SSE, 1) + +DEFUOP( UOP_AMX_COMPUTE, 9999) \ No newline at end of file diff --git a/src/trace_read_cpu.cc b/src/trace_read_cpu.cc index 6eb154c2..75582024 100644 --- a/src/trace_read_cpu.cc +++ b/src/trace_read_cpu.cc @@ -1490,7 +1490,7 @@ void cpu_decoder_c::init_pin_convert(void) { // values - Michael switch (lat_map) { case LATENCY_SAPPHIRE_RAPIDS: - m_int_uop_table[XED_CATEGORY_AMX_TILE] = UOP_AMX; // new + m_int_uop_table[XED_CATEGORY_AMX_TILE] = UOP_AMX_COMPUTE; // new m_int_uop_table[XED_CATEGORY_APX] = UOP_IADD; //new m_int_uop_table[XED_CATEGORY_AVX_IFMA] = UOP_VADD; //new m_int_uop_table[XED_CATEGORY_FP16] = UOP_VADD; //new @@ -1507,7 +1507,7 @@ void cpu_decoder_c::init_pin_convert(void) { m_int_uop_table[XED_CATEGORY_VEX] = UOP_VADD; //new m_int_uop_table[XED_CATEGORY_WRMSRNS] = UOP_IADD; //new - m_fp_uop_table[XED_CATEGORY_AMX_TILE] = UOP_AMX; //new + m_fp_uop_table[XED_CATEGORY_AMX_TILE] = UOP_AMX_COMPUTE; //new m_fp_uop_table[XED_CATEGORY_APX] = UOP_FADD; //new m_fp_uop_table[XED_CATEGORY_AVX_IFMA] = UOP_FADD; //new m_fp_uop_table[XED_CATEGORY_FP16] = UOP_FADD; //new diff --git a/src/uop.h b/src/uop.h index 2aaa6f84..9649e0d7 100644 --- a/src/uop.h +++ b/src/uop.h @@ -114,7 +114,7 @@ typedef enum Uop_Type_enum { UOP_SSE, // AMX Instruction - UOP_AMX, + UOP_AMX_COMPUTE, // SIMD instructions for Intel GPU UOP_SIMD,