From 9aec0c8d9c9fbe676c06d10dfc9938353223efc5 Mon Sep 17 00:00:00 2001
From: Keith Rothman <537074+litghost@users.noreply.github.com>
Date: Wed, 19 Feb 2020 06:25:45 -0800
Subject: [PATCH] Sort wire pairs using extract_numbers.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
---
 fuzzers/074-dump_all/generate_grid.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fuzzers/074-dump_all/generate_grid.py b/fuzzers/074-dump_all/generate_grid.py
index bb90476b..4743d262 100644
--- a/fuzzers/074-dump_all/generate_grid.py
+++ b/fuzzers/074-dump_all/generate_grid.py
@@ -12,6 +12,7 @@ import pickle
 import sys
 
 from prjxray import util, lib
+from prjxray.xjson import extract_numbers
 
 
 def get_tile_grid_info(fname):
@@ -606,7 +607,10 @@ def main():
             pool, node_tree, nodes, wire_map, grid)
 
         for data in tileconn:
-            data['wire_pairs'] = tuple(sorted(data['wire_pairs']))
+            data['wire_pairs'] = tuple(
+                sorted(
+                    data['wire_pairs'],
+                    key=lambda x: tuple(extract_numbers(s) for s in x)))
 
         tileconn = tuple(
             sorted(