Merge branch 'development' of https://github.com/UCSBarchlab/PyRTL into development

Author: timsherwood

.coveragerc

@@ -9,7 +9,7 @@ exclude_lines =
     pragma: no cover
 
     # ignore pass statements that are not run:
-    # sometimes you need them to make a block (especially for unittetsts)
+    # sometimes you need them to make a block (especially for unittests)
     # need to be really careful with this one because 'pass' shows up in other places as well
     \spass\s
     \spass$
@@ -28,4 +28,9 @@ exclude_lines =
 
 ignore_errors = True
 
-omit = .tox/*
+omit =
+    .tox/*
+    */tests/*
+    */ctypes/*
+    six.py
+    pyparsing.py

.github/workflows/python-package.yml

@@ -20,6 +20,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install tox tox-gh-actions
+        pip install tox tox-gh-actions coverage
     - name: Test with tox
-      run: tox
+      run: tox
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v1

.gitignore

@@ -13,6 +13,7 @@ htmlcov/
 dist
 build
 eggs
+.eggs
 parts
 bin
 var

apt.txt

@@ -0,0 +1 @@
+graphviz

docs/conf.py

@@ -22,7 +22,7 @@
 author = 'Timothy Sherwood'
 
 # The full version, including alpha/beta/rc tags
-release = '0.9.0'
+release = '0.10.0'
 
 
 # -- General configuration ---------------------------------------------------

docs/rtllib.rst

@@ -18,6 +18,7 @@ This is a set of files that contain useful miscellaneous functions and classes
 | :ref:`libutils-ref`
 | :ref:`multipliers-ref`
 | :ref:`muxes-ref`
+| :ref:`matrix-ref`
 | :ref:`testingutils-ref`
 
 
@@ -101,7 +102,21 @@ Muxes
    :show-inheritance:
    :special-members:
    :undoc-members:
-   :exclude-members: __dict__,__weakref__,__module__, __exit__
+   :exclude-members: __dict__,__weakref__,__module__,__exit__
+
+:ref:`Back to top of page <top-of-page-rtllib>`
+
+.. _matrix-ref:
+
+Matrix
+------
+
+.. automodule:: pyrtl.rtllib.matrix
+   :members:
+   :show-inheritance:
+   :special-members:
+   :undoc-members:
+   :exclude-members: __dict__,__weakref__,__module__
 
 :ref:`Back to top of page <top-of-page-rtllib>`
 

examples/example7-synth-timing-draft.py renamed to examples/example7-synth-timing.py

@@ -25,8 +25,7 @@
    },
    "outputs": [],
    "source": [
-    "import pyrtl\n",
-    "from pyrtl.analysis import estimate"
+    "import pyrtl"
    ]
   },
   {
@@ -77,7 +76,7 @@
    "source": [
     "# Generating timing analysis information\n",
     "print(\"Pre Synthesis:\")\n",
-    "timing = estimate.TimingAnalysis()\n",
+    "timing = pyrtl.TimingAnalysis()\n",
     "timing.print_max_length()"
    ]
   },
@@ -119,7 +118,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "logic_area, mem_area = estimate.area_estimation(tech_in_nm=65)\n",
+    "logic_area, mem_area = pyrtl.area_estimation(tech_in_nm=65)\n",
     "est_area = logic_area + mem_area\n",
     "print(\"Estimated Area of block\", est_area, \"sq mm\")\n",
     "print()"
@@ -154,7 +153,7 @@
     "pyrtl.synthesize()\n",
     "\n",
     "print(\"Pre Optimization:\")\n",
-    "timing = estimate.TimingAnalysis()\n",
+    "timing = pyrtl.TimingAnalysis()\n",
     "timing.print_max_length()\n",
     "for net in pyrtl.working_block().logic:\n",
     "    print(str(net))\n",
@@ -201,7 +200,7 @@
    "outputs": [],
    "source": [
     "print(\"Post Optimization:\")\n",
-    "timing = estimate.TimingAnalysis()\n",
+    "timing = pyrtl.TimingAnalysis()\n",
     "timing.print_max_length()"
    ]
   },

ipynb-examples/example7-synth-timing-draft.ipynb renamed to ipynb-examples/example7-synth-timing.ipynb

@@ -28,8 +28,7 @@
    "source": [
     "import random\n",
     "import io\n",
-    "import pyrtl\n",
-    "from pyrtl.analysis import estimate"
+    "import pyrtl"
    ]
   },
   {

ipynb-examples/example8-verilog.ipynb

@@ -0,0 +1,3 @@
+set -e
+
+pip install graphviz