From 104536b7aae5970ae1d1e95394f26fbf04603d12 Mon Sep 17 00:00:00 2001
From: Alessandro Comodi <acomodi@antmicro.com>
Date: Wed, 2 Jun 2021 09:49:30 +0200
Subject: interchange: add support for generating BEL clusters

Clustering greatly helps the placer to identify and pack together
specific cells at the same site (e.g. LUT+FF), or cells that are chained through
dedicated interconnections (e.g. CARRY CHAINS)

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
---
 fpga_interchange/chipdb.h | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'fpga_interchange/chipdb.h')

diff --git a/fpga_interchange/chipdb.h b/fpga_interchange/chipdb.h
index 155c2bb2..78d9c1c5 100644
--- a/fpga_interchange/chipdb.h
+++ b/fpga_interchange/chipdb.h
@@ -402,6 +402,27 @@ NPNR_PACKED_STRUCT(struct MacroExpansionPOD {
     RelSlice<MacroParamMapRulePOD> param_rules;
 });
 
+NPNR_PACKED_STRUCT(struct ClusterCellPortPOD {
+    uint32_t cell;
+    uint32_t port;
+});
+
+NPNR_PACKED_STRUCT(struct ChainablePortPOD {
+    uint32_t cell_source;
+    uint32_t cell_sink;
+    uint32_t bel_source;
+    uint32_t bel_sink;
+    int16_t avg_x_offset;
+    int16_t avg_y_offset;
+});
+
+NPNR_PACKED_STRUCT(struct ClusterPOD {
+    uint32_t name;
+    RelSlice<uint32_t> root_cell_types;
+    RelSlice<ChainablePortPOD> chainable_ports;
+    RelSlice<ClusterCellPortPOD> cluster_cells_map;
+});
+
 NPNR_PACKED_STRUCT(struct ChipInfoPOD {
     RelPtr<char> name;
     RelPtr<char> generator;
@@ -421,6 +442,8 @@ NPNR_PACKED_STRUCT(struct ChipInfoPOD {
     RelSlice<MacroPOD> macros;
     RelSlice<MacroExpansionPOD> macro_rules;
 
+    RelSlice<ClusterPOD> clusters;
+
     // BEL bucket constids.
     RelSlice<int32_t> bel_buckets;
 
@@ -460,6 +483,11 @@ inline const SiteInstInfoPOD &site_inst_info(const ChipInfoPOD *chip_info, int32
     return chip_info->sites[chip_info->tiles[tile].sites[site]];
 }
 
+inline const ClusterPOD &cluster_info(const ChipInfoPOD *chip_info, int32_t cluster)
+{
+    return chip_info->clusters[cluster];
+}
+
 enum SyntheticType
 {
     NOT_SYNTH = 0,
-- 
cgit v1.2.3


From e8191dc061ecdb6c29d9a9c21f168dd91fa137c1 Mon Sep 17 00:00:00 2001
From: Alessandro Comodi <acomodi@antmicro.com>
Date: Thu, 10 Jun 2021 12:42:30 +0200
Subject: interchange: increase chipinfo version

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
---
 fpga_interchange/chipdb.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'fpga_interchange/chipdb.h')

diff --git a/fpga_interchange/chipdb.h b/fpga_interchange/chipdb.h
index 78d9c1c5..fde35e7f 100644
--- a/fpga_interchange/chipdb.h
+++ b/fpga_interchange/chipdb.h
@@ -34,7 +34,7 @@ NEXTPNR_NAMESPACE_BEGIN
  * kExpectedChipInfoVersion
  */
 
-static constexpr int32_t kExpectedChipInfoVersion = 10;
+static constexpr int32_t kExpectedChipInfoVersion = 11;
 
 // Flattened site indexing.
 //
-- 
cgit v1.2.3