Update to prjtrellis 85485871fa644bcc90d078374cae8647a5410453
Signed-off-by: David Shah <davey1576@gmail.com>
diff --git a/ECP5/tiledata/MIB2_DSP0/bits.db b/ECP5/tiledata/MIB2_DSP0/bits.db
index aded8a6..3772e77 100644
--- a/ECP5/tiledata/MIB2_DSP0/bits.db
+++ b/ECP5/tiledata/MIB2_DSP0/bits.db
@@ -1,6 +1,257 @@
# Routing Mux Bits
# Non-Routing Configuration
+.config ALU54_3.MASK01 10000000000000000000000000000000111111111111111111001111
+-
+-
+-
+-
+F104B0
+F105B0
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+F103B1
+F102B1
+F100B1
+F99B1
+F98B1
+F97B1
+F96B1
+F91B1
+F90B1
+F82B1
+F81B1
+F80B1
+F78B1
+F77B1
+F71B1
+F70B1
+F69B1
+F68B1
+F67B1
+F66B1
+F65B1
+F64B1
+F63B1
+F62B1
+F57B1
+F56B1
+F55B1
+F54B1
+F51B1
+F50B1
+F49B1
+-
+
+.config ALU54_3.MASKPAT 11000000000000000000000000000000000000000000000000000000
+F73B1
+F76B0
+F39B1
+F29B0
+F89B0
+F22B0
+F38B1
+F28B0
+F88B0
+F6B0
+F51B0
+F27B0
+F79B0
+F20B0
+F50B0
+F14B0
+F87B0
+F18B0
+F49B0
+F5B0
+F86B0
+F19B0
+F48B0
+F1B0
+F85B0
+F66B0
+F47B0
+F3B0
+F84B0
+F68B0
+F46B0
+F2B0
+F83B0
+F67B0
+F45B0
+F23B0
+F78B0
+F65B0
+F44B0
+F26B0
+F82B0
+F64B0
+F43B0
+F25B0
+F77B0
+F63B0
+F42B0
+F4B0
+F81B0
+F62B0
+F41B0
+F0B0
+F80B0
+F61B0
+-
+-
+
+.config ALU54_3.MCPAT 11000000000000000000000000000000000000000100010001000000
+F103B0
+F11B0
+F9B0
+F30B0
+F102B0
+F12B0
+-
+F31B0
+F101B0
+F13B0
+-
+F16B0
+F100B0
+F75B0
+-
+F15B0
+F99B0
+F74B0
+F10B0
+F17B0
+F98B0
+F8B0
+F40B0
+F39B0
+F97B0
+F7B0
+F60B0
+F38B0
+F96B0
+F21B0
+F59B0
+F37B0
+F95B0
+F73B0
+F58B0
+F36B0
+F94B0
+F72B0
+F57B0
+F35B0
+F93B0
+F70B0
+F56B0
+F34B0
+F92B0
+F69B0
+F55B0
+F33B0
+F91B0
+F24B0
+F54B0
+F32B0
+F90B0
+F71B0
+-
+-
+
+.config_enum ALU54_3.LEGACY DISABLED
+DISABLED -
+ENABLED F89B1
+
+.config_enum ALU54_3.MASKPAT_SOURCE DYNAMIC
+DYNAMIC -
+STATIC F87B1
+
+.config_enum ALU54_3.MCPAT_SOURCE DYNAMIC
+DYNAMIC -
+STATIC F85B1
+
+.config_enum ALU54_3.MODE NONE
+ALU54B F40B1
+NONE -
+
+.config_enum ALU54_3.REG_FLAG_CLK NONE
+CLK0 F36B1 F37B1
+CLK1 F36B1 F37B1
+CLK2 F36B1 F37B1
+CLK3 F36B1 F37B1
+NONE -
+
+.config_enum ALU54_3.REG_INPUTC1_CLK NONE
+CLK0 F21B1 F22B1
+CLK1 F21B1 F22B1
+CLK2 F21B1 F22B1
+CLK3 F21B1 F22B1
+NONE -
+
+.config_enum ALU54_3.REG_OPCODEIN_1_CLK CLK3
+CLK0 -
+CLK1 -
+CLK2 -
+CLK3 -
+NONE F84B1
+
+.config_enum ALU54_3.REG_OPCODEOP0_0_CE CE3
+CE0 F60B1 F61B1
+CE1 F61B1
+CE2 F60B1
+CE3 -
+
+.config_enum ALU54_3.REG_OPCODEOP0_1_CE CE3
+CE0 F92B1 F93B1
+CE1 F93B1
+CE2 F92B1
+CE3 -
+
+.config_enum ALU54_3.REG_OPCODEOP0_1_CLK CLK3
+CLK0 -
+CLK1 -
+CLK2 -
+CLK3 -
+NONE F75B1
+
+.config_enum ALU54_3.REG_OPCODEOP1_1_CLK CLK3
+CLK0 -
+CLK1 -
+CLK2 -
+CLK3 -
+NONE F76B1
+
+.config_enum ALU54_3.REG_OUTPUT0_CLK NONE
+CLK0 F34B1 F35B1
+CLK1 F34B1 F35B1
+CLK2 F34B1 F35B1
+CLK3 F34B1 F35B1
+NONE -
+
+.config_enum ALU54_3.REG_OUTPUT1_CLK NONE
+CLK0 F36B1 F37B1
+CLK1 F36B1 F37B1
+CLK2 F36B1 F37B1
+CLK3 F36B1 F37B1
+NONE -
+
.config_enum MULT18_0.REG_PIPELINE_CLK CLK3
CLK0 -
CLK1 -
diff --git a/ECP5/tiledata/MIB2_DSP1/bits.db b/ECP5/tiledata/MIB2_DSP1/bits.db
index a626b48..32dafda 100644
--- a/ECP5/tiledata/MIB2_DSP1/bits.db
+++ b/ECP5/tiledata/MIB2_DSP1/bits.db
@@ -1,6 +1,202 @@
# Routing Mux Bits
# Non-Routing Configuration
+.config ALU54_3.MASK01 11111111111111111111111111111111000000000000000000110000
+F0B0
+F1B0
+F2B0
+F6B0
+-
+-
+F3B0
+F4B0
+F7B0
+F8B0
+F5B0
+F9B0
+F10B0
+F11B0
+F12B0
+F13B0
+F14B0
+F17B1
+F15B1
+F10B1
+F9B1
+F8B1
+F1B1
+F0B1
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+.config ALU54_3.MCPAT 11111111111111111111111111111111111111111011101110111111
+-
+-
+-
+-
+-
+-
+F15B0
+-
+-
+-
+F16B0
+-
+-
+-
+F17B0
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+.config ALU54_3.RNDPAT 11000000000000000000000011111111111111110000000000000000
+F79B0
+F86B0
+F81B0
+F87B0
+F82B0
+F88B0
+F78B0
+F89B0
+F77B0
+F75B0
+F83B0
+F85B0
+F76B0
+F74B0
+F80B0
+F84B0
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+F32B0
+F36B0
+F31B0
+F37B0
+F30B0
+F35B0
+F29B0
+F38B0
+F33B0
+F34B0
+F28B0
+F39B0
+F19B0
+F23B0
+F22B0
+F24B0
+F20B0
+F25B0
+F21B0
+F26B0
+F18B0
+F27B0
+-
+-
+
+.config_enum ALU54_3.FORCE_ZERO_BARREL_SHIFT ENABLED
+DISABLED F73B0
+ENABLED -
+
+.config_enum ALU54_3.MODE NONE
+ALU54B F72B0 F90B0 F101B0
+NONE -
+
+.config_enum ALU54_3.REG_INPUTC0_CLK NONE
+CLK0 F92B1 F93B1 F96B1 F97B1
+CLK1 F93B1 F96B1 F97B1
+CLK2 F92B1 F96B1 F97B1
+CLK3 F96B1 F97B1
+NONE -
+
+.config_enum ALU54_3.REG_INPUTC1_CLK NONE
+CLK0 F98B1 F101B1
+CLK1 F98B1 F101B1
+CLK2 F98B1 F101B1
+CLK3 F98B1 F101B1
+NONE -
+
.config_enum MULT18_0.MODE NONE
MULT18X18D F72B0 F90B0 F101B0
NONE -
diff --git a/ECP5/tiledata/MIB2_DSP2/bits.db b/ECP5/tiledata/MIB2_DSP2/bits.db
index 71a527c..f75f79a 100644
--- a/ECP5/tiledata/MIB2_DSP2/bits.db
+++ b/ECP5/tiledata/MIB2_DSP2/bits.db
@@ -1,6 +1,159 @@
# Routing Mux Bits
# Non-Routing Configuration
+.config ALU54_3.RNDPAT 11111111111111111111111100000000000000001111111111111111
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+F59B0
+F60B0
+F58B0
+F48B0
+F57B0
+F49B0
+F50B0
+F61B0
+F56B0
+F62B0
+F65B0
+F63B0
+F55B0
+F64B0
+F54B0
+F51B0
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+.config_enum ALU54_3.MODE NONE
+ALU54B F1B0 F14B0 F82B0 F83B0 F86B0
+NONE -
+
+.config_enum ALU54_3.REG_FLAG_CLK NONE
+CLK0 F58B1 F59B1
+CLK1 F58B1 F59B1
+CLK2 F58B1 F59B1
+CLK3 F58B1 F59B1
+NONE -
+
+.config_enum ALU54_3.REG_OPCODEIN_0_CLK CLK3
+CLK0 F34B1 F35B1
+CLK1 F35B1
+CLK2 F34B1
+CLK3 -
+NONE -
+
+.config_enum ALU54_3.REG_OPCODEIN_0_RST RST3
+RST0 F92B1 F93B1
+RST1 F93B1
+RST2 F92B1
+RST3 -
+
+.config_enum ALU54_3.REG_OPCODEIN_1_CLK CLK3
+CLK0 F42B1 F43B1
+CLK1 F43B1
+CLK2 F42B1
+CLK3 -
+NONE -
+
+.config_enum ALU54_3.REG_OPCODEIN_1_RST RST3
+RST0 F104B1 F105B1
+RST1 F105B1
+RST2 F104B1
+RST3 -
+
+.config_enum ALU54_3.REG_OPCODEOP0_0_CLK CLK3
+CLK0 F78B1 F79B1
+CLK1 F78B1
+CLK2 F79B1
+CLK3 -
+NONE -
+
+.config_enum ALU54_3.REG_OPCODEOP0_1_CLK CLK3
+CLK0 F74B1 F75B1
+CLK1 F74B1
+CLK2 F75B1
+CLK3 -
+NONE -
+
+.config_enum ALU54_3.REG_OPCODEOP1_0_CLK CLK3
+CLK0 F78B1 F79B1
+CLK1 F78B1
+CLK2 F79B1
+CLK3 -
+NONE -
+
+.config_enum ALU54_3.REG_OPCODEOP1_1_CLK CLK3
+CLK0 F74B1 F75B1
+CLK1 F74B1
+CLK2 F75B1
+CLK3 -
+NONE -
+
+.config_enum ALU54_3.REG_OUTPUT0_CLK NONE
+CLK0 F8B1 F9B1 F48B1 F49B1
+CLK1 F9B1 F48B1 F49B1
+CLK2 F8B1 F48B1 F49B1
+CLK3 F48B1 F49B1
+NONE -
+
+.config_enum ALU54_3.REG_OUTPUT0_RST RST3
+RST0 F24B1 F25B1
+RST1 F25B1
+RST2 F24B1
+RST3 -
+
+.config_enum ALU54_3.REG_OUTPUT1_CLK NONE
+CLK0 F11B1 F12B1 F58B1 F59B1
+CLK1 F11B1 F58B1 F59B1
+CLK2 F12B1 F58B1 F59B1
+CLK3 F58B1 F59B1
+NONE -
+
+.config_enum ALU54_3.REG_OUTPUT1_RST RST3
+RST0 F36B1 F37B1
+RST1 F37B1
+RST2 F36B1
+RST3 -
+
+.config_enum ALU54_3.RESETMODE SYNC
+ASYNC F18B1 F28B1 F40B1 F50B1 F55B1 F65B1 F89B1 F96B1
+SYNC -
+
.config_enum MULT18_0.MODE NONE
MULT18X18D F1B0 F14B0 F82B0 F83B0 F86B0
NONE -
diff --git a/ECP5/tiledata/MIB2_DSP3/bits.db b/ECP5/tiledata/MIB2_DSP3/bits.db
index 7dedeb7..6ac38f1 100644
--- a/ECP5/tiledata/MIB2_DSP3/bits.db
+++ b/ECP5/tiledata/MIB2_DSP3/bits.db
@@ -406,6 +406,54 @@
# Non-Routing Configuration
+.config_enum ALU54_3.MODE NONE
+ALU54B F28B1 F30B0 F34B1 F76B1
+NONE -
+
+.config_enum ALU54_3.REG_FLAG_CLK CLK3
+CLK0 F3B1 F4B1
+CLK1 F3B1
+CLK2 F4B1
+CLK3 -
+NONE -
+
+.config_enum ALU54_3.REG_INPUTC1_CLK CLK3
+CLK0 F30B1 F31B1
+CLK1 F30B1
+CLK2 F31B1
+CLK3 -
+NONE -
+
+.config_enum ALU54_3.REG_OPCODEOP0_0_RST RST3
+RST0 F10B1 F11B1
+RST1 F11B1
+RST2 F10B1
+RST3 -
+
+.config_enum ALU54_3.REG_OPCODEOP0_1_RST RST3
+RST0 F22B1 F23B1
+RST1 F23B1
+RST2 F22B1
+RST3 -
+
+.config_enum ALU54_3.REG_OUTPUT0_CLK CLK3
+CLK0 F5B1 F6B1
+CLK1 F5B1
+CLK2 F6B1
+CLK3 -
+NONE -
+
+.config_enum ALU54_3.REG_OUTPUT1_CLK CLK3
+CLK0 F3B1 F4B1
+CLK1 F3B1
+CLK2 F4B1
+CLK3 -
+NONE -
+
+.config_enum ALU54_3.RESETMODE SYNC
+ASYNC F2B1 F12B1
+SYNC -
+
.config_enum MULT18_0.MODE NONE
MULT18X18D F30B0 F34B1
NONE -
diff --git a/ECP5/tiledata/MIB2_DSP4/bits.db b/ECP5/tiledata/MIB2_DSP4/bits.db
index 6a85771..874b5c7 100644
--- a/ECP5/tiledata/MIB2_DSP4/bits.db
+++ b/ECP5/tiledata/MIB2_DSP4/bits.db
@@ -1,6 +1,39 @@
# Routing Mux Bits
# Non-Routing Configuration
+.config_enum ALU54_3.REG_INPUTC0_CLK NONE
+CLK0 F12B1 F13B1
+CLK1 F12B1 F13B1
+CLK2 F12B1 F13B1
+CLK3 F12B1 F13B1
+NONE -
+
+.config_enum ALU54_3.REG_OPCODEIN_0_CE CE3
+CE0 F20B1 F21B1
+CE1 F20B1
+CE2 F21B1
+CE3 -
+
+.config_enum ALU54_3.REG_OPCODEIN_1_CE CE3
+CE0 F16B1 F19B1
+CE1 F16B1
+CE2 F19B1
+CE3 -
+
+.config_enum ALU54_3.REG_OUTPUT0_CLK NONE
+CLK0 F38B1 F39B1
+CLK1 F38B1 F39B1
+CLK2 F38B1 F39B1
+CLK3 F38B1 F39B1
+NONE -
+
+.config_enum ALU54_3.REG_OUTPUT1_CLK NONE
+CLK0 F10B1 F11B1
+CLK1 F10B1 F11B1
+CLK2 F10B1 F11B1
+CLK3 F10B1 F11B1
+NONE -
+
.config_enum MULT18_0.REG_INPUTA_CE CE3
CE0 F2B1 F3B1 F17B1 F18B1 F42B1 F43B1
CE1 F3B1 F17B1 F43B1
diff --git a/ECP5/tiledata/MIB_DSP0/bits.db b/ECP5/tiledata/MIB_DSP0/bits.db
index da3b2e9..a160f6e 100644
--- a/ECP5/tiledata/MIB_DSP0/bits.db
+++ b/ECP5/tiledata/MIB_DSP0/bits.db
@@ -73,6 +73,10 @@
# Non-Routing Configuration
+.config_enum ALU54_3.MODE NONE
+ALU54B F61B0 F64B0 F67B0 F68B0
+NONE -
+
.config_enum MULT18_0.REG_INPUTA_CLK CLK3
CLK0 -
CLK1 -
diff --git a/ECP5/tiledata/MIB_DSP1/bits.db b/ECP5/tiledata/MIB_DSP1/bits.db
index b567b2a..64f7c29 100644
--- a/ECP5/tiledata/MIB_DSP1/bits.db
+++ b/ECP5/tiledata/MIB_DSP1/bits.db
@@ -1,6 +1,17 @@
# Routing Mux Bits
# Non-Routing Configuration
+.config_enum ALU54_3.GSR ENABLED
+DISABLED F61B0
+ENABLED -
+
+.config_enum ALU54_3.REG_OPCODEOP0_0_CLK CLK3
+CLK0 -
+CLK1 -
+CLK2 -
+CLK3 -
+NONE F103B0
+
.config_enum MULT18_0.GSR ENABLED
DISABLED F61B0
ENABLED -
diff --git a/ECP5/tiledata/MIB_DSP2/bits.db b/ECP5/tiledata/MIB_DSP2/bits.db
index 8045794..cdc067a 100644
--- a/ECP5/tiledata/MIB_DSP2/bits.db
+++ b/ECP5/tiledata/MIB_DSP2/bits.db
@@ -289,6 +289,58 @@
# Non-Routing Configuration
+.config_enum ALU54_3.CLK0_DIV ENABLED
+DISABLED F65B0
+ENABLED -
+
+.config_enum ALU54_3.CLK1_DIV ENABLED
+DISABLED F66B0
+ENABLED -
+
+.config_enum ALU54_3.CLK2_DIV ENABLED
+DISABLED F67B0
+ENABLED -
+
+.config_enum ALU54_3.CLK3_DIV ENABLED
+DISABLED F68B0
+ENABLED -
+
+.config_enum ALU54_3.GSR ENABLED
+DISABLED F60B0
+ENABLED -
+
+.config_enum ALU54_3.MODE NONE
+ALU54B F4B0 F7B0 F14B0 F17B0 F24B0 F27B0 F28B0 F32B0 F37B0 F41B0 F42B0 F51B0 F57B0
+NONE -
+
+.config_enum ALU54_3.REG_INPUTC0_CLK CLK3
+CLK0 -
+CLK1 -
+CLK2 -
+CLK3 -
+NONE F58B0
+
+.config_enum ALU54_3.REG_INPUTC1_CLK CLK3
+CLK0 -
+CLK1 -
+CLK2 -
+CLK3 -
+NONE F59B0
+
+.config_enum ALU54_3.REG_OPCODEIN_0_CLK CLK3
+CLK0 -
+CLK1 -
+CLK2 -
+CLK3 -
+NONE F56B0
+
+.config_enum ALU54_3.REG_OPCODEOP1_0_CLK CLK3
+CLK0 -
+CLK1 -
+CLK2 -
+CLK3 -
+NONE F21B0
+
.config_enum MULT18_0.CLK0_DIV ENABLED
DISABLED F65B0
ENABLED -
diff --git a/ECP5/tiledata/MIB_DSP4/bits.db b/ECP5/tiledata/MIB_DSP4/bits.db
index 86a1e91..361a590 100644
--- a/ECP5/tiledata/MIB_DSP4/bits.db
+++ b/ECP5/tiledata/MIB_DSP4/bits.db
@@ -55,5 +55,9 @@
# Non-Routing Configuration
+.config_enum ALU54_3.MODE NONE
+ALU54B F34B0 F41B0
+NONE -
+
# Fixed Connections
