Merge 13acc8f into 9b98cc0

jaskarth · web-flow · commit 8287491261db · 2025-01-22T10:16:30.000Z
diff --git a/src/hotspot/cpu/aarch64/c2_lowering_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_lowering_aarch64.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#ifdef COMPILER2
+#include "opto/node.hpp"
+#include "opto/phaseX.hpp"
+
+Node* PhaseLowering::lower_node_platform(Node* n) {
+  return nullptr;
+}
+
+bool PhaseLowering::should_lower() {
+  return false;
+}
+#endif // COMPILER2
diff --git a/src/hotspot/cpu/arm/c2_lowering_arm.cpp b/src/hotspot/cpu/arm/c2_lowering_arm.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#ifdef COMPILER2
+#include "opto/node.hpp"
+#include "opto/phaseX.hpp"
+
+Node* PhaseLowering::lower_node_platform(Node* n) {
+  return nullptr;
+}
+
+bool PhaseLowering::should_lower() {
+  return false;
+}
+#endif // COMPILER2
diff --git a/src/hotspot/cpu/ppc/c2_lowering_ppc.cpp b/src/hotspot/cpu/ppc/c2_lowering_ppc.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#ifdef COMPILER2
+#include "opto/node.hpp"
+#include "opto/phaseX.hpp"
+
+Node* PhaseLowering::lower_node_platform(Node* n) {
+  return nullptr;
+}
+
+bool PhaseLowering::should_lower() {
+  return false;
+}
+#endif // COMPILER2
diff --git a/src/hotspot/cpu/riscv/c2_lowering_riscv.cpp b/src/hotspot/cpu/riscv/c2_lowering_riscv.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#ifdef COMPILER2
+#include "opto/node.hpp"
+#include "opto/phaseX.hpp"
+
+Node* PhaseLowering::lower_node_platform(Node* n) {
+  return nullptr;
+}
+
+bool PhaseLowering::should_lower() {
+  return false;
+}
+#endif // COMPILER2
diff --git a/src/hotspot/cpu/s390/c2_lowering_s390.cpp b/src/hotspot/cpu/s390/c2_lowering_s390.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#ifdef COMPILER2
+#include "opto/node.hpp"
+#include "opto/phaseX.hpp"
+
+Node* PhaseLowering::lower_node_platform(Node* n) {
+  return nullptr;
+}
+
+bool PhaseLowering::should_lower() {
+  return false;
+}
+#endif // COMPILER2
diff --git a/src/hotspot/cpu/x86/c2_lowering_x86.cpp b/src/hotspot/cpu/x86/c2_lowering_x86.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#ifdef COMPILER2
+#include "opto/node.hpp"
+#include "opto/phaseX.hpp"
+
+Node* PhaseLowering::lower_node_platform(Node* n) {
+  return nullptr;
+}
+
+bool PhaseLowering::should_lower() {
+  return false;
+}
+#endif // COMPILER2
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
@@ -2480,6 +2480,16 @@ void Compile::Optimize() {
     process_late_inline_calls_no_inline(igvn);
     if (failing())  return;
   }
+
+  // Lower nodes and match backend-specific patterns with Ideal nodes.
+  {
+    TracePhase tp(_t_lower);
+
+    PhaseLowering lower(&igvn);
+    lower.lower();
+
+    print_method(PHASE_AFTER_LOWERING, 2);
+  }
  } // (End scope of igvn; run destructor if necessary for asserts.)
 
  check_no_dead_use();
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
@@ -154,6 +154,7 @@ class PCTableNode;
 class PhaseCCP;
 class PhaseGVN;
 class PhaseIterGVN;
+class PhaseLowering;
 class PhaseRegAlloc;
 class PhaseTransform;
 class PhaseValues;
@@ -1108,6 +1109,11 @@ class Node {
   // -XX:VerifyIterativeGVN=1
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
 
+  // Return an Idealized node only during PhaseLowering.
+  virtual Node* LoweredIdeal(PhaseLowering* phase) {
+    return nullptr;
+  }
+
   // Some nodes have specific Ideal subgraph transformations only if they are
   // unique users of specific nodes. Such nodes should be put on IGVN worklist
   // for the transformations to happen.
diff --git a/src/hotspot/share/opto/phase.cpp b/src/hotspot/share/opto/phase.cpp
@@ -96,6 +96,7 @@ void Phase::print_timers() {
     tty->print_cr ("         GVN 2:               %7.3f s", timers[_t_iterGVN2].seconds());
     tty->print_cr ("         Macro Expand:        %7.3f s", timers[_t_macroExpand].seconds());
     tty->print_cr ("         Barrier Expand:      %7.3f s", timers[_t_barrierExpand].seconds());
+    tty->print_cr ("         Lowering:            %7.3f s", timers[_t_lower].seconds());
     tty->print_cr ("         Graph Reshape:       %7.3f s", timers[_t_graphReshaping].seconds());
 
     double other = timers[_t_optimizer].seconds() -
diff --git a/src/hotspot/share/opto/phase.hpp b/src/hotspot/share/opto/phase.hpp
@@ -58,6 +58,7 @@ class Phase : public StackObj {
     Coalesce,                         // Coalescing copies
     Ideal_Loop,                       // Find idealized trip-counted loops
     Macro_Expand,                     // Expand macro nodes
+    Lower,                            // Backend-dependent Ideal node lowering
     Peephole,                         // Apply peephole optimizations
     Vector,
     Output,
@@ -88,6 +89,7 @@ class Phase : public StackObj {
     f(     _t_iterGVN2,              "iterGVN2")                 \
     f(     _t_macroExpand,           "macroExpand")              \
     f(     _t_barrierExpand,         "barrierExpand")            \
+    f(     _t_lower,                 "lower")                    \
     f(     _t_graphReshaping,        "graphReshape")             \
     f(   _t_matcher,                 "matcher")                  \
     f(     _t_postselect_cleanup,    "postselect_cleanup")       \
diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
@@ -670,6 +670,10 @@ Node* PhaseGVN::apply_ideal(Node* k, bool can_reshape) {
   return i;
 }
 
+Node* PhaseGVN::apply_identity(Node* k) {
+  return k->Identity(this);
+}
+
 //------------------------------transform--------------------------------------
 // Return a node which computes the same function as this node, but
 // in a faster or cheaper fashion.
@@ -721,7 +725,7 @@ Node* PhaseGVN::transform(Node* n) {
   }
 
   // Now check for Identities
-  i = k->Identity(this);        // Look for a nearby replacement
+  i = apply_identity(k);        // Look for a nearby replacement
   if (i != k) {                 // Found? Return replacement!
     NOT_PRODUCT(set_progress();)
     return i;
@@ -1261,7 +1265,7 @@ Node *PhaseIterGVN::transform_old(Node* n) {
   }
 
   // Now check for Identities
-  i = k->Identity(this);      // Look for a nearby replacement
+  i = apply_identity(k);       // Look for a nearby replacement
   if (i != k) {                // Found? Return replacement!
     NOT_PRODUCT(set_progress();)
     add_users_to_worklist(k);
@@ -2288,6 +2292,44 @@ void PhasePeephole::print_statistics() {
 }
 #endif
 
+Node* PhaseLowering::apply_ideal(Node* k, bool can_reshape) {
+  Node* lowered = lower_node(k);
+  if (lowered != nullptr) {
+    return lowered;
+  }
+
+  // Run the lowered Ideal method to continue doing transformations on the node, while avoiding existing ideal transforms
+  // that may undo the changes done during lowering.
+
+  return k->LoweredIdeal(this);
+}
+
+Node* PhaseLowering::apply_identity(Node* k) {
+  return k;
+}
+
+Node* PhaseLowering::lower_node(Node* n) {
+  // Apply shared lowering transforms
+
+  // Apply backend-specific lowering transforms
+  return lower_node_platform(n);
+}
+
+void PhaseLowering::lower() {
+  if (!should_lower()) {
+    return;
+  }
+
+  // Worklist should be empty before lowering
+  _worklist.ensure_empty();
+
+  C->identify_useful_nodes(_worklist);
+
+  optimize();
+
+  // Worklist should be empty after lowering
+  _worklist.ensure_empty();
+}
 
 //=============================================================================
 //------------------------------set_req_X--------------------------------------
diff --git a/src/hotspot/share/opto/phaseX.hpp b/src/hotspot/share/opto/phaseX.hpp
diff --git a/src/hotspot/share/opto/phasetype.hpp b/src/hotspot/share/opto/phasetype.hpp
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java b/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java
