stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8263591: Two C2 compiler phases with the name "after matching"

Browse Source 
Reviewed-by: neliasso, chagedorn
This commit is contained in:
Tobias Hartmann 2021-03-29 12:41:09 +00:00
parent 3caea470e1
commit 3516c2650c
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hotspot/share/opto/compile.cpp
View File

@ -2754,7 +2754,6 @@ void Compile::Code_Gen() {
if (failing()) { if (failing()) {
return; return;
} }
print_method(PHASE_AFTER_MATCHING, 3);
} }
// In debug mode can dump m._nodes.dump() for mapping of ideal to machine // In debug mode can dump m._nodes.dump() for mapping of ideal to machine
// nodes. Mapping is only valid at the root of each matched subtree. // nodes. Mapping is only valid at the root of each matched subtree.
@ -4686,7 +4685,7 @@ void Compile::sort_macro_nodes() {
} }
} }
void Compile::print_method(CompilerPhaseType cpt, const char *name, int level, int idx) { void Compile::print_method(CompilerPhaseType cpt, const char *name, int level) {
EventCompilerPhase event; EventCompilerPhase event;
if (event.should_commit()) { if (event.should_commit()) {
CompilerEvent::PhaseEvent::post(event, C->_latest_stage_start_counter, cpt, C->_compile_id, level); CompilerEvent::PhaseEvent::post(event, C->_latest_stage_start_counter, cpt, C->_compile_id, level);
@ -4708,7 +4707,7 @@ void Compile::print_method(CompilerPhaseType cpt, int level, int idx) {
jio_snprintf(output, sizeof(output), "%s", CompilerPhaseTypeHelper::to_string(cpt)); jio_snprintf(output, sizeof(output), "%s", CompilerPhaseTypeHelper::to_string(cpt));
} }
#endif #endif
print_method(cpt, output, level, idx); print_method(cpt, output, level);
} }
void Compile::print_method(CompilerPhaseType cpt, Node* n, int level) { void Compile::print_method(CompilerPhaseType cpt, Node* n, int level) {
@ -4774,7 +4773,7 @@ void igv_print(bool network, const char* phase_name) {
// Called from debugger. Normal write to the default _printer. Only works if Ideal Graph Visualizer printing flags are set. // Called from debugger. Normal write to the default _printer. Only works if Ideal Graph Visualizer printing flags are set.
void igv_print_default() { void igv_print_default() {
Compile::current()->print_method(PHASE_DEBUG, 0, 0); Compile::current()->print_method(PHASE_DEBUG, 0);
} }
// Called from debugger, especially when replaying a trace in which the program state cannot be altered like with rr replay. // Called from debugger, especially when replaying a trace in which the program state cannot be altered like with rr replay.

2
src/hotspot/share/opto/compile.hpp
View File

@ -643,7 +643,7 @@ class Compile : public Phase {
#endif #endif
} }
void print_method(CompilerPhaseType cpt, const char *name, int level = 1, int idx = 0); void print_method(CompilerPhaseType cpt, const char *name, int level = 1);
void print_method(CompilerPhaseType cpt, int level = 1, int idx = 0); void print_method(CompilerPhaseType cpt, int level = 1, int idx = 0);
void print_method(CompilerPhaseType cpt, Node* n, int level = 3); void print_method(CompilerPhaseType cpt, Node* n, int level = 3);

2
src/hotspot/share/opto/phasetype.hpp
View File

@ -48,7 +48,6 @@ enum CompilerPhaseType {
PHASE_ITER_GVN2, PHASE_ITER_GVN2,
PHASE_PHASEIDEALLOOP_ITERATIONS, PHASE_PHASEIDEALLOOP_ITERATIONS,
PHASE_OPTIMIZE_FINISHED, PHASE_OPTIMIZE_FINISHED,
PHASE_AFTER_MATCHING,
PHASE_GLOBAL_CODE_MOTION, PHASE_GLOBAL_CODE_MOTION,
PHASE_FINAL_CODE, PHASE_FINAL_CODE,
PHASE_AFTER_EA, PHASE_AFTER_EA,
@ -100,7 +99,6 @@ class CompilerPhaseTypeHelper {
case PHASE_ITER_GVN2: return "Iter GVN 2"; case PHASE_ITER_GVN2: return "Iter GVN 2";
case PHASE_PHASEIDEALLOOP_ITERATIONS: return "PhaseIdealLoop iterations"; case PHASE_PHASEIDEALLOOP_ITERATIONS: return "PhaseIdealLoop iterations";
case PHASE_OPTIMIZE_FINISHED: return "Optimize finished"; case PHASE_OPTIMIZE_FINISHED: return "Optimize finished";
case PHASE_AFTER_MATCHING: return "After Matching";
case PHASE_GLOBAL_CODE_MOTION: return "Global code motion"; case PHASE_GLOBAL_CODE_MOTION: return "Global code motion";
case PHASE_FINAL_CODE: return "Final Code"; case PHASE_FINAL_CODE: return "Final Code";
case PHASE_AFTER_EA: return "After Escape Analysis"; case PHASE_AFTER_EA: return "After Escape Analysis";