Rename structural_node class to StructuralNode (phate#657)

EECS-NTNU · Oct 12, 2024 · d5a6f0a · d5a6f0a
1 parent b8f81a0
commit d5a6f0a
Show file tree

Hide file tree

Showing 65 changed files with 182 additions and 188 deletions.
diff --git a/jlm/hls/backend/rhls2firrtl/RhlsToFirrtlConverter.cpp b/jlm/hls/backend/rhls2firrtl/RhlsToFirrtlConverter.cpp
@@ -2517,7 +2517,7 @@ RhlsToFirrtlConverter::TraceArgument(rvsdg::RegionArgument * arg)
       else if (auto o = dynamic_cast<jlm::rvsdg::structural_output *>(origin))
       {
         // Check if we the input of one loop_node is connected to the output of another
-        // structural_node, i.e., if the input is connected to the output of another loop_node
+        // StructuralNode, i.e., if the input is connected to the output of another loop_node
         return TraceStructuralOutput(o);
       }
       // Else we have reached the source

diff --git a/jlm/hls/backend/rvsdg2rhls/GammaConversion.cpp b/jlm/hls/backend/rvsdg2rhls/GammaConversion.cpp
@@ -134,7 +134,7 @@ static void
 ConvertGammaNodesInRegion(rvsdg::Region & region);
 
 static void
-ConvertGammaNodesInStructuralNode(rvsdg::structural_node & structuralNode)
+ConvertGammaNodesInStructuralNode(rvsdg::StructuralNode & structuralNode)
 {
   for (size_t n = 0; n < structuralNode.nsubregions(); n++)
   {
@@ -159,7 +159,7 @@ ConvertGammaNodesInRegion(rvsdg::Region & region)
 {
   for (auto & node : rvsdg::topdown_traverser(&region))
   {
-    if (auto structuralNode = dynamic_cast<rvsdg::structural_node *>(node))
+    if (auto structuralNode = dynamic_cast<rvsdg::StructuralNode *>(node))
     {
       ConvertGammaNodesInStructuralNode(*structuralNode);
     }

diff --git a/jlm/hls/backend/rvsdg2rhls/ThetaConversion.cpp b/jlm/hls/backend/rvsdg2rhls/ThetaConversion.cpp
@@ -47,7 +47,7 @@ static void
 ConvertThetaNodesInRegion(rvsdg::Region & region);
 
 static void
-ConvertThetaNodesInStructuralNode(jlm::rvsdg::structural_node & structuralNode)
+ConvertThetaNodesInStructuralNode(rvsdg::StructuralNode & structuralNode)
 {
   for (size_t n = 0; n < structuralNode.nsubregions(); n++)
   {
@@ -65,7 +65,7 @@ ConvertThetaNodesInRegion(rvsdg::Region & region)
 {
   for (auto & node : jlm::rvsdg::topdown_traverser(&region))
   {
-    if (auto structuralNode = dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (auto structuralNode = dynamic_cast<rvsdg::StructuralNode *>(node))
     {
       ConvertThetaNodesInStructuralNode(*structuralNode);
     }

diff --git a/jlm/hls/backend/rvsdg2rhls/UnusedStateRemoval.cpp b/jlm/hls/backend/rvsdg2rhls/UnusedStateRemoval.cpp
@@ -191,7 +191,7 @@ static void
 RemoveUnusedStatesInRegion(rvsdg::Region & region);
 
 static void
-RemoveUnusedStatesInStructuralNode(rvsdg::structural_node & structuralNode)
+RemoveUnusedStatesInStructuralNode(rvsdg::StructuralNode & structuralNode)
 {
   // Remove unused states from innermost regions first
   for (size_t n = 0; n < structuralNode.nsubregions(); n++)
@@ -218,7 +218,7 @@ RemoveUnusedStatesInRegion(rvsdg::Region & region)
 {
   for (auto & node : rvsdg::topdown_traverser(&region))
   {
-    if (auto structuralNode = dynamic_cast<rvsdg::structural_node *>(node))
+    if (auto structuralNode = dynamic_cast<rvsdg::StructuralNode *>(node))
     {
       RemoveUnusedStatesInStructuralNode(*structuralNode);
     }

diff --git a/jlm/hls/backend/rvsdg2rhls/add-buffers.cpp b/jlm/hls/backend/rvsdg2rhls/add-buffers.cpp
@@ -16,7 +16,7 @@ add_buffers(rvsdg::Region * region, bool pass_through)
 {
   for (auto & node : jlm::rvsdg::topdown_traverser(region))
   {
-    if (auto structnode = dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (auto structnode = dynamic_cast<rvsdg::StructuralNode *>(node))
     {
       for (size_t n = 0; n < structnode->nsubregions(); n++)
       {

diff --git a/jlm/hls/backend/rvsdg2rhls/add-forks.cpp b/jlm/hls/backend/rvsdg2rhls/add-forks.cpp
@@ -30,7 +30,7 @@ add_forks(rvsdg::Region * region)
   }
   for (auto & node : jlm::rvsdg::topdown_traverser(region))
   {
-    if (auto structnode = dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (auto structnode = dynamic_cast<rvsdg::StructuralNode *>(node))
     {
       for (size_t n = 0; n < structnode->nsubregions(); n++)
       {

diff --git a/jlm/hls/backend/rvsdg2rhls/add-prints.cpp b/jlm/hls/backend/rvsdg2rhls/add-prints.cpp
@@ -18,7 +18,7 @@ add_prints(rvsdg::Region * region)
 {
   for (auto & node : jlm::rvsdg::topdown_traverser(region))
   {
-    if (auto structnode = dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (auto structnode = dynamic_cast<rvsdg::StructuralNode *>(node))
     {
       for (size_t n = 0; n < structnode->nsubregions(); n++)
       {
@@ -106,7 +106,7 @@ convert_prints(
 {
   for (auto & node : jlm::rvsdg::topdown_traverser(region))
   {
-    if (auto structnode = dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (auto structnode = dynamic_cast<rvsdg::StructuralNode *>(node))
     {
       for (size_t n = 0; n < structnode->nsubregions(); n++)
       {

diff --git a/jlm/hls/backend/rvsdg2rhls/add-sinks.cpp b/jlm/hls/backend/rvsdg2rhls/add-sinks.cpp
@@ -23,7 +23,7 @@ add_sinks(rvsdg::Region * region)
   }
   for (auto & node : jlm::rvsdg::topdown_traverser(region))
   {
-    if (auto structnode = dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (auto structnode = dynamic_cast<rvsdg::StructuralNode *>(node))
     {
       for (size_t n = 0; n < structnode->nsubregions(); n++)
       {

diff --git a/jlm/hls/backend/rvsdg2rhls/add-triggers.cpp b/jlm/hls/backend/rvsdg2rhls/add-triggers.cpp
@@ -89,7 +89,7 @@ add_triggers(rvsdg::Region * region)
   auto trigger = get_trigger(region);
   for (auto & node : jlm::rvsdg::topdown_traverser(region))
   {
-    if (dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (rvsdg::is<rvsdg::structural_op>(node))
     {
       if (auto ln = dynamic_cast<llvm::lambda::node *>(node))
       {

diff --git a/jlm/hls/backend/rvsdg2rhls/alloca-conv.cpp b/jlm/hls/backend/rvsdg2rhls/alloca-conv.cpp
@@ -120,7 +120,7 @@ alloca_conv(rvsdg::Region * region)
 {
   for (auto & node : jlm::rvsdg::topdown_traverser(region))
   {
-    if (auto structnode = dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (auto structnode = dynamic_cast<rvsdg::StructuralNode *>(node))
     {
       for (size_t n = 0; n < structnode->nsubregions(); n++)
       {

diff --git a/jlm/hls/backend/rvsdg2rhls/check-rhls.cpp b/jlm/hls/backend/rvsdg2rhls/check-rhls.cpp
@@ -17,7 +17,7 @@ check_rhls(rvsdg::Region * sr)
 {
   for (auto & node : jlm::rvsdg::topdown_traverser(sr))
   {
-    if (dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (rvsdg::is<rvsdg::structural_op>(node))
     {
       if (auto ln = dynamic_cast<hls::loop_node *>(node))
       {

diff --git a/jlm/hls/backend/rvsdg2rhls/dae-conv.cpp b/jlm/hls/backend/rvsdg2rhls/dae-conv.cpp
@@ -392,7 +392,7 @@ process_loopnode(loop_node * loopNode)
         bool can_decouple = true;
         for (auto sn : data_slice)
         {
-          if (dynamic_cast<jlm::rvsdg::structural_node *>(sn))
+          if (rvsdg::is<rvsdg::structural_op>(sn))
           {
             // data slice may not contain loops
             can_decouple = false;
@@ -420,7 +420,7 @@ process_loopnode(loop_node * loopNode)
         JLM_ASSERT(!can_decouple || !data_slice.count(simplenode));
         for (auto sn : state_slice)
         {
-          if (dynamic_cast<jlm::rvsdg::structural_node *>(sn))
+          if (rvsdg::is<rvsdg::structural_op>(sn))
           {
             // state slice may not contain loops
             can_decouple = false;

diff --git a/jlm/hls/backend/rvsdg2rhls/distribute-constants.cpp b/jlm/hls/backend/rvsdg2rhls/distribute-constants.cpp
@@ -77,7 +77,7 @@ hls::distribute_constants(rvsdg::Region * region)
   // buffers for them
   for (auto & node : rvsdg::topdown_traverser(region))
   {
-    if (dynamic_cast<rvsdg::structural_node *>(node))
+    if (rvsdg::is<rvsdg::structural_op>(node))
     {
       if (auto ln = dynamic_cast<llvm::lambda::node *>(node))
       {

diff --git a/jlm/hls/backend/rvsdg2rhls/instrument-ref.cpp b/jlm/hls/backend/rvsdg2rhls/instrument-ref.cpp
@@ -153,7 +153,7 @@ instrument_ref(
   auto void_ptr = jlm::llvm::PointerType::Create();
   for (auto & node : jlm::rvsdg::topdown_traverser(region))
   {
-    if (auto structnode = dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (auto structnode = dynamic_cast<rvsdg::StructuralNode *>(node))
     {
       for (size_t n = 0; n < structnode->nsubregions(); n++)
       {

diff --git a/jlm/hls/backend/rvsdg2rhls/mem-conv.cpp b/jlm/hls/backend/rvsdg2rhls/mem-conv.cpp
@@ -332,7 +332,7 @@ gather_mem_nodes(
 {
   for (auto & node : jlm::rvsdg::topdown_traverser(region))
   {
-    if (auto structnode = dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (auto structnode = dynamic_cast<jlm::rvsdg::StructuralNode *>(node))
     {
       for (size_t n = 0; n < structnode->nsubregions(); n++)
         gather_mem_nodes(

diff --git a/jlm/hls/backend/rvsdg2rhls/mem-sep.cpp b/jlm/hls/backend/rvsdg2rhls/mem-sep.cpp
@@ -71,7 +71,7 @@ gather_mem_nodes(rvsdg::Region * region, std::vector<jlm::rvsdg::simple_node *>
 {
   for (auto & node : jlm::rvsdg::topdown_traverser(region))
   {
-    if (auto structnode = dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (auto structnode = dynamic_cast<rvsdg::StructuralNode *>(node))
     {
       for (size_t n = 0; n < structnode->nsubregions(); n++)
         gather_mem_nodes(structnode->subregion(n), mem_nodes);

diff --git a/jlm/hls/backend/rvsdg2rhls/memstate-conv.cpp b/jlm/hls/backend/rvsdg2rhls/memstate-conv.cpp
@@ -29,7 +29,7 @@ memstate_conv(rvsdg::Region * region)
 {
   for (auto & node : jlm::rvsdg::topdown_traverser(region))
   {
-    if (auto structnode = dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (auto structnode = dynamic_cast<rvsdg::StructuralNode *>(node))
     {
       for (size_t n = 0; n < structnode->nsubregions(); n++)
         memstate_conv(structnode->subregion(n));

diff --git a/jlm/hls/backend/rvsdg2rhls/merge-gamma.cpp b/jlm/hls/backend/rvsdg2rhls/merge-gamma.cpp
@@ -201,7 +201,7 @@ merge_gamma(rvsdg::Region * region)
     changed = false;
     for (auto & node : jlm::rvsdg::topdown_traverser(region))
     {
-      if (auto structnode = dynamic_cast<jlm::rvsdg::structural_node *>(node))
+      if (auto structnode = dynamic_cast<rvsdg::StructuralNode *>(node))
       {
         for (size_t n = 0; n < structnode->nsubregions(); n++)
           merge_gamma(structnode->subregion(n));

diff --git a/jlm/hls/backend/rvsdg2rhls/remove-redundant-buf.cpp b/jlm/hls/backend/rvsdg2rhls/remove-redundant-buf.cpp
@@ -37,7 +37,7 @@ remove_redundant_buf(rvsdg::Region * region)
 {
   for (auto & node : jlm::rvsdg::topdown_traverser(region))
   {
-    if (auto structnode = dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (auto structnode = dynamic_cast<rvsdg::StructuralNode *>(node))
     {
       for (size_t n = 0; n < structnode->nsubregions(); n++)
       {

diff --git a/jlm/hls/backend/rvsdg2rhls/remove-unused-state.cpp b/jlm/hls/backend/rvsdg2rhls/remove-unused-state.cpp
@@ -18,7 +18,7 @@ remove_unused_state(rvsdg::Region * region, bool can_remove_arguments)
   // process children first so that unnecessary users get removed
   for (auto & node : jlm::rvsdg::topdown_traverser(region))
   {
-    if (auto structnode = dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (auto structnode = dynamic_cast<rvsdg::StructuralNode *>(node))
     {
       if (auto gn = dynamic_cast<rvsdg::GammaNode *>(node))
       {

diff --git a/jlm/hls/backend/rvsdg2rhls/rvsdg2rhls.cpp b/jlm/hls/backend/rvsdg2rhls/rvsdg2rhls.cpp
@@ -138,7 +138,7 @@ inline_calls(rvsdg::Region * region)
 {
   for (auto & node : jlm::rvsdg::topdown_traverser(region))
   {
-    if (auto structnode = dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (auto structnode = dynamic_cast<rvsdg::StructuralNode *>(node))
     {
       for (size_t n = 0; n < structnode->nsubregions(); n++)
       {
@@ -180,7 +180,7 @@ convert_alloca(rvsdg::Region * region)
 {
   for (auto & node : jlm::rvsdg::topdown_traverser(region))
   {
-    if (auto structnode = dynamic_cast<jlm::rvsdg::structural_node *>(node))
+    if (auto structnode = dynamic_cast<rvsdg::StructuralNode *>(node))
     {
       for (size_t n = 0; n < structnode->nsubregions(); n++)
       {

diff --git a/jlm/hls/ir/hls.hpp b/jlm/hls/ir/hls.hpp
@@ -743,15 +743,15 @@ class ExitResult final : public rvsdg::RegionResult
   }
 };
 
-class loop_node final : public jlm::rvsdg::structural_node
+class loop_node final : public rvsdg::StructuralNode
 {
 public:
   virtual ~loop_node()
   {}
 
 private:
   inline loop_node(rvsdg::Region * parent)
-      : structural_node(loop_op(), parent, 1)
+      : StructuralNode(loop_op(), parent, 1)
   {}
 
   jlm::rvsdg::node_output * _predicate_buffer;
@@ -763,7 +763,7 @@ class loop_node final : public jlm::rvsdg::structural_node
   rvsdg::Region *
   subregion() const noexcept
   {
-    return structural_node::subregion(0);
+    return StructuralNode::subregion(0);
   }
 
   [[nodiscard]] rvsdg::RegionResult *