From 26919031041870c323e91a14e220ed50cc2574c5 Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Thu, 2 Dec 2021 20:45:39 -0500 Subject: [PATCH] Reworked part of the layouts of both caravel and caravan to move the clocking subcircuit from inside the pad area near the "clock" pin to under the DLL. This prevents the DLL from having its outputs travel all the way across the chip to reach the clocking cell and then have the multiplexed clock travel all the way back, especially as the DLL outputs are high-speed signals (up to 150 MHz). --- mag/caravan.mag | 1147 +++++++++++++++------------------ mag/caravan_power_routing.mag | 245 +++---- mag/caravel.mag | 1074 +++++++++++++++--------------- mag/caravel_power_routing.mag | 236 +++---- mag/run_caravan_lvs.sh | 14 + mag/run_caravel_lvs.sh | 14 + 6 files changed, 1329 insertions(+), 1401 deletions(-) diff --git a/mag/caravan.mag b/mag/caravan.mag index e42c9bf0..14d72c4f 100644 --- a/mag/caravan.mag +++ b/mag/caravan.mag @@ -1,113 +1,7 @@ magic tech sky130A magscale 1 2 -timestamp 1638300563 -<< checkpaint >> -rect 702189 899060 710765 901284 -rect 674943 896540 710765 899060 -rect 674943 883707 710581 896540 -rect 7069 819660 15645 821884 -rect 7069 817140 42891 819660 -rect 7253 804307 42891 817140 -rect 7069 776460 15645 778684 -rect 7069 773940 42891 776460 -rect 7253 761107 42891 773940 -rect 7069 733260 15645 735484 -rect 7069 730740 42891 733260 -rect 7253 717907 42891 730740 -rect 702189 718460 710765 720684 -rect 674943 715940 710765 718460 -rect 674943 703107 710581 715940 -rect 7069 690060 15645 692284 -rect 7069 687540 42891 690060 -rect 7253 674707 42891 687540 -rect 702189 673260 710765 675484 -rect 674943 670740 710765 673260 -rect 674943 657907 710581 670740 -rect 7069 646860 15645 649084 -rect 7069 644340 42891 646860 -rect 7253 631507 42891 644340 -rect 702189 628260 710765 630484 -rect 674943 625740 710765 628260 -rect 674943 612907 710581 625740 -rect 7069 603660 15645 605884 -rect 7069 601140 42891 603660 -rect 7253 588307 42891 601140 -rect 702189 583060 710765 585284 -rect 674943 580540 710765 583060 -rect 674943 567707 710581 580540 -rect 7069 560460 15645 562684 -rect 7069 557940 42891 560460 -rect 7253 545107 42891 557940 -rect 702189 538060 710765 540284 -rect 674943 535540 710765 538060 -rect 674943 522707 710581 535540 -rect 702189 494060 710765 496284 -rect 674943 491540 710765 494060 -rect 674943 478707 710581 491540 -rect 7069 432860 15645 435084 -rect 7069 430340 42891 432860 -rect 7253 417507 42891 430340 -rect 702189 405860 710765 408084 -rect 674943 403340 710765 405860 -rect 7069 389660 15645 391884 -rect 674943 390507 710581 403340 -rect 7069 387140 42891 389660 -rect 7253 374307 42891 387140 -rect 702189 360660 710765 362884 -rect 674943 358140 710765 360660 -rect 7069 346460 15645 348684 -rect 7069 343940 42891 346460 -rect 674943 345307 710581 358140 -rect 7253 331107 42891 343940 -rect 702189 315660 710765 317884 -rect 674943 313140 710765 315660 -rect 7069 303260 15645 305484 -rect 7069 300740 42891 303260 -rect 7253 287907 42891 300740 -rect 674943 300307 710581 313140 -rect 702189 270660 710765 272884 -rect 674943 268140 710765 270660 -rect 7069 260060 15645 262284 -rect 7069 257540 42891 260060 -rect 7253 244707 42891 257540 -rect 87372 231268 98892 242788 -rect 167372 231268 178892 242788 -rect 190520 230376 413840 265696 -rect 674943 255307 710581 268140 -rect 427372 231268 438892 242788 -rect 639614 219332 651134 230852 -rect 702189 225460 710765 227684 -rect 674943 222940 710765 225460 -rect 7069 216860 15645 219084 -rect 482696 217778 485574 218682 -rect 7069 214340 42891 216860 -rect 482696 216800 485604 217778 -rect 581542 216800 584126 216818 -rect 587066 216800 589636 216822 -rect 482696 216108 589772 216800 -rect 482906 215084 589772 216108 -rect 7253 201507 42891 214340 -rect 482968 214252 589772 215084 -rect 581542 214234 584126 214252 -rect 581560 148950 584108 214234 -rect 587066 214228 589636 214252 -rect 574733 148218 578602 148497 -rect 581390 148218 585548 148950 -rect 574733 145638 585548 148218 -rect 574733 145382 578602 145638 -rect 581390 145430 585548 145638 -rect 605174 98742 667740 211452 -rect 674943 210107 710581 222940 -rect 702189 180460 710765 182684 -rect 674943 177940 710765 180460 -rect 674943 165107 710581 177940 -rect 702189 135260 710765 137484 -rect 674943 132740 710765 135260 -rect 674943 119907 710581 132740 -rect 626886 79684 644406 97204 -rect 655364 86866 664993 96463 -rect 204448 4180 227006 18748 +timestamp 1638495418 << isosubstrate >> rect 707553 886338 709093 889314 rect 8741 806938 10281 809914 @@ -16729,6 +16623,119 @@ rect 575900 78628 596916 78656 rect 575900 78616 575906 78628 rect 596910 78616 596916 78628 rect 596968 78616 596974 78668 +rect 623114 78026 623120 78078 +rect 623172 78066 623178 78078 +rect 631870 78066 631876 78078 +rect 623172 78038 631876 78066 +rect 623172 78026 623178 78038 +rect 631870 78026 631876 78038 +rect 631928 78026 631934 78078 +rect 625944 77892 625950 77944 +rect 626002 77932 626008 77944 +rect 639322 77932 639328 77944 +rect 626002 77904 639328 77932 +rect 626002 77892 626008 77904 +rect 639322 77892 639328 77904 +rect 639380 77892 639386 77944 +rect 634504 77686 634510 77738 +rect 634562 77726 634568 77738 +rect 642634 77726 642640 77738 +rect 634562 77698 642640 77726 +rect 634562 77686 634568 77698 +rect 642634 77686 642640 77698 +rect 642692 77686 642698 77738 +rect 628814 77520 628820 77572 +rect 628872 77560 628878 77572 +rect 642910 77560 642916 77572 +rect 628872 77532 642916 77560 +rect 628872 77520 628878 77532 +rect 642910 77520 642916 77532 +rect 642968 77520 642974 77572 +rect 621474 77314 621480 77366 +rect 621532 77354 621538 77366 +rect 641938 77354 641944 77366 +rect 621532 77326 641944 77354 +rect 621532 77314 621538 77326 +rect 641938 77314 641944 77326 +rect 641996 77314 642002 77366 +rect 621382 77216 621388 77268 +rect 621440 77256 621446 77268 +rect 641830 77256 641836 77268 +rect 621440 77228 641836 77256 +rect 621440 77216 621446 77228 +rect 641830 77216 641836 77228 +rect 641888 77216 641894 77268 +rect 621290 77074 621296 77126 +rect 621348 77114 621354 77126 +rect 641744 77114 641750 77126 +rect 621348 77086 641750 77114 +rect 621348 77074 621354 77086 +rect 641744 77074 641750 77086 +rect 641802 77074 641808 77126 +rect 621198 76954 621204 77006 +rect 621256 76994 621262 77006 +rect 641634 76994 641640 77006 +rect 621256 76966 641640 76994 +rect 621256 76954 621262 76966 +rect 641634 76954 641640 76966 +rect 641692 76954 641698 77006 +rect 621106 76838 621112 76890 +rect 621164 76878 621170 76890 +rect 641480 76878 641486 76890 +rect 621164 76850 641486 76878 +rect 621164 76838 621170 76850 +rect 641480 76838 641486 76850 +rect 641538 76838 641544 76890 +rect 618254 76754 618260 76806 +rect 618312 76794 618318 76806 +rect 641352 76794 641358 76806 +rect 618312 76766 641358 76794 +rect 618312 76754 618318 76766 +rect 641352 76754 641358 76766 +rect 641410 76754 641416 76806 +rect 613010 76600 613016 76652 +rect 613068 76640 613074 76652 +rect 641160 76640 641166 76652 +rect 613068 76612 641166 76640 +rect 613068 76600 613074 76612 +rect 641160 76600 641166 76612 +rect 641218 76640 641224 76652 +rect 641218 76612 641238 76640 +rect 641218 76600 641224 76612 +rect 627486 76392 627492 76444 +rect 627544 76428 627550 76444 +rect 637336 76428 637342 76446 +rect 627544 76400 637342 76428 +rect 627544 76392 627550 76400 +rect 637336 76394 637342 76400 +rect 637394 76394 637400 76446 +rect 621006 76266 621012 76318 +rect 621064 76306 621070 76318 +rect 623114 76306 623120 76318 +rect 621064 76278 623120 76306 +rect 621064 76266 621070 76278 +rect 623114 76266 623120 76278 +rect 623172 76266 623178 76318 +rect 627302 76264 627308 76316 +rect 627360 76292 627366 76316 +rect 640160 76292 640166 76304 +rect 627360 76264 640166 76292 +rect 640160 76252 640166 76264 +rect 640218 76252 640224 76304 +rect 621244 75760 621250 75812 +rect 621302 75800 621308 75812 +rect 631634 75800 631640 75812 +rect 621302 75772 631640 75800 +rect 621302 75760 621308 75772 +rect 631634 75760 631640 75772 +rect 631692 75760 631698 75812 +rect 621322 75624 621328 75676 +rect 621380 75664 621386 75676 +rect 625944 75664 625950 75676 +rect 621380 75636 625950 75664 +rect 621380 75624 621386 75636 +rect 625944 75624 625950 75636 +rect 626002 75624 626008 75676 rect 575750 74944 575756 74996 rect 575808 74984 575814 74996 rect 589182 74984 589188 74996 @@ -16801,26 +16808,16 @@ rect 642910 52368 642916 52380 rect 642968 52368 642974 52420 rect 52086 51076 52092 51128 rect 52144 51116 52150 51128 -rect 213822 51116 213828 51128 -rect 52144 51088 213828 51116 -rect 52144 51076 52150 51088 -rect 213822 51076 213828 51088 -rect 213880 51116 213886 51128 rect 346486 51116 346492 51128 -rect 213880 51088 346492 51116 -rect 213880 51076 213886 51088 +rect 52144 51088 346492 51116 +rect 52144 51076 52150 51088 rect 346486 51076 346492 51088 rect 346544 51076 346550 51128 rect 198642 51008 198648 51060 rect 198700 51048 198706 51060 -rect 207014 51048 207020 51060 -rect 198700 51020 207020 51048 -rect 198700 51008 198706 51020 -rect 207014 51008 207020 51020 -rect 207072 51048 207078 51060 rect 631870 51048 631876 51060 -rect 207072 51020 631876 51048 -rect 207072 51008 207078 51020 +rect 198700 51020 631876 51048 +rect 198700 51008 198706 51020 rect 631870 51008 631876 51020 rect 631928 51008 631934 51060 rect 478138 48424 478144 48476 @@ -16914,13 +16911,6 @@ rect 311952 45852 607588 45880 rect 311952 45840 311958 45852 rect 607582 45840 607588 45852 rect 607640 45840 607646 45892 -rect 230934 45772 230940 45824 -rect 230992 45812 230998 45824 -rect 613010 45812 613016 45824 -rect 230992 45784 613016 45812 -rect 230992 45772 230998 45784 -rect 613010 45772 613016 45784 -rect 613068 45772 613074 45824 rect 85114 45704 85120 45756 rect 85172 45744 85178 45756 rect 475562 45744 475568 45756 @@ -16928,27 +16918,12 @@ rect 85172 45716 475568 45744 rect 85172 45704 85178 45716 rect 475562 45704 475568 45716 rect 475620 45704 475626 45756 -rect 230382 45636 230388 45688 -rect 230440 45676 230446 45688 -rect 621382 45676 621388 45688 -rect 230440 45648 621388 45676 -rect 230440 45636 230446 45648 -rect 621382 45636 621388 45648 -rect 621440 45636 621446 45688 -rect 233142 45568 233148 45620 -rect 233200 45608 233206 45620 -rect 642818 45608 642824 45620 -rect 233200 45580 642824 45608 -rect 233200 45568 233206 45580 -rect 642818 45568 642824 45580 -rect 642876 45568 642882 45620 rect 212442 45500 212448 45552 rect 212500 45540 212506 45552 -rect 639322 45540 639328 45552 -rect 212500 45512 639328 45540 +rect 621322 45540 621328 45564 +rect 212500 45512 621328 45540 +rect 621380 45512 621386 45564 rect 212500 45500 212506 45512 -rect 639322 45500 639328 45512 -rect 639380 45500 639386 45552 rect 194410 44072 194416 44124 rect 194468 44112 194474 44124 rect 661126 44112 661132 44124 @@ -16970,62 +16945,15 @@ rect 310480 43812 311900 43840 rect 310480 43800 310486 43812 rect 311894 43800 311900 43812 rect 311952 43800 311958 43852 -rect 230474 43460 230480 43512 -rect 230532 43500 230538 43512 -rect 618254 43500 618260 43512 -rect 230532 43472 618260 43500 -rect 230532 43460 230538 43472 -rect 618254 43460 618260 43472 -rect 618312 43460 618318 43512 -rect 230658 43392 230664 43444 -rect 230716 43432 230722 43444 -rect 621474 43432 621480 43444 -rect 230716 43404 621480 43432 -rect 230716 43392 230722 43404 -rect 621474 43392 621480 43404 -rect 621532 43392 621538 43444 -rect 230842 43324 230848 43376 -rect 230900 43364 230906 43376 -rect 621198 43364 621204 43376 -rect 230900 43336 621204 43364 -rect 230900 43324 230906 43336 -rect 621198 43324 621204 43336 -rect 621256 43324 621262 43376 -rect 230566 43256 230572 43308 -rect 230624 43296 230630 43308 -rect 621106 43296 621112 43308 -rect 230624 43268 621112 43296 -rect 230624 43256 230630 43268 -rect 621106 43256 621112 43268 -rect 621164 43256 621170 43308 -rect 230750 43188 230756 43240 -rect 230808 43228 230814 43240 -rect 621290 43228 621296 43240 -rect 230808 43200 621296 43228 -rect 230808 43188 230814 43200 -rect 621290 43188 621296 43200 -rect 621348 43188 621354 43240 -rect 226242 43120 226248 43172 -rect 226300 43160 226306 43172 -rect 622486 43160 622492 43172 -rect 226300 43132 622492 43160 -rect 226300 43120 226306 43132 -rect 622486 43120 622492 43132 -rect 622544 43120 622550 43172 -rect 223482 43052 223488 43104 -rect 223540 43092 223546 43104 rect 622302 43092 622308 43104 -rect 223540 43064 622308 43092 -rect 223540 43052 223546 43064 -rect 622302 43052 622308 43064 -rect 622360 43052 622366 43104 +rect 223818 43064 622308 43092 rect 52178 42712 52184 42764 rect 52236 42752 52242 42764 -rect 215294 42752 215300 42764 -rect 52236 42724 215300 42752 +rect 223818 42752 223846 43064 +rect 622302 43052 622308 43064 +rect 622360 43052 622366 43104 +rect 52236 42724 223846 42752 rect 52236 42712 52242 42724 -rect 215294 42712 215300 42724 -rect 215352 42712 215358 42764 rect 529658 42712 529664 42764 rect 529716 42752 529722 42764 rect 542998 42752 543004 42764 @@ -17100,34 +17028,6 @@ rect 502392 38508 513932 38536 rect 502392 38496 502398 38508 rect 513926 38496 513932 38508 rect 513984 38496 513990 38548 -rect 213178 24760 213184 24812 -rect 213236 24800 213242 24812 -rect 213822 24800 213828 24812 -rect 213236 24772 213828 24800 -rect 213236 24760 213242 24772 -rect 213822 24760 213828 24772 -rect 213880 24760 213886 24812 -rect 224586 22992 224592 23044 -rect 224644 23032 224650 23044 -rect 226242 23032 226248 23044 -rect 224644 23004 226248 23032 -rect 224644 22992 224650 23004 -rect 226242 22992 226248 23004 -rect 226300 22992 226306 23044 -rect 221734 22516 221740 22568 -rect 221792 22556 221798 22568 -rect 223482 22556 223488 22568 -rect 221792 22528 223488 22556 -rect 221792 22516 221798 22528 -rect 223482 22516 223488 22528 -rect 223540 22516 223546 22568 -rect 229370 6468 229376 6520 -rect 229428 6508 229434 6520 -rect 233142 6508 233148 6520 -rect 229428 6480 233148 6508 -rect 229428 6468 229434 6480 -rect 233142 6468 233148 6480 -rect 233200 6468 233206 6520 << via1 >> rect 483572 1004640 483624 1004692 rect 655520 896996 655572 897048 @@ -21806,6 +21706,38 @@ rect 600228 80112 600280 80164 rect 612832 80112 612884 80164 rect 575848 78616 575900 78668 rect 596916 78616 596968 78668 +rect 623120 78026 623172 78078 +rect 631876 78026 631928 78078 +rect 625950 77892 626002 77944 +rect 639328 77892 639380 77944 +rect 634510 77686 634562 77738 +rect 642640 77686 642692 77738 +rect 628820 77520 628872 77572 +rect 642916 77520 642968 77572 +rect 621480 77314 621532 77366 +rect 641944 77314 641996 77366 +rect 621388 77216 621440 77268 +rect 641836 77216 641888 77268 +rect 621296 77074 621348 77126 +rect 641750 77074 641802 77126 +rect 621204 76954 621256 77006 +rect 641640 76954 641692 77006 +rect 621112 76838 621164 76890 +rect 641486 76838 641538 76890 +rect 618260 76754 618312 76806 +rect 641358 76754 641410 76806 +rect 613016 76600 613068 76652 +rect 641166 76600 641218 76652 +rect 627492 76392 627544 76444 +rect 637342 76394 637394 76446 +rect 621012 76266 621064 76318 +rect 623120 76266 623172 76318 +rect 627308 76264 627360 76316 +rect 640166 76252 640218 76304 +rect 621250 75760 621302 75812 +rect 631640 75760 631692 75812 +rect 621328 75624 621380 75676 +rect 625950 75624 626002 75676 rect 575756 74944 575808 74996 rect 589188 74944 589240 74996 rect 583668 73108 583720 73160 @@ -21827,10 +21759,8 @@ rect 198648 52436 198700 52488 rect 346860 52368 346912 52420 rect 642916 52368 642968 52420 rect 52092 51076 52144 51128 -rect 213828 51076 213880 51128 rect 346492 51076 346544 51128 rect 198648 51008 198700 51060 -rect 207020 51008 207072 51060 rect 631876 51008 631928 51060 rect 478144 48424 478196 48476 rect 526168 48424 526220 48476 @@ -21858,38 +21788,18 @@ rect 367100 45908 367152 45960 rect 607312 45908 607364 45960 rect 311900 45840 311952 45892 rect 607588 45840 607640 45892 -rect 230940 45772 230992 45824 -rect 613016 45772 613068 45824 rect 85120 45704 85172 45756 rect 475568 45704 475620 45756 -rect 230388 45636 230440 45688 -rect 621388 45636 621440 45688 -rect 233148 45568 233200 45620 -rect 642824 45568 642876 45620 rect 212448 45500 212500 45552 -rect 639328 45500 639380 45552 +rect 621328 45512 621380 45564 rect 194416 44072 194468 44124 rect 661132 44072 661184 44124 rect 365168 43868 365220 43920 rect 367100 43868 367152 43920 rect 310428 43800 310480 43852 rect 311900 43800 311952 43852 -rect 230480 43460 230532 43512 -rect 618260 43460 618312 43512 -rect 230664 43392 230716 43444 -rect 621480 43392 621532 43444 -rect 230848 43324 230900 43376 -rect 621204 43324 621256 43376 -rect 230572 43256 230624 43308 -rect 621112 43256 621164 43308 -rect 230756 43188 230808 43240 -rect 621296 43188 621348 43240 -rect 226248 43120 226300 43172 -rect 622492 43120 622544 43172 -rect 223488 43052 223540 43104 -rect 622308 43052 622360 43104 rect 52184 42712 52236 42764 -rect 215300 42712 215352 42764 +rect 622308 43052 622360 43104 rect 529664 42712 529716 42764 rect 543004 42712 543056 42764 rect 475476 42576 475528 42628 @@ -21911,14 +21821,6 @@ rect 475568 38564 475620 38616 rect 514024 38564 514076 38616 rect 502340 38496 502392 38548 rect 513932 38496 513984 38548 -rect 213184 24760 213236 24812 -rect 213828 24760 213880 24812 -rect 224592 22992 224644 23044 -rect 226248 22992 226300 23044 -rect 221740 22516 221792 22568 -rect 223488 22516 223540 22568 -rect 229376 6468 229428 6520 -rect 233148 6468 233200 6520 << metal2 >> rect 483570 1004728 483626 1004737 rect 483570 1004663 483572 1004672 @@ -35119,42 +35021,11 @@ rect 150360 48346 150388 52686 rect 198648 52488 198700 52494 rect 198648 52430 198700 52436 rect 198660 51066 198688 52430 -rect 213828 51128 213880 51134 -rect 213828 51070 213880 51076 rect 198648 51060 198700 51066 rect 198648 51002 198700 51008 -rect 207020 51060 207072 51066 -rect 207020 51002 207072 51008 rect 150348 48340 150400 48346 rect 150348 48282 150400 48288 rect 150360 47122 150388 48282 -rect 150348 47116 150400 47122 -rect 150348 47058 150400 47064 -rect 141804 46702 142370 46730 -rect 85120 45756 85172 45762 -rect 85120 45698 85172 45704 -rect 52184 42764 52236 42770 -rect 52184 42706 52236 42712 -rect 141804 40202 141832 46702 -rect 194416 44124 194468 44130 -rect 194416 44066 194468 44072 -rect 194428 42106 194456 44066 -rect 194074 42078 194456 42106 -rect 187606 41848 187662 41857 -rect 187358 41806 187606 41834 -rect 187606 41783 187662 41792 -rect 141758 40174 141832 40202 -rect 141758 39984 141786 40174 -rect 207032 17490 207060 51002 -rect 212448 45552 212500 45558 -rect 212448 45494 212500 45500 -rect 212460 41313 212488 45494 -rect 209778 41304 209834 41313 -rect 209778 41239 209834 41248 -rect 212446 41304 212502 41313 -rect 212446 41239 212502 41248 -rect 209792 17490 209820 41239 -rect 213840 24818 213868 51070 rect 216140 48249 216168 52686 rect 281460 48346 281488 52686 rect 346504 52686 346900 52714 @@ -35185,87 +35056,34 @@ rect 502248 48340 502300 48346 rect 502248 48282 502300 48288 rect 216126 48240 216182 48249 rect 216126 48175 216182 48184 +rect 150348 47116 150400 47122 +rect 150348 47058 150400 47064 rect 218072 46918 218100 48282 rect 218060 46912 218112 46918 rect 218060 46854 218112 46860 -rect 215300 42764 215352 42770 -rect 215300 42706 215352 42712 -rect 213184 24812 213236 24818 -rect 213184 24754 213236 24760 -rect 213828 24812 213880 24818 -rect 213828 24754 213880 24760 -rect 213196 17490 213224 24754 -rect 207032 17462 207184 17490 -rect 209792 17462 210036 17490 -rect 212888 17462 213224 17490 -rect 215312 17490 215340 42706 -rect 218072 33134 218100 46854 +rect 218072 46852 218100 46854 +rect 141804 46702 142370 46730 +rect 85120 45756 85172 45762 +rect 85120 45698 85172 45704 +rect 52184 42764 52236 42770 +rect 52184 42706 52236 42712 +rect 141804 40202 141832 46702 rect 460664 46028 460716 46034 rect 460664 45970 460716 45976 rect 367100 45960 367152 45966 rect 367100 45902 367152 45908 rect 311900 45892 311952 45898 rect 311900 45834 311952 45840 -rect 230940 45824 230992 45830 -rect 230940 45766 230992 45772 -rect 230388 45688 230440 45694 -rect 230388 45630 230440 45636 -rect 226248 43172 226300 43178 -rect 226248 43114 226300 43120 -rect 223488 43104 223540 43110 -rect 223488 43046 223540 43052 -rect 218072 33106 218192 33134 -rect 218164 17490 218192 33106 -rect 223500 22574 223528 43046 -rect 226260 23050 226288 43114 -rect 224592 23044 224644 23050 -rect 224592 22986 224644 22992 -rect 226248 23044 226300 23050 -rect 226248 22986 226300 22992 -rect 221740 22568 221792 22574 -rect 221740 22510 221792 22516 -rect 223488 22568 223540 22574 -rect 223488 22510 223540 22516 -rect 221752 17490 221780 22510 -rect 224604 17490 224632 22986 -rect 215312 17462 215740 17490 -rect 218164 17462 218592 17490 -rect 221444 17462 221780 17490 -rect 224296 17462 224632 17490 -rect 230400 10713 230428 45630 -rect 230480 43512 230532 43518 -rect 230480 43454 230532 43460 -rect 230386 10704 230442 10713 -rect 230386 10639 230442 10648 -rect 230492 7721 230520 43454 -rect 230664 43444 230716 43450 -rect 230664 43386 230716 43392 -rect 230572 43308 230624 43314 -rect 230572 43250 230624 43256 -rect 230584 9217 230612 43250 -rect 230676 13705 230704 43386 -rect 230848 43376 230900 43382 -rect 230848 43318 230900 43324 -rect 230756 43240 230808 43246 -rect 230756 43182 230808 43188 -rect 230768 15201 230796 43182 -rect 230754 15192 230810 15201 -rect 230754 15127 230810 15136 -rect 230662 13696 230718 13705 -rect 230662 13631 230718 13640 -rect 230860 12209 230888 43318 -rect 230952 16697 230980 45766 -rect 233148 45620 233200 45626 -rect 233148 45562 233200 45568 -rect 230938 16688 230994 16697 -rect 230938 16623 230994 16632 -rect 230846 12200 230902 12209 -rect 230846 12135 230902 12144 -rect 230570 9208 230626 9217 -rect 230570 9143 230626 9152 -rect 230478 7712 230534 7721 -rect 230478 7647 230534 7656 -rect 233160 6526 233188 45562 +rect 212448 45552 212500 45558 +rect 212448 45494 212500 45500 +rect 194416 44124 194468 44130 +rect 194416 44066 194468 44072 +rect 194428 42106 194456 44066 +rect 194074 42078 194456 42106 +rect 187606 41848 187662 41857 +rect 187358 41806 187606 41834 +rect 187606 41783 187662 41792 +rect 212460 41313 212488 45494 rect 311912 43858 311940 45834 rect 367112 43926 367140 45902 rect 365168 43920 365220 43926 @@ -35320,12 +35138,16 @@ rect 427910 41783 427966 41792 rect 471702 41783 471758 41792 rect 426348 41472 426400 41478 rect 426348 41414 426400 41420 +rect 212446 41304 212502 41313 +rect 212446 41239 212502 41248 rect 427924 41177 427952 41783 rect 427910 41168 427966 41177 rect 427910 41103 427966 41112 rect 475488 41041 475516 42570 rect 475474 41032 475530 41041 rect 475474 40967 475530 40976 +rect 141758 40174 141832 40202 +rect 141758 39984 141786 40174 rect 475580 38622 475608 45698 rect 502260 41290 502288 48282 rect 506400 41410 506428 48350 @@ -36912,16 +36734,8 @@ rect 614856 93696 614908 93702 rect 614856 93638 614908 93644 rect 612832 80164 612884 80170 rect 612832 80106 612884 80112 -rect 610348 66292 610400 66298 -rect 610348 66234 610400 66240 -rect 610256 46028 610308 46034 -rect 610256 45970 610308 45976 -rect 607588 45892 607640 45898 -rect 607588 45834 607640 45840 -rect 613028 45830 613056 93638 -rect 613016 45824 613068 45830 -rect 613016 45766 613068 45772 -rect 618272 43518 618300 95542 +rect 613028 76658 613056 93638 +rect 618272 76812 618300 95542 rect 618732 94790 618760 100014 rect 619376 95130 619404 100014 rect 620020 95470 620048 100014 @@ -36936,9 +36750,7 @@ rect 619364 95124 619416 95130 rect 619364 95066 619416 95072 rect 618720 94784 618772 94790 rect 618720 94726 618772 94732 -rect 618260 43512 618312 43518 -rect 618260 43454 618312 43460 -rect 621124 43314 621152 100014 +rect 621124 76896 621152 100014 rect 621400 100014 621736 100042 rect 622044 100014 622380 100042 rect 622688 100014 623024 100042 @@ -36954,18 +36766,12 @@ rect 621296 95668 621348 95674 rect 621296 95610 621348 95616 rect 621204 95532 621256 95538 rect 621204 95474 621256 95480 -rect 621216 43382 621244 95474 -rect 621204 43376 621256 43382 -rect 621204 43318 621256 43324 -rect 621112 43308 621164 43314 -rect 621112 43250 621164 43256 -rect 621308 43246 621336 95610 -rect 621400 45694 621428 100014 +rect 621216 77012 621244 95474 +rect 621308 77132 621336 95610 +rect 621400 77274 621428 100014 rect 621480 95600 621532 95606 rect 621480 95542 621532 95548 -rect 621388 45688 621440 45694 -rect 621388 45630 621440 45636 -rect 621492 43450 621520 95542 +rect 621492 77372 621520 95542 rect 622044 95538 622072 100014 rect 622492 95736 622544 95742 rect 622492 95678 622544 95684 @@ -37159,23 +36965,68 @@ rect 623134 84144 623190 84153 rect 623134 84079 623190 84088 rect 622122 83192 622178 83201 rect 622122 83127 622178 83136 -rect 622306 82240 622362 82249 -rect 622306 82175 622362 82184 -rect 621480 43444 621532 43450 -rect 621480 43386 621532 43392 -rect 621296 43240 621348 43246 -rect 621296 43182 621348 43188 -rect 622320 43110 622348 82175 -rect 622490 81424 622546 81433 -rect 622490 81359 622546 81368 -rect 622504 43178 622532 81359 +rect 627490 82264 627546 82273 +rect 627490 82199 627546 82208 +rect 627320 81469 627348 81470 +rect 627304 81460 627364 81469 +rect 627304 81391 627364 81400 +rect 623120 78078 623172 78084 +rect 623120 78020 623172 78026 +rect 621480 77366 621532 77372 +rect 621480 77308 621532 77314 +rect 621388 77268 621440 77274 +rect 621388 77210 621440 77216 +rect 621296 77126 621348 77132 +rect 621296 77068 621348 77074 +rect 621204 77006 621256 77012 +rect 621204 76948 621256 76954 +rect 621112 76890 621164 76896 +rect 621112 76832 621164 76838 +rect 618260 76806 618312 76812 +rect 618260 76748 618312 76754 +rect 613016 76652 613068 76658 +rect 613016 76594 613068 76600 +rect 623132 76324 623160 78020 +rect 625950 77944 626002 77950 +rect 625950 77886 626002 77892 +rect 621012 76318 621064 76324 +rect 621012 76260 621064 76266 +rect 623120 76318 623172 76324 +rect 623120 76260 623172 76266 +rect 610348 66292 610400 66298 +rect 610348 66234 610400 66240 +rect 621024 62689 621052 76260 +rect 621248 75818 621276 75822 +rect 621248 75812 621302 75818 +rect 621248 75760 621250 75812 +rect 621248 75754 621302 75760 +rect 621248 62825 621276 75754 +rect 621328 75676 621380 75682 +rect 621328 75618 621380 75624 +rect 621232 62816 621292 62825 +rect 621232 62747 621292 62756 +rect 621008 62680 621068 62689 +rect 621008 62611 621068 62620 +rect 610256 46028 610308 46034 +rect 610256 45970 610308 45976 +rect 607588 45892 607640 45898 +rect 607588 45834 607640 45840 +rect 621340 45570 621368 75618 +rect 623132 75542 623160 76260 +rect 625962 75682 625990 77886 +rect 627320 76322 627348 81391 +rect 627504 76450 627532 82199 rect 631856 80974 631916 81002 rect 639308 80974 639368 81002 -rect 631888 51066 631916 80974 -rect 631876 51060 631928 51066 -rect 631876 51002 631928 51008 -rect 639340 45558 639368 80974 -rect 642652 46918 642680 100014 +rect 631888 78084 631916 80974 +rect 631876 78078 631928 78084 +rect 631876 78020 631928 78026 +rect 631888 78016 631916 78020 +rect 639340 77950 639368 80974 +rect 639328 77944 639380 77950 +rect 639328 77886 639380 77892 +rect 639340 77882 639368 77886 +rect 642652 77744 642680 100014 rect 642824 95668 642876 95674 rect 642824 95610 642876 95616 rect 642732 95532 642784 95538 @@ -37183,12 +37034,89 @@ rect 642732 95474 642784 95480 rect 642744 92721 642772 95474 rect 642730 92712 642786 92721 rect 642730 92647 642786 92656 -rect 642640 46912 642692 46918 -rect 642640 46854 642692 46860 -rect 642836 45626 642864 95610 +rect 634510 77738 634562 77744 +rect 634510 77680 634562 77686 +rect 642640 77738 642692 77744 +rect 642640 77680 642692 77686 +rect 628820 77572 628872 77578 +rect 628820 77514 628872 77520 +rect 627492 76444 627544 76450 +rect 627492 76386 627544 76392 +rect 627308 76316 627360 76322 +rect 627308 76258 627360 76264 +rect 625950 75676 626002 75682 +rect 625950 75618 626002 75624 +rect 625950 75596 625990 75618 +rect 625962 75534 625990 75596 +rect 628832 75514 628860 77514 +rect 631640 75812 631692 75818 +rect 631640 75754 631692 75760 +rect 631652 75518 631680 75754 +rect 634522 75500 634550 77680 +rect 641944 77366 641996 77372 +rect 641944 77308 641996 77314 +rect 641836 77268 641888 77274 +rect 641836 77210 641888 77216 +rect 641750 77126 641802 77132 +rect 641750 77068 641802 77074 +rect 641640 77006 641692 77012 +rect 641640 76948 641692 76954 +rect 641486 76890 641538 76896 +rect 641486 76832 641538 76838 +rect 641358 76806 641410 76812 +rect 641358 76748 641410 76754 +rect 641166 76652 641218 76658 +rect 641166 76594 641218 76600 +rect 637342 76446 637394 76452 +rect 637342 76388 637394 76394 +rect 637354 75856 637382 76388 +rect 640166 76304 640218 76310 +rect 640166 76246 640218 76252 +rect 637350 75828 637382 75856 +rect 637354 75588 637382 75828 +rect 640180 75552 640208 76246 +rect 641178 74881 641206 76594 +rect 641162 74872 641222 74881 +rect 641162 74803 641222 74812 +rect 641370 65889 641398 76748 +rect 641498 67383 641526 76832 +rect 641652 70361 641680 76948 +rect 641762 73369 641790 77068 +rect 641746 73360 641806 73369 +rect 641746 73291 641806 73300 +rect 641762 73288 641790 73291 +rect 641636 70352 641696 70361 +rect 641636 70283 641696 70292 +rect 641652 70280 641680 70283 +rect 641848 68881 641876 77210 +rect 641956 71863 641984 77308 +rect 641940 71854 642000 71863 +rect 641940 71785 642000 71794 +rect 641956 71780 641984 71785 +rect 641832 68872 641892 68881 +rect 641832 68803 641892 68812 +rect 641848 68796 641876 68803 +rect 641482 67374 641542 67383 +rect 641482 67305 641542 67314 +rect 641498 67298 641526 67305 +rect 641354 65880 641414 65889 +rect 641354 65811 641414 65820 +rect 641370 65810 641398 65811 +rect 622310 62814 622366 62823 +rect 622310 62749 622366 62758 +rect 621328 45564 621380 45570 +rect 621328 45506 621380 45512 +rect 622320 43110 622348 62749 +rect 631872 62674 631932 62683 +rect 631872 62605 631932 62614 +rect 631888 51066 631916 62605 +rect 631876 51060 631928 51066 +rect 631876 51002 631928 51008 +rect 642652 46918 642680 77680 +rect 642836 64373 642864 95610 rect 642916 95600 642968 95606 rect 642916 95542 642968 95548 -rect 642928 52426 642956 95542 +rect 642928 77578 642956 95542 rect 643468 95124 643520 95130 rect 643468 95066 643520 95072 rect 643480 85270 643508 95066 @@ -37501,14 +37429,17 @@ rect 646134 84688 646190 84697 rect 646134 84623 646190 84632 rect 645950 82240 646006 82249 rect 645950 82175 646006 82184 +rect 642916 77572 642968 77578 +rect 642916 77514 642968 77520 +rect 642820 64364 642880 64373 +rect 642820 64295 642880 64304 +rect 642928 52426 642956 77514 rect 642916 52420 642968 52426 rect 642916 52362 642968 52368 rect 661130 47560 661186 47569 rect 661130 47495 661186 47504 -rect 642824 45620 642876 45626 -rect 642824 45562 642876 45568 -rect 639328 45552 639380 45558 -rect 639328 45494 639380 45500 +rect 642640 46912 642692 46918 +rect 642640 46854 642692 46860 rect 661144 44130 661172 47495 rect 665192 47433 665220 95134 rect 666572 48521 666600 170054 @@ -41644,8 +41575,6 @@ rect 665178 47424 665234 47433 rect 665178 47359 665234 47368 rect 661132 44124 661184 44130 rect 661132 44066 661184 44072 -rect 622492 43172 622544 43178 -rect 622492 43114 622544 43120 rect 622308 43104 622360 43110 rect 622308 43046 622360 43052 rect 607496 41472 607548 41478 @@ -41662,13 +41591,6 @@ rect 502340 38548 502392 38554 rect 502340 38490 502392 38496 rect 513932 38548 513984 38554 rect 513932 38490 513984 38496 -rect 229376 6520 229428 6526 -rect 229376 6462 229428 6468 -rect 233148 6520 233200 6526 -rect 233148 6462 233200 6468 -rect 229388 6225 229416 6462 -rect 229374 6216 229430 6225 -rect 229374 6151 229430 6160 << via2 >> rect 483570 1004692 483626 1004728 rect 483570 1004672 483572 1004692 @@ -42833,17 +42755,8 @@ rect 579986 104904 580042 104960 rect 580262 103408 580318 103464 rect 580354 100256 580410 100312 rect 580446 97248 580502 97304 -rect 187606 41792 187662 41848 -rect 209778 41248 209834 41304 -rect 212446 41248 212502 41304 rect 216126 48184 216182 48240 -rect 230386 10648 230442 10704 -rect 230754 15136 230810 15192 -rect 230662 13640 230718 13696 -rect 230938 16632 230994 16688 -rect 230846 12144 230902 12200 -rect 230570 9152 230626 9208 -rect 230478 7656 230534 7712 +rect 187606 41792 187662 41848 rect 307298 43152 307354 43208 rect 416594 43424 416650 43480 rect 415398 43288 415454 43344 @@ -42852,6 +42765,7 @@ rect 361946 41792 362002 41848 rect 419998 41792 420054 41848 rect 427910 41792 427966 41848 rect 471702 41792 471758 41848 +rect 212446 41248 212502 41304 rect 427910 41112 427966 41168 rect 475474 40976 475530 41032 rect 521750 42064 521806 42120 @@ -43082,9 +42996,20 @@ rect 623502 85992 623558 86048 rect 623318 85040 623374 85096 rect 623134 84088 623190 84144 rect 622122 83136 622178 83192 -rect 622306 82184 622362 82240 -rect 622490 81368 622546 81424 +rect 627490 82208 627546 82264 +rect 627304 81400 627364 81460 +rect 621232 62756 621292 62816 +rect 621008 62620 621068 62680 rect 642730 92656 642786 92712 +rect 641162 74812 641222 74872 +rect 641746 73300 641806 73360 +rect 641636 70292 641696 70352 +rect 641940 71794 642000 71854 +rect 641832 68812 641892 68872 +rect 641482 67314 641542 67374 +rect 641354 65820 641414 65880 +rect 622310 62758 622366 62814 +rect 631872 62614 631932 62674 rect 645858 89664 645914 89720 rect 646042 87080 646098 87136 rect 653954 92520 654010 92576 @@ -43103,6 +43028,7 @@ rect 663614 90344 663670 90400 rect 663430 89528 663486 89584 rect 646134 84632 646190 84688 rect 645950 82184 646006 82240 +rect 642820 64304 642880 64364 rect 661130 47504 661186 47560 rect 666742 168544 666798 168600 rect 666742 165144 666798 165200 @@ -43671,7 +43597,6 @@ rect 672078 100816 672134 100872 rect 666558 48456 666614 48512 rect 665178 47368 665234 47424 rect 549258 40976 549314 41032 -rect 229374 6160 229430 6216 << metal3 >> rect 483565 1004730 483631 1004733 rect 483565 1004728 483644 1004730 @@ -53882,24 +53807,22 @@ rect 579674 82592 579679 82648 rect 576312 82590 579679 82592 rect 576312 82332 576372 82590 rect 579613 82587 579679 82590 -rect 622301 82242 622367 82245 +rect 627485 82266 627551 82269 +rect 627485 82264 628268 82266 +rect 627485 82208 627490 82264 +rect 627546 82208 628268 82264 rect 645945 82242 646011 82245 -rect 622301 82240 628268 82242 -rect 622301 82184 622306 82240 -rect 622362 82184 628268 82240 -rect 622301 82182 628268 82184 +rect 627485 82206 628268 82208 rect 642988 82240 646011 82242 +rect 627485 82203 627551 82206 rect 642988 82184 645950 82240 rect 646006 82184 646011 82240 rect 642988 82182 646011 82184 -rect 622301 82179 622367 82182 rect 645945 82179 646011 82182 -rect 622485 81426 622551 81429 -rect 622485 81424 628268 81426 -rect 622485 81368 622490 81424 -rect 622546 81368 628268 81424 -rect 622485 81366 628268 81368 -rect 622485 81363 622551 81366 +rect 627299 81460 627369 81465 +rect 627299 81400 627304 81460 +rect 627364 81400 628320 81460 +rect 627299 81395 627369 81400 rect 581453 80854 581519 80857 rect 576380 80852 581519 80854 rect 576380 80796 581458 80852 @@ -53931,52 +53854,102 @@ rect 581698 74976 581703 75032 rect 576256 74974 581703 74976 rect 576256 74682 576316 74974 rect 581637 74971 581703 74974 +rect 641157 74872 641227 74877 +rect 641157 74812 641162 74872 +rect 641222 74812 641227 74872 +rect 641157 74807 641227 74812 +rect 641452 73360 641811 73365 +rect 641452 73300 641746 73360 +rect 641806 73300 641811 73360 +rect 641452 73295 641811 73300 rect 580942 73258 580948 73260 rect 576380 73198 580948 73258 rect 580942 73196 580948 73198 rect 581012 73196 581018 73260 +rect 641935 71854 642005 71859 +rect 641508 71794 641940 71854 +rect 642000 71794 642005 71854 +rect 641935 71789 642005 71794 rect 581545 71762 581611 71765 rect 576380 71760 581611 71762 rect 576380 71704 581550 71760 rect 581606 71704 581611 71760 rect 576380 71702 581611 71704 rect 581545 71699 581611 71702 +rect 641631 70352 641701 70357 +rect 641578 70292 641636 70352 +rect 641696 70292 641701 70352 +rect 641631 70287 641701 70292 rect 580993 70250 581059 70253 rect 576380 70248 581059 70250 rect 576380 70192 580998 70248 rect 581054 70192 581059 70248 rect 576380 70190 581059 70192 rect 580993 70187 581059 70190 +rect 641827 68872 641897 68877 +rect 641366 68812 641832 68872 +rect 641892 68812 641897 68872 +rect 641827 68807 641897 68812 rect 580717 68754 580783 68757 rect 576380 68752 580783 68754 rect 576380 68696 580722 68752 rect 580778 68696 580783 68752 rect 576380 68694 580783 68696 rect 580717 68691 580783 68694 +rect 641477 67374 641547 67379 +rect 641477 67314 641482 67374 +rect 641542 67314 641547 67374 +rect 641477 67309 641547 67314 rect 581177 67258 581243 67261 rect 576380 67256 581243 67258 rect 576380 67200 581182 67256 rect 581238 67200 581243 67256 rect 576380 67198 581243 67200 rect 581177 67195 581243 67198 +rect 641349 65880 641419 65885 +rect 641349 65820 641354 65880 +rect 641414 65820 641419 65880 +rect 641349 65815 641419 65820 rect 579613 65762 579679 65765 rect 576380 65760 579679 65762 rect 576380 65704 579618 65760 rect 579674 65704 579679 65760 rect 576380 65702 579679 65704 rect 579613 65699 579679 65702 +rect 642815 64364 642885 64369 +rect 641410 64304 642820 64364 +rect 642880 64304 642885 64364 +rect 642815 64299 642885 64304 rect 581085 64266 581151 64269 rect 576380 64264 581151 64266 rect 576380 64208 581090 64264 rect 581146 64208 581151 64264 rect 576380 64206 581151 64208 rect 581085 64203 581151 64206 +rect 621227 62816 621297 62821 +rect 622305 62816 622371 62819 rect 580809 62770 580875 62773 rect 576380 62768 580875 62770 rect 576380 62712 580814 62768 rect 580870 62712 580875 62768 +rect 621227 62756 621232 62816 +rect 621292 62814 622371 62816 +rect 621292 62758 622310 62814 +rect 622366 62758 622371 62814 +rect 621292 62756 622371 62758 +rect 621227 62751 621297 62756 +rect 622305 62753 622371 62756 rect 576380 62710 580875 62712 rect 580809 62707 580875 62710 +rect 621003 62680 621073 62685 +rect 621003 62620 621008 62680 +rect 621068 62674 631940 62680 +rect 621068 62620 631872 62674 +rect 621003 62615 621073 62620 +rect 631867 62614 631872 62620 +rect 631932 62620 631940 62674 +rect 631932 62614 631937 62620 +rect 631867 62609 631937 62614 rect 582189 61258 582255 61261 rect 576380 61256 582255 61258 rect 576380 61200 582194 61256 @@ -54113,11 +54086,9 @@ rect 471758 41792 477510 41848 rect 471697 41790 477510 41792 rect 471697 41787 471763 41790 rect 187650 41306 187710 41787 -rect 209773 41306 209839 41309 rect 212441 41306 212507 41309 rect 187650 41304 212507 41306 -rect 187650 41248 209778 41304 -rect 209834 41248 212446 41304 +rect 187650 41248 212446 41304 rect 212502 41248 212507 41304 rect 187650 41246 212507 41248 rect 361990 41306 362050 41787 @@ -54140,7 +54111,6 @@ rect 361990 41304 530367 41306 rect 361990 41248 530306 41304 rect 530362 41248 530367 41304 rect 361990 41246 530367 41248 -rect 209773 41243 209839 41246 rect 212441 41243 212507 41246 rect 530301 41243 530367 41246 rect 427905 41170 427971 41173 @@ -54161,54 +54131,6 @@ rect 549314 40976 549319 41032 rect 475469 40974 549319 40976 rect 475469 40971 475535 40974 rect 549253 40971 549319 40974 -rect 230933 16690 230999 16693 -rect 225676 16688 230999 16690 -rect 225676 16632 230938 16688 -rect 230994 16632 230999 16688 -rect 225676 16630 230999 16632 -rect 230933 16627 230999 16630 -rect 230749 15194 230815 15197 -rect 225676 15192 230815 15194 -rect 225676 15136 230754 15192 -rect 230810 15136 230815 15192 -rect 225676 15134 230815 15136 -rect 230749 15131 230815 15134 -rect 230657 13698 230723 13701 -rect 225676 13696 230723 13698 -rect 225676 13640 230662 13696 -rect 230718 13640 230723 13696 -rect 225676 13638 230723 13640 -rect 230657 13635 230723 13638 -rect 230841 12202 230907 12205 -rect 225676 12200 230907 12202 -rect 225676 12144 230846 12200 -rect 230902 12144 230907 12200 -rect 225676 12142 230907 12144 -rect 230841 12139 230907 12142 -rect 230381 10706 230447 10709 -rect 225676 10704 230447 10706 -rect 225676 10648 230386 10704 -rect 230442 10648 230447 10704 -rect 225676 10646 230447 10648 -rect 230381 10643 230447 10646 -rect 230565 9210 230631 9213 -rect 225676 9208 230631 9210 -rect 225676 9152 230570 9208 -rect 230626 9152 230631 9208 -rect 225676 9150 230631 9152 -rect 230565 9147 230631 9150 -rect 230473 7714 230539 7717 -rect 225676 7712 230539 7714 -rect 225676 7656 230478 7712 -rect 230534 7656 230539 7712 -rect 225676 7654 230539 7656 -rect 230473 7651 230539 7654 -rect 229369 6218 229435 6221 -rect 225676 6216 229435 6218 -rect 225676 6160 229374 6216 -rect 229430 6160 229435 6216 -rect 225676 6158 229435 6160 -rect 229369 6155 229435 6158 << via3 >> rect 221400 993820 234879 995620 rect 240878 993820 254357 995620 @@ -55370,6 +55292,7 @@ rect 394878 983518 399602 993116 tri 399602 983518 409200 993116 nw rect 394602 982718 399602 983518 rect 6811 956610 18975 968778 +rect 698624 953022 710789 965190 rect 6167 914054 19619 924934 rect 697980 909666 711432 920546 rect 6811 871210 18975 883378 @@ -55413,7 +55336,9 @@ rect 621912 246680 630918 249344 rect 621702 242714 630708 245378 rect 6598 227040 19088 239560 rect 621626 238638 630632 241302 +rect 590522 234770 595540 236910 rect 698512 236640 711002 249160 +rect 590480 230750 595228 233134 rect 6598 183840 19088 196360 rect 698512 191440 711002 203960 rect 698512 146440 711002 158960 @@ -55431,302 +55356,302 @@ 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 1638030917 -transform 1 0 205746 0 1 5488 -box -38 -48 20000 12000 use xres_buf rstb_level -timestamp 1638030917 +timestamp 1638495418 transform -1 0 145710 0 -1 50488 box 414 -400 3522 3800 -use copyright_block_a copyright_block_a_0 -timestamp 1636248774 -transform 1 0 149582 0 1 16298 -box -262 -9464 35048 2764 +use caravan_motto caravan_motto_0 +timestamp 1637698689 +transform 1 0 -54560 0 1 -52 +box 367960 10204 399802 14768 use caravan_logo caravan_logo_0 timestamp 1636751500 -transform 1 0 310698 0 1 5742 +transform 1 0 255300 0 1 6032 box 2240 2560 37000 11520 use open_source open_source_0 hexdigits timestamp 1635801696 -transform 1 0 260430 0 1 2174 +transform 1 0 206074 0 1 2336 box 752 5164 29030 16242 +use copyright_block_a copyright_block_a_0 +timestamp 1636248774 +transform 1 0 149582 0 1 16298 +box -262 -9464 35048 2764 use user_id_textblock user_id_textblock_0 timestamp 1608324878 transform 1 0 96272 0 1 6890 box -656 1508 33720 10344 +use caravel_clocking clocking +timestamp 1638495418 +transform 1 0 621684 0 1 63608 +box -38 -48 20000 12000 use housekeeping housekeeping -timestamp 1638269533 +timestamp 1638495418 transform 1 0 606434 0 1 100002 box 0 0 60046 110190 use digital_pll pll -timestamp 1638030917 +timestamp 1638495418 transform 1 0 628146 0 1 80944 box 0 0 15000 15000 use user_id_programming user_id_value -timestamp 1638030917 +timestamp 1638495418 transform 1 0 656624 0 1 88126 box 0 0 7109 7077 use gpio_defaults_block_1803 gpio_defaults_block_0 -timestamp 1636219436 +timestamp 1638495418 transform -1 0 709467 0 1 134000 box -38 0 6018 2224 use gpio_control_block gpio_control_bidir_1\[0\] -timestamp 1638030917 +timestamp 1638495418 transform -1 0 710203 0 1 121000 box 882 167 34000 13000 use simple_por por ../maglef timestamp 1638030790 transform 1 0 650146 0 -1 55282 box -14 11 11344 8684 -use caravan_motto caravan_motto_0 -timestamp 1637698689 -transform 1 0 886 0 1 288 -box 367960 10204 399802 14768 use mgmt_core_wrapper soc timestamp 1638280046 transform 1 0 52034 0 1 53002 box 382 -400 524400 164400 use gpio_control_block gpio_control_bidir_2\[2\] -timestamp 1638030917 +timestamp 1638495418 transform 1 0 7631 0 1 202600 box 882 167 34000 13000 use gpio_defaults_block_1803 gpio_defaults_block_1 -timestamp 1636219436 +timestamp 1638495418 transform -1 0 709467 0 1 179200 box -38 0 6018 2224 use gpio_control_block gpio_control_bidir_1\[1\] -timestamp 1638030917 +timestamp 1638495418 transform -1 0 710203 0 1 166200 box 882 167 34000 13000 use gpio_control_block gpio_control_bidir_2\[1\] -timestamp 1638030917 +timestamp 1638495418 transform 1 0 7631 0 1 245800 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_37 -timestamp 1638030917 +timestamp 1638495418 transform 1 0 8367 0 1 215600 box -38 0 6018 2224 use mgmt_protect mgmt_buffers -timestamp 1638030917 +timestamp 1638495418 transform 1 0 192180 0 1 232036 box -400 -400 220400 32400 use spare_logic_block spare_logic_block_3 -timestamp 1638030917 +timestamp 1638495418 transform 1 0 88632 0 1 232528 box 0 0 9000 9000 use spare_logic_block spare_logic_block_1 -timestamp 1638030917 +timestamp 1638495418 transform 1 0 168632 0 1 232528 box 0 0 9000 9000 use spare_logic_block spare_logic_block_2 -timestamp 1638030917 +timestamp 1638495418 transform 1 0 428632 0 1 232528 box 0 0 9000 9000 use spare_logic_block spare_logic_block_0 -timestamp 1638030917 +timestamp 1638495418 transform 1 0 640874 0 1 220592 box 0 0 9000 9000 use gpio_control_block gpio_control_in_1a\[0\] -timestamp 1638030917 +timestamp 1638495418 transform -1 0 710203 0 1 211200 box 882 167 34000 13000 use gpio_defaults_block_0403 gpio_defaults_block_2 -timestamp 1638299091 +timestamp 1638495418 transform -1 0 709467 0 1 224200 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_36 -timestamp 1638030917 +timestamp 1638495418 transform 1 0 8367 0 1 258800 box -38 0 6018 2224 use gpio_control_block gpio_control_in_1a\[1\] -timestamp 1638030917 +timestamp 1638495418 transform -1 0 710203 0 1 256400 box 882 167 34000 13000 use gpio_defaults_block_0403 gpio_defaults_block_3 -timestamp 1638299091 +timestamp 1638495418 transform -1 0 709467 0 1 269400 box -38 0 6018 2224 use gpio_control_block gpio_control_bidir_2\[0\] -timestamp 1638030917 +timestamp 1638495418 transform 1 0 7631 0 1 289000 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_35 -timestamp 1638030917 +timestamp 1638495418 transform 1 0 8367 0 1 302000 box -38 0 6018 2224 use gpio_control_block gpio_control_in_1a\[2\] -timestamp 1638030917 +timestamp 1638495418 transform -1 0 710203 0 1 301400 box 882 167 34000 13000 use gpio_defaults_block_0403 gpio_defaults_block_4 -timestamp 1638299091 +timestamp 1638495418 transform -1 0 709467 0 1 314400 box -38 0 6018 2224 use gpio_control_block gpio_control_in_2\[7\] -timestamp 1638030917 +timestamp 1638495418 transform 1 0 7631 0 1 418600 box 882 167 34000 13000 use gpio_control_block gpio_control_in_2\[8\] -timestamp 1638030917 +timestamp 1638495418 transform 1 0 7631 0 1 375400 box 882 167 34000 13000 use gpio_control_block gpio_control_in_2\[9\] -timestamp 1638030917 +timestamp 1638495418 transform 1 0 7631 0 1 332200 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_32 -timestamp 1638030917 +timestamp 1638495418 transform 1 0 8367 0 1 431600 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_33 -timestamp 1638030917 +timestamp 1638495418 transform 1 0 8367 0 1 388400 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_34 -timestamp 1638030917 +timestamp 1638495418 transform 1 0 8367 0 1 345200 box -38 0 6018 2224 use gpio_control_block gpio_control_in_1a\[3\] -timestamp 1638030917 +timestamp 1638495418 transform -1 0 710203 0 1 346400 box 882 167 34000 13000 use gpio_control_block gpio_control_in_1a\[4\] -timestamp 1638030917 +timestamp 1638495418 transform -1 0 710203 0 1 391600 box 882 167 34000 13000 use gpio_control_block gpio_control_in_1a\[5\] -timestamp 1638030917 +timestamp 1638495418 transform -1 0 710203 0 1 479800 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_5 -timestamp 1638030917 +timestamp 1638495418 transform -1 0 709467 0 1 359400 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_6 -timestamp 1638030917 +timestamp 1638495418 transform -1 0 709467 0 1 404600 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_7 -timestamp 1638030917 +timestamp 1638495418 transform -1 0 709467 0 1 492800 box -38 0 6018 2224 -use gpio_control_block gpio_control_in_2\[6\] -timestamp 1638030917 -transform 1 0 7631 0 1 546200 +use gpio_control_block gpio_control_in_2\[4\] +timestamp 1638495418 +transform 1 0 7631 0 1 632600 box 882 167 34000 13000 use gpio_control_block gpio_control_in_2\[5\] -timestamp 1638030917 +timestamp 1638495418 transform 1 0 7631 0 1 589400 box 882 167 34000 13000 -use gpio_control_block gpio_control_in_2\[4\] -timestamp 1638030917 -transform 1 0 7631 0 1 632600 +use gpio_control_block gpio_control_in_2\[6\] +timestamp 1638495418 +transform 1 0 7631 0 1 546200 box 882 167 34000 13000 -use gpio_defaults_block gpio_defaults_block_31 -timestamp 1638030917 -transform 1 0 8367 0 1 559200 -box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_30 -timestamp 1638030917 +timestamp 1638495418 transform 1 0 8367 0 1 602400 box -38 0 6018 2224 -use gpio_control_block gpio_control_in_1\[2\] -timestamp 1638030917 -transform -1 0 710203 0 1 614000 +use gpio_defaults_block gpio_defaults_block_31 +timestamp 1638495418 +transform 1 0 8367 0 1 559200 +box -38 0 6018 2224 +use gpio_control_block gpio_control_in_1\[0\] +timestamp 1638495418 +transform -1 0 710203 0 1 523800 box 882 167 34000 13000 use gpio_control_block gpio_control_in_1\[1\] -timestamp 1638030917 +timestamp 1638495418 transform -1 0 710203 0 1 568800 box 882 167 34000 13000 -use gpio_control_block gpio_control_in_1\[0\] -timestamp 1638030917 -transform -1 0 710203 0 1 523800 +use gpio_control_block gpio_control_in_1\[2\] +timestamp 1638495418 +transform -1 0 710203 0 1 614000 box 882 167 34000 13000 -use gpio_defaults_block gpio_defaults_block_9 -timestamp 1638030917 -transform -1 0 709467 0 1 581800 +use gpio_defaults_block gpio_defaults_block_10 +timestamp 1638495418 +transform -1 0 709467 0 1 627000 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_8 -timestamp 1638030917 +timestamp 1638495418 transform -1 0 709467 0 1 536800 box -38 0 6018 2224 -use gpio_defaults_block gpio_defaults_block_10 -timestamp 1638030917 -transform -1 0 709467 0 1 627000 +use gpio_defaults_block gpio_defaults_block_9 +timestamp 1638495418 +transform -1 0 709467 0 1 581800 box -38 0 6018 2224 -use gpio_control_block gpio_control_in_2\[3\] -timestamp 1638030917 -transform 1 0 7631 0 1 675800 -box 882 167 34000 13000 use gpio_control_block gpio_control_in_2\[2\] -timestamp 1638030917 +timestamp 1638495418 transform 1 0 7631 0 1 719000 box 882 167 34000 13000 -use gpio_defaults_block gpio_defaults_block_29 -timestamp 1638030917 -transform 1 0 8367 0 1 645600 +use gpio_control_block gpio_control_in_2\[3\] +timestamp 1638495418 +transform 1 0 7631 0 1 675800 +box 882 167 34000 13000 +use gpio_defaults_block gpio_defaults_block_27 +timestamp 1638495418 +transform 1 0 8367 0 1 732000 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_28 -timestamp 1638030917 +timestamp 1638495418 transform 1 0 8367 0 1 688800 box -38 0 6018 2224 -use gpio_defaults_block gpio_defaults_block_27 -timestamp 1638030917 -transform 1 0 8367 0 1 732000 +use gpio_defaults_block gpio_defaults_block_29 +timestamp 1638495418 +transform 1 0 8367 0 1 645600 box -38 0 6018 2224 -use gpio_control_block gpio_control_in_1\[4\] -timestamp 1638030917 -transform -1 0 710203 0 1 704200 -box 882 167 34000 13000 use gpio_control_block gpio_control_in_1\[3\] -timestamp 1638030917 +timestamp 1638495418 transform -1 0 710203 0 1 659000 box 882 167 34000 13000 -use gpio_defaults_block gpio_defaults_block_12 -timestamp 1638030917 -transform -1 0 709467 0 1 717200 -box -38 0 6018 2224 +use gpio_control_block gpio_control_in_1\[4\] +timestamp 1638495418 +transform -1 0 710203 0 1 704200 +box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_11 -timestamp 1638030917 +timestamp 1638495418 transform -1 0 709467 0 1 672000 box -38 0 6018 2224 -use gpio_control_block gpio_control_in_2\[1\] -timestamp 1638030917 -transform 1 0 7631 0 1 762200 -box 882 167 34000 13000 +use gpio_defaults_block gpio_defaults_block_12 +timestamp 1638495418 +transform -1 0 709467 0 1 717200 +box -38 0 6018 2224 use gpio_control_block gpio_control_in_2\[0\] -timestamp 1638030917 +timestamp 1638495418 transform 1 0 7631 0 1 805400 box 882 167 34000 13000 -use gpio_defaults_block gpio_defaults_block_26 -timestamp 1638030917 -transform 1 0 8367 0 1 775200 -box -38 0 6018 2224 +use gpio_control_block gpio_control_in_2\[1\] +timestamp 1638495418 +transform 1 0 7631 0 1 762200 +box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_14 -timestamp 1638030917 +timestamp 1638495418 transform 1 0 8367 0 1 818400 box -38 0 6018 2224 +use gpio_defaults_block gpio_defaults_block_26 +timestamp 1638495418 +transform 1 0 8367 0 1 775200 +box -38 0 6018 2224 use gpio_control_block gpio_control_in_1\[5\] -timestamp 1638030917 +timestamp 1638495418 transform -1 0 710203 0 1 884800 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_13 -timestamp 1638030917 +timestamp 1638495418 transform -1 0 709467 0 1 897800 box -38 0 6018 2224 +use chip_io_alt padframe +timestamp 1638495418 +transform 1 0 0 0 1 0 +box 0 0 717600 1037600 use caravan_power_routing caravan_power_routing_0 -timestamp 1637791793 +timestamp 1638483672 transform 1 0 0 0 1 0 box 0 0 717600 1037600 use user_analog_project_wrapper mprj timestamp 1632839657 transform 1 0 65308 0 1 278718 box -800 -800 584800 704800 -use chip_io_alt padframe -timestamp 1638031010 -transform 1 0 0 0 1 0 -box 0 0 717600 1037600 << labels >> flabel metal5 s 187640 6598 200160 19088 0 FreeSans 24000 0 0 0 clock port 0 nsew signal input @@ -55750,8 +55675,6 @@ flabel metal5 s 698512 774440 711002 786960 0 FreeSans 24000 0 0 0 mprj_io[12] port 9 nsew signal bidirectional flabel metal5 s 698512 863640 711002 876160 0 FreeSans 24000 0 0 0 mprj_io[13] port 10 nsew signal bidirectional -flabel metal5 s 698512 952840 711002 965360 0 FreeSans 24000 0 0 0 mprj_io[14] -port 11 nsew signal bidirectional flabel metal5 s 628240 1018512 640760 1031002 0 FreeSans 24000 0 0 0 mprj_io[15] port 12 nsew signal bidirectional flabel metal5 s 526440 1018512 538960 1031002 0 FreeSans 24000 0 0 0 mprj_io[16] @@ -55864,6 +55787,8 @@ flabel metal5 621512 258708 630212 261250 0 FreeSans 16000 0 0 0 vssa2_core flabel metal5 621598 254668 630298 257210 0 FreeSans 16000 0 0 0 vdda2_core flabel metal5 621936 242776 630636 245318 0 FreeSans 16000 0 0 0 vssd2_core flabel metal5 621794 238736 630494 241278 0 FreeSans 16000 0 0 0 vccd2_core +flabel metal5 s 698512 952840 711002 965360 0 FreeSans 24000 0 0 0 mprj_io[14] +port 11 nsew signal bidirectional << properties >> string FIXED_BBOX 0 0 717600 1037600 << end >> diff --git a/mag/caravan_power_routing.mag b/mag/caravan_power_routing.mag index 20b050e8..865f1395 100644 --- a/mag/caravan_power_routing.mag +++ b/mag/caravan_power_routing.mag @@ -1,7 +1,7 @@ magic tech sky130A magscale 1 2 -timestamp 1637791793 +timestamp 1638483672 << error_p >> rect 585752 994898 585758 994904 rect 590380 994898 590386 994904 @@ -351,10 +351,6 @@ rect 679466 134863 680228 134864 rect 679466 133781 679467 134863 rect 680227 133781 680228 134863 rect 679466 133780 680228 133781 -rect 234842 38177 237788 38178 -rect 234842 37337 234843 38177 -rect 237787 37337 237788 38177 -rect 234842 37336 237788 37337 rect 149632 35995 150436 35996 rect 149632 35167 149633 35995 rect 150435 35167 150436 35995 @@ -367,10 +363,6 @@ rect 642026 33989 642027 34759 rect 643633 33989 643634 34759 rect 642026 33988 643634 33989 rect 148098 33958 148902 33959 -rect 204996 31645 207928 31646 -rect 204996 30787 204997 31645 -rect 207927 30787 207928 31645 -rect 204996 30786 207928 30787 << metal1 >> rect 648104 47124 649670 47188 rect 648104 46660 648166 47124 @@ -470,17 +462,9 @@ rect 643660 42198 643694 43988 rect 149600 35166 149632 35996 rect 150436 35166 150458 35996 rect 149600 35114 150458 35166 -rect 234814 38178 237814 38242 -rect 234814 37336 234842 38178 -rect 237788 37336 237814 38178 rect 148068 33958 148098 34788 rect 148902 33958 148926 34788 rect 148068 33900 148926 33958 -rect 204958 31646 207958 31734 -rect 204958 30786 204996 31646 -rect 207928 30786 207958 31646 -rect 204958 18004 207958 30786 -rect 234814 19380 237814 37336 rect 641954 34760 643694 42198 rect 653462 42634 653578 45026 rect 656772 42634 656910 45026 @@ -488,12 +472,6 @@ rect 653462 35808 656910 42634 rect 641954 33988 642026 34760 rect 643634 33988 643694 34760 rect 641954 33920 643694 33988 -rect 234814 18544 234884 19380 -rect 237754 18544 237814 19380 -rect 234814 18466 237814 18544 -rect 204958 17128 205020 18004 -rect 207872 17128 207958 18004 -rect 204958 17038 207958 17128 << via3 >> rect 575762 994884 580384 997314 rect 585758 994898 590380 997328 @@ -516,13 +494,9 @@ rect 251392 42856 255638 46630 rect 648166 46660 649608 47124 rect 641994 42198 643660 43988 rect 149632 35166 150436 35996 -rect 234842 37336 237788 38178 rect 148098 33958 148902 34788 -rect 204996 30786 207928 31646 rect 653578 42634 656772 45026 rect 642026 33988 643634 34760 -rect 234884 18544 237754 19380 -rect 205020 17128 207872 18004 << metal4 >> rect 575680 997314 580478 997462 rect 575680 994884 575762 997314 @@ -971,6 +945,46 @@ rect 640098 80900 640922 81016 rect 640098 78256 640210 80900 rect 640810 78256 640922 80900 rect 640098 78134 640922 78256 +rect 624788 77532 625108 77698 +rect 624788 76626 624806 77532 +rect 625068 76626 625108 77532 +rect 624788 74428 625108 76626 +rect 626338 76130 626658 77698 +rect 626338 75224 626358 76130 +rect 626620 75224 626658 76130 +rect 626338 74428 626658 75224 +rect 627888 77546 628208 77698 +rect 627888 76640 627918 77546 +rect 628180 76640 628208 77546 +rect 627888 74428 628208 76640 +rect 629438 76134 629758 77698 +rect 629438 75228 629452 76134 +rect 629714 75228 629758 76134 +rect 629438 74428 629758 75228 +rect 630988 77542 631308 77698 +rect 630988 76636 631008 77542 +rect 631270 76636 631308 77542 +rect 630988 74428 631308 76636 +rect 632538 76138 632858 77698 +rect 632538 75232 632560 76138 +rect 632822 75232 632858 76138 +rect 632538 74428 632858 75232 +rect 634088 77542 634408 77698 +rect 634088 76636 634102 77542 +rect 634364 76636 634408 77542 +rect 634088 74428 634408 76636 +rect 635638 76130 635958 77698 +rect 635638 75224 635664 76130 +rect 635926 75224 635958 76130 +rect 635638 74428 635958 75224 +rect 637188 77554 637508 77698 +rect 637188 76648 637210 77554 +rect 637472 76648 637508 77554 +rect 637188 74428 637508 76648 +rect 638738 76156 639058 77698 +rect 638738 75250 638766 76156 +rect 639028 75250 639058 76156 +rect 638738 74428 639058 75250 rect 41858 72802 45772 72890 rect 41858 68338 41922 72802 rect 45648 68338 45772 72802 @@ -1035,54 +1049,6 @@ rect 143440 40752 148940 40762 rect 143440 40592 148086 40752 rect 148908 40592 148940 40752 rect 143440 40582 148940 40592 -rect 208850 19412 209170 19578 -rect 208850 18506 208868 19412 -rect 209130 18506 209170 19412 -rect 204960 18004 207956 18076 -rect 204960 17128 205020 18004 -rect 207872 17128 207956 18004 -rect 204960 17072 207956 17128 -rect 208850 16308 209170 18506 -rect 210400 18010 210720 19578 -rect 210400 17104 210420 18010 -rect 210682 17104 210720 18010 -rect 210400 16308 210720 17104 -rect 211950 19426 212270 19578 -rect 211950 18520 211980 19426 -rect 212242 18520 212270 19426 -rect 211950 16308 212270 18520 -rect 213500 18014 213820 19578 -rect 213500 17108 213514 18014 -rect 213776 17108 213820 18014 -rect 213500 16308 213820 17108 -rect 215050 19422 215370 19578 -rect 215050 18516 215070 19422 -rect 215332 18516 215370 19422 -rect 215050 16308 215370 18516 -rect 216600 18018 216920 19578 -rect 216600 17112 216622 18018 -rect 216884 17112 216920 18018 -rect 216600 16308 216920 17112 -rect 218150 19422 218470 19578 -rect 218150 18516 218164 19422 -rect 218426 18516 218470 19422 -rect 218150 16308 218470 18516 -rect 219700 18010 220020 19578 -rect 219700 17104 219726 18010 -rect 219988 17104 220020 18010 -rect 219700 16308 220020 17104 -rect 221250 19434 221570 19578 -rect 221250 18528 221272 19434 -rect 221534 18528 221570 19434 -rect 221250 16308 221570 18528 -rect 222800 18036 223120 19578 -rect 234818 19380 237824 19480 -rect 234818 18544 234884 19380 -rect 237754 18544 237824 19380 -rect 234818 18470 237824 18544 -rect 222800 17130 222828 18036 -rect 223090 17130 223120 18036 -rect 222800 16308 223120 17130 << via4 >> rect 575762 994884 580384 997314 rect 585758 994898 590380 997328 @@ -1202,6 +1168,16 @@ rect 594120 79916 596852 80456 rect 602454 79938 605324 80438 rect 632200 78326 632864 80776 rect 640210 78256 640810 80900 +rect 624806 76626 625068 77532 +rect 626358 75224 626620 76130 +rect 627918 76640 628180 77546 +rect 629452 75228 629714 76134 +rect 631008 76636 631270 77542 +rect 632560 75232 632822 76138 +rect 634102 76636 634364 77542 +rect 635664 75224 635926 76130 +rect 637210 76648 637472 77554 +rect 638766 75250 639028 76156 rect 41922 68338 45648 72802 rect 41936 66902 45690 67438 rect 51444 66916 52306 67436 @@ -1213,18 +1189,6 @@ rect 241740 42842 245986 46616 rect 251392 42856 255638 46630 rect 648166 46660 649608 47124 rect 666460 47030 669380 47282 -rect 208868 18506 209130 19412 -rect 205020 17128 207872 18004 -rect 210420 17104 210682 18010 -rect 211980 18520 212242 19426 -rect 213514 17108 213776 18014 -rect 215070 18516 215332 19422 -rect 216622 17112 216884 18018 -rect 218164 18516 218426 19422 -rect 219726 17104 219988 18010 -rect 221272 18528 221534 19434 -rect 234884 18544 237754 19380 -rect 222828 17130 223090 18036 << metal5 >> rect 575640 997328 666620 997396 rect 575640 997314 585758 997328 @@ -1596,11 +1560,16 @@ rect 657500 96142 657728 98712 rect 626744 96074 657728 96142 rect 602390 95956 657728 96074 rect 602390 80438 605390 95956 -rect 624824 89474 627824 95956 +rect 624824 90740 627824 95956 rect 643544 93474 646544 93588 rect 641906 93154 646544 93474 -rect 624824 89154 629362 89474 -rect 624824 89012 627824 89154 +rect 602390 79938 602454 80438 +rect 605324 79938 605390 80438 +rect 602390 47188 605390 79938 +rect 623076 89474 627824 90740 +rect 623076 89154 629362 89474 +rect 623076 89012 627824 89154 +rect 623076 76192 624208 89012 rect 643544 85474 646544 93154 rect 650994 92590 653994 95956 rect 666426 93406 669426 105300 @@ -1616,9 +1585,6 @@ rect 662504 89822 669426 90142 rect 641968 85154 646544 85474 rect 643544 81082 646544 85154 rect 666426 81082 669426 89822 -rect 602390 79938 602454 80438 -rect 605324 79938 605390 80438 -rect 602390 47188 605390 79938 rect 632002 80900 669426 81082 rect 632002 80776 640210 80900 rect 632002 78326 632200 80776 @@ -1626,6 +1592,48 @@ rect 632864 78326 640210 80776 rect 632002 78256 640210 78326 rect 640810 78256 669426 80900 rect 632002 78082 669426 78256 +rect 642090 77592 643860 78082 +rect 624560 77554 643860 77592 +rect 624560 77546 637210 77554 +rect 624560 77532 627918 77546 +rect 624560 76626 624806 77532 +rect 625068 76640 627918 77532 +rect 628180 77542 637210 77546 +rect 628180 76640 631008 77542 +rect 625068 76636 631008 76640 +rect 631270 76636 634102 77542 +rect 634364 76648 637210 77542 +rect 637472 76648 643860 77554 +rect 634364 76636 643860 76648 +rect 625068 76626 643860 76636 +rect 624560 76592 643860 76626 +rect 620518 76156 639190 76192 +rect 620518 76138 638766 76156 +rect 620518 76134 632560 76138 +rect 620518 76130 629452 76134 +rect 620518 75224 626358 76130 +rect 626620 75228 629452 76130 +rect 629714 75232 632560 76134 +rect 632822 76130 638766 76138 +rect 632822 75232 635664 76130 +rect 629714 75228 635664 75232 +rect 626620 75224 635664 75228 +rect 635926 75250 638766 76130 +rect 639028 75250 639190 76156 +rect 635926 75224 639190 75250 +rect 620518 75192 639190 75224 +rect 620518 72120 621318 75192 +rect 641184 73810 641984 76592 +rect 640436 73490 641984 73810 +rect 620518 71800 621868 72120 +rect 620518 68740 621318 71800 +rect 641184 70430 641984 73490 +rect 640402 70110 641984 70430 +rect 620518 68420 621746 68740 +rect 620518 66216 621318 68420 +rect 641184 67050 641984 70110 +rect 640524 66730 641984 67050 +rect 641184 65958 641984 66730 rect 666426 47282 669426 78082 rect 602390 47124 649668 47188 rect 602390 46788 648166 47124 @@ -1646,53 +1654,6 @@ rect 255638 45788 605390 46588 rect 255638 42856 605396 45788 rect 245986 42842 605396 42856 rect 46836 42788 605396 42842 -rect 205820 19434 237824 19472 -rect 205820 19426 221272 19434 -rect 205820 19412 211980 19426 -rect 205820 18506 208868 19412 -rect 209130 18520 211980 19412 -rect 212242 19422 221272 19426 -rect 212242 18520 215070 19422 -rect 209130 18516 215070 18520 -rect 215332 18516 218164 19422 -rect 218426 18528 221272 19422 -rect 221534 19380 237824 19434 -rect 221534 18544 234884 19380 -rect 237754 18544 237824 19380 -rect 221534 18528 237824 18544 -rect 218426 18516 237824 18528 -rect 209130 18506 237824 18516 -rect 205820 18472 237824 18506 -rect 204580 18036 224806 18072 -rect 204580 18018 222828 18036 -rect 204580 18014 216622 18018 -rect 204580 18010 213514 18014 -rect 204580 18004 210420 18010 -rect 204580 17128 205020 18004 -rect 207872 17128 210420 18004 -rect 204580 17104 210420 17128 -rect 210682 17108 213514 18010 -rect 213776 17112 216622 18014 -rect 216884 18010 222828 18018 -rect 216884 17112 219726 18010 -rect 213776 17108 219726 17112 -rect 210682 17104 219726 17108 -rect 219988 17130 222828 18010 -rect 223090 17130 224806 18036 -rect 219988 17104 224806 17130 -rect 204580 17072 224806 17104 -rect 204580 14000 205380 17072 -rect 225246 15690 226046 18472 -rect 224498 15370 226046 15690 -rect 204580 13680 205930 14000 -rect 204580 10620 205380 13680 -rect 225246 12310 226046 15370 -rect 224464 11990 226046 12310 -rect 204580 10300 205808 10620 -rect 204580 8096 205380 10300 -rect 225246 8930 226046 11990 -rect 224586 8610 226046 8930 -rect 225246 7838 226046 8610 << comment >> rect 0 1037400 717600 1037600 rect 0 200 200 1037400 @@ -1826,8 +1787,6 @@ flabel metal5 664092 267180 666518 267904 0 FreeSans 3200 0 0 0 vssa1_core flabel metal5 667280 263142 669706 263866 0 FreeSans 3200 0 0 0 vdda1_core flabel metal5 634330 96284 638114 98514 0 FreeSans 16000 0 0 0 vssd_core flabel metal5 633452 78554 637236 80784 0 FreeSans 16000 0 0 0 vccd_core -flabel metal5 206106 18628 207168 19326 0 FreeSans 4800 0 0 0 vccd_core -flabel metal5 206018 17180 207080 17878 0 FreeSans 4800 0 0 0 vssd_core flabel metal5 182024 250550 190042 253308 0 FreeSans 16000 0 0 0 vssd1_core flabel metal5 182160 246638 190178 249396 0 FreeSans 16000 0 0 0 vccd1_core flabel metal5 181852 266620 189870 269378 0 FreeSans 16000 0 0 0 vssa1_core @@ -1838,4 +1797,6 @@ flabel metal5 621512 258708 630212 261250 0 FreeSans 16000 0 0 0 vssa2_core flabel metal5 621598 254668 630298 257210 0 FreeSans 16000 0 0 0 vdda2_core flabel metal5 621936 242776 630636 245318 0 FreeSans 16000 0 0 0 vssd2_core flabel metal5 621794 238736 630494 241278 0 FreeSans 16000 0 0 0 vccd2_core +flabel metal5 621956 75300 623018 75998 0 FreeSans 4800 0 0 0 vssd_core +flabel metal5 639514 76786 640576 77484 0 FreeSans 4800 0 0 0 vccd_core << end >> diff --git a/mag/caravel.mag b/mag/caravel.mag index ff04aaa6..72d4eb4c 100644 --- a/mag/caravel.mag +++ b/mag/caravel.mag @@ -1,7 +1,7 @@ magic tech sky130A magscale 1 2 -timestamp 1638283409 +timestamp 1638492834 << isosubstrate >> rect 98738 1027427 101714 1028967 rect 150138 1027427 153114 1028967 @@ -19701,6 +19701,47 @@ rect 600280 78492 610348 78520 rect 600280 78480 600286 78492 rect 610342 78480 610348 78492 rect 610400 78480 610406 78532 +rect 647356 78490 647408 78496 +rect 633862 78438 633868 78490 +rect 633920 78478 633926 78490 +rect 642910 78478 642916 78490 +rect 633920 78450 642916 78478 +rect 633920 78438 633926 78450 +rect 642910 78438 642916 78450 +rect 642968 78478 642974 78490 +rect 642968 78450 647356 78478 +rect 642968 78438 642974 78450 +rect 647356 78432 647408 78438 +rect 642818 78298 642824 78350 +rect 642876 78338 642882 78350 +rect 646964 78338 646970 78350 +rect 642876 78310 646970 78338 +rect 642876 78298 642882 78310 +rect 646964 78298 646970 78310 +rect 647022 78298 647028 78350 +rect 639572 78196 639578 78248 +rect 639630 78236 639636 78248 +rect 642634 78236 642640 78248 +rect 639630 78208 642640 78236 +rect 639630 78196 639636 78208 +rect 642634 78196 642640 78208 +rect 642692 78236 642698 78248 +rect 642692 78208 642700 78236 +rect 642692 78196 642698 78208 +rect 631010 78092 631016 78144 +rect 631068 78132 631074 78144 +rect 639322 78132 639328 78144 +rect 631068 78104 639328 78132 +rect 631068 78092 631074 78104 +rect 639322 78092 639328 78104 +rect 639380 78092 639386 78144 +rect 628086 77938 628092 77990 +rect 628144 77978 628150 77990 +rect 645276 77978 645282 77990 +rect 628144 77950 645282 77978 +rect 628144 77938 628150 77950 +rect 645276 77938 645282 77950 +rect 645334 77938 645340 77990 rect 605834 77800 605840 77852 rect 605892 77840 605898 77852 rect 607306 77840 607312 77852 @@ -19708,6 +19749,109 @@ rect 605892 77812 607312 77840 rect 605892 77800 605898 77812 rect 607306 77800 607312 77812 rect 607364 77800 607370 77852 +rect 627902 77816 627908 77868 +rect 627960 77856 627966 77868 +rect 642420 77856 642426 77868 +rect 627960 77828 642426 77856 +rect 627960 77816 627966 77828 +rect 642420 77816 642426 77828 +rect 642478 77856 642484 77868 +rect 642478 77828 642492 77856 +rect 642478 77816 642484 77828 +rect 628150 77698 628156 77750 +rect 628208 77738 628214 77750 +rect 631870 77738 631876 77750 +rect 628208 77710 631876 77738 +rect 628208 77698 628214 77710 +rect 631870 77698 631876 77710 +rect 631928 77698 631934 77750 +rect 621474 77608 621480 77660 +rect 621532 77648 621538 77660 +rect 646672 77648 646678 77660 +rect 621532 77620 646678 77648 +rect 621532 77608 621538 77620 +rect 646672 77608 646678 77620 +rect 646730 77608 646736 77660 +rect 621382 77472 621388 77524 +rect 621440 77512 621446 77524 +rect 646570 77512 646576 77524 +rect 621440 77484 646576 77512 +rect 621440 77472 621446 77484 +rect 646570 77472 646576 77484 +rect 646628 77512 646634 77524 +rect 646628 77484 646636 77512 +rect 646628 77472 646634 77484 +rect 621290 77348 621296 77400 +rect 621348 77388 621354 77400 +rect 646454 77388 646460 77400 +rect 621348 77360 646460 77388 +rect 621348 77348 621354 77360 +rect 646454 77348 646460 77360 +rect 646512 77388 646518 77400 +rect 646512 77360 646522 77388 +rect 646512 77348 646518 77360 +rect 621198 77226 621204 77278 +rect 621256 77266 621262 77278 +rect 646342 77266 646348 77278 +rect 621256 77238 646348 77266 +rect 621256 77226 621262 77238 +rect 646342 77226 646348 77238 +rect 646400 77266 646406 77278 +rect 646400 77238 646410 77266 +rect 646400 77226 646406 77238 +rect 621106 77102 621112 77154 +rect 621164 77142 621170 77154 +rect 646238 77142 646244 77154 +rect 621164 77114 646244 77142 +rect 621164 77102 621170 77114 +rect 646238 77102 646244 77114 +rect 646296 77142 646302 77154 +rect 646296 77114 646304 77142 +rect 646296 77102 646302 77114 +rect 618254 76938 618260 76990 +rect 618312 76978 618318 76990 +rect 646118 76978 646124 76990 +rect 618312 76950 646124 76978 +rect 618312 76938 618318 76950 +rect 646118 76938 646124 76950 +rect 646176 76978 646182 76990 +rect 646176 76950 646186 76978 +rect 646176 76938 646182 76950 +rect 613010 76770 613016 76822 +rect 613068 76810 613074 76822 +rect 646012 76810 646018 76822 +rect 613068 76782 646018 76810 +rect 613068 76770 613074 76782 +rect 646012 76770 646018 76782 +rect 646070 76770 646076 76822 +rect 622302 76620 622308 76672 +rect 622360 76660 622366 76672 +rect 636712 76660 636718 76672 +rect 622360 76632 636718 76660 +rect 622360 76620 622366 76632 +rect 636712 76620 636718 76632 +rect 636770 76620 636776 76672 +rect 622870 76436 622876 76488 +rect 622928 76476 622934 76488 +rect 628150 76476 628156 76488 +rect 622928 76448 628156 76476 +rect 622928 76436 622934 76448 +rect 628150 76436 628156 76448 +rect 628208 76436 628214 76488 +rect 639572 75488 639578 75540 +rect 639630 75528 639636 75540 +rect 647146 75528 647152 75540 +rect 639630 75500 647152 75528 +rect 639630 75488 639636 75500 +rect 647146 75488 647152 75500 +rect 647204 75488 647210 75540 +rect 623728 75378 623734 75430 +rect 623786 75418 623792 75430 +rect 631010 75418 631016 75430 +rect 623786 75390 631016 75418 +rect 623786 75378 623792 75390 +rect 631010 75378 631016 75390 +rect 631068 75378 631074 75430 rect 600038 74468 600044 74520 rect 600096 74508 600102 74520 rect 605742 74508 605748 74520 @@ -19831,21 +19975,16 @@ rect 571334 53524 571340 53576 rect 571392 53524 571398 53576 rect 346854 52368 346860 52420 rect 346912 52408 346918 52420 -rect 642910 52408 642916 52420 -rect 346912 52380 642916 52408 +rect 647350 52408 647356 52420 +rect 346912 52380 647356 52408 rect 346912 52368 346918 52380 -rect 642910 52368 642916 52380 -rect 642968 52368 642974 52420 +rect 647350 52368 647356 52380 +rect 647408 52368 647414 52420 rect 52086 51008 52092 51060 rect 52144 51048 52150 51060 -rect 213822 51048 213828 51060 -rect 52144 51020 213828 51048 -rect 52144 51008 52150 51020 -rect 213822 51008 213828 51020 -rect 213880 51048 213886 51060 rect 346486 51048 346492 51060 -rect 213880 51020 346492 51048 -rect 213880 51008 213886 51020 +rect 52144 51020 346492 51048 +rect 52144 51008 52150 51020 rect 346486 51008 346492 51020 rect 346544 51008 346550 51060 rect 587986 51008 587992 51060 @@ -19925,11 +20064,11 @@ rect 578234 46928 578240 46940 rect 578292 46928 578298 46980 rect 218054 46860 218060 46912 rect 218112 46900 218118 46912 -rect 642634 46900 642640 46912 -rect 218112 46872 642640 46900 +rect 647144 46900 647150 46912 +rect 218112 46872 647150 46900 rect 218112 46860 218118 46872 -rect 642634 46860 642640 46872 -rect 642692 46860 642698 46912 +rect 647144 46860 647150 46872 +rect 647202 46860 647208 46912 rect 494054 46792 494060 46844 rect 494112 46832 494118 46844 rect 502242 46832 502248 46844 @@ -19972,20 +20111,13 @@ rect 540940 45648 578608 45676 rect 540940 45636 540946 45648 rect 578602 45636 578608 45648 rect 578660 45636 578666 45688 -rect 233142 45568 233148 45620 -rect 233200 45608 233206 45620 -rect 642818 45608 642824 45620 -rect 233200 45580 642824 45608 -rect 233200 45568 233206 45580 -rect 642818 45568 642824 45580 -rect 642876 45568 642882 45620 rect 212442 45500 212448 45552 rect 212500 45540 212506 45552 -rect 639322 45540 639328 45552 -rect 212500 45512 639328 45540 +rect 623722 45540 623728 45552 +rect 212500 45512 623728 45540 rect 212500 45500 212506 45512 -rect 639322 45500 639328 45512 -rect 639380 45500 639386 45552 +rect 623722 45500 623728 45512 +rect 623780 45500 623786 45552 rect 311894 44180 311900 44192 rect 310440 44152 311900 44180 rect 310440 44124 310468 44152 @@ -20028,83 +20160,27 @@ rect 405608 43948 607220 43976 rect 405608 43936 405614 43948 rect 607214 43936 607220 43948 rect 607272 43936 607278 43988 -rect 230934 43868 230940 43920 -rect 230992 43908 230998 43920 -rect 613010 43908 613016 43920 -rect 230992 43880 613016 43908 -rect 230992 43868 230998 43880 -rect 613010 43868 613016 43880 -rect 613068 43868 613074 43920 -rect 230382 43800 230388 43852 -rect 230440 43840 230446 43852 -rect 618254 43840 618260 43852 -rect 230440 43812 618260 43840 -rect 230440 43800 230446 43812 -rect 618254 43800 618260 43812 -rect 618312 43800 618318 43852 -rect 230750 43732 230756 43784 -rect 230808 43772 230814 43784 -rect 621198 43772 621204 43784 -rect 230808 43744 621204 43772 -rect 230808 43732 230814 43744 -rect 621198 43732 621204 43744 -rect 621256 43732 621262 43784 -rect 230842 43664 230848 43716 -rect 230900 43704 230906 43716 -rect 621290 43704 621296 43716 -rect 230900 43676 621296 43704 -rect 230900 43664 230906 43676 -rect 621290 43664 621296 43676 -rect 621348 43664 621354 43716 -rect 230566 43596 230572 43648 -rect 230624 43636 230630 43648 -rect 621474 43636 621480 43648 -rect 230624 43608 621480 43636 -rect 230624 43596 230630 43608 -rect 621474 43596 621480 43608 -rect 621532 43596 621538 43648 -rect 230474 43528 230480 43580 -rect 230532 43568 230538 43580 -rect 621106 43568 621112 43580 -rect 230532 43540 621112 43568 -rect 230532 43528 230538 43540 -rect 621106 43528 621112 43540 -rect 621164 43528 621170 43580 -rect 230658 43460 230664 43512 -rect 230716 43500 230722 43512 -rect 621382 43500 621388 43512 -rect 230716 43472 621388 43500 -rect 230716 43460 230722 43472 -rect 621382 43460 621388 43472 -rect 621440 43460 621446 43512 -rect 226242 43392 226248 43444 -rect 226300 43432 226306 43444 -rect 622486 43432 622492 43444 -rect 226300 43404 622492 43432 -rect 226300 43392 226306 43404 -rect 622486 43392 622492 43404 -rect 622544 43392 622550 43444 -rect 223482 43324 223488 43376 -rect 223540 43364 223546 43376 +rect 214828 43324 214834 43376 +rect 214886 43364 214892 43376 rect 622302 43364 622308 43376 -rect 223540 43336 622308 43364 -rect 223540 43324 223546 43336 +rect 214886 43336 622308 43364 +rect 214886 43324 214892 43336 rect 622302 43324 622308 43336 rect 622360 43324 622366 43376 rect 209682 43256 209688 43308 rect 209740 43296 209746 43308 -rect 631870 43296 631876 43308 -rect 209740 43268 631876 43296 +rect 622870 43296 622876 43308 +rect 209740 43268 622876 43296 rect 209740 43256 209746 43268 -rect 631870 43256 631876 43268 -rect 631928 43256 631934 43308 +rect 622870 43256 622876 43268 +rect 622928 43256 622934 43308 rect 52178 42848 52184 42900 rect 52236 42888 52242 42900 -rect 215294 42888 215300 42900 -rect 52236 42860 215300 42888 +rect 214828 42888 214834 42906 +rect 52236 42860 214834 42888 rect 52236 42848 52242 42860 -rect 215294 42848 215300 42860 -rect 215352 42848 215358 42900 +rect 214828 42854 214834 42860 +rect 214886 42854 214892 42906 rect 530670 42344 530676 42356 rect 525720 42316 530676 42344 rect 455414 42236 455420 42288 @@ -20172,14 +20248,9 @@ rect 530210 41760 530216 41772 rect 530268 41760 530274 41812 rect 145570 41488 145576 41540 rect 145628 41528 145634 41540 -rect 207014 41528 207020 41540 -rect 145628 41500 207020 41528 -rect 145628 41488 145634 41500 -rect 207014 41488 207020 41500 -rect 207072 41528 207078 41540 rect 209682 41528 209688 41540 -rect 207072 41500 209688 41528 -rect 207072 41488 207078 41500 +rect 145628 41500 209688 41528 +rect 145628 41488 145634 41500 rect 209682 41488 209688 41500 rect 209740 41488 209746 41540 rect 505646 38632 505652 38684 @@ -20210,34 +20281,6 @@ rect 475620 38508 505652 38536 rect 475620 38496 475626 38508 rect 505646 38496 505652 38508 rect 505704 38496 505710 38548 -rect 213178 24760 213184 24812 -rect 213236 24800 213242 24812 -rect 213822 24800 213828 24812 -rect 213236 24772 213828 24800 -rect 213236 24760 213242 24772 -rect 213822 24760 213828 24772 -rect 213880 24760 213886 24812 -rect 224586 22992 224592 23044 -rect 224644 23032 224650 23044 -rect 226242 23032 226248 23044 -rect 224644 23004 226248 23032 -rect 224644 22992 224650 23004 -rect 226242 22992 226248 23004 -rect 226300 22992 226306 23044 -rect 221734 22516 221740 22568 -rect 221792 22556 221798 22568 -rect 223482 22556 223488 22568 -rect 221792 22528 223488 22556 -rect 221792 22516 221798 22528 -rect 223482 22516 223488 22528 -rect 223540 22516 223546 22568 -rect 229370 6468 229376 6520 -rect 229428 6508 229434 6520 -rect 233142 6508 233148 6520 -rect 229428 6480 233148 6508 -rect 229428 6468 229434 6480 -rect 233142 6468 233148 6480 -rect 233200 6468 233206 6520 << via1 >> rect 145196 1007428 145248 1007480 rect 154580 1007428 154632 1007480 @@ -25751,8 +25794,45 @@ rect 591948 80792 592000 80844 rect 596180 80792 596232 80844 rect 600228 78480 600280 78532 rect 610348 78480 610400 78532 +rect 633868 78438 633920 78490 +rect 642916 78438 642968 78490 +rect 647356 78438 647408 78490 +rect 642824 78298 642876 78350 +rect 646970 78298 647022 78350 +rect 639578 78196 639630 78248 +rect 642640 78196 642692 78248 +rect 631016 78092 631068 78144 +rect 639328 78092 639380 78144 +rect 628092 77938 628144 77990 +rect 645282 77938 645334 77990 rect 605840 77800 605892 77852 rect 607312 77800 607364 77852 +rect 627908 77816 627960 77868 +rect 642426 77816 642478 77868 +rect 628156 77698 628208 77750 +rect 631876 77698 631928 77750 +rect 621480 77608 621532 77660 +rect 646678 77608 646730 77660 +rect 621388 77472 621440 77524 +rect 646576 77472 646628 77524 +rect 621296 77348 621348 77400 +rect 646460 77348 646512 77400 +rect 621204 77226 621256 77278 +rect 646348 77226 646400 77278 +rect 621112 77102 621164 77154 +rect 646244 77102 646296 77154 +rect 618260 76938 618312 76990 +rect 646124 76938 646176 76990 +rect 613016 76770 613068 76822 +rect 646018 76770 646070 76822 +rect 622308 76620 622360 76672 +rect 636718 76620 636770 76672 +rect 622876 76436 622928 76488 +rect 628156 76436 628208 76488 +rect 639578 75488 639630 75540 +rect 647152 75488 647204 75540 +rect 623734 75378 623786 75430 +rect 631016 75378 631068 75430 rect 600044 74468 600096 74520 rect 605748 74468 605800 74520 rect 590660 73108 590712 73160 @@ -25788,9 +25868,8 @@ rect 595076 55224 595128 55276 rect 582564 53592 582616 53644 rect 571340 53524 571392 53576 rect 346860 52368 346912 52420 -rect 642916 52368 642968 52420 +rect 647356 52368 647408 52420 rect 52092 51008 52144 51060 -rect 213828 51008 213880 51060 rect 346492 51008 346544 51060 rect 587992 51008 588044 51060 rect 600320 51008 600372 51060 @@ -25814,7 +25893,7 @@ rect 149244 47064 149296 47116 rect 574836 46928 574888 46980 rect 578240 46928 578292 46980 rect 218060 46860 218112 46912 -rect 642640 46860 642692 46912 +rect 647150 46860 647202 46912 rect 494060 46792 494112 46844 rect 502248 46792 502300 46844 rect 460664 45840 460716 45892 @@ -25827,10 +25906,8 @@ rect 85120 45636 85172 45688 rect 475660 45636 475712 45688 rect 540888 45636 540940 45688 rect 578608 45636 578660 45688 -rect 233148 45568 233200 45620 -rect 642824 45568 642876 45620 rect 212448 45500 212500 45552 -rect 639328 45500 639380 45552 +rect 623728 45500 623780 45552 rect 311900 44140 311952 44192 rect 367100 44140 367152 44192 rect 563612 44140 563664 44192 @@ -25843,28 +25920,12 @@ rect 419724 44004 419776 44056 rect 540888 44004 540940 44056 rect 405556 43936 405608 43988 rect 607220 43936 607272 43988 -rect 230940 43868 230992 43920 -rect 613016 43868 613068 43920 -rect 230388 43800 230440 43852 -rect 618260 43800 618312 43852 -rect 230756 43732 230808 43784 -rect 621204 43732 621256 43784 -rect 230848 43664 230900 43716 -rect 621296 43664 621348 43716 -rect 230572 43596 230624 43648 -rect 621480 43596 621532 43648 -rect 230480 43528 230532 43580 -rect 621112 43528 621164 43580 -rect 230664 43460 230716 43512 -rect 621388 43460 621440 43512 -rect 226248 43392 226300 43444 -rect 622492 43392 622544 43444 -rect 223488 43324 223540 43376 +rect 214834 43324 214886 43376 rect 622308 43324 622360 43376 rect 209688 43256 209740 43308 -rect 631876 43256 631928 43308 +rect 622876 43256 622928 43308 rect 52184 42848 52236 42900 -rect 215300 42848 215352 42900 +rect 214834 42854 214886 42906 rect 455420 42236 455472 42288 rect 530676 42304 530728 42356 rect 531044 42304 531096 42356 @@ -25884,7 +25945,6 @@ rect 514852 41760 514904 41812 rect 529664 41760 529716 41812 rect 530216 41760 530268 41812 rect 145576 41488 145628 41540 -rect 207020 41488 207072 41540 rect 209688 41488 209740 41540 rect 505652 38632 505704 38684 rect 510620 38632 510672 38684 @@ -25894,14 +25954,6 @@ rect 475660 38564 475712 38616 rect 514024 38564 514076 38616 rect 475568 38496 475620 38548 rect 505652 38496 505704 38548 -rect 213184 24760 213236 24812 -rect 213828 24760 213880 24812 -rect 224592 22992 224644 23044 -rect 226248 22992 226300 23044 -rect 221740 22516 221792 22568 -rect 223488 22516 223540 22568 -rect 229376 6468 229428 6520 -rect 233148 6468 233200 6520 << metal2 >> rect 110170 1029098 110262 1029126 rect 212934 1029098 213026 1029126 @@ -41487,47 +41539,18 @@ rect 52184 42842 52236 42848 rect 141804 40202 141832 46702 rect 145588 41546 145616 50064 rect 150268 48414 150296 52426 -rect 213828 51060 213880 51066 -rect 213828 51002 213880 51008 rect 149244 48408 149296 48414 rect 149244 48350 149296 48356 rect 150256 48408 150308 48414 rect 150256 48350 150308 48356 rect 149256 47122 149284 48350 -rect 149244 47116 149296 47122 -rect 149244 47058 149296 47064 -rect 212448 45552 212500 45558 -rect 212448 45494 212500 45500 -rect 209688 43308 209740 43314 -rect 209688 43250 209740 43256 -rect 187606 41848 187662 41857 -rect 187358 41806 187606 41834 -rect 194414 41848 194470 41857 -rect 194074 41806 194414 41834 -rect 187606 41783 187662 41792 -rect 194414 41783 194470 41792 -rect 209700 41546 209728 43250 -rect 145576 41540 145628 41546 -rect 145576 41482 145628 41488 -rect 207020 41540 207072 41546 -rect 207020 41482 207072 41488 -rect 209688 41540 209740 41546 -rect 209688 41482 209740 41488 -rect 141758 40174 141832 40202 -rect 141758 39984 141786 40174 -rect 207032 17490 207060 41482 -rect 212460 41313 212488 45494 -rect 209778 41304 209834 41313 -rect 209778 41239 209834 41248 -rect 212446 41304 212502 41313 -rect 212446 41239 212502 41248 -rect 209792 17490 209820 41239 -rect 213840 24818 213868 51002 rect 216140 48346 216168 52686 rect 218060 48408 218112 48414 rect 218060 48350 218112 48356 rect 216128 48340 216180 48346 rect 216128 48282 216180 48288 +rect 149244 47116 149296 47122 +rect 149244 47058 149296 47064 rect 218072 46918 218100 48350 rect 281460 48249 281488 52686 rect 346504 52686 346900 52714 @@ -41554,18 +41577,7 @@ rect 281446 48240 281502 48249 rect 281446 48175 281502 48184 rect 218060 46912 218112 46918 rect 218060 46854 218112 46860 -rect 215300 42900 215352 42906 -rect 215300 42842 215352 42848 -rect 213184 24812 213236 24818 -rect 213184 24754 213236 24760 -rect 213828 24812 213880 24818 -rect 213828 24754 213880 24760 -rect 213196 17490 213224 24754 -rect 207032 17462 207184 17490 -rect 209792 17462 210036 17490 -rect 212888 17462 213224 17490 -rect 215312 17490 215340 42842 -rect 218072 33134 218100 46854 +rect 218072 46852 218100 46854 rect 494072 46850 494100 48350 rect 494060 46844 494112 46850 rect 494060 46786 494112 46792 @@ -41577,66 +41589,22 @@ rect 367100 45824 367152 45830 rect 367100 45766 367152 45772 rect 311900 45756 311952 45762 rect 311900 45698 311952 45704 -rect 233148 45620 233200 45626 -rect 233148 45562 233200 45568 -rect 230940 43920 230992 43926 -rect 230940 43862 230992 43868 -rect 230388 43852 230440 43858 -rect 230388 43794 230440 43800 -rect 226248 43444 226300 43450 -rect 226248 43386 226300 43392 -rect 223488 43376 223540 43382 -rect 223488 43318 223540 43324 -rect 218072 33106 218192 33134 -rect 218164 17490 218192 33106 -rect 223500 22574 223528 43318 -rect 226260 23050 226288 43386 -rect 224592 23044 224644 23050 -rect 224592 22986 224644 22992 -rect 226248 23044 226300 23050 -rect 226248 22986 226300 22992 -rect 221740 22568 221792 22574 -rect 221740 22510 221792 22516 -rect 223488 22568 223540 22574 -rect 223488 22510 223540 22516 -rect 221752 17490 221780 22510 -rect 224604 17490 224632 22986 -rect 215312 17462 215740 17490 -rect 218164 17462 218592 17490 -rect 221444 17462 221780 17490 -rect 224296 17462 224632 17490 -rect 230400 7721 230428 43794 -rect 230756 43784 230808 43790 -rect 230756 43726 230808 43732 -rect 230572 43648 230624 43654 -rect 230572 43590 230624 43596 -rect 230480 43580 230532 43586 -rect 230480 43522 230532 43528 -rect 230492 9217 230520 43522 -rect 230584 12209 230612 43590 -rect 230664 43512 230716 43518 -rect 230664 43454 230716 43460 -rect 230570 12200 230626 12209 -rect 230570 12135 230626 12144 -rect 230676 10713 230704 43454 -rect 230768 13705 230796 43726 -rect 230848 43716 230900 43722 -rect 230848 43658 230900 43664 -rect 230860 15201 230888 43658 -rect 230952 16697 230980 43862 -rect 230938 16688 230994 16697 -rect 230938 16623 230994 16632 -rect 230846 15192 230902 15201 -rect 230846 15127 230902 15136 -rect 230754 13696 230810 13705 -rect 230754 13631 230810 13640 -rect 230662 10704 230718 10713 -rect 230662 10639 230718 10648 -rect 230478 9208 230534 9217 -rect 230478 9143 230534 9152 -rect 230386 7712 230442 7721 -rect 230386 7647 230442 7656 -rect 233160 6526 233188 45562 +rect 212448 45552 212500 45558 +rect 212448 45494 212500 45500 +rect 209688 43308 209740 43314 +rect 209688 43250 209740 43256 +rect 187606 41848 187662 41857 +rect 187358 41806 187606 41834 +rect 194414 41848 194470 41857 +rect 194074 41806 194414 41834 +rect 187606 41783 187662 41792 +rect 194414 41783 194470 41792 +rect 209700 41546 209728 43250 +rect 145576 41540 145628 41546 +rect 145576 41482 145628 41488 +rect 209688 41540 209740 41546 +rect 209688 41482 209740 41488 +rect 212460 41313 212488 45494 rect 311912 44198 311940 45698 rect 367112 44198 367140 45766 rect 311900 44192 311952 44198 @@ -41647,6 +41615,11 @@ rect 310428 44124 310480 44130 rect 310428 44066 310480 44072 rect 365168 44124 365220 44130 rect 365168 44066 365220 44072 +rect 214834 43376 214886 43382 +rect 214834 43318 214886 43324 +rect 214846 42912 214874 43318 +rect 214834 42906 214886 42912 +rect 214834 42848 214886 42854 rect 310440 42106 310468 44066 rect 365180 42106 365208 44066 rect 419724 44056 419776 44062 @@ -41674,6 +41647,10 @@ rect 415490 41783 415546 41792 rect 416688 41754 416740 41760 rect 420736 41812 420788 41818 rect 420736 41754 420788 41760 +rect 212446 41304 212502 41313 +rect 212446 41239 212502 41248 +rect 141758 40174 141832 40202 +rect 141758 39984 141786 40174 rect 420748 38622 420776 41754 rect 455432 38622 455460 42230 rect 460676 42106 460704 45834 @@ -43653,13 +43630,7 @@ rect 610360 91066 610756 91094 rect 610360 78538 610388 91066 rect 610348 78532 610400 78538 rect 610348 78474 610400 78480 -rect 610256 45892 610308 45898 -rect 610256 45834 610308 45840 -rect 607588 45756 607640 45762 -rect 607588 45698 607640 45704 -rect 607220 43988 607272 43994 -rect 607220 43930 607272 43936 -rect 613028 43926 613056 95542 +rect 613028 76828 613056 95542 rect 613580 93906 613608 100014 rect 614776 95810 614804 100014 rect 614868 100014 615204 100042 @@ -43691,9 +43662,7 @@ rect 616788 94580 616840 94586 rect 616788 94522 616840 94528 rect 613568 93900 613620 93906 rect 613568 93842 613620 93848 -rect 613016 43920 613068 43926 -rect 613016 43862 613068 43868 -rect 618272 43858 618300 95542 +rect 618272 76996 618300 95542 rect 618732 95266 618760 100014 rect 619376 95402 619404 100014 rect 620020 95674 620048 100014 @@ -43708,9 +43677,7 @@ rect 619364 95396 619416 95402 rect 619364 95338 619416 95344 rect 618720 95260 618772 95266 rect 618720 95202 618772 95208 -rect 618260 43852 618312 43858 -rect 618260 43794 618312 43800 -rect 621124 43586 621152 100014 +rect 621124 77160 621152 100014 rect 621400 100014 621736 100042 rect 621860 100014 622380 100042 rect 622688 100014 623024 100042 @@ -43724,17 +43691,11 @@ rect 627624 100014 627960 100042 rect 628268 100014 628328 100042 rect 621204 95600 621256 95606 rect 621204 95542 621256 95548 -rect 621216 43790 621244 95542 +rect 621216 77284 621244 95542 rect 621296 95532 621348 95538 rect 621296 95474 621348 95480 -rect 621204 43784 621256 43790 -rect 621204 43726 621256 43732 -rect 621308 43722 621336 95474 -rect 621296 43716 621348 43722 -rect 621296 43658 621348 43664 -rect 621112 43580 621164 43586 -rect 621112 43522 621164 43528 -rect 621400 43518 621428 100014 +rect 621308 77406 621336 95474 +rect 621400 77530 621428 100014 rect 621860 91094 621888 100014 rect 622688 95606 622716 100014 rect 622676 95600 622728 95606 @@ -43751,7 +43712,7 @@ rect 622124 95338 622176 95344 rect 621940 94852 621992 94858 rect 621940 94794 621992 94800 rect 621492 91066 621888 91094 -rect 621492 43654 621520 91066 +rect 621492 77666 621520 91066 rect 621952 84153 621980 94794 rect 622136 86057 622164 95338 rect 622676 95260 622728 95266 @@ -43931,25 +43892,69 @@ rect 623502 87000 623558 87009 rect 623502 86935 623558 86944 rect 623318 83192 623374 83201 rect 623318 83127 623374 83136 -rect 622306 82240 622362 82249 -rect 622306 82175 622362 82184 -rect 621480 43648 621532 43654 -rect 621480 43590 621532 43596 -rect 621388 43512 621440 43518 -rect 621388 43454 621440 43460 -rect 622320 43382 622348 82175 -rect 622490 81424 622546 81433 -rect 622490 81359 622546 81368 -rect 622504 43450 622532 81359 +rect 627906 82240 627962 82249 +rect 627906 82175 627962 82184 +rect 627920 77874 627948 82175 +rect 628090 81424 628146 81433 +rect 628090 81359 628146 81368 +rect 628104 77996 628132 81359 rect 631856 80974 631916 81002 rect 639308 80974 639368 81002 -rect 622492 43444 622544 43450 -rect 622492 43386 622544 43392 +rect 631016 78144 631068 78150 +rect 631016 78086 631068 78092 +rect 628092 77990 628144 77996 +rect 628092 77932 628144 77938 +rect 627908 77868 627960 77874 +rect 627908 77810 627960 77816 +rect 628156 77750 628208 77756 +rect 628156 77692 628208 77698 +rect 621480 77660 621532 77666 +rect 621480 77602 621532 77608 +rect 621388 77524 621440 77530 +rect 621388 77466 621440 77472 +rect 621296 77400 621348 77406 +rect 621296 77342 621348 77348 +rect 621204 77278 621256 77284 +rect 621204 77220 621256 77226 +rect 621112 77154 621164 77160 +rect 621112 77096 621164 77102 +rect 618260 76990 618312 76996 +rect 618260 76932 618312 76938 +rect 613016 76822 613068 76828 +rect 613016 76764 613068 76770 +rect 622308 76672 622360 76678 +rect 622308 76614 622360 76620 +rect 610256 45892 610308 45898 +rect 610256 45834 610308 45840 +rect 607588 45756 607640 45762 +rect 607588 45698 607640 45704 +rect 607220 43988 607272 43994 +rect 607220 43930 607272 43936 +rect 622320 43382 622348 76614 +rect 628168 76494 628196 77692 +rect 622876 76488 622928 76494 +rect 622876 76430 622928 76436 +rect 628156 76488 628208 76494 +rect 628156 76430 628208 76436 rect 622308 43376 622360 43382 rect 622308 43318 622360 43324 -rect 631888 43314 631916 80974 -rect 639340 45558 639368 80974 -rect 642652 46918 642680 100014 +rect 622888 43314 622916 76430 +rect 623734 75430 623786 75436 +rect 623734 75372 623786 75378 +rect 623740 45558 623768 75372 +rect 628168 75218 628196 76430 +rect 631028 75436 631056 78086 +rect 631888 77756 631916 80974 +rect 633868 78490 633920 78496 +rect 633868 78432 633920 78438 +rect 631876 77750 631928 77756 +rect 631876 77692 631928 77698 +rect 631016 75430 631068 75436 +rect 631016 75372 631068 75378 +rect 631028 75146 631056 75372 +rect 633880 75104 633908 78432 +rect 639340 78150 639368 80974 +rect 642652 78254 642680 100014 rect 642824 95668 642876 95674 rect 642824 95610 642876 95616 rect 642732 95532 642784 95538 @@ -43957,12 +43962,10 @@ rect 642732 95474 642784 95480 rect 642744 92721 642772 95474 rect 642730 92712 642786 92721 rect 642730 92647 642786 92656 -rect 642640 46912 642692 46918 -rect 642640 46854 642692 46860 -rect 642836 45626 642864 95610 +rect 642836 78356 642864 95610 rect 642916 95600 642968 95606 rect 642916 95542 642968 95548 -rect 642928 52426 642956 95542 +rect 642928 78496 642956 95542 rect 643100 94988 643152 94994 rect 643100 94930 643152 94936 rect 643112 85270 643140 94930 @@ -44272,10 +44275,92 @@ rect 646134 84688 646190 84697 rect 646134 84623 646190 84632 rect 645858 82240 645914 82249 rect 645858 82175 645914 82184 -rect 642916 52420 642968 52426 -rect 642916 52362 642968 52368 +rect 642916 78490 642968 78496 +rect 647350 78438 647356 78490 +rect 647408 78438 647414 78490 +rect 642916 78432 642968 78438 +rect 642928 78420 642956 78432 +rect 642824 78350 642876 78356 +rect 642824 78292 642876 78298 +rect 646970 78350 647022 78356 +rect 646970 78292 647022 78298 +rect 639578 78248 639630 78254 +rect 639578 78190 639630 78196 +rect 642640 78248 642692 78254 +rect 642640 78190 642692 78196 +rect 639328 78144 639380 78150 +rect 639328 78086 639380 78092 +rect 639340 78080 639368 78086 +rect 636718 76672 636770 76678 +rect 636718 76614 636770 76620 +rect 636730 75078 636758 76614 +rect 639590 75546 639618 78190 +rect 642652 78188 642680 78190 +rect 645282 77990 645334 77996 +rect 645282 77932 645334 77938 +rect 642426 77868 642478 77874 +rect 642426 77810 642478 77816 +rect 639578 75540 639630 75546 +rect 639578 75482 639630 75488 +rect 639590 75230 639618 75482 +rect 642438 75234 642466 77810 +rect 645294 75202 645322 77932 +rect 646678 77660 646730 77666 +rect 646678 77602 646730 77608 +rect 646576 77524 646628 77530 +rect 646576 77466 646628 77472 +rect 646460 77400 646512 77406 +rect 646460 77342 646512 77348 +rect 646348 77278 646400 77284 +rect 646348 77220 646400 77226 +rect 646244 77154 646296 77160 +rect 646244 77096 646296 77102 +rect 646124 76990 646176 76996 +rect 646124 76932 646176 76938 +rect 646018 76822 646070 76828 +rect 646018 76764 646070 76770 +rect 646030 74557 646058 76764 +rect 646014 74548 646074 74557 +rect 646014 74479 646074 74488 +rect 646136 65581 646164 76932 +rect 646256 67063 646284 77096 +rect 646360 71565 646388 77220 +rect 646472 73053 646500 77342 +rect 646456 73044 646516 73053 +rect 646456 72975 646516 72984 +rect 646472 72972 646500 72975 +rect 646344 71556 646404 71565 +rect 646344 71487 646404 71496 +rect 646360 71486 646388 71487 +rect 646588 68573 646616 77466 +rect 646690 70063 646718 77602 +rect 646674 70054 646734 70063 +rect 646674 69985 646734 69994 +rect 646690 69974 646718 69985 +rect 646572 68564 646632 68573 +rect 646572 68495 646632 68504 +rect 646588 68486 646616 68495 +rect 646240 67054 646300 67063 +rect 646240 66985 646300 66994 +rect 646256 66972 646284 66985 +rect 646120 65572 646180 65581 +rect 646120 65503 646180 65512 +rect 646136 65498 646164 65503 +rect 646982 64067 647010 78292 +rect 647152 75540 647204 75546 +rect 647152 75482 647204 75488 +rect 646966 64058 647026 64067 +rect 646966 63989 647026 63998 +rect 646982 63980 647010 63989 +rect 647164 46918 647192 75482 +rect 647368 52426 647396 78438 +rect 647356 52420 647408 52426 +rect 647356 52362 647408 52368 rect 661130 47560 661186 47569 rect 661130 47495 661186 47504 +rect 647150 46912 647202 46918 +rect 647150 46854 647202 46860 +rect 647164 46850 647192 46854 rect 661144 46249 661172 47495 rect 665192 47433 665220 95134 rect 666572 48521 666600 989402 @@ -48175,12 +48260,10 @@ rect 665178 47424 665234 47433 rect 665178 47359 665234 47368 rect 661130 46240 661186 46249 rect 661130 46175 661186 46184 -rect 642824 45620 642876 45626 -rect 642824 45562 642876 45568 -rect 639328 45552 639380 45558 -rect 639328 45494 639380 45500 -rect 631876 43308 631928 43314 -rect 631876 43250 631928 43256 +rect 623728 45552 623780 45558 +rect 623728 45494 623780 45500 +rect 622876 43308 622928 43314 +rect 622876 43250 622928 43256 rect 587990 41576 588046 41585 rect 587990 41511 588046 41520 rect 530214 41304 530270 41313 @@ -48193,13 +48276,6 @@ rect 475568 38548 475620 38554 rect 475568 38490 475620 38496 rect 505652 38548 505704 38554 rect 505652 38490 505704 38496 -rect 229376 6520 229428 6526 -rect 229376 6462 229428 6468 -rect 233148 6520 233200 6526 -rect 233148 6462 233200 6468 -rect 229388 6225 229416 6462 -rect 229374 6216 229430 6225 -rect 229374 6151 229430 6160 << via2 >> rect 154578 1007428 154580 1007448 rect 154580 1007428 154632 1007448 @@ -50140,21 +50216,13 @@ rect 580722 137920 580778 137976 rect 580630 127432 580686 127488 rect 580538 97288 580594 97344 rect 580446 95792 580502 95848 +rect 281446 48184 281502 48240 rect 187606 41792 187662 41848 rect 194414 41792 194470 41848 -rect 209778 41248 209834 41304 -rect 212446 41248 212502 41304 -rect 281446 48184 281502 48240 -rect 230570 12144 230626 12200 -rect 230938 16632 230994 16688 -rect 230846 15136 230902 15192 -rect 230754 13640 230810 13696 -rect 230662 10648 230718 10704 -rect 230478 9152 230534 9208 -rect 230386 7656 230442 7712 rect 307298 41792 307354 41848 rect 362038 41792 362094 41848 rect 415490 41792 415546 41848 +rect 212446 41248 212502 41304 rect 470052 41928 470108 41984 rect 518806 44240 518862 44296 rect 520462 42064 520518 42120 @@ -50434,8 +50502,8 @@ rect 625894 91568 625950 91624 rect 623962 89664 624018 89720 rect 623502 86944 623558 87000 rect 623318 83136 623374 83192 -rect 622306 82184 622362 82240 -rect 622490 81368 622546 81424 +rect 627906 82184 627962 82240 +rect 628090 81368 628146 81424 rect 642730 92656 642786 92712 rect 645950 89664 646006 89720 rect 646042 87080 646098 87136 @@ -50455,6 +50523,14 @@ rect 663706 90344 663762 90400 rect 662142 88712 662198 88768 rect 646134 84632 646190 84688 rect 645858 82184 645914 82240 +rect 646014 74488 646074 74548 +rect 646456 72984 646516 73044 +rect 646344 71496 646404 71556 +rect 646674 69994 646734 70054 +rect 646572 68504 646632 68564 +rect 646240 66994 646300 67054 +rect 646120 65512 646180 65572 +rect 646966 63998 647026 64058 rect 661130 47504 661186 47560 rect 666650 183776 666706 183832 rect 666650 180376 666706 180432 @@ -51144,7 +51220,6 @@ rect 661130 46184 661186 46240 rect 587990 41520 588046 41576 rect 530214 41248 530270 41304 rect 543002 41248 543058 41304 -rect 229374 6160 229430 6216 << metal3 >> rect 154573 1007450 154639 1007453 rect 154573 1007448 154836 1007450 @@ -62849,24 +62924,24 @@ rect 576380 82232 579618 82288 rect 579674 82232 579679 82288 rect 576380 82230 579679 82232 rect 579613 82227 579679 82230 -rect 622301 82242 622367 82245 +rect 627901 82242 627967 82245 rect 645853 82242 645919 82245 -rect 622301 82240 628268 82242 -rect 622301 82184 622306 82240 -rect 622362 82184 628268 82240 -rect 622301 82182 628268 82184 +rect 627901 82240 628332 82242 +rect 627901 82184 627906 82240 +rect 627962 82184 628332 82240 +rect 627901 82182 628332 82184 rect 642988 82240 645919 82242 rect 642988 82184 645858 82240 rect 645914 82184 645919 82240 rect 642988 82182 645919 82184 -rect 622301 82179 622367 82182 +rect 627901 82179 627967 82182 rect 645853 82179 645919 82182 -rect 622485 81426 622551 81429 -rect 622485 81424 628268 81426 -rect 622485 81368 622490 81424 -rect 622546 81368 628268 81424 -rect 622485 81366 628268 81368 -rect 622485 81363 622551 81366 +rect 628085 81426 628151 81429 +rect 628085 81424 628332 81426 +rect 628085 81368 628090 81424 +rect 628146 81368 628332 81424 +rect 628085 81366 628332 81368 +rect 628085 81363 628151 81366 rect 581545 80794 581611 80797 rect 576380 80792 581611 80794 rect 576380 80736 581550 80792 @@ -62897,46 +62972,78 @@ rect 576380 74656 581642 74712 rect 581698 74656 581703 74712 rect 576380 74654 581703 74656 rect 581637 74651 581703 74654 +rect 646009 74548 646079 74553 +rect 646009 74488 646014 74548 +rect 646074 74488 646079 74548 +rect 646009 74483 646079 74488 rect 580942 73218 580948 73220 rect 576380 73158 580948 73218 rect 580942 73156 580948 73158 rect 581012 73156 581018 73220 +rect 646451 73044 646521 73049 +rect 646451 72984 646456 73044 +rect 646516 72984 646521 73044 +rect 646451 72979 646521 72984 rect 581361 71722 581427 71725 rect 576380 71720 581427 71722 rect 576380 71664 581366 71720 rect 581422 71664 581427 71720 rect 576380 71662 581427 71664 rect 581361 71659 581427 71662 +rect 646339 71556 646409 71561 +rect 646339 71496 646344 71556 +rect 646404 71496 646409 71556 +rect 646339 71491 646409 71496 rect 580993 70250 581059 70253 rect 576380 70248 581059 70250 rect 576380 70192 580998 70248 rect 581054 70192 581059 70248 rect 576380 70190 581059 70192 rect 580993 70187 581059 70190 +rect 646669 70054 646739 70059 +rect 646669 69994 646674 70054 +rect 646734 69994 646739 70054 +rect 646669 69989 646739 69994 rect 582281 68694 582347 68697 rect 576380 68692 582347 68694 rect 576380 68636 582286 68692 rect 582342 68636 582347 68692 rect 576380 68634 582347 68636 rect 582281 68631 582347 68634 +rect 646567 68564 646637 68569 +rect 646567 68504 646572 68564 +rect 646632 68504 646637 68564 +rect 646567 68499 646637 68504 rect 581177 67198 581243 67201 rect 576380 67196 581243 67198 rect 576380 67140 581182 67196 rect 581238 67140 581243 67196 rect 576380 67138 581243 67140 rect 581177 67135 581243 67138 +rect 646235 67054 646305 67059 +rect 646235 66994 646240 67054 +rect 646300 66994 646305 67054 +rect 646235 66989 646305 66994 rect 580533 65722 580599 65725 rect 576380 65720 580599 65722 rect 576380 65664 580538 65720 rect 580594 65664 580599 65720 rect 576380 65662 580599 65664 rect 580533 65659 580599 65662 +rect 646115 65572 646185 65577 +rect 646115 65512 646120 65572 +rect 646180 65512 646185 65572 +rect 646115 65507 646185 65512 rect 581085 64246 581151 64249 rect 576380 64244 581151 64246 rect 576380 64188 581090 64244 rect 581146 64188 581151 64244 rect 576380 64186 581151 64188 rect 581085 64183 581151 64186 +rect 646961 64058 647031 64063 +rect 646484 63998 646966 64058 +rect 647026 63998 647031 64058 +rect 646961 63993 647031 63998 rect 582005 62770 582071 62773 rect 576380 62768 582071 62770 rect 576380 62712 582010 62768 @@ -63014,15 +63121,15 @@ rect 187601 41848 187710 41850 rect 187601 41792 187606 41848 rect 187662 41792 187710 41848 rect 187601 41787 187710 41792 -rect 194409 41848 207030 41850 +rect 194409 41848 206830 41850 rect 194409 41792 194414 41848 -rect 194470 41792 207030 41848 -rect 194409 41790 207030 41792 +rect 194470 41792 206830 41848 +rect 194409 41790 206830 41792 rect 194409 41787 194475 41790 rect 187650 41306 187710 41787 -rect 206970 41442 207030 41790 +rect 206770 41442 206830 41790 rect 236372 41442 236432 47100 -rect 206970 41382 236432 41442 +rect 206770 41382 236432 41442 rect 256744 41442 256804 47100 rect 661125 46242 661191 46245 rect 620186 46240 661191 46242 @@ -63096,14 +63203,11 @@ rect 587985 41515 588051 41518 rect 620186 41442 620246 46182 rect 661125 46179 661191 46182 rect 256744 41382 620246 41442 -rect 209773 41306 209839 41309 rect 212441 41306 212507 41309 rect 187650 41304 212507 41306 -rect 187650 41248 209778 41304 -rect 209834 41248 212446 41304 +rect 187650 41248 212446 41304 rect 212502 41248 212507 41304 rect 187650 41246 212507 41248 -rect 209773 41243 209839 41246 rect 212441 41243 212507 41246 rect 530209 41306 530275 41309 rect 542997 41306 543063 41309 @@ -63114,54 +63218,6 @@ rect 543058 41248 543063 41304 rect 530209 41246 543063 41248 rect 530209 41243 530275 41246 rect 542997 41243 543063 41246 -rect 230933 16690 230999 16693 -rect 225676 16688 230999 16690 -rect 225676 16632 230938 16688 -rect 230994 16632 230999 16688 -rect 225676 16630 230999 16632 -rect 230933 16627 230999 16630 -rect 230841 15194 230907 15197 -rect 225676 15192 230907 15194 -rect 225676 15136 230846 15192 -rect 230902 15136 230907 15192 -rect 225676 15134 230907 15136 -rect 230841 15131 230907 15134 -rect 230749 13698 230815 13701 -rect 225676 13696 230815 13698 -rect 225676 13640 230754 13696 -rect 230810 13640 230815 13696 -rect 225676 13638 230815 13640 -rect 230749 13635 230815 13638 -rect 230565 12202 230631 12205 -rect 225676 12200 230631 12202 -rect 225676 12144 230570 12200 -rect 230626 12144 230631 12200 -rect 225676 12142 230631 12144 -rect 230565 12139 230631 12142 -rect 230657 10706 230723 10709 -rect 225676 10704 230723 10706 -rect 225676 10648 230662 10704 -rect 230718 10648 230723 10704 -rect 225676 10646 230723 10648 -rect 230657 10643 230723 10646 -rect 230473 9210 230539 9213 -rect 225676 9208 230539 9210 -rect 225676 9152 230478 9208 -rect 230534 9152 230539 9208 -rect 225676 9150 230539 9152 -rect 230473 9147 230539 9150 -rect 230381 7714 230447 7717 -rect 225676 7712 230447 7714 -rect 225676 7656 230386 7712 -rect 230442 7656 230447 7712 -rect 225676 7654 230447 7656 -rect 230381 7651 230447 7654 -rect 229369 6218 229435 6221 -rect 225676 6216 229435 6218 -rect 225676 6160 229374 6216 -rect 229430 6160 229435 6216 -rect 225676 6158 229435 6160 -rect 229369 6155 229435 6158 << via3 >> rect 187740 997188 187804 997252 rect 187740 995692 187804 995756 @@ -64755,22 +64811,22 @@ rect 0 1037400 717600 1037600 rect 0 37510 200 1037400 rect 717400 200 717600 1037400 rect 39330 0 717600 200 -use caravel_clocking clocking -timestamp 1638283409 -transform 1 0 205746 0 1 5488 -box -38 -48 20000 12000 -use xres_buf rstb_level -timestamp 1638030917 -transform -1 0 145710 0 -1 50488 -box 414 -400 3522 3800 +use caravel_motto caravel_motto_0 +timestamp 1637698310 +transform 1 0 -54372 0 1 -4446 +box 373080 14838 395618 19242 use caravel_logo caravel_logo_0 timestamp 1636495793 -transform 1 0 324236 0 1 5094 +transform 1 0 269370 0 1 5100 box -2520 0 15000 15560 use open_source open_source_0 hexdigits timestamp 1635801696 -transform 1 0 260430 0 1 2174 +transform 1 0 206098 0 1 2054 box 752 5164 29030 16242 +use xres_buf rstb_level +timestamp 1638492834 +transform -1 0 145710 0 -1 50488 +box 414 -400 3522 3800 use user_id_textblock user_id_textblock_0 timestamp 1608324878 transform 1 0 96272 0 1 6890 @@ -64779,360 +64835,360 @@ use copyright_block copyright_block_0 timestamp 1636248654 transform 1 0 149582 0 1 16298 box -262 -9464 35048 2764 +use caravel_clocking clocking +timestamp 1638492834 +transform 1 0 626764 0 1 63284 +box -38 -48 20000 12000 use housekeeping housekeeping -timestamp 1638283409 +timestamp 1638492834 transform 1 0 606434 0 1 100002 box 0 0 60046 110190 use digital_pll pll -timestamp 1638283409 +timestamp 1638492834 transform 1 0 628146 0 1 80944 box 0 0 15000 15000 use user_id_programming user_id_value -timestamp 1638283409 +timestamp 1638492834 transform 1 0 656624 0 1 88126 box 0 0 7109 7077 use gpio_control_block gpio_control_bidir_1\[0\] -timestamp 1638283409 +timestamp 1638492834 transform -1 0 710203 0 1 121000 box 882 167 34000 13000 use gpio_defaults_block_1803 gpio_defaults_block_0 -timestamp 1638283409 +timestamp 1638492834 transform -1 0 709467 0 1 134000 box -38 0 6018 2224 -use simple_por por ../maglef -timestamp 1638031832 +use simple_por por ../maglef +timestamp 1638030790 transform 1 0 650146 0 -1 55282 -box -52 -62 11344 8684 -use caravel_motto caravel_motto_0 -timestamp 1637698310 -transform 1 0 290 0 1 -4352 -box 373080 14838 395618 19242 +box -14 11 11344 8684 use mgmt_core_wrapper soc timestamp 1638280046 transform 1 0 52034 0 1 53002 box 382 -400 524400 164400 use gpio_control_block gpio_control_bidir_2\[2\] -timestamp 1638283409 +timestamp 1638492834 transform 1 0 7631 0 1 202600 box 882 167 34000 13000 use gpio_control_block gpio_control_bidir_1\[1\] -timestamp 1638283409 +timestamp 1638492834 transform -1 0 710203 0 1 166200 box 882 167 34000 13000 use gpio_defaults_block_1803 gpio_defaults_block_1 -timestamp 1638283409 +timestamp 1638492834 transform -1 0 709467 0 1 179200 box -38 0 6018 2224 use gpio_control_block gpio_control_bidir_2\[1\] -timestamp 1638283409 +timestamp 1638492834 transform 1 0 7631 0 1 245800 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_37 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 8367 0 1 215600 box -38 0 6018 2224 use spare_logic_block spare_logic_block_3 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 88632 0 1 232528 box 0 0 9000 9000 use spare_logic_block spare_logic_block_1 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 168632 0 1 232528 box 0 0 9000 9000 use mgmt_protect mgmt_buffers -timestamp 1638283409 +timestamp 1638492834 transform 1 0 192180 0 1 232036 box -400 -400 220400 32400 use spare_logic_block spare_logic_block_2 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 428632 0 1 232528 box 0 0 9000 9000 use spare_logic_block spare_logic_block_0 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 640874 0 1 220592 box 0 0 9000 9000 use gpio_control_block gpio_control_in_1a\[0\] -timestamp 1638283409 +timestamp 1638492834 transform -1 0 710203 0 1 211200 box 882 167 34000 13000 use gpio_defaults_block_0403 gpio_defaults_block_2 -timestamp 1638283409 +timestamp 1638492834 transform -1 0 709467 0 1 224200 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_36 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 8367 0 1 258800 box -38 0 6018 2224 use gpio_control_block gpio_control_in_1a\[1\] -timestamp 1638283409 +timestamp 1638492834 transform -1 0 710203 0 1 256400 box 882 167 34000 13000 use gpio_defaults_block_0403 gpio_defaults_block_3 -timestamp 1638283409 +timestamp 1638492834 transform -1 0 709467 0 1 269400 box -38 0 6018 2224 use gpio_control_block gpio_control_bidir_2\[0\] -timestamp 1638283409 +timestamp 1638492834 transform 1 0 7631 0 1 289000 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_35 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 8367 0 1 302000 box -38 0 6018 2224 use gpio_control_block gpio_control_in_1a\[2\] -timestamp 1638283409 +timestamp 1638492834 transform -1 0 710203 0 1 301400 box 882 167 34000 13000 use gpio_defaults_block_0403 gpio_defaults_block_4 -timestamp 1638283409 +timestamp 1638492834 transform -1 0 709467 0 1 314400 box -38 0 6018 2224 use gpio_control_block gpio_control_in_2\[13\] -timestamp 1638283409 +timestamp 1638492834 transform 1 0 7631 0 1 418600 box 882 167 34000 13000 use gpio_control_block gpio_control_in_2\[14\] -timestamp 1638283409 +timestamp 1638492834 transform 1 0 7631 0 1 375400 box 882 167 34000 13000 use gpio_control_block gpio_control_in_2\[15\] -timestamp 1638283409 +timestamp 1638492834 transform 1 0 7631 0 1 332200 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_32 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 8367 0 1 431600 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_33 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 8367 0 1 388400 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_defaults_block_34 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 8367 0 1 345200 box -38 0 6018 2224 use gpio_control_block gpio_control_in_1a\[3\] -timestamp 1638283409 +timestamp 1638492834 transform -1 0 710203 0 1 346400 box 882 167 34000 13000 use gpio_control_block gpio_control_in_1a\[4\] -timestamp 1638283409 +timestamp 1638492834 transform -1 0 710203 0 1 391600 box 882 167 34000 13000 use gpio_control_block gpio_control_in_1a\[5\] -timestamp 1638283409 +timestamp 1638492834 transform -1 0 710203 0 1 479800 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_6 -timestamp 1638283409 +timestamp 1638492834 transform -1 0 709467 0 1 404600 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_5 -timestamp 1638283409 +timestamp 1638492834 transform -1 0 709467 0 1 359400 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_7 -timestamp 1638283409 +timestamp 1638492834 transform -1 0 709467 0 1 492800 box -38 0 6018 2224 use gpio_control_block gpio_control_in_2\[11\] -timestamp 1638283409 +timestamp 1638492834 transform 1 0 7631 0 1 589400 box 882 167 34000 13000 use gpio_control_block gpio_control_in_2\[12\] -timestamp 1638283409 +timestamp 1638492834 transform 1 0 7631 0 1 546200 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_31 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 8367 0 1 559200 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_30 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 8367 0 1 602400 box -38 0 6018 2224 use gpio_control_block gpio_control_in_1\[0\] -timestamp 1638283409 +timestamp 1638492834 transform -1 0 710203 0 1 523800 box 882 167 34000 13000 use gpio_control_block gpio_control_in_1\[1\] -timestamp 1638283409 +timestamp 1638492834 transform -1 0 710203 0 1 568800 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_8 -timestamp 1638283409 +timestamp 1638492834 transform -1 0 709467 0 1 536800 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_9 -timestamp 1638283409 +timestamp 1638492834 transform -1 0 709467 0 1 581800 box -38 0 6018 2224 use gpio_control_block gpio_control_in_2\[10\] -timestamp 1638283409 +timestamp 1638492834 transform 1 0 7631 0 1 632600 box 882 167 34000 13000 use gpio_control_block gpio_control_in_2\[9\] -timestamp 1638283409 +timestamp 1638492834 transform 1 0 7631 0 1 675800 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_29 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 8367 0 1 645600 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_28 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 8367 0 1 688800 box -38 0 6018 2224 use gpio_control_block gpio_control_in_1\[2\] -timestamp 1638283409 +timestamp 1638492834 transform -1 0 710203 0 1 614000 box 882 167 34000 13000 use gpio_control_block gpio_control_in_1\[3\] -timestamp 1638283409 +timestamp 1638492834 transform -1 0 710203 0 1 659000 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_10 -timestamp 1638283409 +timestamp 1638492834 transform -1 0 709467 0 1 627000 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_11 -timestamp 1638283409 +timestamp 1638492834 transform -1 0 709467 0 1 672000 box -38 0 6018 2224 use gpio_control_block gpio_control_in_2\[7\] -timestamp 1638283409 +timestamp 1638492834 transform 1 0 7631 0 1 762200 box 882 167 34000 13000 use gpio_control_block gpio_control_in_2\[8\] -timestamp 1638283409 +timestamp 1638492834 transform 1 0 7631 0 1 719000 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_27 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 8367 0 1 732000 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_26 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 8367 0 1 775200 box -38 0 6018 2224 use gpio_control_block gpio_control_in_1\[4\] -timestamp 1638283409 +timestamp 1638492834 transform -1 0 710203 0 1 704200 box 882 167 34000 13000 use gpio_control_block gpio_control_in_1\[5\] -timestamp 1638283409 +timestamp 1638492834 transform -1 0 710203 0 1 749200 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_12 -timestamp 1638283409 +timestamp 1638492834 transform -1 0 709467 0 1 717200 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_13 -timestamp 1638283409 +timestamp 1638492834 transform -1 0 709467 0 1 762200 box -38 0 6018 2224 use gpio_control_block gpio_control_in_2\[6\] -timestamp 1638283409 +timestamp 1638492834 transform 1 0 7631 0 1 805400 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_25 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 8367 0 1 818400 box -38 0 6018 2224 use gpio_control_block gpio_control_in_2\[5\] -timestamp 1638283409 +timestamp 1638492834 transform 1 0 7631 0 1 931200 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_24 -timestamp 1638283409 +timestamp 1638492834 transform 1 0 8367 0 1 944200 box -38 0 6018 2224 use gpio_control_block gpio_control_in_1\[6\] -timestamp 1638283409 +timestamp 1638492834 transform -1 0 710203 0 1 927600 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_14 -timestamp 1638283409 +timestamp 1638492834 transform -1 0 709467 0 1 940600 box -38 0 6018 2224 use gpio_control_block gpio_control_in_2\[3\] -timestamp 1638283409 +timestamp 1638492834 transform 0 1 148600 -1 0 1030077 box 882 167 34000 13000 use gpio_control_block gpio_control_in_2\[4\] -timestamp 1638283409 +timestamp 1638492834 transform 0 1 97200 -1 0 1030077 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_23 -timestamp 1638283409 +timestamp 1638492834 transform 0 1 110194 -1 0 1029341 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_22 -timestamp 1638283409 +timestamp 1638492834 transform 0 1 161594 -1 0 1029341 box -38 0 6018 2224 use gpio_control_block gpio_control_in_2\[1\] -timestamp 1638283409 +timestamp 1638492834 transform 0 1 251400 -1 0 1030077 box 882 167 34000 13000 use gpio_control_block gpio_control_in_2\[2\] -timestamp 1638283409 +timestamp 1638492834 transform 0 1 200000 -1 0 1030077 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_21 -timestamp 1638283409 +timestamp 1638492834 transform 0 1 212994 -1 0 1029341 box -38 0 6018 2224 use gpio_control_block gpio_control_in_2\[0\] -timestamp 1638283409 +timestamp 1638492834 transform 0 1 303000 -1 0 1030077 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_20 -timestamp 1638283409 +timestamp 1638492834 transform 0 1 264394 -1 0 1029341 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_19 -timestamp 1638283409 +timestamp 1638492834 transform 0 1 315994 -1 0 1029341 box -38 0 6018 2224 use gpio_control_block gpio_control_in_1\[10\] -timestamp 1638283409 +timestamp 1638492834 transform 0 1 353400 -1 0 1030077 box 882 167 34000 13000 use gpio_control_block gpio_control_in_1\[9\] -timestamp 1638283409 +timestamp 1638492834 transform 0 1 420800 -1 0 1030077 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_18 -timestamp 1638283409 +timestamp 1638492834 transform 0 1 366394 -1 0 1029341 box -38 0 6018 2224 use gpio_defaults_block gpio_defaults_block_17 -timestamp 1638283409 +timestamp 1638492834 transform 0 1 433794 -1 0 1029341 box -38 0 6018 2224 use gpio_control_block gpio_control_in_1\[8\] -timestamp 1638283409 +timestamp 1638492834 transform 0 1 497800 -1 0 1030077 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_16 -timestamp 1638283409 +timestamp 1638492834 transform 0 1 510794 -1 0 1029341 box -38 0 6018 2224 use gpio_control_block gpio_control_in_1\[7\] -timestamp 1638283409 +timestamp 1638492834 transform 0 1 549200 -1 0 1030077 box 882 167 34000 13000 use gpio_defaults_block gpio_defaults_block_15 -timestamp 1638283409 +timestamp 1638492834 transform 0 1 562194 -1 0 1029341 box -38 0 6018 2224 use chip_io padframe -timestamp 1638030917 +timestamp 1638492834 transform 1 0 0 0 1 0 box 0 0 717600 1037600 use caravel_power_routing caravel_power_routing_0 -timestamp 1637790566 +timestamp 1638492834 transform 1 0 0 0 1 0 box 0 0 717600 1037600 use user_project_wrapper mprj diff --git a/mag/caravel_power_routing.mag b/mag/caravel_power_routing.mag index 4984f6d3..914907c6 100644 --- a/mag/caravel_power_routing.mag +++ b/mag/caravel_power_routing.mag @@ -1,7 +1,7 @@ magic tech sky130A magscale 1 2 -timestamp 1637790566 +timestamp 1638492834 << error_p >> rect 111554 1006757 112632 1006758 rect 111554 1006005 111555 1006757 @@ -789,10 +789,6 @@ rect 679466 134863 680228 134864 rect 679466 133781 679467 134863 rect 680227 133781 680228 134863 rect 679466 133780 680228 133781 -rect 234842 38177 237788 38178 -rect 234842 37337 234843 38177 -rect 237787 37337 237788 38177 -rect 234842 37336 237788 37337 rect 149632 35995 150436 35996 rect 149632 35167 149633 35995 rect 150435 35167 150436 35995 @@ -805,10 +801,6 @@ rect 642026 33989 642027 34759 rect 643633 33989 643634 34759 rect 642026 33988 643634 33989 rect 148098 33958 148902 33959 -rect 204996 31645 207928 31646 -rect 204996 30787 204997 31645 -rect 207927 30787 207928 31645 -rect 204996 30786 207928 30787 << error_s >> rect 41068 950418 41092 951330 rect 43500 950418 43524 951330 @@ -1418,17 +1410,9 @@ rect 643660 42198 643694 43988 rect 149600 35166 149632 35996 rect 150436 35166 150458 35996 rect 149600 35114 150458 35166 -rect 234814 38178 237814 38242 -rect 234814 37336 234842 38178 -rect 237788 37336 237814 38178 rect 148068 33958 148098 34788 rect 148902 33958 148926 34788 rect 148068 33900 148926 33958 -rect 204958 31646 207958 31734 -rect 204958 30786 204996 31646 -rect 207928 30786 207958 31646 -rect 204958 18004 207958 30786 -rect 234814 19380 237814 37336 rect 641954 34760 643694 42198 rect 653462 42634 653578 45026 rect 656772 42634 656910 45026 @@ -1436,12 +1420,6 @@ rect 653462 35808 656910 42634 rect 641954 33988 642026 34760 rect 643634 33988 643694 34760 rect 641954 33920 643694 33988 -rect 234814 18544 234884 19380 -rect 237754 18544 237814 19380 -rect 234814 18466 237814 18544 -rect 204958 17128 205020 18004 -rect 207872 17128 207958 18004 -rect 204958 17038 207958 17128 << via3 >> rect 575788 995134 580384 997056 rect 585758 995140 590354 997062 @@ -1566,13 +1544,9 @@ rect 251392 42856 255638 46630 rect 648166 46660 649608 47124 rect 641994 42198 643660 43988 rect 149632 35166 150436 35996 -rect 234842 37336 237788 38178 rect 148098 33958 148902 34788 -rect 204996 30786 207928 31646 rect 653578 42634 656772 45026 rect 642026 33988 643634 34760 -rect 234884 18544 237754 19380 -rect 205020 17128 207872 18004 << metal4 >> rect 575680 997056 580478 997130 rect 575680 995134 575788 997056 @@ -2343,6 +2317,46 @@ rect 640098 80900 640922 81016 rect 640098 78256 640210 80900 rect 640810 78256 640922 80900 rect 640098 78134 640922 78256 +rect 629888 77208 630208 77374 +rect 629888 76302 629906 77208 +rect 630168 76302 630208 77208 +rect 629888 74104 630208 76302 +rect 631438 75806 631758 77374 +rect 631438 74900 631458 75806 +rect 631720 74900 631758 75806 +rect 631438 74104 631758 74900 +rect 632988 77222 633308 77374 +rect 632988 76316 633018 77222 +rect 633280 76316 633308 77222 +rect 632988 74104 633308 76316 +rect 634538 75810 634858 77374 +rect 634538 74904 634552 75810 +rect 634814 74904 634858 75810 +rect 634538 74104 634858 74904 +rect 636088 77218 636408 77374 +rect 636088 76312 636108 77218 +rect 636370 76312 636408 77218 +rect 636088 74104 636408 76312 +rect 637638 75814 637958 77374 +rect 637638 74908 637660 75814 +rect 637922 74908 637958 75814 +rect 637638 74104 637958 74908 +rect 639188 77218 639508 77374 +rect 639188 76312 639202 77218 +rect 639464 76312 639508 77218 +rect 639188 74104 639508 76312 +rect 640738 75806 641058 77374 +rect 640738 74900 640764 75806 +rect 641026 74900 641058 75806 +rect 640738 74104 641058 74900 +rect 642288 77230 642608 77374 +rect 642288 76324 642310 77230 +rect 642572 76324 642608 77230 +rect 642288 74104 642608 76324 +rect 643838 75832 644158 77374 +rect 643838 74926 643866 75832 +rect 644128 74926 644158 75832 +rect 643838 74104 644158 74926 rect 41858 72802 45772 72890 rect 41858 68338 41922 72802 rect 45648 68338 45772 72802 @@ -2407,54 +2421,6 @@ rect 143440 40752 148940 40762 rect 143440 40592 148086 40752 rect 148908 40592 148940 40752 rect 143440 40582 148940 40592 -rect 208850 19412 209170 19578 -rect 208850 18506 208868 19412 -rect 209130 18506 209170 19412 -rect 204960 18004 207956 18076 -rect 204960 17128 205020 18004 -rect 207872 17128 207956 18004 -rect 204960 17072 207956 17128 -rect 208850 16308 209170 18506 -rect 210400 18010 210720 19578 -rect 210400 17104 210420 18010 -rect 210682 17104 210720 18010 -rect 210400 16308 210720 17104 -rect 211950 19426 212270 19578 -rect 211950 18520 211980 19426 -rect 212242 18520 212270 19426 -rect 211950 16308 212270 18520 -rect 213500 18014 213820 19578 -rect 213500 17108 213514 18014 -rect 213776 17108 213820 18014 -rect 213500 16308 213820 17108 -rect 215050 19422 215370 19578 -rect 215050 18516 215070 19422 -rect 215332 18516 215370 19422 -rect 215050 16308 215370 18516 -rect 216600 18018 216920 19578 -rect 216600 17112 216622 18018 -rect 216884 17112 216920 18018 -rect 216600 16308 216920 17112 -rect 218150 19422 218470 19578 -rect 218150 18516 218164 19422 -rect 218426 18516 218470 19422 -rect 218150 16308 218470 18516 -rect 219700 18010 220020 19578 -rect 219700 17104 219726 18010 -rect 219988 17104 220020 18010 -rect 219700 16308 220020 17104 -rect 221250 19434 221570 19578 -rect 221250 18528 221272 19434 -rect 221534 18528 221570 19434 -rect 221250 16308 221570 18528 -rect 222800 18036 223120 19578 -rect 234818 19380 237824 19480 -rect 234818 18544 234884 19380 -rect 237754 18544 237824 19380 -rect 234818 18470 237824 18544 -rect 222800 17130 222828 18036 -rect 223090 17130 223120 18036 -rect 222800 16308 223120 17130 << via4 >> rect 575762 990884 580384 993314 rect 670928 995628 676500 996584 @@ -2651,6 +2617,16 @@ rect 594120 79916 596852 80456 rect 602454 79938 605324 80438 rect 632200 78326 632864 80776 rect 640210 78256 640810 80900 +rect 629906 76302 630168 77208 +rect 631458 74900 631720 75806 +rect 633018 76316 633280 77222 +rect 634552 74904 634814 75810 +rect 636108 76312 636370 77218 +rect 637660 74908 637922 75814 +rect 639202 76312 639464 77218 +rect 640764 74900 641026 75806 +rect 642310 76324 642572 77230 +rect 643866 74926 644128 75832 rect 41922 68338 45648 72802 rect 41936 66902 45690 67438 rect 51444 66916 52306 67436 @@ -2662,18 +2638,6 @@ rect 241740 42842 245986 46616 rect 251392 42856 255638 46630 rect 648166 46660 649608 47124 rect 666460 47030 669380 47282 -rect 208868 18506 209130 19412 -rect 205020 17128 207872 18004 -rect 210420 17104 210682 18010 -rect 211980 18520 212242 19426 -rect 213514 17108 213776 18014 -rect 215070 18516 215332 19422 -rect 216622 17112 216884 18018 -rect 218164 18516 218426 19422 -rect 219726 17104 219988 18010 -rect 221272 18528 221534 19434 -rect 234884 18544 237754 19380 -rect 222828 17130 223090 18036 << metal5 >> rect 52598 996584 676660 996702 rect 52598 995628 670928 996584 @@ -3195,6 +3159,10 @@ rect 643544 93474 646544 93588 rect 641906 93154 646544 93474 rect 624824 89154 629362 89474 rect 624824 89012 627824 89154 +rect 602390 79938 602454 80438 +rect 605324 79938 605390 80438 +rect 602390 47188 605390 79938 +rect 625618 75868 627034 89012 rect 643544 85474 646544 93154 rect 650994 92590 653994 95956 rect 666426 93406 669426 105300 @@ -3210,9 +3178,6 @@ rect 662504 89822 669426 90142 rect 641968 85154 646544 85474 rect 643544 81082 646544 85154 rect 666426 81082 669426 89822 -rect 602390 79938 602454 80438 -rect 605324 79938 605390 80438 -rect 602390 47188 605390 79938 rect 632002 80900 669426 81082 rect 632002 80776 640210 80900 rect 632002 78326 632200 80776 @@ -3220,6 +3185,46 @@ rect 632864 78326 640210 80776 rect 632002 78256 640210 78326 rect 640810 78256 669426 80900 rect 632002 78082 669426 78256 +rect 645256 77268 647084 78082 +rect 629786 77230 647084 77268 +rect 629786 77222 642310 77230 +rect 629786 77208 633018 77222 +rect 629786 76302 629906 77208 +rect 630168 76316 633018 77208 +rect 633280 77218 642310 77222 +rect 633280 76316 636108 77218 +rect 630168 76312 636108 76316 +rect 636370 76312 639202 77218 +rect 639464 76324 642310 77218 +rect 642572 76324 647084 77230 +rect 639464 76312 647084 76324 +rect 630168 76302 647084 76312 +rect 629786 76268 647084 76302 +rect 625618 75832 644188 75868 +rect 625618 75814 643866 75832 +rect 625618 75810 637660 75814 +rect 625618 75806 634552 75810 +rect 625618 74900 631458 75806 +rect 631720 74904 634552 75806 +rect 634814 74908 637660 75810 +rect 637922 75806 643866 75814 +rect 637922 74908 640764 75806 +rect 634814 74904 640764 74908 +rect 631720 74900 640764 74904 +rect 641026 74926 643866 75806 +rect 644128 74926 644188 75832 +rect 641026 74900 644188 74926 +rect 625618 74868 644188 74900 +rect 625618 71796 626418 74868 +rect 646284 73486 647084 76268 +rect 645536 73166 647084 73486 +rect 625618 71476 626968 71796 +rect 625618 68416 626418 71476 +rect 646284 70106 647084 73166 +rect 645502 69786 647084 70106 +rect 625618 68096 626846 68416 +rect 646284 66726 647084 69786 +rect 645624 66406 647084 66726 rect 666426 47282 669426 78082 rect 602390 47124 649668 47188 rect 602390 46788 648166 47124 @@ -3240,53 +3245,6 @@ rect 255638 45788 605390 46588 rect 255638 42856 605396 45788 rect 245986 42842 605396 42856 rect 46836 42788 605396 42842 -rect 205820 19434 237824 19472 -rect 205820 19426 221272 19434 -rect 205820 19412 211980 19426 -rect 205820 18506 208868 19412 -rect 209130 18520 211980 19412 -rect 212242 19422 221272 19426 -rect 212242 18520 215070 19422 -rect 209130 18516 215070 18520 -rect 215332 18516 218164 19422 -rect 218426 18528 221272 19422 -rect 221534 19380 237824 19434 -rect 221534 18544 234884 19380 -rect 237754 18544 237824 19380 -rect 221534 18528 237824 18544 -rect 218426 18516 237824 18528 -rect 209130 18506 237824 18516 -rect 205820 18472 237824 18506 -rect 204580 18036 224806 18072 -rect 204580 18018 222828 18036 -rect 204580 18014 216622 18018 -rect 204580 18010 213514 18014 -rect 204580 18004 210420 18010 -rect 204580 17128 205020 18004 -rect 207872 17128 210420 18004 -rect 204580 17104 210420 17128 -rect 210682 17108 213514 18010 -rect 213776 17112 216622 18014 -rect 216884 18010 222828 18018 -rect 216884 17112 219726 18010 -rect 213776 17108 219726 17112 -rect 210682 17104 219726 17108 -rect 219988 17130 222828 18010 -rect 223090 17130 224806 18036 -rect 219988 17104 224806 17130 -rect 204580 17072 224806 17104 -rect 204580 14000 205380 17072 -rect 225246 15690 226046 18472 -rect 224498 15370 226046 15690 -rect 204580 13680 205930 14000 -rect 204580 10620 205380 13680 -rect 225246 12310 226046 15370 -rect 224464 11990 226046 12310 -rect 204580 10300 205808 10620 -rect 204580 8096 205380 10300 -rect 225246 8930 226046 11990 -rect 224586 8610 226046 8930 -rect 225246 7838 226046 8610 << comment >> rect 0 1037400 717600 1037600 rect 0 200 200 1037400 @@ -3464,8 +3422,6 @@ flabel metal5 664092 267180 666518 267904 0 FreeSans 3200 0 0 0 vssa1_core flabel metal5 667280 263142 669706 263866 0 FreeSans 3200 0 0 0 vdda1_core flabel metal5 634330 96284 638114 98514 0 FreeSans 16000 0 0 0 vssd_core flabel metal5 633452 78554 637236 80784 0 FreeSans 16000 0 0 0 vccd_core -flabel metal5 206106 18628 207168 19326 0 FreeSans 4800 0 0 0 vccd_core -flabel metal5 206018 17180 207080 17878 0 FreeSans 4800 0 0 0 vssd_core flabel metal5 182024 250550 190042 253308 0 FreeSans 16000 0 0 0 vssd1_core flabel metal5 182160 246638 190178 249396 0 FreeSans 16000 0 0 0 vccd1_core flabel metal5 181852 266620 189870 269378 0 FreeSans 16000 0 0 0 vssa1_core @@ -3476,4 +3432,6 @@ flabel metal5 621512 258708 630212 261250 0 FreeSans 16000 0 0 0 vssa2_core flabel metal5 621598 254668 630298 257210 0 FreeSans 16000 0 0 0 vdda2_core flabel metal5 621936 242776 630636 245318 0 FreeSans 16000 0 0 0 vssd2_core flabel metal5 621794 238736 630494 241278 0 FreeSans 16000 0 0 0 vccd2_core +flabel metal5 627056 74976 628118 75674 0 FreeSans 4800 0 0 0 vssd_core +flabel metal5 644752 76466 645814 77164 0 FreeSans 4800 0 0 0 vccd_core << end >> diff --git a/mag/run_caravan_lvs.sh b/mag/run_caravan_lvs.sh index e0379ff4..e09b0059 100755 --- a/mag/run_caravan_lvs.sh +++ b/mag/run_caravan_lvs.sh @@ -1,4 +1,18 @@ #!/bin/sh # +magic -dnull -noconsole -rcfile /usr/share/pdk/sky130A/libs.tech/magic/sky130A.magicrc << EOF +drc off +crashbackups stop +load caravan +select top cell +expand +extract do local +extract all +ext2spice lvs +ext2spice +EOF + +rm *.ext + export NETGEN_COLUMNS=60 netgen -batch lvs "caravan.spice caravan" "../verilog/gl/caravan.v caravan" ./sky130A_setup.tcl comp.out diff --git a/mag/run_caravel_lvs.sh b/mag/run_caravel_lvs.sh index 2b8bae37..29f82b38 100755 --- a/mag/run_caravel_lvs.sh +++ b/mag/run_caravel_lvs.sh @@ -1,4 +1,18 @@ #!/bin/sh # +magic -dnull -noconsole -rcfile /usr/share/pdk/sky130A/libs.tech/magic/sky130A.magicrc << EOF +drc off +crashbackups stop +load caravel +select top cell +expand +extract do local +extract all +ext2spice lvs +ext2spice +EOF + +rm *.ext + export NETGEN_COLUMNS=60 netgen -batch lvs "caravel.spice caravel" "../verilog/gl/caravel.v caravel" ./sky130A_setup.tcl comp.out