DRC resolving
diff --git a/mag/c4_1.mag b/mag/c4_1.mag index eb2695c..74b15ed 100644 --- a/mag/c4_1.mag +++ b/mag/c4_1.mag
@@ -1,7 +1,7 @@ magic tech sky130B magscale 1 2 -timestamp 1654288242 +timestamp 1654490084 << nwell >> rect 8 166 208 585 << nmos >> @@ -244,7 +244,6 @@ rect -318 187 -261 197 << metal2 >> rect -329 242 -251 251 -rect -1392 136 -1272 210 rect -329 185 -320 242 rect -260 185 -251 242 rect -329 176 -251 185 @@ -259,7 +258,7 @@ rect -260 185 -243 242 rect -363 158 -243 185 use sky130_fd_pr__cap_mim_m3_1_5NP42Z sky130_fd_pr__cap_mim_m3_1_5NP42Z_0 -timestamp 1654287887 +timestamp 1654490084 transform 1 0 -1036 0 1 178 -box -309 -400 794 400 +box -613 -400 794 400 << end >>
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag index 26401bf..ffaf39d 100644 --- a/mag/user_analog_project_wrapper.mag +++ b/mag/user_analog_project_wrapper.mag
@@ -1,10 +1,26 @@ magic tech sky130B magscale 1 2 -timestamp 1654454918 +timestamp 1654490385 << locali >> rect 256417 656497 256484 656565 << metal1 >> +rect 141506 696385 582623 696394 +rect 141506 696327 141515 696385 +rect 141623 696327 582623 696385 +rect 141506 696318 582623 696327 +rect 141697 696281 582502 696290 +rect 141697 696223 141706 696281 +rect 141803 696223 582502 696281 +rect 141697 696214 582502 696223 +rect 141858 696177 582381 696186 +rect 141858 696119 141867 696177 +rect 141963 696119 582381 696177 +rect 141858 696110 582381 696119 +rect 142041 696072 582263 696081 +rect 142041 696014 142050 696072 +rect 142148 696014 582263 696072 +rect 142041 696005 582263 696014 rect 561180 686400 561428 686442 rect 561180 686254 561216 686400 rect 561378 686254 561428 686400 @@ -87,8 +103,28 @@ rect 227322 581188 227336 581322 rect 227494 581188 227510 581322 rect 227322 581174 227510 581188 +rect 582187 536382 582263 696005 +rect 582187 536318 582193 536382 +rect 582257 536318 582263 536382 +rect 582187 536312 582263 536318 +rect 582305 536382 582381 696110 +rect 582305 536318 582311 536382 +rect 582375 536318 582381 536382 +rect 582305 536312 582381 536318 +rect 582426 536383 582502 696214 +rect 582426 536319 582432 536383 +rect 582496 536319 582502 536383 +rect 582426 536313 582502 536319 +rect 582547 536383 582623 696318 +rect 582547 536319 582553 536383 +rect 582617 536319 582623 536383 +rect 582547 536313 582623 536319 rect 291944 351944 292056 427554 << via1 >> +rect 141515 696327 141623 696385 +rect 141706 696223 141803 696281 +rect 141867 696119 141963 696177 +rect 142050 696014 142148 696072 rect 561216 686254 561378 686400 rect 561216 685764 561378 685910 rect 326572 684652 326878 684824 @@ -104,17 +140,77 @@ rect 255950 656373 256002 656427 rect 256860 656205 257122 656257 rect 227336 581188 227494 581322 +rect 582193 536318 582257 536382 +rect 582311 536318 582375 536382 +rect 582432 536319 582496 536383 +rect 582553 536319 582617 536383 << metal2 >> rect 512622 703358 513362 703376 rect 415430 703206 416162 703216 +rect 122455 702724 122537 702733 +rect 122455 702660 122464 702724 +rect 122528 702660 122537 702724 +rect 51436 666500 51710 666510 +rect 51436 666332 51446 666500 +rect 51700 666332 51710 666500 +rect 51436 666322 51710 666332 +rect 43032 663602 43200 663612 +rect 43032 663434 43042 663602 +rect 43190 663434 43200 663602 +rect 43032 663424 43200 663434 +rect 56246 663594 56386 663604 +rect 56246 663434 56256 663594 +rect 56376 663434 56386 663594 +rect 56246 663424 56386 663434 +rect 122455 660400 122537 702660 rect 415430 702616 415440 703206 rect 416152 702616 416162 703206 rect 415430 702606 416162 702616 rect 467610 703066 468342 703076 -rect 172762 699814 173502 699834 -rect 172762 699114 172784 699814 -rect 173484 699114 173502 699814 -rect 172762 681286 173502 699114 +rect 173176 699283 173258 699292 +rect 173176 699219 173185 699283 +rect 173249 699219 173258 699283 +rect 141506 696385 141632 696394 +rect 141506 696327 141515 696385 +rect 141623 696327 141632 696385 +rect 141506 690618 141632 696327 +rect 141697 696281 141812 696290 +rect 141697 696223 141706 696281 +rect 141803 696223 141812 696281 +rect 141697 693474 141812 696223 +rect 141506 684556 141633 690618 +rect 141506 682743 141632 684556 +rect 141508 672840 141630 682743 +rect 141509 664389 141629 672840 +rect 121182 660341 122537 660400 +rect 141511 659230 141627 664389 +rect 140402 659221 141634 659230 +rect 140402 659123 140411 659221 +rect 141189 659123 141634 659221 +rect 140402 659114 141634 659123 +rect 51838 657602 52004 657616 +rect 51838 657502 51856 657602 +rect 51982 657502 52004 657602 +rect 51838 657486 52004 657502 +rect 141696 656782 141812 693474 +rect 141858 696177 141972 696186 +rect 141858 696119 141867 696177 +rect 141963 696119 141972 696177 +rect 141858 659101 141972 696119 +rect 142041 696072 142157 696081 +rect 142041 696014 142050 696072 +rect 142148 696014 142157 696072 +rect 140402 656773 141812 656782 +rect 140402 656675 140411 656773 +rect 141189 656675 141812 656773 +rect 140402 656666 141812 656675 +rect 141857 654198 141973 659101 +rect 140402 654189 141973 654198 +rect 140402 654091 140411 654189 +rect 141189 654091 141973 654189 +rect 140402 654082 141973 654091 +rect 142041 651750 142157 696014 +rect 173176 660224 173258 699219 rect 224634 698474 225366 698484 rect 224634 697884 224644 698474 rect 225356 697884 225366 698474 @@ -191,31 +287,23 @@ rect 512610 682292 513366 684870 rect 256850 681546 513366 682292 rect 256850 681536 513364 681546 -rect 254610 681286 254689 681288 -rect 172756 681134 254689 681286 -rect 172756 681131 226746 681134 -rect 51436 666500 51710 666510 -rect 51436 666332 51446 666500 -rect 51700 666332 51710 666500 -rect 51436 666322 51710 666332 -rect 43032 663602 43200 663612 -rect 43032 663434 43042 663602 -rect 43190 663434 43200 663602 -rect 43032 663424 43200 663434 -rect 56246 663594 56386 663604 -rect 56246 663434 56256 663594 -rect 56376 663434 56386 663594 -rect 56246 663424 56386 663434 -rect 51838 657602 52004 657616 -rect 51838 657502 51856 657602 -rect 51982 657502 52004 657602 -rect 51838 657486 52004 657502 -rect 254610 656928 254689 681134 +rect 173176 660151 174412 660224 +rect 193580 659044 194369 659053 +rect 193580 658947 193589 659044 +rect 194360 658947 194369 659044 +rect 193580 658938 194369 658947 +rect 254610 656928 254689 660569 rect 254610 656869 254618 656928 rect 254679 656869 254689 656928 rect 254610 656861 254689 656869 rect 213547 656795 255948 656796 -rect 213547 656727 256482 656795 +rect 213547 656732 256482 656795 +rect 213547 656727 254500 656732 +rect 254778 656727 256482 656732 +rect 193576 656597 194372 656606 +rect 193576 656499 193585 656597 +rect 194363 656499 194372 656597 +rect 193576 656490 194372 656499 rect 213547 656306 213617 656727 rect 256416 656714 256482 656727 rect 256416 656662 256424 656714 @@ -236,6 +324,53 @@ rect 253995 656373 255950 656427 rect 256002 656373 256009 656427 rect 253995 656366 256009 656373 +rect 193576 654013 194372 654022 +rect 193576 653915 193585 654013 +rect 194363 653915 194372 654013 +rect 193576 653906 194372 653915 +rect 140402 651741 142157 651750 +rect 140402 651643 140411 651741 +rect 141189 651643 142157 651741 +rect 140402 651634 142157 651643 +rect 193576 651565 194372 651574 +rect 193576 651467 193585 651565 +rect 194363 651467 194372 651565 +rect 193576 651458 194372 651467 +rect 101760 650750 101836 650880 +rect 102906 650750 103018 650880 +rect 104088 650750 104200 650880 +rect 105270 650750 105382 650880 +rect 106452 650750 106564 650880 +rect 107634 650750 107746 650880 +rect 108816 650750 108928 650880 +rect 109998 650750 110110 650880 +rect 111180 650750 111292 650880 +rect 112362 650750 112474 650880 +rect 113544 650750 113656 650880 +rect 114726 650750 114838 650880 +rect 115908 650750 116020 650880 +rect 117090 650750 117202 650880 +rect 118272 650750 118384 650880 +rect 119454 650750 119566 650880 +rect 120636 650750 120748 650880 +rect 121818 650750 121930 650880 +rect 123000 650750 123112 650880 +rect 124182 650750 124294 650880 +rect 125364 650750 125476 650880 +rect 126546 650750 126658 650880 +rect 127728 650750 127840 650880 +rect 128910 650750 129022 650880 +rect 130092 650750 130204 650880 +rect 131274 650750 131386 650880 +rect 132456 650750 132568 650880 +rect 133638 650750 133750 650880 +rect 134820 650750 134932 650880 +rect 136002 650750 136114 650880 +rect 137184 650750 137296 650880 +rect 138366 650750 138478 650880 +rect 139548 650750 139660 650880 +rect 140730 650750 140842 650880 +rect 141912 650750 142024 650880 rect 4346 511652 4478 511670 rect 213548 511652 213616 656306 rect 340 511642 213616 511652 @@ -307,45 +442,86 @@ rect 261364 426642 262077 549780 rect 251643 425931 262077 426642 rect 261364 425930 262077 425931 +rect 582183 536382 582265 536393 +rect 582183 536318 582193 536382 +rect 582257 536318 582265 536382 rect 362 381971 223657 381982 rect 362 381870 372 381971 rect 475 381870 223657 381971 rect 362 381860 223657 381870 -rect 524 -800 636 480 -rect 1706 -800 1818 480 -rect 2888 -800 3000 480 -rect 4070 -800 4182 480 -rect 5252 -800 5364 480 -rect 6434 -800 6546 480 -rect 7616 -800 7728 480 -rect 8798 -800 8910 480 -rect 9980 -800 10092 480 -rect 11162 -800 11274 480 -rect 12344 -800 12456 480 -rect 13526 -800 13638 480 -rect 14708 -800 14820 480 -rect 15890 -800 16002 480 -rect 17072 -800 17184 480 -rect 18254 -800 18366 480 -rect 19436 -800 19548 480 -rect 20618 -800 20730 480 -rect 21800 -800 21912 480 -rect 22982 -800 23094 480 -rect 24164 -800 24276 480 -rect 25346 -800 25458 480 -rect 26528 -800 26640 480 -rect 27710 -800 27822 480 -rect 28892 -800 29004 480 -rect 30074 -800 30186 480 -rect 31256 -800 31368 480 -rect 32438 -800 32550 480 -rect 33620 -800 33732 480 -rect 34802 -800 34914 480 -rect 35984 -800 36096 480 -rect 37166 -800 37278 480 -rect 38348 -800 38460 480 -rect 39530 -800 39642 480 -rect 40712 -800 40824 480 +rect 582183 406392 582265 536318 +rect 582303 536382 582385 536393 +rect 582303 536318 582311 536382 +rect 582375 536318 582385 536382 +rect 582303 406392 582385 536318 +rect 582423 536383 582505 536393 +rect 582423 536319 582432 536383 +rect 582496 536319 582505 536383 +rect 582423 406392 582505 536319 +rect 582543 536383 582625 536393 +rect 582543 536319 582553 536383 +rect 582617 536319 582625 536383 +rect 582543 406393 582625 536319 +rect 582183 405310 582267 406392 +rect 582303 405310 582387 406392 +rect 582422 406312 582506 406392 +rect 582542 406312 582626 406393 +rect 582183 269329 582265 405310 +rect 582303 313752 582385 405310 +rect 582423 358971 582505 406312 +rect 582543 405393 582625 406312 +rect 582543 405384 583625 405393 +rect 582543 405320 583552 405384 +rect 583616 405320 583625 405384 +rect 582543 405311 583625 405320 +rect 582423 358962 583621 358971 +rect 582423 358898 583548 358962 +rect 583612 358898 583621 358962 +rect 582423 358889 583621 358898 +rect 582303 313743 583621 313752 +rect 582303 313679 583548 313743 +rect 583612 313679 583621 313743 +rect 582303 313670 583621 313679 +rect 582183 269320 583620 269329 +rect 582183 269256 583547 269320 +rect 583611 269256 583620 269320 +rect 582183 269248 583620 269256 +rect 524 350 560 480 +rect 524 -800 636 350 +rect 1706 -800 1818 350 +rect 2888 -800 3000 350 +rect 4070 -800 4182 350 +rect 5252 -800 5364 350 +rect 6434 -800 6546 350 +rect 7616 -800 7728 350 +rect 8798 -800 8910 350 +rect 9980 -800 10092 350 +rect 11162 -800 11274 350 +rect 12344 -800 12456 350 +rect 13526 -800 13638 350 +rect 14708 -800 14820 350 +rect 15890 -800 16002 350 +rect 17072 -800 17184 350 +rect 18254 -800 18366 350 +rect 19436 -800 19548 350 +rect 20618 -800 20730 350 +rect 21800 -800 21912 350 +rect 22982 -800 23094 350 +rect 24164 -800 24276 350 +rect 25346 -800 25458 350 +rect 26528 -800 26640 350 +rect 27710 -800 27822 350 +rect 28892 -800 29004 350 +rect 30074 -800 30186 350 +rect 31256 -800 31368 350 +rect 32438 -800 32550 350 +rect 33620 -800 33732 350 +rect 34802 -800 34914 350 +rect 35984 -800 36096 350 +rect 37166 -800 37278 350 +rect 38348 -800 38460 350 +rect 39530 -800 39642 350 +rect 40712 -800 40824 350 rect 41894 -800 42006 480 rect 43076 -800 43188 480 rect 44258 -800 44370 480 @@ -806,8 +982,18 @@ rect 582068 -800 582180 480 rect 583250 -800 583362 480 << via2 >> +rect 122464 702660 122528 702724 +rect 51446 666332 51700 666500 +rect 43042 663434 43190 663602 +rect 56256 663434 56376 663594 rect 415440 702616 416152 703206 -rect 172784 699114 173484 699814 +rect 173185 699219 173249 699283 +rect 140411 659123 141189 659221 +rect 51856 657600 51982 657602 +rect 51856 657502 51858 657600 +rect 51858 657502 51982 657600 +rect 140411 656675 141189 656773 +rect 140411 654091 141189 654189 rect 224644 697884 225356 698474 rect 326344 697884 327056 698474 rect 467620 702476 468332 703066 @@ -816,12 +1002,11 @@ rect 568942 702550 569254 702900 rect 512642 686570 513342 687270 rect 512642 684870 513342 685570 -rect 51446 666332 51700 666500 -rect 43042 663434 43190 663602 -rect 56256 663434 56376 663594 -rect 51856 657600 51982 657602 -rect 51856 657502 51858 657600 -rect 51858 657502 51982 657600 +rect 193589 658947 194360 659044 +rect 193585 656499 194363 656597 +rect 193585 653915 194363 654013 +rect 140411 651643 141189 651741 +rect 193585 651467 194363 651565 rect 340 511530 480 511642 rect 582730 681176 583036 681526 rect 261420 585180 262020 585780 @@ -833,10 +1018,17 @@ rect 261434 551164 262034 551706 rect 396 425092 474 425192 rect 372 381870 475 381971 +rect 583552 405320 583616 405384 +rect 583548 358898 583612 358962 +rect 583548 313679 583612 313743 +rect 583547 269256 583611 269320 << metal3 >> rect 16194 702300 21194 704800 rect 68194 702300 73194 704800 -rect 120194 702300 125194 704800 +rect 120194 702724 125194 704800 +rect 120194 702660 122464 702724 +rect 122528 702660 125194 702724 +rect 120194 702300 125194 702660 rect 165594 702300 170594 704800 rect 170894 702300 173094 704800 rect 173394 702300 175594 704800 @@ -875,10 +1067,10 @@ rect 68196 695160 73195 702300 rect 165596 701002 170590 702300 rect 175896 701002 180890 702300 -rect 165556 699814 180890 701002 -rect 165556 699114 172784 699814 -rect 173484 699114 180890 699814 -rect 165556 698298 180890 699114 +rect 165556 699283 180890 701002 +rect 165556 699219 173185 699283 +rect 173249 699219 180890 699283 +rect 165556 698298 180890 699219 rect 217296 699170 222286 702300 rect 227598 699170 232588 702300 rect 217296 698474 232588 699170 @@ -1005,7 +1197,10 @@ rect 583520 408842 584800 408954 rect 583520 407660 584800 407772 rect 583520 406478 584800 406590 -rect 583520 405296 584800 405408 +rect 583520 405384 584800 405408 +rect 583520 405320 583552 405384 +rect 583616 405320 584800 405384 +rect 583520 405296 584800 405320 rect -800 381971 480 381976 rect -800 381870 372 381971 rect 475 381870 480 381971 @@ -1020,7 +1215,10 @@ rect 583520 362420 584800 362532 rect 583520 361238 584800 361350 rect 583520 360056 584800 360168 -rect 583520 358874 584800 358986 +rect 583520 358962 584800 358986 +rect 583520 358898 583548 358962 +rect 583612 358898 584800 358962 +rect 583520 358874 584800 358898 rect -800 338642 480 338754 rect -800 337460 480 337572 rect -800 336278 480 336390 @@ -1032,7 +1230,10 @@ rect 583520 317198 584800 317310 rect 583520 316016 584800 316128 rect 583520 314834 584800 314946 -rect 583520 313652 584800 313764 +rect 583520 313743 584800 313764 +rect 583520 313679 583548 313743 +rect 583612 313679 584800 313743 +rect 583520 313652 584800 313679 rect -800 295420 480 295532 rect -800 294238 480 294350 rect -800 293056 480 293168 @@ -1044,7 +1245,10 @@ rect 583520 272776 584800 272888 rect 583520 271594 584800 271706 rect 583520 270412 584800 270524 -rect 583520 269230 584800 269342 +rect 583520 269320 584800 269342 +rect 583520 269256 583547 269320 +rect 583611 269256 584800 269320 +rect 583520 269230 584800 269256 rect -800 252398 480 252510 rect -800 251216 480 251328 rect -800 250034 480 250146 @@ -1140,22 +1344,30 @@ rect -100 0 0 704000 rect 584000 0 584100 704000 rect -100 -100 584100 0 -use hv_tgate hv_tgate_0 -timestamp 1648694146 -transform 1 0 230448 0 1 427446 -box -5090 -470 22390 1062 -use c4_1 c4_1_1 -timestamp 1654288242 -transform 1 0 256206 0 1 656412 -box -1392 -222 277 585 -use FG_pfet FG_pfet_0 -timestamp 1654453464 -transform 1 0 52313 0 1 660624 -box -2563 -40 1390 600 use 1T1R_2x2 1T1R_2x2_0 timestamp 1647533459 transform 1 0 562058 0 1 685450 box 0 0 864 800 +use FG_pfet FG_pfet_0 +timestamp 1654453464 +transform 1 0 52313 0 1 660624 +box -2563 -40 1390 600 +use amux amux_0 +timestamp 1654316057 +transform 1 0 101200 0 1 650400 +box 1066 0 40000 10000 +use amux amux_1 +timestamp 1654316057 +transform 1 0 154374 0 1 650224 +box 1066 0 40000 10000 +use c4_1 c4_1_1 +timestamp 1654490084 +transform 1 0 256206 0 1 656412 +box -1649 -222 277 585 +use hv_tgate hv_tgate_0 +timestamp 1648694146 +transform 1 0 230448 0 1 427446 +box -5090 -470 22390 1062 << labels >> flabel metal3 s 582300 677984 584800 682984 0 FreeSans 1120 0 0 0 io_analog[0] port 36 nsew signal bidirectional