Merge branch 'coredac:master' into master

tancheng · Dec 2, 2024 · bffa83b · bffa83b
2 parents 182ae58 + 6ae3ed4
commit bffa83b
Show file tree

Hide file tree

Showing 144 changed files with 1,858 additions and 831 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -65,4 +65,5 @@ jobs:
         pytest ../cgra/translate/CGRAMemBottomRTL_matmul_2x2_test.py -xvs --tb=short --test-verilog --dump-vtb --dump-vcd
         pytest ../cgra/translate/CGRAMemRightAndBottomRTL_matmul_2x2_test.py -xvs --tb=short
         pytest ../cgra/translate/CGRAMemRightAndBottomRTL_matmul_2x2_test.py -xvs --tb=short --test-verilog --dump-vtb --dump-vcd
+        pytest ../noc/PyOCN/pymtl3_net/ringnet/test/RingNetworkRTL_test.py --tb=short -sv
 
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "fu/dp_fpfma"]
 	path = fu/dp_fpfma
 	url = https://github.com/tancheng/dp_fpfma
+[submodule "noc/PyOCN"]
+	path = noc/PyOCN
+	url = https://github.com/tancheng/PyOCN
diff --git a/cgra/CGRACL.py b/cgra/CGRACL.py
@@ -7,14 +7,15 @@
   Date : Dec 28, 2019
 """
 
-from pymtl3               import *
-from ..noc.CrossbarRTL    import CrossbarRTL
-from ..noc.ChannelRTL     import ChannelRTL
-from ..tile.TileCL        import TileCL
-from ..lib.opt_type       import *
-from ..lib.common         import *
-from ..lib.ifcs           import SendIfcRTL, RecvIfcRTL
+from pymtl3 import *
+from ..lib.basic.en_rdy.ifcs import SendIfcRTL, RecvIfcRTL
+from ..lib.opt_type import *
+from ..lib.util.common import *
+from ..noc.CrossbarRTL import CrossbarRTL
+from ..noc.ChannelRTL import ChannelRTL
 from ..mem.data.DataMemCL import DataMemCL
+from ..tile.TileCL import TileCL
+
 
 class CGRACL( Component ):
 

diff --git a/cgra/CGRAFL.py b/cgra/CGRAFL.py
@@ -6,10 +6,9 @@
 
 Author : Cheng Tan
   Date : Feb 13, 2020
-
 """
 
-from pymtl3         import *
+from pymtl3 import *
 from ..lib.opt_type import *
 from ..lib.messages import *
 

diff --git a/cgra/CGRAKingMeshRTL.py b/cgra/CGRAKingMeshRTL.py
@@ -6,19 +6,20 @@
   Date : Dec 15, 2019
 """
 
-from pymtl3                      import *
-from ..lib.ifcs                  import SendIfcRTL, RecvIfcRTL
-from ..noc.CrossbarRTL           import CrossbarRTL
-from ..noc.ChannelRTL            import ChannelRTL
-from ..tile.TileRTL              import TileRTL
-from ..lib.opt_type              import *
-from ..lib.common                import *
-from ..mem.data.DataMemRTL       import DataMemRTL
-from ..mem.data.DataMemCL        import DataMemCL
-from ..fu.single.MemUnitRTL      import MemUnitRTL
-from ..fu.single.AdderRTL        import AdderRTL
+from pymtl3 import *
+from ..lib.basic.en_rdy.ifcs import SendIfcRTL, RecvIfcRTL
+from ..noc.CrossbarRTL import CrossbarRTL
+from ..noc.ChannelRTL import ChannelRTL
+from ..tile.TileRTL import TileRTL
+from ..lib.opt_type import *
+from ..lib.util.common import *
+from ..mem.data.DataMemRTL import DataMemRTL
+from ..mem.data.DataMemCL import DataMemCL
+from ..fu.single.MemUnitRTL import MemUnitRTL
+from ..fu.single.AdderRTL import AdderRTL
 from ..fu.flexible.FlexibleFuRTL import FlexibleFuRTL
 
+
 class CGRAKingMeshRTL( Component ):
 
   def construct( s, DataType, PredicateType, CtrlType, width, height,

diff --git a/cgra/CGRAMemBottomRTL.py b/cgra/CGRAMemBottomRTL.py
@@ -8,18 +8,18 @@
   Date : Nov 18, 2024
 """
 
-from pymtl3                      import *
-from ..lib.ifcs                  import SendIfcRTL, RecvIfcRTL
-from ..noc.CrossbarRTL           import CrossbarRTL
-from ..noc.ChannelRTL            import ChannelRTL
-from ..tile.TileRTL              import TileRTL
-from ..lib.opt_type              import *
-from ..lib.common                import *
-from ..mem.data.DataMemRTL       import DataMemRTL
-from ..mem.data.DataMemCL        import DataMemCL
-from ..fu.single.MemUnitRTL      import MemUnitRTL
-from ..fu.single.AdderRTL        import AdderRTL
+from pymtl3 import *
 from ..fu.flexible.FlexibleFuRTL import FlexibleFuRTL
+from ..fu.single.MemUnitRTL import MemUnitRTL
+from ..fu.single.AdderRTL import AdderRTL
+from ..lib.basic.en_rdy.ifcs import SendIfcRTL, RecvIfcRTL
+from ..lib.opt_type import *
+from ..lib.util.common import *
+from ..mem.data.DataMemRTL import DataMemRTL
+from ..mem.data.DataMemCL import DataMemCL
+from ..noc.ChannelRTL import ChannelRTL
+from ..noc.CrossbarRTL import CrossbarRTL
+from ..tile.TileRTL import TileRTL
 
 class CGRAMemBottomRTL(Component):
 

diff --git a/cgra/CGRAMemRightAndBottomRTL.py b/cgra/CGRAMemRightAndBottomRTL.py
@@ -11,18 +11,19 @@
   Date : Nov 19, 2024
 """
 
-from pymtl3                      import *
-from ..lib.ifcs                  import SendIfcRTL, RecvIfcRTL
-from ..noc.CrossbarRTL           import CrossbarRTL
-from ..noc.ChannelRTL            import ChannelRTL
-from ..tile.TileRTL              import TileRTL
-from ..lib.opt_type              import *
-from ..lib.common                import *
-from ..mem.data.DataMemRTL       import DataMemRTL
-from ..mem.data.DataMemCL        import DataMemCL
-from ..fu.single.MemUnitRTL      import MemUnitRTL
-from ..fu.single.AdderRTL        import AdderRTL
+from pymtl3 import *
 from ..fu.flexible.FlexibleFuRTL import FlexibleFuRTL
+from ..fu.single.MemUnitRTL import MemUnitRTL
+from ..fu.single.AdderRTL import AdderRTL
+from ..lib.basic.en_rdy.ifcs import SendIfcRTL, RecvIfcRTL
+from ..lib.opt_type import *
+from ..lib.util.common import *
+from ..mem.data.DataMemRTL import DataMemRTL
+from ..mem.data.DataMemCL import DataMemCL
+from ..noc.ChannelRTL import ChannelRTL
+from ..noc.CrossbarRTL import CrossbarRTL
+from ..tile.TileRTL import TileRTL
+
 
 class CGRAMemRightAndBottomRTL(Component):
 

diff --git a/cgra/CGRARTL.py b/cgra/CGRARTL.py
@@ -6,18 +6,19 @@
   Date : Dec 15, 2019
 """
 
-from pymtl3                      import *
-from ..lib.ifcs                  import SendIfcRTL, RecvIfcRTL
-from ..noc.CrossbarRTL           import CrossbarRTL
-from ..noc.ChannelRTL            import ChannelRTL
-from ..tile.TileRTL              import TileRTL
-from ..lib.opt_type              import *
-from ..lib.common                import *
-from ..mem.data.DataMemRTL       import DataMemRTL
-from ..mem.data.DataMemCL        import DataMemCL
-from ..fu.single.MemUnitRTL      import MemUnitRTL
-from ..fu.single.AdderRTL        import AdderRTL
+from pymtl3 import *
 from ..fu.flexible.FlexibleFuRTL import FlexibleFuRTL
+from ..fu.single.MemUnitRTL import MemUnitRTL
+from ..fu.single.AdderRTL import AdderRTL
+from ..lib.basic.en_rdy.ifcs import SendIfcRTL, RecvIfcRTL
+from ..lib.opt_type import *
+from ..lib.util.common import *
+from ..mem.data.DataMemRTL import DataMemRTL
+from ..mem.data.DataMemCL import DataMemCL
+from ..noc.ChannelRTL import ChannelRTL
+from ..noc.CrossbarRTL import CrossbarRTL
+from ..tile.TileRTL import TileRTL
+
 
 class CGRARTL( Component ):
 

diff --git a/cgra/CGRASeparateCrossbarRTL.py b/cgra/CGRASeparateCrossbarRTL.py
@@ -11,15 +11,16 @@
 from ..fu.flexible.FlexibleFuRTL import FlexibleFuRTL
 from ..fu.single.MemUnitRTL import MemUnitRTL
 from ..fu.single.AdderRTL import AdderRTL
-from ..lib.common import *
-from ..lib.ifcs import SendIfcRTL, RecvIfcRTL
+from ..lib.util.common import *
+from ..lib.basic.en_rdy.ifcs import SendIfcRTL, RecvIfcRTL
 from ..lib.opt_type import *
 from ..mem.data.DataMemCL import DataMemCL
 from ..mem.data.DataMemRTL import DataMemRTL
 from ..noc.ChannelNormalRTL import ChannelNormalRTL
 from ..noc.CrossbarSeparateRTL import CrossbarSeparateRTL
 from ..tile.TileSeparateCrossbarRTL import TileSeparateCrossbarRTL
 
+
 class CGRASeparateCrossbarRTL(Component):
   def construct(s, DataType, PredicateType, CtrlType, width, height,
                 ctrl_mem_size, data_mem_size, num_ctrl, total_steps,

diff --git a/cgra/CGRATemplateRTL.py b/cgra/CGRATemplateRTL.py
@@ -6,18 +6,20 @@
   Date : Dec 15, 2019
 """
 
-from pymtl3                      import *
-from ..lib.ifcs                  import SendIfcRTL, RecvIfcRTL
-from ..noc.CrossbarRTL           import CrossbarRTL
-from ..noc.ChannelRTL            import ChannelRTL
-from ..tile.TileRTL              import TileRTL
-from ..lib.opt_type              import *
-from ..lib.common                import *
-from ..mem.data.DataMemRTL       import DataMemRTL
-from ..mem.data.DataMemCL        import DataMemCL
-from ..fu.single.MemUnitRTL      import MemUnitRTL
-from ..fu.single.AdderRTL        import AdderRTL
+
+from pymtl3 import *
 from ..fu.flexible.FlexibleFuRTL import FlexibleFuRTL
+from ..fu.single.MemUnitRTL import MemUnitRTL
+from ..fu.single.AdderRTL import AdderRTL
+from ..lib.basic.en_rdy.ifcs import SendIfcRTL, RecvIfcRTL
+from ..lib.opt_type import *
+from ..lib.util.common import *
+from ..mem.data.DataMemRTL import DataMemRTL
+from ..mem.data.DataMemCL import DataMemCL
+from ..noc.ChannelRTL import ChannelRTL
+from ..noc.CrossbarRTL import CrossbarRTL
+from ..tile.TileRTL import TileRTL
+
 
 class CGRATemplateRTL( Component ):
 

diff --git a/cgra/test/CGRACL_FIR_demo_test.py b/cgra/test/CGRACL_FIR_demo_test.py
@@ -6,32 +6,29 @@
 
 Author : Cheng Tan
   Date : Dec 28, 2019
-
 """
 
-from pymtl3                       import *
-
-from ...lib.opt_type              import *
-from ...lib.messages              import *
 
+from pymtl3 import *
+from ..CGRACL import CGRACL
+from ..CGRAFL import CGRAFL
 from ...fu.flexible.FlexibleFuRTL import FlexibleFuRTL
-from ...fu.single.AdderRTL        import AdderRTL
-from ...fu.single.MulRTL          import MulRTL
-from ...fu.single.LogicRTL        import LogicRTL
-from ...fu.single.CompRTL         import CompRTL
-from ...fu.single.BranchRTL       import BranchRTL
-from ...fu.single.PhiRTL          import PhiRTL
-from ...fu.single.ShifterRTL      import ShifterRTL
-from ...fu.single.MemUnitRTL      import MemUnitRTL
-from ..CGRACL                     import CGRACL
-
-from ..CGRAFL                     import CGRAFL
-from ...lib.dfg_helper            import *
-from ...lib.ctrl_helper           import *
-
+from ...fu.single.AdderRTL import AdderRTL
+from ...fu.single.MulRTL import MulRTL
+from ...fu.single.BranchRTL import BranchRTL
+from ...fu.single.CompRTL import CompRTL
+from ...fu.single.LogicRTL import LogicRTL
+from ...fu.single.MemUnitRTL import MemUnitRTL
+from ...fu.single.PhiRTL import PhiRTL
+from ...fu.single.ShifterRTL import ShifterRTL
+from ...lib.util.ctrl_helper import *
+from ...lib.util.dfg_helper import *
+from ...lib.messages import *
+from ...lib.opt_type import *
 import copy
 import os
 
+
 #-------------------------------------------------------------------------
 # Test harness
 #-------------------------------------------------------------------------

diff --git a/cgra/test/CGRACL_test.py b/cgra/test/CGRACL_test.py
@@ -6,26 +6,24 @@
 
 Author : Cheng Tan
   Date : Dec 28, 2019
-
 """
 
-from pymtl3                       import *
-
-from ...lib.opt_type              import *
-from ...lib.messages              import *
-from ...lib.ctrl_helper           import *
 
+from pymtl3 import *
+from ..CGRACL import CGRACL
 from ...fu.flexible.FlexibleFuRTL import FlexibleFuRTL
-from ...fu.single.AdderRTL        import AdderRTL
-from ...fu.single.MulRTL          import MulRTL
-from ...fu.single.PhiRTL          import PhiRTL
-from ...fu.single.CompRTL         import CompRTL
-from ...fu.single.BranchRTL       import BranchRTL
-from ...fu.single.MemUnitRTL      import MemUnitRTL
-from ..CGRACL                     import CGRACL
-
+from ...fu.single.AdderRTL import AdderRTL
+from ...fu.single.MulRTL import MulRTL
+from ...fu.single.PhiRTL import PhiRTL
+from ...fu.single.CompRTL import CompRTL
+from ...fu.single.BranchRTL import BranchRTL
+from ...fu.single.MemUnitRTL import MemUnitRTL
+from ...lib.opt_type import *
+from ...lib.messages import *
+from ...lib.util.ctrl_helper import *
 import os
 
+
 #-------------------------------------------------------------------------
 # Test harness
 #-------------------------------------------------------------------------

diff --git a/cgra/test/CGRAFL_test.py b/cgra/test/CGRAFL_test.py
@@ -9,13 +9,14 @@
 
 """
 
-from pymtl3                       import *
-from ...lib.messages              import *
-from ..CGRAFL                     import CGRAFL
-from ...lib.dfg_helper            import *
 
+from pymtl3 import *
+from ...lib.messages import *
+from ..CGRAFL import CGRAFL
+from ...lib.util.dfg_helper import *
 import os
 
+
 def test_fl():
   target_json = "dfg_fir.json"
   script_dir  = os.path.dirname(__file__)

diff --git a/cgra/test/CGRAKingMeshRTL_test.py b/cgra/test/CGRAKingMeshRTL_test.py
@@ -6,24 +6,23 @@
 
 Author : Cheng Tan
   Date : Dec 15, 2019
-
 """
 
-from pymtl3                       import *
-from pymtl3.stdlib.test_utils     import (run_sim,
-                                          config_model_with_cmdline_opts)
+
+from pymtl3 import *
+from pymtl3.stdlib.test_utils import (run_sim,
+                                      config_model_with_cmdline_opts)
 from pymtl3.passes.backends.verilog import (VerilogTranslationPass,
                                             VerilogVerilatorImportPass)
-
-from ...lib.test_srcs             import TestSrcRTL
-from ...lib.opt_type              import *
-from ...lib.messages              import *
-
+from ..CGRAKingMeshRTL import CGRAKingMeshRTL
 from ...fu.flexible.FlexibleFuRTL import FlexibleFuRTL
-from ...fu.single.AdderRTL        import AdderRTL
-from ...fu.single.ShifterRTL      import ShifterRTL
-from ...fu.single.MemUnitRTL      import MemUnitRTL
-from ..CGRAKingMeshRTL            import CGRAKingMeshRTL
+from ...fu.single.AdderRTL import AdderRTL
+from ...fu.single.MemUnitRTL import MemUnitRTL
+from ...fu.single.ShifterRTL import ShifterRTL
+from ...lib.basic.en_rdy.test_srcs import TestSrcRTL
+from ...lib.messages import *
+from ...lib.opt_type import *
+
 
 #-------------------------------------------------------------------------
 # Test harness