simdref 0.0.1__tar.gz → 0.0.3__tar.gz

{simdref-0.0.1/src/simdref.egg-info → simdref-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simdref
-Version: 0.0.1
+Version: 0.0.3
 Summary: Searchable SIMD intrinsic and instruction reference with CLI, manpages, TUI, LSP, and static web export.
 Author: Marco
 License: GPL-3.0-or-later
@@ -33,7 +33,7 @@ Dynamic: license-file
 
 [![CI](https://github.com/DiamonDinoia/simdref/actions/workflows/ci.yml/badge.svg)](https://github.com/DiamonDinoia/simdref/actions/workflows/ci.yml)
 [![TestPyPI](https://img.shields.io/pypi/v/simdref?pypiBaseUrl=https%3A%2F%2Ftest.pypi.org&label=TestPyPI)](https://test.pypi.org/project/simdref/)
-[![Python](https://img.shields.io/pypi/pyversions/simdref?pypiBaseUrl=https%3A%2F%2Ftest.pypi.org)](https://test.pypi.org/project/simdref/)
+[![Python](https://img.shields.io/pypi/pyversions/simdref?pypiBaseUrl=https%3A%2F%2Ftest.pypi.org)](https://pypi.org/project/simdref/)
 
 A single searchable reference for SIMD intrinsics and instructions across
 **x86 (Intel + uops.info)**, **Arm (ACLE / AARCHMRS)**, and **RISC-V

{simdref-0.0.1 → simdref-0.0.3}/README.md

@@ -2,7 +2,7 @@
 
 [![CI](https://github.com/DiamonDinoia/simdref/actions/workflows/ci.yml/badge.svg)](https://github.com/DiamonDinoia/simdref/actions/workflows/ci.yml)
 [![TestPyPI](https://img.shields.io/pypi/v/simdref?pypiBaseUrl=https%3A%2F%2Ftest.pypi.org&label=TestPyPI)](https://test.pypi.org/project/simdref/)
-[![Python](https://img.shields.io/pypi/pyversions/simdref?pypiBaseUrl=https%3A%2F%2Ftest.pypi.org)](https://test.pypi.org/project/simdref/)
+[![Python](https://img.shields.io/pypi/pyversions/simdref?pypiBaseUrl=https%3A%2F%2Ftest.pypi.org)](https://pypi.org/project/simdref/)
 
 A single searchable reference for SIMD intrinsics and instructions across
 **x86 (Intel + uops.info)**, **Arm (ACLE / AARCHMRS)**, and **RISC-V

{simdref-0.0.1 → simdref-0.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "simdref"
-version = "0.0.1"
+version = "0.0.3"
 description = "Searchable SIMD intrinsic and instruction reference with CLI, manpages, TUI, LSP, and static web export."
 readme = "README.md"
 requires-python = ">=3.11"

{simdref-0.0.1 → simdref-0.0.3}/src/simdref/tui.py

@@ -191,6 +191,24 @@ def _normalize_sub_isa_selection(
 # ---------------------------------------------------------------------------
 
 
+_MNEMONIC_HINT_TOKENS = frozenset({"add", "sub", "mul", "div", "mov", "cmp", "and", "or", "xor"})
+
+
+def _classify_query(query: str) -> str:
+    """Mirror the web SPA's `classifyQuery` so ranking biases match."""
+    lo = query.strip().lower()
+    if not lo:
+        return "neutral"
+    if lo.startswith("_mm") or lo.startswith("__m") or "_mm" in lo:
+        return "intrinsic"
+    parts = lo.replace("_", " ").split()
+    if parts:
+        first = parts[0]
+        if first in _MNEMONIC_HINT_TOKENS or first.startswith("v"):
+            return "instruction"
+    return "neutral"
+
+
 def _name_match_score(name: str, terms: list[str]) -> int:
     """Score how well query terms match a name. Higher = better match.
 
@@ -224,6 +242,7 @@ def _fts_search(
     enabled_sub_isas: set[str] | None = None,
     offset: int = 0,
     limit: int = 30,
+    enabled_kinds: set[str] | None = None,
 ) -> list[SearchResult]:
     """Search using SQLite FTS5 with ISA family and sub-ISA filtering."""
     _t_start = time.perf_counter() if _PROFILE else 0.0
@@ -240,17 +259,31 @@ def _fts_search(
     fts_expr_broad = term_expr
 
     # Build an ISA LIKE-clause fragment so SQLite can drop non-matching rows
-    # before we ever hand them to Python. Sub-ISA tokens (e.g. "SSE2") and
-    # family names (e.g. "Arm") are substring-matched against the space-joined
-    # isa column. Families without a sub-ISA breakdown (RISC-V "x86", etc.)
-    # get their family name added so a plain family-level toggle still matches.
+    # before we ever hand them to Python. Sub-ISA tokens (e.g. "SSE2") are
+    # substring-matched against the isa column.
+    #
+    # Families without a sub-ISA breakdown (e.g. "x86", "MMX", "APX", "AVX10",
+    # "SVML", "Other") have raw ISA tokens like "I86" or "BMI1" — none of which
+    # contain the family-name string. We can't construct a sound LIKE pattern
+    # for those, so when any such family is enabled we skip the SQL pushdown
+    # entirely and let the Python `_isa_visible` post-filter do the work.
+    # Bias scoring by query classification (mirrors the web SPA): a mnemonic
+    # query like "add" should rank instructions above intrinsics, while an
+    # `_mm…`/`__m…` query should still favour intrinsics. Neutral queries get
+    # no kind bias.
+    qkind = _classify_query(query)
+    if qkind == "instruction":
+        intrinsic_bias, instruction_bias, default_kind = -10, 35, "instruction"
+    elif qkind == "intrinsic":
+        intrinsic_bias, instruction_bias, default_kind = 35, -10, "intrinsic"
+    else:
+        intrinsic_bias, instruction_bias, default_kind = 0, 0, "intrinsic"
+
+    has_no_sub_family = bool(enabled_families) and any(
+        not FAMILY_SUB_ORDER.get(fam) for fam in enabled_families
+    )
     isa_like_tokens: list[str] = []
-    if enabled_families:
-        for fam in enabled_families:
-            subs = FAMILY_SUB_ORDER.get(fam)
-            if not subs:
-                isa_like_tokens.append(fam)
-    if enabled_sub_isas is not None:
+    if not has_no_sub_family and enabled_sub_isas is not None:
         isa_like_tokens.extend(enabled_sub_isas)
     # Normalise the isa column the same way _isa_matches_sub does: strip
     # hyphens so "AVX-512F" matches a pushed-down "AVX512F" pattern. REPLACE
@@ -343,8 +376,10 @@ def _fts_search(
     # The name-only query uses {name name_tokens} column filter which
     # requires schema v7+; fall back to broad search on OperationalError.
     search_exprs = [fts_expr, fts_expr_broad]
+    want_intrinsic = enabled_kinds is None or "intrinsic" in enabled_kinds
+    want_instruction = enabled_kinds is None or "instruction" in enabled_kinds
     for expr in search_exprs:
-        rows = _query_intrinsic_rows(expr)
+        rows = _query_intrinsic_rows(expr) if want_intrinsic else []
         for row in rows:
             if row["name"] in seen or not _isa_visible(row["isa"] or ""):
                 continue
@@ -359,9 +394,9 @@ def _fts_search(
                 subtitle=subtitle,
                 score=100,
             )
-            candidates.append((_name_match_score(row["name"], terms), result))
+            candidates.append((_name_match_score(row["name"], terms) + intrinsic_bias, result))
 
-        irows = _query_instruction_rows(expr)
+        irows = _query_instruction_rows(expr) if want_instruction else []
         for row in irows:
             if row["db_key"] in seen or not _isa_visible(row["isa"] or ""):
                 continue
@@ -373,10 +408,17 @@ def _fts_search(
                 subtitle=row["summary"] or "",
                 score=90,
             )
-            candidates.append((_name_match_score(row["key"], terms), result))
-
-    # Sort by match score descending, then by kind (intrinsics first)
-    candidates.sort(key=lambda c: (-c[0], 0 if c[1].kind == "intrinsic" else 1))
+            candidates.append((_name_match_score(row["key"], terms) + instruction_bias, result))
+
+    # Sort by (biased) match score descending. The kind tiebreaker follows the
+    # query classification so a mnemonic-like query ("add") doesn't get its
+    # instructions buried under intrinsics with identical text scores.
+    candidates.sort(
+        key=lambda c: (
+            -c[0],
+            0 if c[1].kind == default_kind else 1,
+        )
+    )
     results = [r for _, r in candidates[offset : offset + limit]]
     if _PROFILE:
         _profile_log(
@@ -1456,9 +1498,8 @@ class SimdrefApp(App):
             self._enabled_sub_isas,
             offset=0,
             limit=_INITIAL_RESULT_BATCH,
+            enabled_kinds=set(self._enabled_kinds) if self._enabled_kinds else None,
         )
-        if self._enabled_kinds and len(self._enabled_kinds) < 2:
-            results = [r for r in results if r.kind in self._enabled_kinds]
         self._current_results = results
         self._has_more_results = len(results) == _INITIAL_RESULT_BATCH
         for i, result in enumerate(results, 1):
@@ -1493,9 +1534,8 @@ class SimdrefApp(App):
             self._enabled_sub_isas,
             offset=len(self._current_results),
             limit=_RESULT_BATCH_SIZE,
+            enabled_kinds=set(self._enabled_kinds) if self._enabled_kinds else None,
         )
-        if self._enabled_kinds and len(self._enabled_kinds) < 2:
-            more = [r for r in more if r.kind in self._enabled_kinds]
         if not more:
             self._has_more_results = False
             return

{simdref-0.0.1 → simdref-0.0.3/src/simdref.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simdref
-Version: 0.0.1
+Version: 0.0.3
 Summary: Searchable SIMD intrinsic and instruction reference with CLI, manpages, TUI, LSP, and static web export.
 Author: Marco
 License: GPL-3.0-or-later
@@ -33,7 +33,7 @@ Dynamic: license-file
 
 [![CI](https://github.com/DiamonDinoia/simdref/actions/workflows/ci.yml/badge.svg)](https://github.com/DiamonDinoia/simdref/actions/workflows/ci.yml)
 [![TestPyPI](https://img.shields.io/pypi/v/simdref?pypiBaseUrl=https%3A%2F%2Ftest.pypi.org&label=TestPyPI)](https://test.pypi.org/project/simdref/)
-[![Python](https://img.shields.io/pypi/pyversions/simdref?pypiBaseUrl=https%3A%2F%2Ftest.pypi.org)](https://test.pypi.org/project/simdref/)
+[![Python](https://img.shields.io/pypi/pyversions/simdref?pypiBaseUrl=https%3A%2F%2Ftest.pypi.org)](https://pypi.org/project/simdref/)
 
 A single searchable reference for SIMD intrinsics and instructions across
 **x86 (Intel + uops.info)**, **Arm (ACLE / AARCHMRS)**, and **RISC-V