From 993c2b45be8446a13b63c81848e6166a2380866b Mon Sep 17 00:00:00 2001
From: Tobias Tebbi <tebbi@chromium.org>
Date: Tue, 31 Jan 2023 17:21:31 +0100
Subject: [PATCH] [turboshaft] refactor assemblers/reducers to enable IDE
 autocomplete

Bug: v8:12783
Change-Id: I237f470cea6be265475fec6c4301f3bf60bcb118
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4208931
Auto-Submit: Tobias Tebbi <tebbi@chromium.org>
Reviewed-by: Nico Hartmann <nicohartmann@chromium.org>
Commit-Queue: Nico Hartmann <nicohartmann@chromium.org>
Cr-Commit-Position: refs/heads/main@{#85586}
---
 src/compiler/turboshaft/assembler.h           | 54 +++++++++++--------
 .../turboshaft/assert-types-reducer.h         |  3 +-
 .../turboshaft/branch-elimination-reducer.h   |  3 +-
 .../dead-code-elimination-reducer.h           |  3 +-
 src/compiler/turboshaft/graph-builder.cc      | 20 +++----
 src/compiler/turboshaft/graph.h               |  4 +-
 .../turboshaft/late-escape-analysis-reducer.h |  2 +-
 .../turboshaft/machine-lowering-reducer.h     |  5 +-
 src/compiler/turboshaft/memory-optimization.h |  3 +-
 src/compiler/turboshaft/optimization-phase.h  | 13 ++---
 .../turboshaft/select-lowering-reducer.h      |  2 +-
 .../turboshaft/type-inference-reducer.h       |  3 +-
 .../turboshaft/typed-optimizations-reducer.h  |  3 +-
 .../turboshaft/uniform-reducer-adapter.h      |  2 +-
 .../turboshaft/value-numbering-reducer.h      |  3 +-
 src/compiler/turboshaft/variable-reducer.h    |  2 +-
 16 files changed, 72 insertions(+), 53 deletions(-)

diff --git a/src/compiler/turboshaft/assembler.h b/src/compiler/turboshaft/assembler.h
index 3bc4d5cffc..14b2e2eaf2 100644
--- a/src/compiler/turboshaft/assembler.h
+++ b/src/compiler/turboshaft/assembler.h
@@ -52,16 +52,32 @@ class ReducerStack<Assembler, FirstReducer, Reducers...>
   using FirstReducer<ReducerStack<Assembler, Reducers...>>::FirstReducer;
 };
 
-template <class Assembler>
-class ReducerStack<Assembler> {
+template <class Reducers>
+class ReducerStack<Assembler<Reducers>> {
  public:
-  using AssemblerType = Assembler;
-  Assembler& Asm() { return *static_cast<Assembler*>(this); }
+  using AssemblerType = Assembler<Reducers>;
+  using ReducerList = Reducers;
+  Assembler<ReducerList>& Asm() {
+    return *static_cast<Assembler<ReducerList>*>(this);
+  }
+};
+
+template <class Reducers>
+struct reducer_stack_type {};
+template <template <class> class... Reducers>
+struct reducer_stack_type<reducer_list<Reducers...>> {
+  using type = ReducerStack<Assembler<reducer_list<Reducers...>>, Reducers...,
+                            v8::internal::compiler::turboshaft::ReducerBase>;
 };
 
 template <typename Next>
 class ReducerBase;
 
+#define TURBOSHAFT_REDUCER_BOILERPLATE()                               \
+  Assembler<typename Next::ReducerList>& Asm() {                       \
+    return *static_cast<Assembler<typename Next::ReducerList>*>(this); \
+  }
+
 // LABEL_BLOCK is used in Reducers to have a single call forwarding to the next
 // reducer without change. A typical use would be:
 //
@@ -101,9 +117,9 @@ class ReducerBaseForwarder : public Next {
 template <class Next>
 class ReducerBase : public ReducerBaseForwarder<Next> {
  public:
-  using Next::Asm;
-  using Base = ReducerBaseForwarder<Next>;
+  TURBOSHAFT_REDUCER_BOILERPLATE()
 
+  using Base = ReducerBaseForwarder<Next>;
   using ArgT = std::tuple<>;
 
   template <class... Args>
@@ -1047,24 +1063,18 @@ class AssemblerOpInterface {
   Assembler& stack() { return *static_cast<Assembler*>(this); }
 };
 
-template <template <class> class... Reducers>
-class Assembler
-    : public GraphVisitor<Assembler<Reducers...>>,
-      public ReducerStack<Assembler<Reducers...>, Reducers...,
-                          v8::internal::compiler::turboshaft::ReducerBase>,
-      public OperationMatching<Assembler<Reducers...>>,
-      public AssemblerOpInterface<Assembler<Reducers...>> {
-  using Stack = ReducerStack<Assembler<Reducers...>, Reducers...,
-                             v8::internal::compiler::turboshaft::ReducerBase>;
+template <class Reducers>
+class Assembler : public GraphVisitor<Assembler<Reducers>>,
+                  public reducer_stack_type<Reducers>::type,
+                  public OperationMatching<Assembler<Reducers>>,
+                  public AssemblerOpInterface<Assembler<Reducers>> {
+  using Stack = typename reducer_stack_type<Reducers>::type;
 
  public:
   template <class... ReducerArgs>
-  explicit Assembler(
-      Graph& input_graph, Graph& output_graph, Zone* phase_zone,
-      compiler::NodeOriginTable* origins,
-      const typename ReducerStack<
-          Assembler<Reducers...>, Reducers...,
-          v8::internal::compiler::turboshaft::ReducerBase>::ArgT& reducer_args)
+  explicit Assembler(Graph& input_graph, Graph& output_graph, Zone* phase_zone,
+                     compiler::NodeOriginTable* origins,
+                     const typename Stack::ArgT& reducer_args)
       : GraphVisitor<Assembler>(input_graph, output_graph, phase_zone, origins),
         Stack(reducer_args) {
     SupportedOperations::Initialize();
@@ -1075,7 +1085,7 @@ class Assembler
   Block* NewLoopHeader() { return this->output_graph().NewLoopHeader(); }
   Block* NewBlock() { return this->output_graph().NewBlock(); }
 
-  using OperationMatching<Assembler<Reducers...>>::Get;
+  using OperationMatching<Assembler<Reducers>>::Get;
   using Stack::Get;
 
   V8_INLINE V8_WARN_UNUSED_RESULT bool Bind(Block* block,
diff --git a/src/compiler/turboshaft/assert-types-reducer.h b/src/compiler/turboshaft/assert-types-reducer.h
index adabcbd12b..e6901f126f 100644
--- a/src/compiler/turboshaft/assert-types-reducer.h
+++ b/src/compiler/turboshaft/assert-types-reducer.h
@@ -37,7 +37,8 @@ struct AssertTypesReducerArgs {
 template <class Next>
 class AssertTypesReducer : public Next {
  public:
-  using Next::Asm;
+  TURBOSHAFT_REDUCER_BOILERPLATE()
+
   using ArgT =
       base::append_tuple_type<typename Next::ArgT, AssertTypesReducerArgs>;
 
diff --git a/src/compiler/turboshaft/branch-elimination-reducer.h b/src/compiler/turboshaft/branch-elimination-reducer.h
index b117c4ff6b..19cbe2d39d 100644
--- a/src/compiler/turboshaft/branch-elimination-reducer.h
+++ b/src/compiler/turboshaft/branch-elimination-reducer.h
@@ -168,7 +168,8 @@ class BranchEliminationReducer : public Next {
   // that's the case, then we copy the destination block, and the 1st
   // optimization will replace its final Branch by a Goto when reaching it.
  public:
-  using Next::Asm;
+  TURBOSHAFT_REDUCER_BOILERPLATE()
+
   template <class... Args>
   explicit BranchEliminationReducer(const std::tuple<Args...>& args)
       : Next(args),
diff --git a/src/compiler/turboshaft/dead-code-elimination-reducer.h b/src/compiler/turboshaft/dead-code-elimination-reducer.h
index 715cd17456..097365e027 100644
--- a/src/compiler/turboshaft/dead-code-elimination-reducer.h
+++ b/src/compiler/turboshaft/dead-code-elimination-reducer.h
@@ -415,8 +415,9 @@ template <class Next>
 class DeadCodeEliminationReducer
     : public UniformReducerAdapter<DeadCodeEliminationReducer, Next> {
  public:
+  TURBOSHAFT_REDUCER_BOILERPLATE()
+
   using Adapter = UniformReducerAdapter<DeadCodeEliminationReducer, Next>;
-  using Next::Asm;
 
   template <class... Args>
   explicit DeadCodeEliminationReducer(const std::tuple<Args...>& args)
diff --git a/src/compiler/turboshaft/graph-builder.cc b/src/compiler/turboshaft/graph-builder.cc
index efcb0e09b4..b28ee678eb 100644
--- a/src/compiler/turboshaft/graph-builder.cc
+++ b/src/compiler/turboshaft/graph-builder.cc
@@ -45,7 +45,7 @@ struct GraphBuilder {
   Zone* graph_zone;
   Zone* phase_zone;
   Schedule& schedule;
-  Assembler<> assembler;
+  Assembler<reducer_list<>> assembler;
   Linkage* linkage;
   SourcePositionTable* source_positions;
   NodeOriginTable* origins;
@@ -1121,15 +1121,15 @@ base::Optional<BailoutReason> BuildGraph(JSHeapBroker* broker,
                                          Graph* graph, Linkage* linkage,
                                          SourcePositionTable* source_positions,
                                          NodeOriginTable* origins) {
-  GraphBuilder builder{
-      broker,
-      graph_zone,
-      phase_zone,
-      *schedule,
-      Assembler<>(*graph, *graph, phase_zone, nullptr, std::tuple<>{}),
-      linkage,
-      source_positions,
-      origins};
+  GraphBuilder builder{broker,
+                       graph_zone,
+                       phase_zone,
+                       *schedule,
+                       Assembler<reducer_list<>>(*graph, *graph, phase_zone,
+                                                 nullptr, std::tuple<>{}),
+                       linkage,
+                       source_positions,
+                       origins};
   return builder.Run();
 }
 
diff --git a/src/compiler/turboshaft/graph.h b/src/compiler/turboshaft/graph.h
index f7696e8335..0917a775a1 100644
--- a/src/compiler/turboshaft/graph.h
+++ b/src/compiler/turboshaft/graph.h
@@ -23,7 +23,7 @@
 
 namespace v8::internal::compiler::turboshaft {
 
-template <template <class> class... Reducers>
+template <class Reducers>
 class Assembler;
 
 // `OperationBuffer` is a growable, Zone-allocated buffer to store Turboshaft
@@ -405,7 +405,7 @@ class Block : public RandomAccessStackDominatorNode<Block> {
   }
 
   friend class Graph;
-  template <template <class> class... Reducers>
+  template <class Reducers>
   friend class Assembler;
 
   Kind kind_;
diff --git a/src/compiler/turboshaft/late-escape-analysis-reducer.h b/src/compiler/turboshaft/late-escape-analysis-reducer.h
index 413163d674..c0000c8b3b 100644
--- a/src/compiler/turboshaft/late-escape-analysis-reducer.h
+++ b/src/compiler/turboshaft/late-escape-analysis-reducer.h
@@ -46,7 +46,7 @@ class LateEscapeAnalysisAnalyzer {
 template <class Next>
 class LateEscapeAnalysisReducer : public Next {
  public:
-  using Next::Asm;
+  TURBOSHAFT_REDUCER_BOILERPLATE()
 
   template <class... Args>
   explicit LateEscapeAnalysisReducer(const std::tuple<Args...>& args)
diff --git a/src/compiler/turboshaft/machine-lowering-reducer.h b/src/compiler/turboshaft/machine-lowering-reducer.h
index a61ae954be..959e997fe9 100644
--- a/src/compiler/turboshaft/machine-lowering-reducer.h
+++ b/src/compiler/turboshaft/machine-lowering-reducer.h
@@ -9,8 +9,8 @@
 #include "src/compiler/access-builder.h"
 #include "src/compiler/globals.h"
 #include "src/compiler/simplified-operator.h"
+#include "src/compiler/turboshaft/assembler.h"
 #include "src/compiler/turboshaft/index.h"
-#include "src/compiler/turboshaft/optimization-phase.h"
 #include "src/compiler/turboshaft/representations.h"
 #include "src/objects/bigint.h"
 
@@ -25,7 +25,8 @@ struct MachineLoweringReducerArgs {
 template <typename Next>
 class MachineLoweringReducer : public Next {
  public:
-  using Next::Asm;
+  TURBOSHAFT_REDUCER_BOILERPLATE()
+
   using ArgT =
       base::append_tuple_type<typename Next::ArgT, MachineLoweringReducerArgs>;
 
diff --git a/src/compiler/turboshaft/memory-optimization.h b/src/compiler/turboshaft/memory-optimization.h
index b2d7e278b4..ec64c1dc4c 100644
--- a/src/compiler/turboshaft/memory-optimization.h
+++ b/src/compiler/turboshaft/memory-optimization.h
@@ -95,7 +95,8 @@ struct MemoryOptimizationReducerArgs {
 template <class Next>
 class MemoryOptimizationReducer : public Next {
  public:
-  using Next::Asm;
+  TURBOSHAFT_REDUCER_BOILERPLATE()
+
   using ArgT = base::append_tuple_type<typename Next::ArgT,
                                        MemoryOptimizationReducerArgs>;
 
diff --git a/src/compiler/turboshaft/optimization-phase.h b/src/compiler/turboshaft/optimization-phase.h
index d3b45af59e..33f95457e6 100644
--- a/src/compiler/turboshaft/optimization-phase.h
+++ b/src/compiler/turboshaft/optimization-phase.h
@@ -68,10 +68,11 @@ template <template <class> class... Reducers>
 class OptimizationPhaseImpl {
  public:
   static void Run(Graph* input, Zone* phase_zone, NodeOriginTable* origins,
-                  const typename Assembler<Reducers...>::ArgT& reducer_args =
-                      std::tuple<>{}) {
-    Assembler<Reducers...> phase(*input, input->GetOrCreateCompanion(),
-                                 phase_zone, origins, reducer_args);
+                  const typename Assembler<reducer_list<Reducers...>>::ArgT&
+                      reducer_args = std::tuple<>{}) {
+    Assembler<reducer_list<Reducers...>> phase(
+        *input, input->GetOrCreateCompanion(), phase_zone, origins,
+        reducer_args);
     if (v8_flags.turboshaft_trace_reduction) {
       phase.template VisitGraph<true>();
     } else {
@@ -120,8 +121,8 @@ class OptimizationPhase {
  public:
   static void Run(Isolate* isolate, Graph* input, Zone* phase_zone,
                   NodeOriginTable* origins,
-                  const typename Assembler<Reducers...>::ArgT& reducer_args =
-                      std::tuple<>{}) {
+                  const typename Assembler<reducer_list<Reducers...>>::ArgT&
+                      reducer_args = std::tuple<>{}) {
 #ifdef DEBUG
     if (v8_flags.turboshaft_verify_reductions) {
       impl_with_verification_t::Run(
diff --git a/src/compiler/turboshaft/select-lowering-reducer.h b/src/compiler/turboshaft/select-lowering-reducer.h
index f586c85b44..71eb822b73 100644
--- a/src/compiler/turboshaft/select-lowering-reducer.h
+++ b/src/compiler/turboshaft/select-lowering-reducer.h
@@ -33,7 +33,7 @@ namespace v8::internal::compiler::turboshaft {
 template <class Next>
 class SelectLoweringReducer : public Next {
  public:
-  using Next::Asm;
+  TURBOSHAFT_REDUCER_BOILERPLATE()
 
   template <class... Args>
   explicit SelectLoweringReducer(const std::tuple<Args...>& args)
diff --git a/src/compiler/turboshaft/type-inference-reducer.h b/src/compiler/turboshaft/type-inference-reducer.h
index fa250e4cc7..4e08b49169 100644
--- a/src/compiler/turboshaft/type-inference-reducer.h
+++ b/src/compiler/turboshaft/type-inference-reducer.h
@@ -991,7 +991,8 @@ class TypeInferenceReducer : public Next {
   using table_t = SnapshotTable<Type>;
 
  public:
-  using Next::Asm;
+  TURBOSHAFT_REDUCER_BOILERPLATE()
+
   using ArgT =
       base::append_tuple_type<typename Next::ArgT, TypeInferenceReducerArgs>;
 
diff --git a/src/compiler/turboshaft/typed-optimizations-reducer.h b/src/compiler/turboshaft/typed-optimizations-reducer.h
index 8b938d6247..9d514a6587 100644
--- a/src/compiler/turboshaft/typed-optimizations-reducer.h
+++ b/src/compiler/turboshaft/typed-optimizations-reducer.h
@@ -16,8 +16,9 @@ template <typename Next>
 class TypedOptimizationsReducer
     : public UniformReducerAdapter<TypedOptimizationsReducer, Next> {
  public:
+  TURBOSHAFT_REDUCER_BOILERPLATE()
+
   using Adapter = UniformReducerAdapter<TypedOptimizationsReducer, Next>;
-  using Next::Asm;
 
   template <typename... Args>
   explicit TypedOptimizationsReducer(const std::tuple<Args...>& args)
diff --git a/src/compiler/turboshaft/uniform-reducer-adapter.h b/src/compiler/turboshaft/uniform-reducer-adapter.h
index f2ae6c46e2..11274e93ef 100644
--- a/src/compiler/turboshaft/uniform-reducer-adapter.h
+++ b/src/compiler/turboshaft/uniform-reducer-adapter.h
@@ -19,8 +19,8 @@ namespace v8::internal::compiler::turboshaft {
 // template <typename Next>
 // class MyReducer : public UniformReducerAdapter<MyReducer, Next> {
 //  public:
+//   TURBOSHAFT_REDUCER_BOILERPLATE()
 //   using Adapter = UniformReducerAdapter<MyReducer, Next>;
-//   using Next::Asm;
 //
 //   template <typename... Args>
 //   explicit MyReducer(const std::tuple<Args...>& args)
diff --git a/src/compiler/turboshaft/value-numbering-reducer.h b/src/compiler/turboshaft/value-numbering-reducer.h
index 5625aea889..b857587363 100644
--- a/src/compiler/turboshaft/value-numbering-reducer.h
+++ b/src/compiler/turboshaft/value-numbering-reducer.h
@@ -71,7 +71,8 @@ namespace turboshaft {
 template <class Next>
 class ValueNumberingReducer : public Next {
  public:
-  using Next::Asm;
+  TURBOSHAFT_REDUCER_BOILERPLATE()
+
   template <class... Args>
   explicit ValueNumberingReducer(const std::tuple<Args...>& args)
       : Next(args),
diff --git a/src/compiler/turboshaft/variable-reducer.h b/src/compiler/turboshaft/variable-reducer.h
index 3f3dc60671..4482215034 100644
--- a/src/compiler/turboshaft/variable-reducer.h
+++ b/src/compiler/turboshaft/variable-reducer.h
@@ -55,7 +55,7 @@ class VariableReducer : public Next {
       SnapshotTable<OpIndex, base::Optional<RegisterRepresentation>>::Snapshot;
 
  public:
-  using Next::Asm;
+  TURBOSHAFT_REDUCER_BOILERPLATE()
 
   template <class... Args>
   explicit VariableReducer(const std::tuple<Args...>& args)