Make tilegrid["tiles"] the tilegrid top-level object
Signed-off-by: Clifford Wolf <clifford@clifford.at>
diff --git a/fuzzers/005-tilegrid/generate.py b/fuzzers/005-tilegrid/generate.py
index a066863..90cb6bb 100644
--- a/fuzzers/005-tilegrid/generate.py
+++ b/fuzzers/005-tilegrid/generate.py
@@ -226,6 +226,8 @@
# print(tile_type, offset)
assert False
+database = database["tiles"]
+
#######################################
# Write
diff --git a/fuzzers/070-tileconn/generate.py b/fuzzers/070-tileconn/generate.py
index 1c94746..7a707ac 100644
--- a/fuzzers/070-tileconn/generate.py
+++ b/fuzzers/070-tileconn/generate.py
@@ -11,7 +11,7 @@
os.getenv("XRAY_DATABASE")), "r") as f:
grid = json.load(f)
-for tile, tiledata in grid["tiles"].items():
+for tile, tiledata in grid.items():
grid_xy = (tiledata["grid_x"], tiledata["grid_y"])
grid2tile[grid_xy] = tile
@@ -61,8 +61,8 @@
if tile1 not in tilenodes: return
if tile2 not in tilenodes: return
- tile1data = grid["tiles"][tile1]
- tile2data = grid["tiles"][tile2]
+ tile1data = grid[tile1]
+ tile2data = grid[tile2]
grid1_xy = (tile1data["grid_x"], tile1data["grid_y"])
grid2_xy = (tile2data["grid_x"], tile2data["grid_y"])
@@ -91,7 +91,7 @@
database[key] &= wire_pairs
-for tile, tiledata in grid["tiles"].items():
+for tile, tiledata in grid.items():
grid_right_xy = (tiledata["grid_x"] + 1, tiledata["grid_y"])
grid_below_xy = (tiledata["grid_x"], tiledata["grid_y"] + 1)
diff --git a/htmlgen/htmlgen.py b/htmlgen/htmlgen.py
index 3b933fd..3693adc 100755
--- a/htmlgen/htmlgen.py
+++ b/htmlgen/htmlgen.py
@@ -160,13 +160,10 @@
data = f.read()
if not data:
grid = {
- "segments": {},
- "tiles": {
- "NULL": {
- "grid_x": 0,
- "grid_y": 0,
- "type": "NULL",
- }
+ "NULL": {
+ "grid_x": 0,
+ "grid_y": 0,
+ "type": "NULL",
}
}
else:
diff --git a/tools/simpleroute.py b/tools/simpleroute.py
index 8613961..d8293fd 100755
--- a/tools/simpleroute.py
+++ b/tools/simpleroute.py
@@ -27,7 +27,7 @@
with open("%s/%s/tilegrid.json" % (os.getenv("XRAY_DATABASE_DIR"),
os.getenv("XRAY_DATABASE")), "r") as f:
- tiles = json.load(f)["tiles"]
+ tilegrid = json.load(f)
with open("%s/%s/tileconn.json" % (os.getenv("XRAY_DATABASE_DIR"),
os.getenv("XRAY_DATABASE")), "r") as f:
@@ -37,7 +37,7 @@
grid_to_tile = dict()
nodes = MergeFind()
- for tile, tiledata in tiles.items():
+ for tile, tiledata in tilegrid.items():
if tiledata["type"] not in type_to_tiles:
type_to_tiles[tiledata["type"]] = list()
type_to_tiles[tiledata["type"]].append(tile)
@@ -48,7 +48,7 @@
for entry in tileconn:
type_a, type_b = entry["tile_types"]
for tile_a in type_to_tiles[type_a]:
- tiledata_a = tiles[tile_a]
+ tiledata_a = tilegrid[tile_a]
grid_a = (tiledata_a["grid_x"], tiledata_a["grid_y"])
grid_b = (
grid_a[0] + entry["grid_deltas"][0],
@@ -58,7 +58,7 @@
continue
tile_b = grid_to_tile[grid_b]
- tiledata_b = tiles[tile_b]
+ tiledata_b = tilegrid[tile_b]
if tiledata_b["type"] != type_b:
continue
diff --git a/utils/segmaker.py b/utils/segmaker.py
index 5910096..bca2054 100644
--- a/utils/segmaker.py
+++ b/utils/segmaker.py
@@ -39,7 +39,7 @@
self.segments_by_type = dict()
- for tilename, tiledata in self.grid["tiles"].items():
+ for tilename, tiledata in self.grid.items():
if "baseaddr" not in tiledata:
continue
diff --git a/utils/tileconnloops.py b/utils/tileconnloops.py
index 1bb825a..9499ab1 100644
--- a/utils/tileconnloops.py
+++ b/utils/tileconnloops.py
@@ -7,7 +7,7 @@
with open("%s/%s/tilegrid.json" % (os.getenv("XRAY_DATABASE_DIR"),
os.getenv("XRAY_DATABASE")), "r") as f:
- tilegrid = json.load(f)["tiles"]
+ tilegrid = json.load(f)
with open("%s/%s/tileconn.json" % (os.getenv("XRAY_DATABASE_DIR"),
os.getenv("XRAY_DATABASE")), "r") as f:
