added VCO to Caravan
diff --git a/checks/full_log.log b/checks/full_log.log
index f0c1d21..29e9112 100644
--- a/checks/full_log.log
+++ b/checks/full_log.log
@@ -5,7 +5,7 @@
{{LICENSE COMPLIANCE PASSED}} Apache-2.0 LICENSE file was found in project root
No third party libraries found.
Step 1 done without fatal errors.
-{{SPDX COMPLIANCE WARNING}} Found 31 non-compliant files with the SPDX Standard. Check full log for more information
+{{SPDX COMPLIANCE WARNING}} Found 32 non-compliant files with the SPDX Standard. Check full log for more information
SPDX COMPLIANCE: NON-COMPLIANT FILES PREVIEW: ['/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/caravel/verilog/rtl/mgmt_soc.v', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/caravel/verilog/rtl/spimemio.v', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/caravel/verilog/rtl/picorv32.v', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/caravel/verilog/rtl/simpleuart.v', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/caravel/verilog/dv/caravel/spiflash.v', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/caravel/verilog/dv/caravel/tbuart.v', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/caravel/verilog/dv/caravel/mgmt_soc/uart/uart_tb.v', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/caravel/verilog/dv/caravel/mgmt_soc/timer/timer_tb.v', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/caravel/verilog/dv/caravel/mgmt_soc/storage/storage_tb.v', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/caravel/verilog/dv/caravel/mgmt_soc/mem/mem_tb.v', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/caravel/verilog/dv/caravel/mgmt_soc/caravan/caravan_tb.v', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/caravel/verilog/dv/caravel/mgmt_soc/qspi/qspi_tb.v', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/caravel/verilog/dv/caravel/mgmt_soc/perf/perf_tb.v', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/caravel/verilog/dv/caravel/mgmt_soc/timer2/timer2_tb.v', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/caravel/verilog/dv/caravel/mgmt_soc/gpio/gpio_tb.v', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/caravel/openlane/user_analog_project_wrapper_empty/or_ioplace.tcl', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/.github/scripts/dv/run-dv.sh', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/.github/workflows/auto_update_submodule.yml', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/.github/workflows/caravan_build.yml', '/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/.github/workflows/user_project_ci.yml']
Executing Step 2 of 6: Checking YAML description.
YAML file valid!
diff --git a/checks/spdx_compliance_report.log b/checks/spdx_compliance_report.log
index 609da5c..d90c970 100644
--- a/checks/spdx_compliance_report.log
+++ b/checks/spdx_compliance_report.log
@@ -31,3 +31,4 @@
/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/xschem/test.data
/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/xschem/user_analog_project_wrapper.sch
/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/mag/comparator.ext
+/run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/mag/inverter3v3.ext
diff --git a/checks/user_analog_project_wrapper.magic.drc.mag b/checks/user_analog_project_wrapper.magic.drc.mag
index 9f395ff..e8c7e61 100644
--- a/checks/user_analog_project_wrapper.magic.drc.mag
+++ b/checks/user_analog_project_wrapper.magic.drc.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1623264863
+timestamp 1623677385
<< checkpaint >>
rect -4732 -4732 588732 708732
<< metal2 >>
@@ -793,7 +793,7 @@
rect -800 1544 480 1656
rect 583520 1544 584800 1656
use comparator comparator_0
-timestamp 1623264863
+timestamp 1623677385
transform 1 0 512636 0 -1 679846
box -722 -1410 1692 1620
<< labels >>
diff --git a/checks/user_analog_project_wrapper.xor.gds b/checks/user_analog_project_wrapper.xor.gds
index 3940d05..76587db 100644
--- a/checks/user_analog_project_wrapper.xor.gds
+++ b/checks/user_analog_project_wrapper.xor.gds
Binary files differ
diff --git a/checks/user_analog_project_wrapper_empty_erased.gds b/checks/user_analog_project_wrapper_empty_erased.gds
index f485e4a..b441313 100644
--- a/checks/user_analog_project_wrapper_empty_erased.gds
+++ b/checks/user_analog_project_wrapper_empty_erased.gds
Binary files differ
diff --git a/checks/user_analog_project_wrapper_erased.gds b/checks/user_analog_project_wrapper_erased.gds
index 7800f8e..b961f6e 100644
--- a/checks/user_analog_project_wrapper_erased.gds
+++ b/checks/user_analog_project_wrapper_erased.gds
Binary files differ
diff --git a/checks/xor.log b/checks/xor.log
index 314a6c9..18fecd9 100644
--- a/checks/xor.log
+++ b/checks/xor.log
@@ -20,29 +20,29 @@
"_input" in: xor.drc:38
Elapsed: 0.000s
"^" in: xor.drc:38
-Elapsed: 0.010s
+Elapsed: 0.000s
XOR differences: 0
"_output" in: xor.drc:41
-Elapsed: 0.000s
+Elapsed: 0.010s
--- Running XOR for 70/20 ---
"_input" in: xor.drc:38
-Elapsed: 0.010s
-"_input" in: xor.drc:38
Elapsed: 0.000s
-"^" in: xor.drc:38
+"_input" in: xor.drc:38
Elapsed: 0.010s
+"^" in: xor.drc:38
+Elapsed: 0.000s
XOR differences: 0
"_output" in: xor.drc:41
-Elapsed: 0.000s
+Elapsed: 0.010s
--- Running XOR for 81/14 ---
"_input" in: xor.drc:38
-Elapsed: 0.010s
-"_input" in: xor.drc:38
Elapsed: 0.000s
-"^" in: xor.drc:38
+"_input" in: xor.drc:38
Elapsed: 0.010s
+"^" in: xor.drc:38
+Elapsed: 0.000s
XOR differences: 0
"_output" in: xor.drc:41
-Elapsed: 0.000s
+Elapsed: 0.010s
Writing layout file: /run/media/malay/6be2233d-18c3-46f3-acec-b4e06d2e1a6a/ManjaroWork/VLSI/MPW-2/caravel_comparator/checks/user_analog_project_wrapper.xor.gds ..
-Total run time: 0.110s
+Total run time: 0.100s
diff --git a/mag/VCO_Ring_OSC_v4.mag b/mag/VCO_Ring_OSC_v4.mag
index f6c6d7b..fd2bc47 100644
--- a/mag/VCO_Ring_OSC_v4.mag
+++ b/mag/VCO_Ring_OSC_v4.mag
@@ -24,33 +24,33 @@
rect 326 182 332 209
rect 367 182 373 209
rect 326 -12 373 182
-use inverter3v3 inverter3v3_6
+use inverter3v3 inverter3v3_3
timestamp 1623667149
-transform 1 0 1250 0 1 0
-box 0 0 175 554
-use inverter3v3 inverter3v3_5
-timestamp 1623667149
-transform 1 0 1075 0 1 0
-box 0 0 175 554
-use inverter3v3 inverter3v3_4
-timestamp 1623667149
-transform 1 0 700 0 1 0
-box 0 0 175 554
-use inverter3v3 inverter3v3_0
-timestamp 1623667149
-transform 1 0 0 0 1 0
-box 0 0 175 554
-use inverter3v3 inverter3v3_1
-timestamp 1623667149
-transform 1 0 175 0 1 0
+transform 1 0 525 0 1 0
box 0 0 175 554
use inverter3v3 inverter3v3_2
timestamp 1623667149
transform 1 0 350 0 1 0
box 0 0 175 554
-use inverter3v3 inverter3v3_3
+use inverter3v3 inverter3v3_1
timestamp 1623667149
-transform 1 0 525 0 1 0
+transform 1 0 175 0 1 0
+box 0 0 175 554
+use inverter3v3 inverter3v3_0
+timestamp 1623667149
+transform 1 0 0 0 1 0
+box 0 0 175 554
+use inverter3v3 inverter3v3_4
+timestamp 1623667149
+transform 1 0 700 0 1 0
+box 0 0 175 554
+use inverter3v3 inverter3v3_5
+timestamp 1623667149
+transform 1 0 1075 0 1 0
+box 0 0 175 554
+use inverter3v3 inverter3v3_6
+timestamp 1623667149
+transform 1 0 1250 0 1 0
box 0 0 175 554
<< labels >>
rlabel metal1 1433 187 1433 187 7 OUT
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index 8448268..cef59bd 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,15 +1,76 @@
magic
tech sky130A
-timestamp 1623213371
+timestamp 1623677234
+<< metal1 >>
+rect 7815 341843 17141 342202
+rect 7815 281637 14037 341843
+rect 15575 341796 15706 341806
+rect 15575 341452 15587 341796
+rect 15671 341452 15706 341796
+rect 15575 341439 15706 341452
+rect 17151 341788 17353 341806
+rect 17151 341459 17215 341788
+rect 17333 341459 17353 341788
+rect 17151 341439 17353 341459
+rect 15716 341295 16601 341314
+rect 15716 341149 15738 341295
+rect 16574 341149 16601 341295
+rect 15716 341129 16601 341149
+rect 16781 341303 17141 341314
+rect 16781 341141 16794 341303
+rect 17127 341141 17141 341303
+rect 16781 341128 17141 341141
+rect 7815 275182 8325 281637
+rect 13557 275182 14037 281637
+rect 7815 274721 14037 275182
+<< via1 >>
+rect 15587 341452 15671 341796
+rect 17215 341459 17333 341788
+rect 15738 341149 16574 341295
+rect 16794 341141 17127 341303
+rect 8325 275182 13557 281637
<< metal2 >>
rect 263032 344748 285799 344845
+rect 8097 344330 15914 344452
+rect 8097 342932 8225 344330
+rect 10494 342932 15914 344330
+rect 8097 342813 15914 342932
+rect 2100 342446 15680 342621
+rect 2100 340287 2264 342446
+rect 3196 341796 15680 342446
+rect 15867 341880 15914 342813
+rect 16042 343723 36597 343853
+rect 16042 342390 34294 343723
+rect 36452 342390 36597 343723
+rect 16042 342214 36597 342390
rect 263032 342481 263176 344748
rect 264537 344663 285799 344748
rect 264537 342547 283541 344663
rect 285582 342547 285799 344663
rect 264537 342481 285799 342547
rect 263032 342359 285799 342481
+rect 16042 341966 16320 342214
rect 232687 342062 254766 342145
+rect 16042 341880 16089 341966
+rect 3196 341452 15587 341796
+rect 15671 341452 15680 341796
+rect 3196 340287 15680 341452
+rect 17193 341788 62597 341831
+rect 17193 341459 17215 341788
+rect 17333 341651 62597 341788
+rect 17333 341459 60283 341651
+rect 2100 340121 15680 340287
+rect 15716 341295 16599 341314
+rect 15716 341149 15738 341295
+rect 16574 341149 16599 341295
+rect 15716 335479 16599 341149
+rect 16781 341303 17141 341314
+rect 16781 341141 16794 341303
+rect 17127 341141 17141 341303
+rect 16781 339947 17141 341141
+rect 17193 340289 60283 341459
+rect 62408 340289 62597 341651
+rect 17193 340143 62597 340289
rect 232687 340193 232760 342062
rect 235125 340492 254766 342062
rect 264954 341405 291149 341492
@@ -21,6 +82,10 @@
rect 264560 340249 264647 341244
rect 257114 340158 264647 340249
rect 206700 340086 209199 340088
+rect 16781 339846 20609 339947
+rect 16781 339406 16912 339846
+rect 20494 339406 20609 339846
+rect 16781 339301 20609 339406
rect 206700 339922 255960 340086
rect 264954 340029 289811 341405
rect 206700 338271 206963 339922
@@ -38,6 +103,20 @@
rect 264954 338992 291149 339243
rect 263025 338697 264682 338775
rect 206700 338099 254763 338271
+rect 15716 334766 46641 335479
+rect 15716 329520 39831 334766
+rect 45869 329520 46641 334766
+rect 15716 328884 46641 329520
+rect 830 324164 20609 324321
+rect 830 322081 988 324164
+rect 1908 324042 20609 324164
+rect 1908 322081 17208 324042
+rect 830 319169 17208 322081
+rect 830 317086 990 319169
+rect 1910 317184 17208 319169
+rect 20310 317184 20609 324042
+rect 1910 317086 20609 317184
+rect 830 316921 20609 317086
rect 263025 294124 291404 294257
rect 263025 293840 288814 294124
rect 263025 292257 263358 293840
@@ -45,13 +124,27 @@
rect 263025 291961 288814 292257
rect 291232 291961 291404 294124
rect 263025 291770 291404 291961
-rect 255248 277313 291170 277681
-rect 255248 276951 287954 277313
-rect 255248 271239 256125 276951
+rect 830 282013 14037 282121
+rect 830 279843 965 282013
+rect 1947 281637 14037 282013
+rect 1947 279843 8325 281637
+rect 830 276999 8325 279843
+rect 830 274829 963 276999
+rect 1945 275182 8325 276999
+rect 13557 275182 14037 281637
+rect 1945 274829 14037 275182
+rect 830 274721 14037 274829
+rect 39191 277313 291170 277681
+rect 39191 277228 287954 277313
+rect 39191 270701 39725 277228
+rect 46159 276951 287954 277228
+rect 46159 271239 256125 276951
rect 261961 271239 287954 276951
-rect 255248 270715 287954 271239
+rect 46159 270715 287954 271239
rect 290786 270715 291170 277313
-rect 255248 270298 291170 270715
+rect 46159 270701 291170 270715
+rect 39191 270298 291170 270701
+rect 39191 270126 255248 270298
rect 262 -400 318 240
rect 853 -400 909 240
rect 1444 -400 1500 240
@@ -548,21 +641,43 @@
rect 291625 -400 291681 240
<< via2 >>
rect 111930 345909 112968 346760
+rect 8225 342932 10494 344330
+rect 2264 340287 3196 342446
+rect 34294 342390 36452 343723
rect 263176 342481 264537 344748
rect 283541 342547 285582 344663
+rect 60283 340289 62408 341651
rect 232760 340193 235125 342062
rect 263124 340249 264560 341244
+rect 16912 339406 20494 339846
rect 206963 338271 209005 339922
rect 263117 338775 264606 339432
rect 289811 339243 291064 341405
+rect 39831 329520 45869 334766
+rect 988 322081 1908 324164
+rect 990 317086 1910 319169
+rect 17208 317184 20310 324042
rect 263358 292257 264321 293840
rect 288814 291961 291232 294124
+rect 965 279843 1947 282013
+rect 963 274829 1945 276999
+rect 39725 270701 46159 277228
rect 256125 271239 261961 276951
rect 287954 270715 290786 277313
<< metal3 >>
-rect 8097 351150 10597 352400
-rect 34097 351150 36597 352400
-rect 60097 351150 62597 352400
+rect 8097 344330 10597 352400
+rect 8097 342932 8225 344330
+rect 10494 342932 10597 344330
+rect 8097 342813 10597 342932
+rect 34097 343723 36597 352400
+rect -400 342446 3350 342621
+rect -400 340287 2264 342446
+rect 3196 340287 3350 342446
+rect 34097 342390 34294 343723
+rect 36452 342390 36597 343723
+rect 34097 342214 36597 342390
+rect -400 340121 3350 340287
+rect 60097 341651 62597 352400
rect 82797 348317 85297 352400
rect 85447 351150 86547 352400
rect 86697 351150 87797 352400
@@ -588,7 +703,17 @@
rect 111806 345909 111930 346760
rect 112968 345909 113056 346760
rect 111806 345815 113056 345909
-rect -400 340121 850 342621
+rect 60097 340289 60283 341651
+rect 62408 340289 62597 341651
+rect 60097 340143 62597 340289
+rect 16781 339846 20609 339947
+rect 16781 339406 16912 339846
+rect 20494 339406 20609 339846
+rect -400 324164 2060 324321
+rect -400 322081 988 324164
+rect 1908 322081 2060 324164
+rect -400 321921 2060 322081
+rect 16781 324042 20609 339406
rect 206700 339922 209199 351150
rect 232690 342062 235199 351150
rect 232690 340193 232760 342062
@@ -611,10 +736,28 @@
rect 209005 338271 209199 339922
rect 263025 339432 264682 339492
rect 206700 338099 209199 338271
-rect -400 321921 830 324321
-rect -400 316921 830 319321
-rect -400 279721 830 282121
-rect -400 274721 830 277121
+rect -400 319169 2060 319321
+rect -400 317086 990 319169
+rect 1910 317086 2060 319169
+rect -400 316921 2060 317086
+rect 16781 317184 17208 324042
+rect 20310 317184 20609 324042
+rect 16781 316921 20609 317184
+rect 39191 334766 46641 335479
+rect 39191 329520 39831 334766
+rect 45869 329520 46641 334766
+rect -400 282013 2060 282121
+rect -400 279843 965 282013
+rect 1947 279843 2060 282013
+rect -400 279721 2060 279843
+rect 39191 277228 46641 329520
+rect -400 276999 2060 277121
+rect -400 274829 963 276999
+rect 1945 274829 2060 276999
+rect -400 274721 2060 274829
+rect 39191 270701 39725 277228
+rect 46159 270701 46641 277228
+rect 39191 270126 46641 270701
rect 255248 276951 262698 339126
rect 263025 338775 263117 339432
rect 264606 338775 264682 339432
@@ -802,14 +945,18 @@
rect -50 0 0 352000
rect 292000 0 292050 352000
rect -50 -50 292050 0
+use VCO_Ring_OSC_v4 VCO_Ring_OSC_v4_0
+timestamp 1623667149
+transform 1 0 15716 0 -1 341868
+box -10 -12 1435 554
+use comparator comparator_0
+timestamp 1623262514
+transform 1 0 256318 0 -1 339923
+box -361 -705 846 810
use sky130_fd_pr__rf_test_coil3 sky130_fd_pr__rf_test_coil3_0
timestamp 1623149243
transform 0 -1 112431 1 0 328106
box -18254 -18254 18754 18254
-use comparator comparator_0
-timestamp 1621157240
-transform 1 0 256318 0 -1 339923
-box -361 -705 846 810
<< labels >>
flabel metal3 s 291760 134615 292400 134671 0 FreeSans 560 0 0 0 gpio_analog[0]
port 0 nsew signal bidirectional
@@ -2168,5 +2315,5 @@
flabel metal2 s 3217 -400 3273 240 0 FreeSans 560 90 0 0 wbs_we_i
port 677 nsew signal input
<< properties >>
-string FIXED_BBOX 0 0 584000 704000
+string FIXED_BBOX 0 0 1168000 1408000
<< end >>
