From fe21089505c96894c0a165f63498683bcbeed271 Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Wed, 24 Nov 2021 17:10:05 -0500 Subject: [PATCH] Updated caravan with the same addition of four spare logic blocks as was made to caravel. --- mag/caravan.mag | 370 ++++++++++++++++++---------------- mag/caravan_power_routing.mag | 112 ++++++---- verilog/gl/caravan.v | 49 +++++ 3 files changed, 319 insertions(+), 212 deletions(-) diff --git a/mag/caravan.mag b/mag/caravan.mag index 06ea827f..012b9173 100644 --- a/mag/caravan.mag +++ b/mag/caravan.mag @@ -1,7 +1,7 @@ magic tech sky130A magscale 1 2 -timestamp 1637706758 +timestamp 1637791793 << isosubstrate >> rect 707553 886338 709093 889314 rect 8741 806938 10281 809914 @@ -8838,13 +8838,8 @@ rect 42208 238496 43812 238524 rect 42208 238484 42214 238496 rect 43806 238484 43812 238496 rect 43864 238484 43870 238536 -rect 52086 237396 52092 237448 -rect 52144 237436 52150 237448 rect 184934 237436 184940 237448 -rect 52144 237408 184940 237436 -rect 52144 237396 52150 237408 -rect 184934 237396 184940 237408 -rect 184992 237396 184998 237448 +rect 184806 237408 184940 237436 rect 42242 236036 42248 236088 rect 42300 236076 42306 236088 rect 43070 236076 43076 236088 @@ -8852,20 +8847,6 @@ rect 42300 236048 43076 236076 rect 42300 236036 42306 236048 rect 43070 236036 43076 236048 rect 43128 236036 43134 236088 -rect 674926 235560 674932 235612 -rect 674984 235600 674990 235612 -rect 675754 235600 675760 235612 -rect 674984 235572 675760 235600 -rect 674984 235560 674990 235572 -rect 675754 235560 675760 235572 -rect 675812 235560 675818 235612 -rect 674742 235492 674748 235544 -rect 674800 235532 674806 235544 -rect 675662 235532 675668 235544 -rect 674800 235504 675668 235532 -rect 674800 235492 674806 235504 -rect 675662 235492 675668 235504 -rect 675720 235492 675726 235544 rect 42150 235356 42156 235408 rect 42208 235396 42214 235408 rect 43346 235396 43352 235408 @@ -8894,6 +8875,25 @@ rect 42208 233328 43536 233356 rect 42208 233316 42214 233328 rect 43530 233316 43536 233328 rect 43588 233316 43594 233368 +rect 52086 230796 52092 230848 +rect 52144 230836 52150 230848 +rect 184806 230836 184834 237408 +rect 184934 237396 184940 237408 +rect 184992 237396 184998 237448 +rect 674926 235560 674932 235612 +rect 674984 235600 674990 235612 +rect 675754 235600 675760 235612 +rect 674984 235572 675760 235600 +rect 674984 235560 674990 235572 +rect 675754 235560 675760 235572 +rect 675812 235560 675818 235612 +rect 674742 235492 674748 235544 +rect 674800 235532 674806 235544 +rect 675662 235532 675668 235544 +rect 674800 235504 675668 235532 +rect 674800 235492 674806 235504 +rect 675662 235492 675668 235504 +rect 675720 235492 675726 235544 rect 345934 231140 345940 231192 rect 345992 231180 345998 231192 rect 414014 231180 414020 231192 @@ -8929,6 +8929,8 @@ rect 348844 230880 420460 230908 rect 348844 230868 348850 230880 rect 420454 230868 420460 230880 rect 420512 230868 420518 230920 +rect 52144 230808 184834 230836 +rect 52144 230796 52150 230808 rect 351638 230800 351644 230852 rect 351696 230840 351702 230852 rect 427170 230840 427176 230852 @@ -19498,14 +19500,8 @@ rect 42248 239708 42300 239760 rect 42708 239708 42760 239760 rect 42156 238484 42208 238536 rect 43812 238484 43864 238536 -rect 52092 237396 52144 237448 -rect 184940 237396 184992 237448 rect 42248 236036 42300 236088 rect 43076 236036 43128 236088 -rect 674932 235560 674984 235612 -rect 675760 235560 675812 235612 -rect 674748 235492 674800 235544 -rect 675668 235492 675720 235544 rect 42156 235356 42208 235408 rect 43352 235356 43404 235408 rect 42156 234608 42208 234660 @@ -19514,6 +19510,12 @@ rect 42248 233520 42300 233572 rect 43260 233520 43312 233572 rect 42156 233316 42208 233368 rect 43536 233316 43588 233368 +rect 52092 230796 52144 230848 +rect 184940 237396 184992 237448 +rect 674932 235560 674984 235612 +rect 675760 235560 675812 235612 +rect 674748 235492 674800 235544 +rect 675668 235492 675720 235544 rect 345940 231140 345992 231192 rect 414020 231140 414072 231192 rect 355876 231072 355928 231124 @@ -25173,8 +25175,8 @@ rect 52276 256760 52328 256766 rect 52276 256702 52328 256708 rect 52184 245812 52236 245818 rect 52184 245754 52236 245760 -rect 52092 237448 52144 237454 -rect 52092 237390 52144 237396 +rect 52092 230848 52144 230854 +rect 52092 230790 52144 230796 rect 50988 219700 51040 219706 rect 50988 219642 51040 219648 rect 48596 219496 48648 219502 @@ -25184,7 +25186,7 @@ rect 42156 182106 42208 182112 rect 48504 182164 48556 182170 rect 48504 182106 48556 182112 rect 42168 181900 42196 182106 -rect 52104 51134 52132 237390 +rect 52104 51134 52132 230790 rect 52092 51128 52144 51134 rect 52092 51070 52144 51076 rect 52196 42770 52224 245754 @@ -34600,6 +34602,13 @@ rect 566832 222284 566884 222290 rect 566832 222226 566884 222232 rect 566844 217410 566872 222226 rect 567120 221649 567148 251194 +rect 648632 231334 648660 277578 +rect 648724 269142 648752 278038 +rect 654140 277568 654192 277574 +rect 654140 277510 654192 277516 +rect 648712 269136 648764 269142 +rect 648712 269078 648764 269084 +rect 648632 231306 650380 231334 rect 570236 227724 570288 227730 rect 570236 227666 570288 227672 rect 569314 227624 569370 227633 @@ -34628,13 +34637,6 @@ rect 567672 217396 568022 217410 rect 568592 217410 568620 222634 rect 569328 217410 569356 227559 rect 570248 222290 570276 227666 -rect 648632 226334 648660 277578 -rect 648724 269142 648752 278038 -rect 654140 277568 654192 277574 -rect 654140 277510 654192 277516 -rect 648712 269136 648764 269142 -rect 648712 269078 648764 269084 -rect 648632 226306 649580 226334 rect 623412 223576 623464 223582 rect 623412 223518 623464 223524 rect 607588 223508 607640 223514 @@ -34924,6 +34926,8 @@ rect 637396 215756 637448 215762 rect 637396 215698 637448 215704 rect 637408 210202 637436 215698 rect 637868 210202 637896 221031 +rect 650352 220346 650380 231306 +rect 649552 220318 650380 220346 rect 639696 217048 639748 217054 rect 639696 216990 639748 216996 rect 638316 215620 638368 215626 @@ -35031,7 +35035,7 @@ rect 648816 210310 649120 210338 rect 648816 210202 648844 210310 rect 648508 210174 648844 210202 rect 649092 210066 649120 210310 -rect 649552 210066 649580 226306 +rect 649552 210066 649580 220318 rect 651288 220040 651340 220046 rect 651288 219982 651340 219988 rect 650196 210310 650500 210338 @@ -55255,6 +55259,10 @@ rect 460640 6598 473160 19088 rect 515440 6598 527960 19088 rect 570422 6811 582590 18975 rect 624222 6811 636390 18975 +use caravel_clocking clocking +timestamp 1637790566 +transform 1 0 205746 0 1 5488 +box -38 -48 20000 12000 use copyright_block_a copyright_block_a_0 timestamp 1636248774 transform 1 0 149582 0 1 16298 @@ -55267,10 +55275,6 @@ use xres_buf rstb_level timestamp 1637551221 transform -1 0 145710 0 -1 50488 box 414 -400 3522 3800 -use caravel_clocking clocking -timestamp 1637551221 -transform 1 0 205746 0 1 5488 -box -38 -48 20000 12000 use open_source open_source_0 hexdigits timestamp 1635801696 transform 1 0 260430 0 1 2174 @@ -55279,252 +55283,268 @@ use user_id_textblock user_id_textblock_0 timestamp 1608324878 transform 1 0 96272 0 1 6890 box -656 1508 33720 10344 +use housekeeping housekeeping +timestamp 1637790566 +transform 1 0 606434 0 1 100002 +box 0 0 60046 110190 +use digital_pll pll +timestamp 1637790566 +transform 1 0 628146 0 1 80944 +box 0 0 15000 15000 +use user_id_programming user_id_value +timestamp 1637790566 +transform 1 0 656624 0 1 88126 +box 0 0 7109 7077 +use gpio_defaults_block gpio_01_defaults\[0\] +timestamp 1637790566 +transform -1 0 709467 0 1 134000 +box -38 0 6018 2224 +use gpio_control_block gpio_control_bidir_1\[0\] +timestamp 1637790566 +transform -1 0 710203 0 1 121000 +box 882 167 34000 13000 use caravan_motto caravan_motto_0 timestamp 1637698689 transform 1 0 886 0 1 288 box 367960 10204 399802 14768 -use housekeeping housekeeping -timestamp 1637551221 -transform 1 0 606434 0 1 100002 -box 0 0 60046 110190 -use digital_pll pll -timestamp 1637551221 -transform 1 0 628146 0 1 80944 -box 0 0 15000 15000 use simple_por por timestamp 1637617477 transform 1 0 650146 0 -1 55282 box -52 -62 11344 8684 -use user_id_programming user_id_value -timestamp 1637551221 -transform 1 0 656624 0 1 88126 -box 0 0 7109 7077 -use gpio_defaults_block gpio_01_defaults\[0\] -timestamp 1637551221 -transform -1 0 709467 0 1 134000 -box -38 0 6018 2224 -use gpio_control_block gpio_control_bidir_1\[0\] -timestamp 1637551221 -transform -1 0 710203 0 1 121000 -box 882 167 34000 13000 use mgmt_core_wrapper soc timestamp 1637416673 transform 1 0 52034 0 1 53002 box 382 -400 524400 164400 use gpio_control_block gpio_control_bidir_2\[2\] -timestamp 1637551221 +timestamp 1637790566 transform 1 0 7631 0 1 202600 box 882 167 34000 13000 -use gpio_defaults_block gpio_37_defaults -timestamp 1637551221 -transform 1 0 8367 0 1 215600 -box -38 0 6018 2224 -use gpio_control_block gpio_control_bidir_1\[1\] -timestamp 1637551221 -transform -1 0 710203 0 1 166200 -box 882 167 34000 13000 -use gpio_control_block gpio_control_in_1a\[0\] -timestamp 1637551221 -transform -1 0 710203 0 1 211200 -box 882 167 34000 13000 use gpio_defaults_block gpio_01_defaults\[1\] -timestamp 1637551221 +timestamp 1637790566 transform -1 0 709467 0 1 179200 box -38 0 6018 2224 +use gpio_control_block gpio_control_bidir_1\[1\] +timestamp 1637790566 +transform -1 0 710203 0 1 166200 +box 882 167 34000 13000 +use gpio_defaults_block gpio_37_defaults +timestamp 1637790566 +transform 1 0 8367 0 1 215600 +box -38 0 6018 2224 use gpio_control_block gpio_control_bidir_2\[1\] -timestamp 1637551221 +timestamp 1637790566 transform 1 0 7631 0 1 245800 box 882 167 34000 13000 -use gpio_defaults_block gpio_36_defaults -timestamp 1637551221 -transform 1 0 8367 0 1 258800 -box -38 0 6018 2224 use mgmt_protect mgmt_buffers -timestamp 1637553843 +timestamp 1637790566 transform 1 0 192180 0 1 232036 box -400 -400 220400 32400 -use gpio_control_block gpio_control_in_1a\[1\] -timestamp 1637551221 -transform -1 0 710203 0 1 256400 -box 882 167 34000 13000 +use spare_logic_block spare_logic_block_3 +timestamp 1637790566 +transform 1 0 88632 0 1 232528 +box 0 0 9000 9000 +use spare_logic_block spare_logic_block_1 +timestamp 1637790566 +transform 1 0 168632 0 1 232528 +box 0 0 9000 9000 +use spare_logic_block spare_logic_block_2 +timestamp 1637790566 +transform 1 0 428632 0 1 232528 +box 0 0 9000 9000 +use spare_logic_block spare_logic_block_0 +timestamp 1637790566 +transform 1 0 640874 0 1 220592 +box 0 0 9000 9000 use gpio_defaults_block gpio_234_defaults\[0\] -timestamp 1637551221 +timestamp 1637790566 transform -1 0 709467 0 1 224200 box -38 0 6018 2224 +use gpio_control_block gpio_control_in_1a\[0\] +timestamp 1637790566 +transform -1 0 710203 0 1 211200 +box 882 167 34000 13000 +use gpio_defaults_block gpio_36_defaults +timestamp 1637790566 +transform 1 0 8367 0 1 258800 +box -38 0 6018 2224 use gpio_defaults_block gpio_234_defaults\[1\] -timestamp 1637551221 +timestamp 1637790566 transform -1 0 709467 0 1 269400 box -38 0 6018 2224 -use gpio_control_block gpio_control_bidir_2\[0\] -timestamp 1637551221 -transform 1 0 7631 0 1 289000 +use gpio_control_block gpio_control_in_1a\[1\] +timestamp 1637790566 +transform -1 0 710203 0 1 256400 box 882 167 34000 13000 use gpio_defaults_block gpio_35_defaults -timestamp 1637551221 +timestamp 1637790566 transform 1 0 8367 0 1 302000 box -38 0 6018 2224 -use gpio_control_block gpio_control_in_1a\[2\] -timestamp 1637551221 -transform -1 0 710203 0 1 301400 +use gpio_control_block gpio_control_bidir_2\[0\] +timestamp 1637790566 +transform 1 0 7631 0 1 289000 box 882 167 34000 13000 use gpio_defaults_block gpio_234_defaults\[2\] -timestamp 1637551221 +timestamp 1637790566 transform -1 0 709467 0 1 314400 box -38 0 6018 2224 -use gpio_control_block gpio_control_in_2\[7\] -timestamp 1637551221 -transform 1 0 7631 0 1 418600 -box 882 167 34000 13000 -use gpio_control_block gpio_control_in_2\[8\] -timestamp 1637551221 -transform 1 0 7631 0 1 375400 -box 882 167 34000 13000 -use gpio_control_block gpio_control_in_2\[9\] -timestamp 1637551221 -transform 1 0 7631 0 1 332200 +use gpio_control_block gpio_control_in_1a\[2\] +timestamp 1637790566 +transform -1 0 710203 0 1 301400 box 882 167 34000 13000 use gpio_defaults_block gpio_32_defaults -timestamp 1637551221 +timestamp 1637790566 transform 1 0 8367 0 1 431600 box -38 0 6018 2224 use gpio_defaults_block gpio_33_defaults -timestamp 1637551221 +timestamp 1637790566 transform 1 0 8367 0 1 388400 box -38 0 6018 2224 use gpio_defaults_block gpio_34_defaults -timestamp 1637551221 +timestamp 1637790566 transform 1 0 8367 0 1 345200 box -38 0 6018 2224 -use gpio_control_block gpio_control_in_1a\[3\] -timestamp 1637551221 -transform -1 0 710203 0 1 346400 +use gpio_control_block gpio_control_in_2\[7\] +timestamp 1637790566 +transform 1 0 7631 0 1 418600 box 882 167 34000 13000 -use gpio_control_block gpio_control_in_1a\[4\] -timestamp 1637551221 -transform -1 0 710203 0 1 391600 +use gpio_control_block gpio_control_in_2\[8\] +timestamp 1637790566 +transform 1 0 7631 0 1 375400 box 882 167 34000 13000 -use gpio_control_block gpio_control_in_1a\[5\] -timestamp 1637551221 -transform -1 0 710203 0 1 479800 +use gpio_control_block gpio_control_in_2\[9\] +timestamp 1637790566 +transform 1 0 7631 0 1 332200 box 882 167 34000 13000 use gpio_defaults_block gpio_5_defaults -timestamp 1637551221 +timestamp 1637790566 transform -1 0 709467 0 1 359400 box -38 0 6018 2224 use gpio_defaults_block gpio_6_defaults -timestamp 1637551221 +timestamp 1637790566 transform -1 0 709467 0 1 404600 box -38 0 6018 2224 use gpio_defaults_block gpio_7_defaults -timestamp 1637551221 +timestamp 1637790566 transform -1 0 709467 0 1 492800 box -38 0 6018 2224 -use gpio_control_block gpio_control_in_2\[6\] -timestamp 1637551221 -transform 1 0 7631 0 1 546200 +use gpio_control_block gpio_control_in_1a\[3\] +timestamp 1637790566 +transform -1 0 710203 0 1 346400 box 882 167 34000 13000 -use gpio_control_block gpio_control_in_2\[5\] -timestamp 1637551221 -transform 1 0 7631 0 1 589400 +use gpio_control_block gpio_control_in_1a\[4\] +timestamp 1637790566 +transform -1 0 710203 0 1 391600 box 882 167 34000 13000 -use gpio_control_block gpio_control_in_2\[4\] -timestamp 1637551221 -transform 1 0 7631 0 1 632600 +use gpio_control_block gpio_control_in_1a\[5\] +timestamp 1637790566 +transform -1 0 710203 0 1 479800 box 882 167 34000 13000 use gpio_defaults_block gpio_31_defaults -timestamp 1637551221 +timestamp 1637790566 transform 1 0 8367 0 1 559200 box -38 0 6018 2224 use gpio_defaults_block gpio_30_defaults -timestamp 1637551221 +timestamp 1637790566 transform 1 0 8367 0 1 602400 box -38 0 6018 2224 -use gpio_control_block gpio_control_in_1\[2\] -timestamp 1637551221 -transform -1 0 710203 0 1 614000 +use gpio_control_block gpio_control_in_2\[6\] +timestamp 1637790566 +transform 1 0 7631 0 1 546200 box 882 167 34000 13000 -use gpio_control_block gpio_control_in_1\[1\] -timestamp 1637551221 -transform -1 0 710203 0 1 568800 +use gpio_control_block gpio_control_in_2\[5\] +timestamp 1637790566 +transform 1 0 7631 0 1 589400 box 882 167 34000 13000 -use gpio_control_block gpio_control_in_1\[0\] -timestamp 1637551221 -transform -1 0 710203 0 1 523800 +use gpio_control_block gpio_control_in_2\[4\] +timestamp 1637790566 +transform 1 0 7631 0 1 632600 box 882 167 34000 13000 use gpio_defaults_block gpio_9_defaults -timestamp 1637551221 +timestamp 1637790566 transform -1 0 709467 0 1 581800 box -38 0 6018 2224 use gpio_defaults_block gpio_8_defaults -timestamp 1637551221 +timestamp 1637790566 transform -1 0 709467 0 1 536800 box -38 0 6018 2224 use gpio_defaults_block gpio_10_defaults -timestamp 1637551221 +timestamp 1637790566 transform -1 0 709467 0 1 627000 box -38 0 6018 2224 -use gpio_control_block gpio_control_in_2\[3\] -timestamp 1637551221 -transform 1 0 7631 0 1 675800 +use gpio_control_block gpio_control_in_1\[2\] +timestamp 1637790566 +transform -1 0 710203 0 1 614000 box 882 167 34000 13000 -use gpio_control_block gpio_control_in_2\[2\] -timestamp 1637551221 -transform 1 0 7631 0 1 719000 +use gpio_control_block gpio_control_in_1\[1\] +timestamp 1637790566 +transform -1 0 710203 0 1 568800 +box 882 167 34000 13000 +use gpio_control_block gpio_control_in_1\[0\] +timestamp 1637790566 +transform -1 0 710203 0 1 523800 box 882 167 34000 13000 use gpio_defaults_block gpio_29_defaults -timestamp 1637551221 +timestamp 1637790566 transform 1 0 8367 0 1 645600 box -38 0 6018 2224 use gpio_defaults_block gpio_28_defaults -timestamp 1637551221 +timestamp 1637790566 transform 1 0 8367 0 1 688800 box -38 0 6018 2224 use gpio_defaults_block gpio_27_defaults -timestamp 1637551221 +timestamp 1637790566 transform 1 0 8367 0 1 732000 box -38 0 6018 2224 -use gpio_control_block gpio_control_in_1\[4\] -timestamp 1637551221 -transform -1 0 710203 0 1 704200 +use gpio_control_block gpio_control_in_2\[3\] +timestamp 1637790566 +transform 1 0 7631 0 1 675800 box 882 167 34000 13000 -use gpio_control_block gpio_control_in_1\[3\] -timestamp 1637551221 -transform -1 0 710203 0 1 659000 +use gpio_control_block gpio_control_in_2\[2\] +timestamp 1637790566 +transform 1 0 7631 0 1 719000 box 882 167 34000 13000 use gpio_defaults_block gpio_12_defaults -timestamp 1637551221 +timestamp 1637790566 transform -1 0 709467 0 1 717200 box -38 0 6018 2224 use gpio_defaults_block gpio_11_defaults -timestamp 1637551221 +timestamp 1637790566 transform -1 0 709467 0 1 672000 box -38 0 6018 2224 -use gpio_control_block gpio_control_in_2\[1\] -timestamp 1637551221 -transform 1 0 7631 0 1 762200 +use gpio_control_block gpio_control_in_1\[4\] +timestamp 1637790566 +transform -1 0 710203 0 1 704200 box 882 167 34000 13000 -use gpio_control_block gpio_control_in_2\[0\] -timestamp 1637551221 -transform 1 0 7631 0 1 805400 +use gpio_control_block gpio_control_in_1\[3\] +timestamp 1637790566 +transform -1 0 710203 0 1 659000 box 882 167 34000 13000 use gpio_defaults_block gpio_26_defaults -timestamp 1637551221 +timestamp 1637790566 transform 1 0 8367 0 1 775200 box -38 0 6018 2224 use gpio_defaults_block gpio_14_defaults -timestamp 1637551221 +timestamp 1637790566 transform 1 0 8367 0 1 818400 box -38 0 6018 2224 -use gpio_control_block gpio_control_in_1\[5\] -timestamp 1637551221 -transform -1 0 710203 0 1 884800 +use gpio_control_block gpio_control_in_2\[1\] +timestamp 1637790566 +transform 1 0 7631 0 1 762200 +box 882 167 34000 13000 +use gpio_control_block gpio_control_in_2\[0\] +timestamp 1637790566 +transform 1 0 7631 0 1 805400 box 882 167 34000 13000 use gpio_defaults_block gpio_13_defaults -timestamp 1637551221 +timestamp 1637790566 transform -1 0 709467 0 1 897800 box -38 0 6018 2224 +use gpio_control_block gpio_control_in_1\[5\] +timestamp 1637790566 +transform -1 0 710203 0 1 884800 +box 882 167 34000 13000 use caravan_power_routing caravan_power_routing_0 -timestamp 1637628636 +timestamp 1637791793 transform 1 0 0 0 1 0 box 0 0 717600 1037600 use user_analog_project_wrapper mprj diff --git a/mag/caravan_power_routing.mag b/mag/caravan_power_routing.mag index 944332e1..20b050e8 100644 --- a/mag/caravan_power_routing.mag +++ b/mag/caravan_power_routing.mag @@ -1,7 +1,7 @@ magic tech sky130A magscale 1 2 -timestamp 1637628636 +timestamp 1637791793 << error_p >> rect 585752 994898 585758 994904 rect 590380 994898 590386 994904 @@ -765,8 +765,20 @@ rect 391834 234448 392314 234540 rect 44186 233340 63160 233466 rect 44186 230606 56406 233340 rect 63018 230606 63160 233340 -rect 44186 230466 63160 230606 +rect 89776 232386 90096 233602 +rect 93776 232386 94096 233602 +rect 89776 232258 94096 232386 +rect 89776 231398 89900 232258 +rect 93968 231398 94096 232258 +rect 89776 231266 94096 231398 +rect 169776 232338 170096 233638 +rect 173776 232338 174096 233612 +rect 169776 232252 174096 232338 +rect 169776 231392 169864 232252 +rect 173932 231392 174096 232252 +rect 169776 231302 174096 231392 rect 195988 233390 196616 233464 +rect 44186 230466 63160 230606 rect 195988 230538 196058 233390 rect 196556 230538 196616 233390 rect 195988 230466 196616 230538 @@ -796,6 +808,12 @@ rect 377056 230538 377116 233390 rect 376488 230466 377116 230538 rect 406660 233390 407116 233464 rect 407056 230538 407116 233390 +rect 429776 232520 430096 233612 +rect 433776 232520 434096 233612 +rect 429776 232370 434096 232520 +rect 429776 231510 429910 232370 +rect 433978 231510 434096 232370 +rect 429776 231392 434096 231510 rect 406660 230466 407116 230538 rect 44198 197498 46798 230466 rect 598368 212326 610962 212504 @@ -1134,6 +1152,8 @@ rect 331414 234540 332122 237386 rect 361458 234540 362222 237386 rect 391834 234540 392222 237386 rect 56406 230606 63018 233340 +rect 89900 231398 93968 232258 +rect 169864 231392 173932 232252 rect 196058 230538 196556 233390 rect 226158 230538 226656 233390 rect 256258 230538 256756 233390 @@ -1142,6 +1162,7 @@ rect 316458 230538 316956 233390 rect 346558 230538 347056 233390 rect 376558 230538 377056 233390 rect 406660 230538 407056 233390 +rect 429910 231510 433978 232370 rect 598598 209740 601098 212326 rect 607452 209740 609952 212326 rect 641152 209640 642010 212352 @@ -1357,7 +1378,13 @@ rect 56288 234466 605390 234540 rect 56296 233390 601374 233466 rect 56296 233340 196058 233390 rect 56296 230606 56406 233340 -rect 63018 230606 196058 233340 +rect 63018 232258 196058 233340 +rect 63018 231398 89900 232258 +rect 93968 232252 196058 232258 +rect 93968 231398 169864 232252 +rect 63018 231392 169864 231398 +rect 173932 231392 196058 232252 +rect 63018 230606 196058 231392 rect 56296 230538 196058 230606 rect 196556 230538 226158 233390 rect 226656 230538 256258 233390 @@ -1366,7 +1393,10 @@ rect 286856 230538 316458 233390 rect 316956 230538 346558 233390 rect 347056 230538 376558 233390 rect 377056 230538 406660 233390 -rect 407056 230538 601374 233390 +rect 407056 232370 601374 233390 +rect 407056 231510 429910 232370 +rect 433978 231510 601374 232370 +rect 407056 230538 601374 231510 rect 56296 230466 601374 230538 rect 598374 212326 601374 230466 rect 47836 209858 53232 210498 @@ -1494,7 +1524,15 @@ rect 58210 50004 143390 50624 rect 144652 50004 601374 50624 rect 58210 48370 601374 50004 rect 54374 48222 601374 48370 -rect 602390 208434 605390 234466 +rect 602390 224536 605390 234466 +rect 648666 225872 651190 226192 +rect 602390 224192 641044 224536 +rect 602390 223872 641990 224192 +rect 602390 223336 641044 223872 +rect 602390 208434 605390 223336 +rect 649990 222192 651190 225872 +rect 648662 221872 651190 222192 +rect 649990 212504 651190 221872 rect 607252 212352 669426 212504 rect 607252 212326 641152 212352 rect 607252 209740 607452 212326 @@ -1660,14 +1698,6 @@ rect 0 1037400 717600 1037600 rect 0 200 200 1037400 rect 717400 200 717600 1037400 rect 0 0 717600 200 -use gpio_control_power_routing_right gpio_control_power_routing_right_13 -timestamp 1637595202 -transform -1 0 717846 0 1 -36400 -box 6032 203748 46226 221470 -use gpio_control_power_routing_right gpio_control_power_routing_right_14 -timestamp 1637595202 -transform -1 0 717846 0 1 -81600 -box 6032 203748 46226 221470 use gpio_control_power_routing gpio_control_power_routing_1 timestamp 1637447660 transform 1 0 -10 0 1 43200 @@ -1676,6 +1706,22 @@ use gpio_control_power_routing gpio_control_power_routing_0 timestamp 1637447660 transform 1 0 -10 0 1 0 box 6032 203748 55470 221470 +use gpio_control_power_routing_right gpio_control_power_routing_right_13 +timestamp 1637595202 +transform -1 0 717846 0 1 -36400 +box 6032 203748 46226 221470 +use gpio_control_power_routing_right gpio_control_power_routing_right_14 +timestamp 1637595202 +transform -1 0 717846 0 1 -81600 +box 6032 203748 46226 221470 +use gpio_control_power_routing_right gpio_control_power_routing_right_11 +timestamp 1637595202 +transform -1 0 717846 0 1 53800 +box 6032 203748 46226 221470 +use gpio_control_power_routing_right gpio_control_power_routing_right_12 +timestamp 1637595202 +transform -1 0 717846 0 1 8600 +box 6032 203748 46226 221470 use gpio_control_power_routing gpio_control_power_routing_4 timestamp 1637447660 transform 1 0 -10 0 1 172800 @@ -1688,18 +1734,6 @@ use gpio_control_power_routing gpio_control_power_routing_2 timestamp 1637447660 transform 1 0 -10 0 1 86400 box 6032 203748 55470 221470 -use gpio_control_power_routing gpio_control_power_routing_5 -timestamp 1637447660 -transform 1 0 -10 0 1 216000 -box 6032 203748 55470 221470 -use gpio_control_power_routing_right gpio_control_power_routing_right_11 -timestamp 1637595202 -transform -1 0 717846 0 1 53800 -box 6032 203748 46226 221470 -use gpio_control_power_routing_right gpio_control_power_routing_right_12 -timestamp 1637595202 -transform -1 0 717846 0 1 8600 -box 6032 203748 46226 221470 use gpio_control_power_routing_right gpio_control_power_routing_right_8 timestamp 1637595202 transform -1 0 717846 0 1 189000 @@ -1712,10 +1746,22 @@ use gpio_control_power_routing_right gpio_control_power_routing_right_10 timestamp 1637595202 transform -1 0 717846 0 1 98800 box 6032 203748 46226 221470 +use gpio_control_power_routing gpio_control_power_routing_5 +timestamp 1637447660 +transform 1 0 -10 0 1 216000 +box 6032 203748 55470 221470 use gpio_control_power_routing gpio_control_power_routing_6 timestamp 1637447660 transform 1 0 -10 0 1 343600 box 6032 203748 55470 221470 +use gpio_control_power_routing_right gpio_control_power_routing_right_6 +timestamp 1637595202 +transform -1 0 717846 0 1 321200 +box 6032 203748 46226 221470 +use gpio_control_power_routing_right gpio_control_power_routing_right_7 +timestamp 1637595202 +transform -1 0 717846 0 1 277200 +box 6032 203748 46226 221470 use gpio_control_power_routing gpio_control_power_routing_9 timestamp 1637447660 transform 1 0 -10 0 1 473200 @@ -1728,14 +1774,6 @@ use gpio_control_power_routing gpio_control_power_routing_7 timestamp 1637447660 transform 1 0 -10 0 1 386800 box 6032 203748 55470 221470 -use gpio_control_power_routing_right gpio_control_power_routing_right_6 -timestamp 1637595202 -transform -1 0 717846 0 1 321200 -box 6032 203748 46226 221470 -use gpio_control_power_routing_right gpio_control_power_routing_right_7 -timestamp 1637595202 -transform -1 0 717846 0 1 277200 -box 6032 203748 46226 221470 use gpio_control_power_routing_right gpio_control_power_routing_right_3 timestamp 1637595202 transform -1 0 717846 0 1 456400 @@ -1748,10 +1786,6 @@ use gpio_control_power_routing_right gpio_control_power_routing_right_5 timestamp 1637595202 transform -1 0 717846 0 1 366200 box 6032 203748 46226 221470 -use gpio_control_power_routing_right gpio_control_power_routing_right_2 -timestamp 1637595202 -transform -1 0 717846 0 1 501600 -box 6032 203748 46226 221470 use gpio_control_power_routing gpio_control_power_routing_12 timestamp 1637447660 transform 1 0 -10 0 1 602800 @@ -1764,6 +1798,10 @@ use gpio_control_power_routing gpio_control_power_routing_11 timestamp 1637447660 transform 1 0 -10 0 1 559600 box 6032 203748 55470 221470 +use gpio_control_power_routing_right gpio_control_power_routing_right_2 +timestamp 1637595202 +transform -1 0 717846 0 1 501600 +box 6032 203748 46226 221470 use gpio_control_power_routing_right gpio_control_power_routing_right_0 timestamp 1637595202 transform -1 0 717836 0 1 682200 diff --git a/verilog/gl/caravan.v b/verilog/gl/caravan.v index 776ac525..486ba711 100644 --- a/verilog/gl/caravan.v +++ b/verilog/gl/caravan.v @@ -4118,6 +4118,55 @@ module caravan(vddio, vddio_2, vssio, vssio_2, vdda, vssa, vccd, vssd, vdda1, vd .VPWR(vccd_core), .mask_rev({ \mask_rev[31] , \mask_rev[30] , \mask_rev[29] , \mask_rev[28] , \mask_rev[27] , \mask_rev[26] , \mask_rev[25] , \mask_rev[24] , \mask_rev[23] , \mask_rev[22] , \mask_rev[21] , \mask_rev[20] , \mask_rev[19] , \mask_rev[18] , \mask_rev[17] , \mask_rev[16] , \mask_rev[15] , \mask_rev[14] , \mask_rev[13] , \mask_rev[12] , \mask_rev[11] , \mask_rev[10] , \mask_rev[9] , \mask_rev[8] , \mask_rev[7] , \mask_rev[6] , \mask_rev[5] , \mask_rev[4] , \mask_rev[3] , \mask_rev[2] , \mask_rev[1] , \mask_rev[0] }) ); + spare_logic_block \spare_logic[0] ( + .vssd(vssd_core), + .vccd(vccd_core), + .spare_xz(), + .spare_xi(), + .spare_xib(), + .spare_xna(), + .spare_xno(), + .spare_xmx(), + .spare_xfq(), + .spare_xfqn() + ); + spare_logic_block \spare_logic[1] ( + .vssd(vssd_core), + .vccd(vccd_core), + .spare_xz(), + .spare_xi(), + .spare_xib(), + .spare_xna(), + .spare_xno(), + .spare_xmx(), + .spare_xfq(), + .spare_xfqn() + ); + spare_logic_block \spare_logic[2] ( + .vssd(vssd_core), + .vccd(vccd_core), + .spare_xz(), + .spare_xi(), + .spare_xib(), + .spare_xna(), + .spare_xno(), + .spare_xmx(), + .spare_xfq(), + .spare_xfqn() + ); + spare_logic_block \spare_logic[3] ( + .vssd(vssd_core), + .vccd(vccd_core), + .spare_xz(), + .spare_xi(), + .spare_xib(), + .spare_xna(), + .spare_xno(), + .spare_xmx(), + .spare_xfq(), + .spare_xfqn() + ); + assign \gpio_resetn_1_shifted[13] = \gpio_resetn_1[12] ; assign \gpio_resetn_1_shifted[12] = \gpio_resetn_1[11] ; assign \gpio_resetn_1_shifted[11] = \gpio_resetn_1[10] ;