wavekit 0.2.0__tar.gz → 0.2.1__tar.gz

{wavekit-0.2.0 → wavekit-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wavekit
-Version: 0.2.0
+Version: 0.2.1
 Summary: a fundamental package for digital circuit waveform analysis
 License-File: LICENSE
 Author: cxzzzz

{wavekit-0.2.0 → wavekit-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wavekit"
-version = "0.2.0"
+version = "0.2.1"
 description = "a fundamental package for digital circuit waveform analysis"
 authors = ["cxzzzz <cxz19961010@outlook.com>"]
 readme = "README.md"

{wavekit-0.2.0 → wavekit-0.2.1}/src/wavekit/__init__.py

@@ -19,3 +19,10 @@ from .signal import Signal as Signal
 from .waveform import Waveform as Waveform
 
 __all__ = ['Waveform', 'VcdReader', 'FsdbReader', 'Scope', 'Signal']
+
+try:
+    from .readers.fsdb.reader import FsdbReader as FsdbReader
+
+    __all__.append('FsdbReader')
+except ImportError:
+    pass

{wavekit-0.2.0 → wavekit-0.2.1}/src/wavekit/readers/base.py

@@ -46,6 +46,10 @@ class Reader:
     def get_signal_width(self, signal: str) -> int:
         pass
 
+    @abstractmethod
+    def get_signal_range(self, signal: str) -> tuple[int]:
+        pass
+
     @staticmethod
     def value_change_to_waveform(
         value_change: np.ndarray,

{wavekit-0.2.0 → wavekit-0.2.1}/src/wavekit/readers/fsdb/npi_fsdb.pxd

@@ -82,8 +82,13 @@ cdef extern from "npi_fsdb.h":
         npiFsdbScopeFullName
         npiFsdbScopeDefName
         npiFsdbScopeType
-
-
+    
+    ctypedef enum npiFsdbSigCompositeType_e:
+        npiFsdbSigCtArray
+        npiFsdbSigCtStruct
+        npiFsdbSigCtUnion
+        npiFsdbSigCtTaggedUnion
+        npiFsdbSigCtRecord
 
 
     npiFsdbFileHandle npi_fsdb_open( const NPI_BYTE8* name )
@@ -113,3 +118,5 @@ cdef extern from "npi_fsdb.h":
     npiFsdbSigHandle npi_fsdb_iter_sig_next( npiFsdbSigIter iter )
     npiFsdbSigIter npi_fsdb_iter_sig( npiFsdbScopeHandle scope )
     npiFsdbSigIter npi_fsdb_iter_member( npiFsdbSigHandle sig )
+    NPI_INT32 npi_fsdb_iter_scope_stop( npiFsdbScopeIter iter )
+    NPI_INT32 npi_fsdb_iter_sig_stop( npiFsdbSigIter iter )

{wavekit-0.2.0 → wavekit-0.2.1}/src/wavekit/readers/fsdb/npi_fsdb_reader.pyx

@@ -10,37 +10,53 @@ from libc.stdlib cimport malloc, free
 from libc.string cimport strcpy, strlen
 from .npi_fsdb cimport *
 
+
 cdef class NpiFsdbScope:
+    pass
+
+
+cdef class NpiFsdbNormalScope(NpiFsdbScope):
     cdef npiFsdbScopeHandle scope_handle
 
     @staticmethod
     cdef init(npiFsdbScopeHandle scope_handle):
-        scope = NpiFsdbScope()
+        scope = NpiFsdbNormalScope()
         scope.scope_handle = scope_handle
         return scope
 
     def __init__(self):
         self.scope_handle = NULL
 
-    def child_scope_list(self) -> list[NpiFsdbScope]:
+    def child_scope_list(self, include_signal_scope:bool = True) -> list[NpiFsdbScope]:
         assert self.scope_handle != NULL
-
         res = []
         child_scope_handle_iter = npi_fsdb_iter_child_scope(self.scope_handle)
+        
         cdef npiFsdbScopeHandle child_scope_handle
         while True:
             child_scope_handle = npi_fsdb_iter_scope_next(child_scope_handle_iter)
             if child_scope_handle == NULL:
                 break
-            res.append(NpiFsdbScope.init(child_scope_handle))
-
+            res.append(NpiFsdbNormalScope.init(child_scope_handle))
+        npi_fsdb_iter_scope_stop(child_scope_handle_iter)
+
+
+        cdef npiFsdbSigHandle child_sig_handle
+        if include_signal_scope:
+            child_sig_handle_iter = npi_fsdb_iter_sig(self.scope_handle)
+            while True:
+                child_sig_handle = npi_fsdb_iter_sig_next(child_sig_handle_iter)
+                if child_sig_handle == NULL:
+                    break
+                res.append(NpiFsdbSignalScope.init(child_sig_handle))
+            npi_fsdb_iter_sig_stop(child_sig_handle_iter)
         return res
 
     def signal_list(self) -> list[str]:
         assert self.scope_handle != NULL
 
         res = []
-        cdef npiFsdbScopeHandle sig_handle_iter = npi_fsdb_iter_sig(self.scope_handle)
+        sig_handle_iter = npi_fsdb_iter_sig(self.scope_handle)
         cdef npiFsdbSigHandle sig_handle
         cdef const char* c_str
         while True:
@@ -50,21 +66,92 @@ cdef class NpiFsdbScope:
             c_str = npi_fsdb_sig_property_str(npiFsdbSigName, sig_handle)
             name = c_str.decode('ascii')
             res.append(name)
+        npi_fsdb_iter_sig_stop(sig_handle_iter)
 
         return res
 
     def name(self) -> str:
         assert self.scope_handle != NULL
-        return npi_fsdb_scope_property_str(npiFsdbScopeName, self.scope_handle).decode('ascii')
+        name = npi_fsdb_scope_property_str(npiFsdbScopeName, self.scope_handle).decode('ascii')
+        return name
 
     def type(self) -> str:
         assert self.scope_handle != NULL
-        return npi_fsdb_scope_property_str(npiFsdbScopeType, self.scope_handle).decode('ascii')
+        type_str = npi_fsdb_scope_property_str(npiFsdbScopeType, self.scope_handle).decode('ascii')
+        return type_str
 
     def def_name(self) -> str:
         assert self.scope_handle != NULL
-        return npi_fsdb_scope_property_str(npiFsdbScopeDefName, self.scope_handle).decode('ascii')
+        def_name = npi_fsdb_scope_property_str(npiFsdbScopeDefName, self.scope_handle).decode('ascii')
+        return def_name
+
+cdef class NpiFsdbSignalScope(NpiFsdbScope):
+    cdef npiFsdbSigHandle sig_handle
+
+    @staticmethod
+    cdef init(npiFsdbSigHandle sig_handle):
+        scope = NpiFsdbSignalScope()
+        scope.sig_handle = sig_handle
+        return scope
+
+    def __init__(self):
+        self.sig_handle = NULL
+
+    def child_scope_list(self, include_signal_scope:bool = True) -> list[NpiFsdbScope]:
+        assert self.sig_handle != NULL
+
+        cdef int has_member
+        cdef npiFsdbSigIter member_iter
+        cdef npiFsdbSigHandle member_handle
+
+        res = []
+        if include_signal_scope:
+            if npi_fsdb_sig_property(npiFsdbSigHasMember, self.sig_handle, &has_member) and has_member:
+                member_iter = npi_fsdb_iter_member(self.sig_handle)
+                while True:
+                    member_handle = npi_fsdb_iter_sig_next(member_iter)
+                    if member_handle == NULL:
+                        break
+                    res.append(NpiFsdbSignalScope.init(member_handle))
+                npi_fsdb_iter_sig_stop(member_iter)
+        return res
+
+    def signal_list(self) -> list[str]:
+        assert self.sig_handle != NULL
+
+        cdef const char* c_str
+        cdef npiFsdbSigIter member_iter
+        cdef npiFsdbSigHandle member_handle
+        cdef int has_member
+        res = []
 
+        if npi_fsdb_sig_property(npiFsdbSigHasMember, self.sig_handle, &has_member) and has_member:
+            member_iter = npi_fsdb_iter_member(self.sig_handle)
+            while True:
+                member_handle = npi_fsdb_iter_sig_next(member_iter)
+                if member_handle == NULL:
+                    break
+                c_str = npi_fsdb_sig_property_str(npiFsdbSigName, member_handle)
+                name = c_str.decode('ascii')
+                name = name.split(".")
+                name = name[len(name)-1]
+                res.append(name)
+            npi_fsdb_iter_sig_stop(member_iter)
+        return res
+
+    def name(self) -> str:
+        assert self.sig_handle != NULL
+        name = npi_fsdb_sig_property_str(npiFsdbSigName, self.sig_handle).decode('ascii')
+        #TODO: this only works for non-array type (array's name is like data[0],can't be split by ".")
+        name = name.split(".")
+        name = name[len(name)-1]
+        return name
+
+    def type(self) -> str:
+        raise NotImplementedError("type property of signal scope is not supported")
+
+    def def_name(self) -> str:
+        raise NotImplementedError("def_name property of signal scope is not supported")
 @cython.boundscheck(False)  # 关闭边界检查以提升性能
 @cython.wraparound(False)   # 关闭负索引检查以提升性能
 cdef inline cstr_to_ull(char* str, unsigned int xz_value, int max_bit_num = 2147483647):
@@ -150,7 +237,7 @@ cdef inline fsdb_read_value_change(vct_handle: npiFsdbVctHandle, begin_time, end
 
     return result
 
-cdef get_signal_handle_width( npiFsdbSigHandle signal_handle):
+cdef get_signal_handle_width(npiFsdbSigHandle signal_handle):
     cdef int has_member
     cdef int width
     cdef npiFsdbSigIter sub_signal_iter
@@ -167,11 +254,33 @@ cdef get_signal_handle_width( npiFsdbSigHandle signal_handle):
             width += get_signal_handle_width(sub_signal)
         return width
 
+cdef get_signal_handle_range(npiFsdbSigHandle signal_handle):
+    cdef int has_member
+    cdef int type
+    cdef int left_range, right_range
+    assert(npi_fsdb_sig_property(npiFsdbSigHasMember, signal_handle, &has_member))
+    assert(npi_fsdb_sig_property(npiFsdbSigLeftRange, signal_handle, &left_range))
+    assert(npi_fsdb_sig_property(npiFsdbSigRightRange, signal_handle, &right_range))
+    return (left_range, right_range)
+
+    if(has_member != 0):
+        assert(npi_fsdb_sig_property(npiFsdbSigCompositeType, signal_handle, &type))
+        if(type == <int>npiFsdbSigCtArray):
+            return (left_range, right_range)
+    return None
+
 cdef class NpiFsdbReader:
     cdef npiFsdbFileHandle fsdb_handle
     cdef str file
 
     def __init__(self, str file):
+        import os
+        
+        # 检查VERDI_HOME环境变量
+        verdi_home = os.environ.get('VERDI_HOME')
+        if verdi_home:
+            npi_lib_path = os.path.join(verdi_home, 'share/NPI/lib/LINUX64/libNPI.so')
+        
         #cdef int argc = len(sys.argv)
         #cdef char** argv = <char**>malloc((argc + 1) * sizeof(char*))
 
@@ -188,6 +297,8 @@ cdef class NpiFsdbReader:
         file_str = file.encode('utf-8')
         cdef char* file_s = file_str
         self.fsdb_handle = npi_fsdb_open(file_s)
+        if(self.fsdb_handle == NULL):
+            raise OSError(f"Failed to open fsdb file :{file_str}")
 
 
 
@@ -195,10 +306,22 @@ cdef class NpiFsdbReader:
         self,
         str signal
     ) -> int:
+        
+        cdef npiFsdbSigHandle signal_handle = npi_fsdb_sig_by_name(self.fsdb_handle,  signal.encode('ascii'), NULL)
+        assert signal_handle != NULL, f"can't find signal: {signal}"
+        
+        cdef int width = get_signal_handle_width(signal_handle)
+        return width
 
+    def get_signal_range(
+        self,
+        str signal
+    ) -> tuple[int,int]:
+        
         cdef npiFsdbSigHandle signal_handle = npi_fsdb_sig_by_name(self.fsdb_handle,  signal.encode('ascii'), NULL)
         assert signal_handle != NULL, f"can't find signal: {signal}"
-        return get_signal_handle_width(signal_handle)
+
+        return get_signal_handle_range(signal_handle)
 
     @cython.boundscheck(False)  # 关闭边界检查以提升性能
     @cython.wraparound(False)   # 关闭负索引检查以提升性能
@@ -209,7 +332,7 @@ cdef class NpiFsdbReader:
         unsigned long long end_time,
         int xz_value
     ) -> np.ndarray:
-
+        
         cdef npiFsdbSigHandle signal_handle = npi_fsdb_sig_by_name(self.fsdb_handle,  signal.encode('ascii'), NULL)
         assert signal_handle != NULL, f"can't find signal: {signal}"
         cdef int width = get_signal_handle_width(signal_handle)
@@ -235,6 +358,7 @@ cdef class NpiFsdbReader:
                     stat = npi_fsdb_goto_time(signal_vct_handle,  <npiFsdbTime> begin_time)
             else:
                 stat = npi_fsdb_goto_next(signal_vct_handle)
+            
             if stat == 0:
                 break
 
@@ -245,6 +369,7 @@ cdef class NpiFsdbReader:
             if cur_time > end_time:
                 break
             time_array.push_back(cur_time)
+            first = False
 
             if width == 1: # opt for clk
                 value_array[0].push_back(cstr_to_bit(<char*>cur_value.value.str, xz_value))
@@ -287,7 +412,8 @@ cdef class NpiFsdbReader:
             top_scope_handle = npi_fsdb_iter_scope_next(top_scope_iter)
             if top_scope_handle == NULL:
                 break
-            res.append(NpiFsdbScope.init(top_scope_handle))
+            res.append(NpiFsdbNormalScope.init(top_scope_handle))
+        npi_fsdb_iter_scope_stop(top_scope_iter)
         return res
 
     def min_time(self) -> int:

{wavekit-0.2.0 → wavekit-0.2.1}/src/wavekit/readers/fsdb/reader.py

@@ -10,7 +10,7 @@ from ...scope import Scope
 from ...signal import Signal
 from ...waveform import Waveform
 from ..base import Reader
-from .npi_fsdb_reader import NpiFsdbReader, NpiFsdbScope
+from .npi_fsdb_reader import NpiFsdbReader, NpiFsdbScope, NpiFsdbSignalScope
 
 
 class FsdbScope(Scope):
@@ -39,6 +39,13 @@ class FsdbScope(Scope):
     def child_scope_list(self) -> Sequence[Scope]:
         return [FsdbScope(c, self, self.reader) for c in self.handle.child_scope_list()]
 
+    @cached_property
+    def child_normal_scope_list(self) -> Sequence[Scope]:
+        return [
+            FsdbScope(c, self, self.reader)
+            for c in self.handle.child_scope_list(include_signal_scope=False)
+        ]
+
     @property
     def type(self) -> str:
         if not hasattr(self, '_type'):
@@ -65,8 +72,11 @@ class FsdbScope(Scope):
         return self.parent_scope.end_time if self.parent_scope else 0
 
     def preload_module_scope(self):
+        if isinstance(self.handle, NpiFsdbSignalScope):
+            return {}
+
         preloaded_module_scope = defaultdict(list)
-        for c in self.child_scope_list:
+        for c in self.child_normal_scope_list:
             for module_name, module_scope_list in c.preload_module_scope().items():
                 preloaded_module_scope[module_name].extend(module_scope_list)
 
@@ -141,6 +151,9 @@ class FsdbReader(Reader):
     def get_signal_width(self, signal: str) -> int:
         return self.file_handle.get_signal_width(signal)
 
+    def get_signal_range(self, signal: str) -> tuple[int]:
+        return self.file_handle.get_signal_range(signal)
+
     @property
     def begin_time(self) -> str:
         return self.file_handle.min_time()