diff --git a/.gitignore b/.gitignore index d7aaae5..6915824 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ __pycache__/ *.pyc *.swp +.pdm-python # Claude Code session data .claude/ diff --git a/.pdm-python b/.pdm-python deleted file mode 100644 index 9636cf9..0000000 --- a/.pdm-python +++ /dev/null @@ -1 +0,0 @@ -/Users/roberttaylor/Code/ChipFlow/Loom/.venv/bin/python \ No newline at end of file diff --git a/designs/mcu_soc_sky130/.pdm-python b/designs/mcu_soc_sky130/.pdm-python deleted file mode 100644 index e8f2bad..0000000 --- a/designs/mcu_soc_sky130/.pdm-python +++ /dev/null @@ -1 +0,0 @@ -/Users/roberttaylor/Code/ChipFlow/Loom/designs/mcu_soc_sky130/.venv/bin/python \ No newline at end of file diff --git a/scripts/compare_timing.py b/scripts/compare_timing.py index 7631d9a..43fa91e 100644 --- a/scripts/compare_timing.py +++ b/scripts/compare_timing.py @@ -420,7 +420,7 @@ def main() -> int: help="CVC stdout log with RESULT: lines") parser.add_argument("--cvc-vcd", type=Path, required=True, help="CVC output VCD") - parser.add_argument("--jacquard-vcd", "--loom-vcd", type=Path, required=True, + parser.add_argument("--jacquard-vcd", type=Path, required=True, help="Jacquard --timing-vcd output") parser.add_argument("--clock-period-ps", type=int, required=True, help="Clock period in picoseconds") diff --git a/tests/mcu_soc/cvc/compare_simulation.py b/tests/mcu_soc/cvc/compare_simulation.py index b8c8736..df1ff47 100644 --- a/tests/mcu_soc/cvc/compare_simulation.py +++ b/tests/mcu_soc/cvc/compare_simulation.py @@ -489,7 +489,7 @@ def main() -> None: else: skip_bits.add(int(part)) i += 2 - elif args[i] in ("--jacquard-timing-vcd", "--loom-timing-vcd") and i + 1 < len(args): + elif args[i] == "--jacquard-timing-vcd" and i + 1 < len(args): jacquard_timing_vcd = Path(args[i + 1]) i += 2 elif args[i] == "--cvc-timing-vcd" and i + 1 < len(args): diff --git a/tests/timing_test/cvc/run_cvc.sh b/tests/timing_test/cvc/run_cvc.sh index 6700c56..98fa1ae 100644 --- a/tests/timing_test/cvc/run_cvc.sh +++ b/tests/timing_test/cvc/run_cvc.sh @@ -58,16 +58,16 @@ if grep -q "RESULT: total_delay=" "$OUTPUT_DIR/cvc_output.log"; then CVC_TOTAL=$(grep "RESULT: total_delay=" "$OUTPUT_DIR/cvc_output.log" | sed 's/.*=//') CVC_CLK_TO_Q=$(grep "RESULT: clk_to_q=" "$OUTPUT_DIR/cvc_output.log" | sed 's/.*=//') CVC_CHAIN=$(grep "RESULT: chain_delay=" "$OUTPUT_DIR/cvc_output.log" | sed 's/.*=//') - LOOM_TOTAL=1323 + JACQUARD_TOTAL=1323 echo "CVC: clk_to_q=${CVC_CLK_TO_Q}ps chain=${CVC_CHAIN}ps total=${CVC_TOTAL}ps" - echo "Jacquard: clk_to_q=350ps chain=973ps total=${LOOM_TOTAL}ps" + echo "Jacquard: clk_to_q=350ps chain=973ps total=${JACQUARD_TOTAL}ps" echo "" # Jacquard uses max(rise, fall) per cell — a conservative approximation since # the GPU kernel processes 32 packed signals and can't track per-signal # transition direction. CVC tracks actual rise/fall transitions. # Expected overestimate: 8 inverters × 10ps IOPATH + 8 wires × 1ps = 88ps. - DIFF=$((LOOM_TOTAL - CVC_TOTAL)) + DIFF=$((JACQUARD_TOTAL - CVC_TOTAL)) echo "Difference: ${DIFF}ps (Jacquard conservative overestimate)" if [ "$DIFF" -ge 0 ] && [ "$DIFF" -le 200 ]; then echo "PASS: Jacquard within expected conservative bound"