Removing short name column from compphases.h (#76030)

* Avoiding the use of JIT phases shorName

* Removing shortName from JIT phases description

* Avoiding memory allocation

* Renaming variable

4 files changed, 97 insertions, 98 deletions

diff --git a/src/coreclr/jit/compiler.cpp b/src/coreclr/jit/compiler.cpp
index a8f85a3e56d..e92d45518e9 100644
--- a/src/coreclr/jit/compiler.cpp
+++ b/src/coreclr/jit/compiler.cpp
@@ -7797,34 +7797,34 @@ double JitTimer::s_cyclesPerSec = CachedCyclesPerSecond();
 
 #if defined(FEATURE_JIT_METHOD_PERF) || DUMP_FLOWGRAPHS || defined(FEATURE_TRACELOGGING)
 const char* PhaseNames[] = {
-#define CompPhaseNameMacro(enum_nm, string_nm, short_nm, hasChildren, parent, measureIR) string_nm,
+#define CompPhaseNameMacro(enum_nm, string_nm, hasChildren, parent, measureIR) string_nm,
 #include "compphases.h"
 };
 
 const char* PhaseEnums[] = {
-#define CompPhaseNameMacro(enum_nm, string_nm, short_nm, hasChildren, parent, measureIR) #enum_nm,
+#define CompPhaseNameMacro(enum_nm, string_nm, hasChildren, parent, measureIR) #enum_nm,
 #include "compphases.h"
 };
 
-const LPCWSTR PhaseShortNames[] = {
-#define CompPhaseNameMacro(enum_nm, string_nm, short_nm, hasChildren, parent, measureIR) W(short_nm),
+const LPCWSTR PhaseEnumsW[] = {
+#define CompPhaseNameMacro(enum_nm, string_nm, hasChildren, parent, measureIR) W(#enum_nm),
 #include "compphases.h"
 };
 #endif // defined(FEATURE_JIT_METHOD_PERF) || DUMP_FLOWGRAPHS
 
 #ifdef FEATURE_JIT_METHOD_PERF
 bool PhaseHasChildren[] = {
-#define CompPhaseNameMacro(enum_nm, string_nm, short_nm, hasChildren, parent, measureIR) hasChildren,
+#define CompPhaseNameMacro(enum_nm, string_nm, hasChildren, parent, measureIR) hasChildren,
 #include "compphases.h"
 };
 
 int PhaseParent[] = {
-#define CompPhaseNameMacro(enum_nm, string_nm, short_nm, hasChildren, parent, measureIR) parent,
+#define CompPhaseNameMacro(enum_nm, string_nm, hasChildren, parent, measureIR) parent,
 #include "compphases.h"
 };
 
 bool PhaseReportsIRSize[] = {
-#define CompPhaseNameMacro(enum_nm, string_nm, short_nm, hasChildren, parent, measureIR) measureIR,
+#define CompPhaseNameMacro(enum_nm, string_nm, hasChildren, parent, measureIR) measureIR,
 #include "compphases.h"
 };
 
diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h
index 7f65f012426..6850cd9d2b1 100644
--- a/src/coreclr/jit/compiler.h
+++ b/src/coreclr/jit/compiler.h
@@ -1390,14 +1390,14 @@ LinearScanInterface* getLinearScanAllocator(Compiler* comp);
 // partition a compilation.
 enum Phases
 {
-#define CompPhaseNameMacro(enum_nm, string_nm, short_nm, hasChildren, parent, measureIR) enum_nm,
+#define CompPhaseNameMacro(enum_nm, string_nm, hasChildren, parent, measureIR) enum_nm,
 #include "compphases.h"
     PHASE_NUMBER_OF
 };
 
 extern const char*   PhaseNames[];
 extern const char*   PhaseEnums[];
-extern const LPCWSTR PhaseShortNames[];
+extern const LPCWSTR PhaseEnumsW[];
 
 // Specify which checks should be run after each phase
 //
diff --git a/src/coreclr/jit/compphases.h b/src/coreclr/jit/compphases.h
index a67f6d52d9f..e7e502ee42f 100644
--- a/src/coreclr/jit/compphases.h
+++ b/src/coreclr/jit/compphases.h
@@ -10,10 +10,9 @@
 // corresponding array of string names of those phases.  This include file undefines CompPhaseNameMacro
 // after the last use.
 // The arguments are:
-//   CompPhaseNameMacro(enumName, stringName, shortName, hasChildren, parent, measureIR)
+//   CompPhaseNameMacro(enumName, stringName, hasChildren, parent, measureIR)
 //     "enumName" is an Enumeration-style all-caps name.
 //     "stringName" is a self-explanatory.
-//     "shortName" is an abbreviated form for stringName
 //     "hasChildren" is true if this phase is broken out into subphases.
 //         (We should never do EndPhase on a phase that has children, only on 'leaf phases.')
 //     "parent" is -1 for leaf phases, otherwise it is the "enumName" of the parent phase.
@@ -21,100 +20,100 @@
 //         true.
 
 // clang-format off
-//                 enumName                          stringName                        shortName     hasChildren
-//                                                                                                          parent
-//                                                                                                              measureIR
-CompPhaseNameMacro(PHASE_PRE_IMPORT,                 "Pre-import",                     "PRE-IMP",    false, -1, false)
-CompPhaseNameMacro(PHASE_IMPORTATION,                "Importation",                    "IMPORT",     false, -1, true)
-CompPhaseNameMacro(PHASE_INDXCALL,                   "Indirect call transform",        "INDXCALL",   false, -1, true)
-CompPhaseNameMacro(PHASE_PATCHPOINTS,                "Expand patchpoints",             "PPOINT",     false, -1, true)
-CompPhaseNameMacro(PHASE_POST_IMPORT,                "Post-import",                    "POST-IMP",   false, -1, false)
-CompPhaseNameMacro(PHASE_IBCPREP,                    "Profile instrumentation prep",   "IBCPREP",    false, -1, false)
-CompPhaseNameMacro(PHASE_IBCINSTR,                   "Profile instrumentation",        "IBCINSTR",   false, -1, false)
-CompPhaseNameMacro(PHASE_INCPROFILE,                 "Profile incorporation",          "INCPROF",    false, -1, false)
-CompPhaseNameMacro(PHASE_MORPH_INIT,                 "Morph - Init",                   "MOR-INIT",   false, -1, false)
-CompPhaseNameMacro(PHASE_MORPH_INLINE,               "Morph - Inlining",               "MOR-INL",    false, -1, true)
-CompPhaseNameMacro(PHASE_MORPH_ADD_INTERNAL,         "Morph - Add internal blocks",    "MOR-ADD",    false, -1, true)
-CompPhaseNameMacro(PHASE_ALLOCATE_OBJECTS,           "Allocate Objects",               "ALLOC-OBJ",  false, -1, false)
-CompPhaseNameMacro(PHASE_EMPTY_TRY,                  "Remove empty try",               "EMPTYTRY",   false, -1, false)
-CompPhaseNameMacro(PHASE_EMPTY_FINALLY,              "Remove empty finally",           "EMPTYFIN",   false, -1, false)
-CompPhaseNameMacro(PHASE_MERGE_FINALLY_CHAINS,       "Merge callfinally chains",       "MRGCFCHN",   false, -1, false)
-CompPhaseNameMacro(PHASE_CLONE_FINALLY,              "Clone finally",                  "CLONEFIN",   false, -1, false)
-CompPhaseNameMacro(PHASE_UPDATE_FINALLY_FLAGS,       "Update finally target flags",    "UPD-FTF",    false, -1, false)
-CompPhaseNameMacro(PHASE_COMPUTE_PREDS,              "Compute preds",                  "PREDS",      false, -1, false)
-CompPhaseNameMacro(PHASE_EARLY_UPDATE_FLOW_GRAPH,    "Update flow graph early pass",   "UPD-FG-E",   false, -1, false)
-CompPhaseNameMacro(PHASE_STR_ADRLCL,                 "Morph - Structs/AddrExp",        "MOR-STRAL",  false, -1, false)
-CompPhaseNameMacro(PHASE_FWD_SUB,                    "Forward Substitution",           "FWD-SUB",    false, -1, false)
-CompPhaseNameMacro(PHASE_MORPH_IMPBYREF,             "Morph - ByRefs",                 "MOR-BYREF",  false, -1, false)
-CompPhaseNameMacro(PHASE_PROMOTE_STRUCTS,            "Morph - Promote Structs",        "PROMOTER" ,  false, -1, false)
-CompPhaseNameMacro(PHASE_MORPH_GLOBAL,               "Morph - Global",                 "MOR-GLOB",   false, -1, false)
-CompPhaseNameMacro(PHASE_MORPH_END,                  "Morph - Finish",                 "MOR-END",    false, -1, true)
-CompPhaseNameMacro(PHASE_GS_COOKIE,                  "GS Cookie",                      "GS-COOK",    false, -1, false)
-CompPhaseNameMacro(PHASE_COMPUTE_EDGE_WEIGHTS,       "Compute edge weights (1, false)","EDG-WGT",    false, -1, false)
+//                 enumName                          stringName                        hasChildren
+//                                                                                           parent
+//                                                                                                measureIR
+CompPhaseNameMacro(PHASE_PRE_IMPORT,                 "Pre-import",                     false, -1, false)
+CompPhaseNameMacro(PHASE_IMPORTATION,                "Importation",                    false, -1, true)
+CompPhaseNameMacro(PHASE_INDXCALL,                   "Indirect call transform",        false, -1, true)
+CompPhaseNameMacro(PHASE_PATCHPOINTS,                "Expand patchpoints",             false, -1, true)
+CompPhaseNameMacro(PHASE_POST_IMPORT,                "Post-import",                    false, -1, false)
+CompPhaseNameMacro(PHASE_IBCPREP,                    "Profile instrumentation prep",   false, -1, false)
+CompPhaseNameMacro(PHASE_IBCINSTR,                   "Profile instrumentation",        false, -1, false)
+CompPhaseNameMacro(PHASE_INCPROFILE,                 "Profile incorporation",          false, -1, false)
+CompPhaseNameMacro(PHASE_MORPH_INIT,                 "Morph - Init",                   false, -1, false)
+CompPhaseNameMacro(PHASE_MORPH_INLINE,               "Morph - Inlining",               false, -1, true)
+CompPhaseNameMacro(PHASE_MORPH_ADD_INTERNAL,         "Morph - Add internal blocks",    false, -1, true)
+CompPhaseNameMacro(PHASE_ALLOCATE_OBJECTS,           "Allocate Objects",               false, -1, false)
+CompPhaseNameMacro(PHASE_EMPTY_TRY,                  "Remove empty try",               false, -1, false)
+CompPhaseNameMacro(PHASE_EMPTY_FINALLY,              "Remove empty finally",           false, -1, false)
+CompPhaseNameMacro(PHASE_MERGE_FINALLY_CHAINS,       "Merge callfinally chains",       false, -1, false)
+CompPhaseNameMacro(PHASE_CLONE_FINALLY,              "Clone finally",                  false, -1, false)
+CompPhaseNameMacro(PHASE_UPDATE_FINALLY_FLAGS,       "Update finally target flags",    false, -1, false)
+CompPhaseNameMacro(PHASE_COMPUTE_PREDS,              "Compute preds",                  false, -1, false)
+CompPhaseNameMacro(PHASE_EARLY_UPDATE_FLOW_GRAPH,    "Update flow graph early pass",   false, -1, false)
+CompPhaseNameMacro(PHASE_STR_ADRLCL,                 "Morph - Structs/AddrExp",        false, -1, false)
+CompPhaseNameMacro(PHASE_FWD_SUB,                    "Forward Substitution",           false, -1, false)
+CompPhaseNameMacro(PHASE_MORPH_IMPBYREF,             "Morph - ByRefs",                 false, -1, false)
+CompPhaseNameMacro(PHASE_PROMOTE_STRUCTS,            "Morph - Promote Structs",        false, -1, false)
+CompPhaseNameMacro(PHASE_MORPH_GLOBAL,               "Morph - Global",                 false, -1, false)
+CompPhaseNameMacro(PHASE_MORPH_END,                  "Morph - Finish",                 false, -1, true)
+CompPhaseNameMacro(PHASE_GS_COOKIE,                  "GS Cookie",                      false, -1, false)
+CompPhaseNameMacro(PHASE_COMPUTE_EDGE_WEIGHTS,       "Compute edge weights (1, false)",false, -1, false)
 #if defined(FEATURE_EH_FUNCLETS)
-CompPhaseNameMacro(PHASE_CREATE_FUNCLETS,            "Create EH funclets",             "EH-FUNC",    false, -1, false)
+CompPhaseNameMacro(PHASE_CREATE_FUNCLETS,            "Create EH funclets",             false, -1, false)
 #endif // FEATURE_EH_FUNCLETS
-CompPhaseNameMacro(PHASE_MERGE_THROWS,               "Merge throw blocks",             "MRGTHROW",   false, -1, false)
-CompPhaseNameMacro(PHASE_INVERT_LOOPS,               "Invert loops",                   "LOOP-INV",   false, -1, false)
-CompPhaseNameMacro(PHASE_OPTIMIZE_FLOW,              "Optimize control flow",          "OPT-FLOW",   false, -1, false)
-CompPhaseNameMacro(PHASE_OPTIMIZE_LAYOUT,            "Optimize layout",                "LAYOUT",     false, -1, false)
-CompPhaseNameMacro(PHASE_COMPUTE_REACHABILITY,       "Compute blocks reachability",    "BL_REACH",   false, -1, false)
-CompPhaseNameMacro(PHASE_SET_BLOCK_WEIGHTS,          "Set block weights",              "BL-WEIGHTS", false, -1, false)
-CompPhaseNameMacro(PHASE_ZERO_INITS,                 "Redundant zero Inits",           "ZERO-INIT",  false, -1, false)
-CompPhaseNameMacro(PHASE_FIND_LOOPS,                 "Find loops",                     "LOOP-FND",   false, -1, false)
-CompPhaseNameMacro(PHASE_CLONE_LOOPS,                "Clone loops",                    "LP-CLONE",   false, -1, false)
-CompPhaseNameMacro(PHASE_UNROLL_LOOPS,               "Unroll loops",                   "UNROLL",     false, -1, false)
-CompPhaseNameMacro(PHASE_CLEAR_LOOP_INFO,            "Clear loop info",                "LP-CLEAR",   false, -1, false)
-CompPhaseNameMacro(PHASE_MORPH_MDARR,                "Morph array ops",                "MOR-ARRAY",  false, -1, false)
-CompPhaseNameMacro(PHASE_HOIST_LOOP_CODE,            "Hoist loop code",                "LP-HOIST",   false, -1, false)
-CompPhaseNameMacro(PHASE_MARK_LOCAL_VARS,            "Mark local vars",                "MARK-LCL",   false, -1, false)
-CompPhaseNameMacro(PHASE_OPTIMIZE_ADD_COPIES,        "Opt add copies",                 "OPT-ADD-CP", false, -1, false)
-CompPhaseNameMacro(PHASE_OPTIMIZE_BOOLS,             "Optimize bools",                 "OPT-BOOL",   false, -1, false)
-CompPhaseNameMacro(PHASE_FIND_OPER_ORDER,            "Find oper order",                "OPER-ORD",   false, -1, false)
-CompPhaseNameMacro(PHASE_SET_BLOCK_ORDER,            "Set block order",                "BLK-ORD",    false, -1, true)
-CompPhaseNameMacro(PHASE_BUILD_SSA,                  "Build SSA representation",       "SSA",        true,  -1, false)
-CompPhaseNameMacro(PHASE_BUILD_SSA_TOPOSORT,         "SSA: topological sort",          "SSA-SORT",   false, PHASE_BUILD_SSA, false)
-CompPhaseNameMacro(PHASE_BUILD_SSA_DOMS,             "SSA: Doms1",                     "SSA-DOMS",   false, PHASE_BUILD_SSA, false)
-CompPhaseNameMacro(PHASE_BUILD_SSA_LIVENESS,         "SSA: liveness",                  "SSA-LIVE",   false, PHASE_BUILD_SSA, false)
-CompPhaseNameMacro(PHASE_BUILD_SSA_DF,               "SSA: DF",                        "SSA-DF",     false, PHASE_BUILD_SSA, false)
-CompPhaseNameMacro(PHASE_BUILD_SSA_INSERT_PHIS,      "SSA: insert phis",               "SSA-PHI",    false, PHASE_BUILD_SSA, false)
-CompPhaseNameMacro(PHASE_BUILD_SSA_RENAME,           "SSA: rename",                    "SSA-REN",    false, PHASE_BUILD_SSA, false)
-CompPhaseNameMacro(PHASE_EARLY_PROP,                 "Early Value Propagation",        "ERL-PROP",   false, -1, false)
-CompPhaseNameMacro(PHASE_VALUE_NUMBER,               "Do value numbering",             "VAL-NUM",    false, -1, false)
-CompPhaseNameMacro(PHASE_OPTIMIZE_INDEX_CHECKS,      "Optimize index checks",          "OPT-CHK",    false, -1, false)
-CompPhaseNameMacro(PHASE_OPTIMIZE_VALNUM_CSES,       "Optimize Valnum CSEs",           "OPT-CSE",    false, -1, false)
-CompPhaseNameMacro(PHASE_VN_COPY_PROP,               "VN based copy prop",             "CP-PROP",    false, -1, false)
-CompPhaseNameMacro(PHASE_OPTIMIZE_BRANCHES,          "Redundant branch opts",          "OPT-BR",     false, -1, false)
-CompPhaseNameMacro(PHASE_ASSERTION_PROP_MAIN,        "Assertion prop",                 "AST-PROP",   false, -1, false)
-CompPhaseNameMacro(PHASE_OPT_UPDATE_FLOW_GRAPH,      "Update flow graph opt pass",     "UPD-FG-O",   false, -1, false)
-CompPhaseNameMacro(PHASE_COMPUTE_EDGE_WEIGHTS2,      "Compute edge weights (2, false)","EDG-WGT2",   false, -1, false)
-CompPhaseNameMacro(PHASE_INSERT_GC_POLLS,            "Insert GC Polls",                "GC-POLLS",   false, -1, true)
-CompPhaseNameMacro(PHASE_DETERMINE_FIRST_COLD_BLOCK, "Determine first cold block",     "COLD-BLK",   false, -1, true)
-CompPhaseNameMacro(PHASE_RATIONALIZE,                "Rationalize IR",                 "RAT",        false, -1, false)
-CompPhaseNameMacro(PHASE_SIMPLE_LOWERING,            "Do 'simple' lowering",           "SMP-LWR",    false, -1, false)
+CompPhaseNameMacro(PHASE_MERGE_THROWS,               "Merge throw blocks",             false, -1, false)
+CompPhaseNameMacro(PHASE_INVERT_LOOPS,               "Invert loops",                   false, -1, false)
+CompPhaseNameMacro(PHASE_OPTIMIZE_FLOW,              "Optimize control flow",          false, -1, false)
+CompPhaseNameMacro(PHASE_OPTIMIZE_LAYOUT,            "Optimize layout",                false, -1, false)
+CompPhaseNameMacro(PHASE_COMPUTE_REACHABILITY,       "Compute blocks reachability",    false, -1, false)
+CompPhaseNameMacro(PHASE_SET_BLOCK_WEIGHTS,          "Set block weights",              false, -1, false)
+CompPhaseNameMacro(PHASE_ZERO_INITS,                 "Redundant zero Inits",           false, -1, false)
+CompPhaseNameMacro(PHASE_FIND_LOOPS,                 "Find loops",                     false, -1, false)
+CompPhaseNameMacro(PHASE_CLONE_LOOPS,                "Clone loops",                    false, -1, false)
+CompPhaseNameMacro(PHASE_UNROLL_LOOPS,               "Unroll loops",                   false, -1, false)
+CompPhaseNameMacro(PHASE_CLEAR_LOOP_INFO,            "Clear loop info",                false, -1, false)
+CompPhaseNameMacro(PHASE_MORPH_MDARR,                "Morph array ops",                false, -1, false)
+CompPhaseNameMacro(PHASE_HOIST_LOOP_CODE,            "Hoist loop code",                false, -1, false)
+CompPhaseNameMacro(PHASE_MARK_LOCAL_VARS,            "Mark local vars",                false, -1, false)
+CompPhaseNameMacro(PHASE_OPTIMIZE_ADD_COPIES,        "Opt add copies",                 false, -1, false)
+CompPhaseNameMacro(PHASE_OPTIMIZE_BOOLS,             "Optimize bools",                 false, -1, false)
+CompPhaseNameMacro(PHASE_FIND_OPER_ORDER,            "Find oper order",                false, -1, false)
+CompPhaseNameMacro(PHASE_SET_BLOCK_ORDER,            "Set block order",                false, -1, true)
+CompPhaseNameMacro(PHASE_BUILD_SSA,                  "Build SSA representation",       true,  -1, false)
+CompPhaseNameMacro(PHASE_BUILD_SSA_TOPOSORT,         "SSA: topological sort",          false, PHASE_BUILD_SSA, false)
+CompPhaseNameMacro(PHASE_BUILD_SSA_DOMS,             "SSA: Doms1",                     false, PHASE_BUILD_SSA, false)
+CompPhaseNameMacro(PHASE_BUILD_SSA_LIVENESS,         "SSA: liveness",                  false, PHASE_BUILD_SSA, false)
+CompPhaseNameMacro(PHASE_BUILD_SSA_DF,               "SSA: DF",                        false, PHASE_BUILD_SSA, false)
+CompPhaseNameMacro(PHASE_BUILD_SSA_INSERT_PHIS,      "SSA: insert phis",               false, PHASE_BUILD_SSA, false)
+CompPhaseNameMacro(PHASE_BUILD_SSA_RENAME,           "SSA: rename",                    false, PHASE_BUILD_SSA, false)
+CompPhaseNameMacro(PHASE_EARLY_PROP,                 "Early Value Propagation",        false, -1, false)
+CompPhaseNameMacro(PHASE_VALUE_NUMBER,               "Do value numbering",             false, -1, false)
+CompPhaseNameMacro(PHASE_OPTIMIZE_INDEX_CHECKS,      "Optimize index checks",          false, -1, false)
+CompPhaseNameMacro(PHASE_OPTIMIZE_VALNUM_CSES,       "Optimize Valnum CSEs",           false, -1, false)
+CompPhaseNameMacro(PHASE_VN_COPY_PROP,               "VN based copy prop",             false, -1, false)
+CompPhaseNameMacro(PHASE_OPTIMIZE_BRANCHES,          "Redundant branch opts",          false, -1, false)
+CompPhaseNameMacro(PHASE_ASSERTION_PROP_MAIN,        "Assertion prop",                 false, -1, false)
+CompPhaseNameMacro(PHASE_OPT_UPDATE_FLOW_GRAPH,      "Update flow graph opt pass",     false, -1, false)
+CompPhaseNameMacro(PHASE_COMPUTE_EDGE_WEIGHTS2,      "Compute edge weights (2, false)",false, -1, false)
+CompPhaseNameMacro(PHASE_INSERT_GC_POLLS,            "Insert GC Polls",                false, -1, true)
+CompPhaseNameMacro(PHASE_DETERMINE_FIRST_COLD_BLOCK, "Determine first cold block",     false, -1, true)
+CompPhaseNameMacro(PHASE_RATIONALIZE,                "Rationalize IR",                 false, -1, false)
+CompPhaseNameMacro(PHASE_SIMPLE_LOWERING,            "Do 'simple' lowering",           false, -1, false)
 
-CompPhaseNameMacro(PHASE_LCLVARLIVENESS,             "Local var liveness",             "LIVENESS",   true,  -1, false)
-CompPhaseNameMacro(PHASE_LCLVARLIVENESS_INIT,        "Local var liveness init",        "LIV-INIT",   false, PHASE_LCLVARLIVENESS, false)
-CompPhaseNameMacro(PHASE_LCLVARLIVENESS_PERBLOCK,    "Per block local var liveness",   "LIV-BLK",    false, PHASE_LCLVARLIVENESS, false)
-CompPhaseNameMacro(PHASE_LCLVARLIVENESS_INTERBLOCK,  "Global local var liveness",      "LIV-GLBL",   false, PHASE_LCLVARLIVENESS, false)
+CompPhaseNameMacro(PHASE_LCLVARLIVENESS,             "Local var liveness",             true,  -1, false)
+CompPhaseNameMacro(PHASE_LCLVARLIVENESS_INIT,        "Local var liveness init",        false, PHASE_LCLVARLIVENESS, false)
+CompPhaseNameMacro(PHASE_LCLVARLIVENESS_PERBLOCK,    "Per block local var liveness",   false, PHASE_LCLVARLIVENESS, false)
+CompPhaseNameMacro(PHASE_LCLVARLIVENESS_INTERBLOCK,  "Global local var liveness",      false, PHASE_LCLVARLIVENESS, false)
 
-CompPhaseNameMacro(PHASE_LOWERING_DECOMP,            "Lowering decomposition",         "LWR-DEC",    false, -1, false)
-CompPhaseNameMacro(PHASE_LOWERING,                   "Lowering nodeinfo",              "LWR-INFO",   false, -1, true)
-CompPhaseNameMacro(PHASE_STACK_LEVEL_SETTER,         "Calculate stack level slots",    "STK-SET",    false, -1, false)
-CompPhaseNameMacro(PHASE_LINEAR_SCAN,                "Linear scan register alloc",     "LSRA",       true,  -1, true)
-CompPhaseNameMacro(PHASE_LINEAR_SCAN_BUILD,          "LSRA build intervals",           "LSRA-BLD",   false, PHASE_LINEAR_SCAN, false)
-CompPhaseNameMacro(PHASE_LINEAR_SCAN_ALLOC,          "LSRA allocate",                  "LSRA-ALL",   false, PHASE_LINEAR_SCAN, false)
-CompPhaseNameMacro(PHASE_LINEAR_SCAN_RESOLVE,        "LSRA resolve",                   "LSRA-RES",   false, PHASE_LINEAR_SCAN, false)
-CompPhaseNameMacro(PHASE_ALIGN_LOOPS,                "Place 'align' instructions",     "LOOP-ALIGN", false, -1, false)
-CompPhaseNameMacro(PHASE_GENERATE_CODE,              "Generate code",                  "CODEGEN",    false, -1, false)
-CompPhaseNameMacro(PHASE_EMIT_CODE,                  "Emit code",                      "EMIT",       false, -1, false)
-CompPhaseNameMacro(PHASE_EMIT_GCEH,                  "Emit GC+EH tables",              "EMT-GCEH",   false, -1, false)
-CompPhaseNameMacro(PHASE_POST_EMIT,                  "Post-Emit",                      "POST-EMIT",  false, -1, false)
+CompPhaseNameMacro(PHASE_LOWERING_DECOMP,            "Lowering decomposition",         false, -1, false)
+CompPhaseNameMacro(PHASE_LOWERING,                   "Lowering nodeinfo",              false, -1, true)
+CompPhaseNameMacro(PHASE_STACK_LEVEL_SETTER,         "Calculate stack level slots",    false, -1, false)
+CompPhaseNameMacro(PHASE_LINEAR_SCAN,                "Linear scan register alloc",     true,  -1, true)
+CompPhaseNameMacro(PHASE_LINEAR_SCAN_BUILD,          "LSRA build intervals",           false, PHASE_LINEAR_SCAN, false)
+CompPhaseNameMacro(PHASE_LINEAR_SCAN_ALLOC,          "LSRA allocate",                  false, PHASE_LINEAR_SCAN, false)
+CompPhaseNameMacro(PHASE_LINEAR_SCAN_RESOLVE,        "LSRA resolve",                   false, PHASE_LINEAR_SCAN, false)
+CompPhaseNameMacro(PHASE_ALIGN_LOOPS,                "Place 'align' instructions",     false, -1, false)
+CompPhaseNameMacro(PHASE_GENERATE_CODE,              "Generate code",                  false, -1, false)
+CompPhaseNameMacro(PHASE_EMIT_CODE,                  "Emit code",                      false, -1, false)
+CompPhaseNameMacro(PHASE_EMIT_GCEH,                  "Emit GC+EH tables",              false, -1, false)
+CompPhaseNameMacro(PHASE_POST_EMIT,                  "Post-Emit",                      false, -1, false)
 
 #if MEASURE_CLRAPI_CALLS
 // The following is a "pseudo-phase" - it aggregates timing info
 // for calls through ICorJitInfo across all "real" phases.
-CompPhaseNameMacro(PHASE_CLR_API,                    "CLR API calls",                  "CLR-API",    false, -1, false)
+CompPhaseNameMacro(PHASE_CLR_API,                    "CLR API calls",                  false, -1, false)
 #endif
 // clang-format on
 
diff --git a/src/coreclr/jit/fgdiagnostic.cpp b/src/coreclr/jit/fgdiagnostic.cpp
index c5d1aff9aa6..d379c0124b3 100644
--- a/src/coreclr/jit/fgdiagnostic.cpp
+++ b/src/coreclr/jit/fgdiagnostic.cpp
@@ -480,7 +480,7 @@ FILE* Compiler::fgOpenFlowGraphFile(bool* wbDontClose, Phases phase, PhasePositi
         return nullptr;
     }
 
-    LPCWSTR phaseName = PhaseShortNames[phase];
+    LPCWSTR phaseName = PhaseEnumsW[phase] + strlen("PHASE_");
 
     if (pos == PhasePosition::PrePhase)
     {