ECO: Update include paths and clean up code formatting across multipl…

…e files
alirezazd · Feb 9, 2026 · Feb 9, 2026 · Feb 9, 2026 · Feb 9, 2026 · Feb 9, 2026
commit 58e61c587f603d41df45f4ebb1f1c714a3da3292
diff --git a/xls/eco/ged.cc b/xls/eco/ged.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "ged.h"
+#include "xls/eco/ged.h"
 
 #include <algorithm>
 #include <chrono>

diff --git a/xls/eco/ged.h b/xls/eco/ged.h
@@ -21,7 +21,7 @@
 #include <utility>
 #include <vector>
 
-#include "graph.h"
+#include "xls/eco/graph.h"
 
 namespace ged {
 
@@ -134,15 +134,6 @@ struct GEDResult {
   int total_cost = INT_MAX;
 };
 
-struct SearchState;
-
-void GetEditPaths(SearchState& state, CostMatrix& Cv, CostMatrix& Ce,
-                  const XLSGraph& G1, const XLSGraph& G2,
-                  std::function<bool(int64_t)> prune, int& maxcost_value,
-                  int& best_cost, GEDResult& best_result, int& expansion_count,
-                  std::vector<std::vector<double>>& dense_Cv_buffer,
-                  std::vector<std::vector<double>>& dense_Ce_buffer);
-
 GEDResult SolveGED(const XLSGraph& graph1, const XLSGraph& graph2,
                    const GEDOptions& options);
 

diff --git a/xls/eco/graph.h b/xls/eco/graph.h
@@ -69,7 +69,7 @@ struct XLSGraph
   absl::flat_hash_map<std::pair<int, int>, int, PairHash> edge_counts;
   absl::flat_hash_map<std::string, int> node_name_to_index;
   std::optional<std::string> return_node_name;
-  
+
   // Mapping between current indices and original indices after cutting
   std::vector<int> original_indices;  // current_index -> original_index
   absl::flat_hash_map<int, int> current_indices;  // original_index -> current_index

diff --git a/xls/eco/gxl_parser.h b/xls/eco/gxl_parser.h
@@ -16,7 +16,7 @@
 #define XLS_ECO_GXL_PARSER_H_
 
 #include "xls/eco/graph.h"
-#include "tinyxml2.h"
+#include "xls/eco/libs/tinyxml2/tinyxml2.h"
 #include <iostream>
 #include <map>
 #include <sstream>

diff --git a/xls/eco/ir2gxl.py b/xls/eco/ir2gxl.py
@@ -20,6 +20,11 @@
 # - Integration with C++ GED implementation
 # Please migrate to using the C++ GXL tools in //xls/eco.
 
+import sys
+import os
+from pathlib import Path
+
+
 """IR to GXL conversion library for XLS ECO.
 
 This module provides functionality to convert XLS IR files to GXL format
@@ -33,12 +38,6 @@
 the same IR graph construction logic.
 """
 
-import sys
-import os
-from pathlib import Path
-from typing import Optional
-import networkx as nx
-
 # Add the parent directory to the path so we can import the modules
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 

diff --git a/xls/eco/ir_patch.proto b/xls/eco/ir_patch.proto
@@ -65,4 +65,4 @@ message IrPatchProto {
   repeated EditPathProto edit_paths = 1;
   string function_name = 2;
   optional NodeProto return_node = 3;
-}
+}
diff --git a/xls/eco/mcs.cc b/xls/eco/mcs.cc
@@ -18,12 +18,12 @@
 #include <cmath>
 #include <limits>
 #include <string>
-#include "absl/container/flat_hash_set.h"
 
+#include "absl/container/flat_hash_set.h"
 #include "absl/log/log.h"
 
-/* Implementation of the Maximum Common Subgraph (MCS) algorithm based on the work:
-Kaiqiang Yu, Kaixin Wang, Cheng Long, Laks Lakshmanan, and Reynold Cheng.
+/* Implementation of the Maximum Common Subgraph (MCS) algorithm based on the
+work: Kaiqiang Yu, Kaixin Wang, Cheng Long, Laks Lakshmanan, and Reynold Cheng.
 "Fast Maximum Common Subgraph Search: A Redundancy-Reduced Backtracking
 Approach." Proc. ACM Manag. Data 3, 3, Article 160 (2025).
 https://doi.org/10.1145/3725404 */
@@ -207,7 +207,7 @@ void RRSplitRec(State& S, const CandidateSet& C, const ForbiddenSet& D,
     S_best = S;
     g_best_size = (int)S.size();
     VLOG(2) << indent(depth) << "[best] improved best_size=" << g_best_size;
-    
+
     // Check cutoff: stop if remaining unmatched nodes <= cutoff threshold
     if (g_mcs_cutoff >= 0) {
       int remaining = g_total_nodes - g_best_size;
@@ -218,7 +218,7 @@ void RRSplitRec(State& S, const CandidateSet& C, const ForbiddenSet& D,
         return;
       }
     }
-    
+
     if (g_best_size == (int)Q.nodes.size()) {
       g_stop = true;
       VLOG(2) << indent(depth)
@@ -347,8 +347,7 @@ MCSResult SolveMCS(const XLSGraph& graph1, const XLSGraph& graph2,
   VLOG(0) << "MCS start: G1 nodes=" << graph1.nodes.size()
           << " edges=" << graph1.edges.size()
           << " | G2 nodes=" << graph2.nodes.size()
-          << " edges=" << graph2.edges.size()
-          << " | cutoff=" << mcs_cutoff;
+          << " edges=" << graph2.edges.size() << " | cutoff=" << mcs_cutoff;
 
   g_stop = false;
   g_best_size = 0;
@@ -361,9 +360,8 @@ MCSResult SolveMCS(const XLSGraph& graph1, const XLSGraph& graph2,
   // Check cutoff condition before starting search
   int total_nodes = graph1.nodes.size();
   if (mcs_cutoff >= 0 && total_nodes <= mcs_cutoff) {
-    VLOG(0) << "MCS cutoff: total nodes (" << total_nodes
-            << ") <= cutoff (" << mcs_cutoff
-            << "), skipping MCS (will use GED for all nodes)";
+    VLOG(0) << "MCS cutoff: total nodes (" << total_nodes << ") <= cutoff ("
+            << mcs_cutoff << "), skipping MCS (will use GED for all nodes)";
     MCSResult empty_result;
     empty_result.size = 0;
     for (int i = 0; i < total_nodes; ++i) {
@@ -385,8 +383,9 @@ MCSResult SolveMCS(const XLSGraph& graph1, const XLSGraph& graph2,
   // Check if cutoff threshold is met
   int remaining_nodes = total_nodes - result.size;
   if (mcs_cutoff >= 0 && remaining_nodes <= mcs_cutoff) {
-    VLOG(0) << "MCS cutoff reached: remaining unmatched nodes (" << remaining_nodes
-            << ") <= cutoff (" << mcs_cutoff << "), stopping MCS early";
+    VLOG(0) << "MCS cutoff reached: remaining unmatched nodes ("
+            << remaining_nodes << ") <= cutoff (" << mcs_cutoff
+            << "), stopping MCS early";
   }
 
   VLOG(1) << "MCS found with " << result.size << " matched nodes";
@@ -423,8 +422,8 @@ MCSResult SolveMCS(const XLSGraph& graph1, const XLSGraph& graph2,
   return result;
 }
 absl::flat_hash_map<int, int> GetBoundaryNodes(const MCSResult& mcs,
-                                              const XLSGraph& graph1,
-                                              const XLSGraph& graph2) {
+                                               const XLSGraph& graph1,
+                                               const XLSGraph& graph2) {
   absl::flat_hash_map<int, int> boundary_nodes;
   if (mcs.mapping.empty()) return boundary_nodes;
 

diff --git a/xls/eco/test/apfloat_fmac.org.x b/xls/eco/test/apfloat_fmac.org.x
@@ -45,4 +45,4 @@ pub proc fmac {
         send(tok3, output, acc);
         acc
     }
-}
+}
diff --git a/xls/eco/test/fir_filter_fp32.rev.x b/xls/eco/test/fir_filter_fp32.rev.x
@@ -58,4 +58,4 @@ pub fn fir_filter_float32<NUM_TAPS:u32, NUM_SAMPLES:u32,
 
 pub fn main(samples: F32[6], coefficients: F32[4]) -> F32[3] {
   fir_filter_float32(samples, coefficients)
-}
+}
diff --git a/xls/eco/test/histogram.rev.x b/xls/eco/test/histogram.rev.x
@@ -165,4 +165,3 @@ pub proc histogram {
         (final_num_bins, final_min_value, final_max_value, updated_histogram)
     }
 }
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,4 +45,4 @@ pub proc fmac { @@
             send(tok3, output, acc);
             acc
         }
-    }
+    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -165,4 +165,3 @@ pub proc histogram {
		(final_num_bins, final_min_value, final_max_value, updated_histogram)
		}
		}