Model hashing

gistfile1.txt

kdv8@brg-01:~/lab2-group04/pymtl/build$ git diff
diff --git a/pymtl/pmx/ProcMemXcel.py b/pymtl/pmx/ProcMemXcel.py
index 839d386..0f87c52 100644
--- a/pymtl/pmx/ProcMemXcel.py
+++ b/pymtl/pmx/ProcMemXcel.py
@@ -15,8 +15,8 @@ class ProcMemXcel ( Model ):

   def __init__( s, ProcModel, MemModel, XcelModel ):

-    s.proc   = ProcModel()
-    s.xcel   = XcelModel()
+    s.proc   = ProcModel
+    s.xcel   = XcelModel
     # No cache translatable yet, so commented out for now
     #s.mem    = TestMemory    ( MemMsg4B(), 2, mem_stall_prob, mem_latency )

@@ -59,3 +59,5 @@ class ProcMemXcel ( Model ):
   def line_trace( s ):
     return s.proc.line_trace() + "|" + s.xcel.line_trace()

+  def __hash__ ( s ):
+    return hash(s.__class__.__name__)
\ No newline at end of file
diff --git a/pymtl/pmx/pmx-sim b/pymtl/pmx/pmx-sim
index 9768add..436939c 100755
--- a/pymtl/pmx/pmx-sim
+++ b/pymtl/pmx/pmx-sim
@@ -321,7 +321,7 @@ def main():

   # Create test harness and elaborate

-  proc_xcel = ProcMemXcel( proc_impl_dict[ opts.proc_impl ], None, xcel_impl_dict[ opts.xcel_impl ] )
+  proc_xcel = ProcMemXcel( proc_impl_dict[ opts.proc_impl ](), None, xcel_impl_dict[ opts.xcel_impl ]() )

   model = TestHarness( proc_xcel, dump_vcd, opts.translate )

diff --git a/pymtl/proc/NullXcel.py b/pymtl/proc/NullXcel.py
index 067bdec..4f98884 100644
--- a/pymtl/proc/NullXcel.py
+++ b/pymtl/proc/NullXcel.py
@@ -103,3 +103,5 @@ class NullXcel( Model ):
   def line_trace( s ):
     return "{}(){}".format( s.xcelreq, s.xcelresp )

+  def __hash__ ( s ):
+    return hash(s.__class__.__name__)
\ No newline at end of file
diff --git a/pymtl/proc/ProcAltRTL.py b/pymtl/proc/ProcAltRTL.py
index 5ee6799..d885109 100644
--- a/pymtl/proc/ProcAltRTL.py
+++ b/pymtl/proc/ProcAltRTL.py
@@ -253,3 +253,5 @@ class ProcAltRTL( Model ):

     return pipeline_str

+  def __hash__ ( s ):
+    return hash(s.__class__.__name__)
\ No newline at end of file
diff --git a/pymtl/sort_xcel/SortXcelMergePRTL.py b/pymtl/sort_xcel/SortXcelMergePRTL.py
index 85d4454..0138c32 100644
--- a/pymtl/sort_xcel/SortXcelMergePRTL.py
+++ b/pymtl/sort_xcel/SortXcelMergePRTL.py
@@ -361,3 +361,6 @@ class SortXcelMergePRTL( Model ):
       s.xcelresp,
     )
     return s.trace
+
+  def __hash__ ( s ):
+    return hash(s.__class__.__name__)
\ No newline at end of file