opencos-eda 0.2.34__tar.gz → 0.2.35__tar.gz

{opencos_eda-0.2.34/opencos_eda.egg-info → opencos_eda-0.2.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opencos-eda
-Version: 0.2.34
+Version: 0.2.35
 Summary: A simple Python package for wrapping RTL simuliatons and synthesis
 Author-email: Simon Sabato <simon@cognichip.ai>, Drew Ranck <drew@cognichip.ai>
 Project-URL: Homepage, https://github.com/cognichip/opencos

{opencos_eda-0.2.34 → opencos_eda-0.2.35}/opencos/deps_helpers.py

@@ -261,7 +261,8 @@ def get_all_targets(
         base_path: str = os.getcwd(),
         filter_str: str = '',
         filter_using_multi: str = '',
-        error_on_empty_return: bool = True
+        error_on_empty_return: bool = True,
+        lstrip_path: bool = True
 ) -> list:
     '''Returns a list of [dir/target, ... ] using relpath from base_path
 
@@ -273,6 +274,8 @@ def get_all_targets(
     To all targets from dirs.
     '''
 
+    _path_lprefix = str(Path('.')) + os.path.sep
+
     if filter_using_multi:
         targets = []
         orig_dir = os.path.abspath(os.getcwd())
@@ -295,9 +298,10 @@ def get_all_targets(
                 this_dir, leaf_target = os.path.split(target)
                 if fnmatch_or_re(pattern=filter_str,
                                  string=leaf_target):
-                    targets.add(
-                        os.path.join(os.path.relpath(this_dir, start=base_path), leaf_target)
-                    )
+                    t = os.path.join(os.path.relpath(this_dir, start=base_path), leaf_target)
+                    if lstrip_path:
+                        t = t.removeprefix(_path_lprefix)
+                    targets.add(t)
             targets = list(targets)
         if not targets and error_on_empty_return:
             error(f'get_all_targets: {base_path=} {filter_using_multi=} returned no targets')
@@ -314,9 +318,10 @@ def get_all_targets(
         for leaf_target in deps_data_get_all_targets(data):
             if not filter_str or fnmatch_or_re(pattern=filter_str,
                                                string=leaf_target):
-                targets.add(
-                    os.path.join(os.path.relpath(this_dir, start=base_path), leaf_target)
-                )
+                t = os.path.join(os.path.relpath(this_dir, start=base_path), leaf_target)
+                if lstrip_path:
+                    t = t.removeprefix(_path_lprefix)
+                targets.add(t)
 
     if not targets and error_on_empty_return:
         error(f'get_all_targets: {base_path=} {dirs=} {filter_str=} returned no targets')

{opencos_eda-0.2.34 → opencos_eda-0.2.35}/opencos/eda_config_defaults.yml

@@ -144,7 +144,6 @@ tools:
 
     coverage-args: |
       --annotate logs/annotated
-      --annotate-min 1
       coverage.dat
 
     # If you want to set your own run-time plusarg on all verilator exe's for --waves,

opencos_eda-0.2.35/opencos/eda_extract_deps_keys.py

@@ -0,0 +1,117 @@
+#!/usr/bin/env python3
+
+'''
+Helper pymodule used by eda_deps_bash_completion.bash, extracts valid
+targets from DEPS files
+'''
+
+import sys
+import os
+from pathlib import Path
+import json
+
+import yaml
+import toml
+
+from opencos.deps_helpers import get_all_targets
+
+PATH_LPREFIX = str(Path('.')) + os.path.sep
+
+
+def get_terminal_columns():
+    """
+    Retrieves the number of columns (width) of the terminal window.
+
+    Returns:
+        int: The number of columns in the terminal, or a default value (e.g., 80)
+             if the terminal size cannot be determined.
+    """
+    try:
+        size = os.get_terminal_size()
+        return size.columns
+    except OSError:
+        # Handle cases where the terminal size cannot be determined (e.g., not in a TTY)
+        return 80  # Default to 80 columns
+    else:
+        return 80
+
+
+def print_columns_manual(data: list, num_columns: int = 4, auto_columns: bool = True) -> None:
+    """Prints a list of strings in columns, manually aligning them."""
+    if not data:
+        print()
+        return
+
+    _spacing = 2
+
+    # Calculate maximum width for each column
+    max_lengths = [0] * num_columns
+    max_item_len = 0
+    for i, item in enumerate(data):
+        col_index = i % num_columns
+        max_lengths[col_index] = max(max_lengths[col_index], len(item))
+        max_item_len = max(max_item_len, len(item))
+
+    if auto_columns and num_columns > 1:
+        window_cols = get_terminal_columns()
+        max_line_len = 0
+        for x in max_lengths:
+            max_line_len += x + _spacing
+        if max_line_len > window_cols:
+            # subtract a column (already >= 2):
+            return print_columns_manual(data=data, num_columns=num_columns-1, auto_columns=True)
+        if max_line_len + max_item_len + _spacing < window_cols:
+            # add 1 more column if we're guaranteed to have room.
+            return print_columns_manual(data=data, num_columns=num_columns+1, auto_columns=True)
+        # else continue
+
+    # Print data in columns
+    for i, item in enumerate(data):
+        col_index = i % num_columns
+        print(item.ljust(max_lengths[col_index] + _spacing), end="")  # Add padding
+        if col_index == num_columns - 1 or i == len(data) - 1:
+            print() # New line at the end of a row or end of data
+
+
+def run(partial_path: str = '', base_path=str(Path('.'))) -> None:
+    '''Returns None, prints DEPS keys into pretty columns, using arg
+
+    partial_path as a string filter for target completions.
+    '''
+    partial_target = ''
+    if not partial_path or partial_path == str(Path('.')):
+        partial_path = PATH_LPREFIX
+    if not os.path.exists(partial_path):
+        partial_path, partial_target = os.path.split(partial_path)
+    if not partial_path:
+        partial_path = PATH_LPREFIX
+
+    try:
+        keys = get_all_targets(
+            dirs=[partial_path],
+            base_path=base_path,
+            filter_str=partial_target,
+            error_on_empty_return=False,
+            lstrip_path=True
+        )
+    except:
+        keys = []
+
+    print_columns_manual(data=keys, num_columns=4, auto_columns=True)
+
+
+def main() -> None:
+    '''Returns None, prints DEPS keys into pretty columns, uses sys.argv[1] for args:
+
+    sys.args[1] -- optional partial path for target completions
+    '''
+
+    if len(sys.argv) > 1:
+        partial_path = sys.argv[1]
+    else:
+        partial_path = PATH_LPREFIX
+    run(partial_path)
+
+
+if __name__ == "__main__":
+    main()

{opencos_eda-0.2.34 → opencos_eda-0.2.35}/opencos/tools/verilator.py

@@ -78,6 +78,7 @@ class VerilatorSim(CommandSim, ToolVerilator):
             'dump-vcd': False,
             'lint-only': False,
             'cc-mode': False,
+            'verilator-coverage-args': [],
         })
 
         self.args_help.update({
@@ -303,9 +304,11 @@ class VerilatorSim(CommandSim, ToolVerilator):
             verilated_post_exec_coverage_command_list = [self.verilator_coverage_exe]
             config_coverage_args = self.tool_config.get(
                 'coverage-args',
-                '--annotate logs/annotated --annotate-min 1 coverage.dat').split()
+                '--annotate logs/annotated coverage.dat').split()
+
+            verilated_post_exec_coverage_command_list += \
+                config_coverage_args + self.args['verilator-coverage-args']
 
-            verilated_post_exec_coverage_command_list += config_coverage_args
 
             return [ util.ShellCommandList(verilated_post_exec_coverage_command_list,
                                            tee_fpath='coverage.log') ] # single entry list

{opencos_eda-0.2.34 → opencos_eda-0.2.35/opencos_eda.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opencos-eda
-Version: 0.2.34
+Version: 0.2.35
 Summary: A simple Python package for wrapping RTL simuliatons and synthesis
 Author-email: Simon Sabato <simon@cognichip.ai>, Drew Ranck <drew@cognichip.ai>
 Project-URL: Homepage, https://github.com/cognichip/opencos

{opencos_eda-0.2.34 → opencos_eda-0.2.35}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [project]
 name = "opencos-eda"
-version = "0.2.34"
+version = "0.2.35"
 dependencies = [
   # opencos/eda.py dependencies
   "mergedeep >= 1.3.4",

opencos_eda-0.2.34/opencos/eda_extract_deps_keys.py

@@ -1,81 +0,0 @@
-#!/usr/bin/env python3
-
-'''
-Helper pymodule used by eda_deps_bash_completion.bash, extracts valid
-targets from DEPS files
-'''
-
-import sys
-import os
-import json
-
-import yaml
-import toml
-
-from opencos.deps_helpers import get_deps_markup_file
-
-def get_markup_table_keys(partial_path='./') -> list:
-    '''Returns a list of root level keys for DEPS.[yml|yaml|toml|json]
-
-    Does not include DEFAULTS.
-    '''
-    partial_target = ''
-    if not partial_path or partial_path == '.':
-        partial_path = './'
-
-    if not os.path.exists(partial_path):
-        partial_path, partial_target = os.path.split(partial_path)
-    if not partial_path:
-        partial_path = './'
-
-    filepath = get_deps_markup_file(base_path=partial_path)
-    if not filepath:
-        # Couldn't find a DEPS file, let bash completion handle it (with -W words or -G glob)
-        return []
-
-    data = {}
-    _, file_ext = os.path.splitext(filepath)
-    try:
-        if file_ext in ['', '.yml', 'yaml']:
-            with open(filepath, 'r', encoding='utf-8') as f:
-                data = yaml.safe_load(f)
-        elif file_ext == '.toml':
-            data = toml.load(filepath)
-        elif file_ext == '.json':
-            with open(filepath, 'r', encoding='utf-8') as f:
-                data = json.load(f)
-    except Exception: # pylint: disable=broad-exception-caught
-        return []
-
-    if not isinstance(data, dict):
-        # We found a DEPS file, but it wasn't a table/dict so we can't return root keys
-        return []
-
-    # Try to resolve path/to/target/partial_target_
-    # -- prepend path information to found targets in path/to/target/DEPS
-    prepend = ''
-    if partial_path and partial_path != './':
-        prepend = partial_path
-        if not partial_path.endswith('/'):
-            prepend += '/'
-
-    # Return the list of keys w/ prepended path information, and don't include
-    # uppercase strings like 'DEFAULTS' or 'METADATA'
-    return [
-        prepend + x for x in list(data.keys()) if x.startswith(partial_target) and not x.isupper()
-    ]
-
-
-def main() -> None:
-    '''Returns None, prints DEPS keys space separated, uses sys.argv for a single
-    partial path arg (DEPS file to examine)'''
-
-    if len(sys.argv) > 1:
-        partial_path = sys.argv[1]
-    else:
-        partial_path = './'
-    keys = get_markup_table_keys(partial_path)
-    print(" ".join(keys))
-
-if __name__ == "__main__":
-    main()