Merge remote-tracking branch 'upstream/dev' into unsigned-signed

Author: ZiaCheemaGit

.github/workflows/regression-tests.yaml

@@ -69,7 +69,7 @@ jobs:
           name: sdist
           path: dist
 
-      - uses: actions/setup-python@v6.2.0
+      - uses: actions/setup-python@v6.3.0
         with:
           python-version: ${{matrix.python-version}}
           allow-prereleases: true

.github/workflows/release.yaml

@@ -32,7 +32,7 @@ jobs:
     steps:
     - uses: actions/checkout@v7
 
-    - uses: actions/setup-python@v6.2.0
+    - uses: actions/setup-python@v6.3.0
       with:
         python-version: "3.13"
 

.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
   - id: check-toml
   - id: check-added-large-files
 - repo: https://github.com/henryiii/validate-pyproject-schema-store
-  rev: "2026.06.14"
+  rev: "2026.06.26"
   hooks:
     - id: validate-pyproject
 - repo: https://github.com/codespell-project/codespell
@@ -26,7 +26,7 @@ repos:
     additional_dependencies:
     - tomli
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.15.18"
+  rev: "v0.15.20"
   hooks:
     - id: "ruff"
       args:
@@ -51,7 +51,7 @@ repos:
     exclude: "^src/cocotb/share/include/(sv_vpi|vhpi|vpi)_user(_ext)?.h"
     types_or: [c, c++]
 - repo: https://github.com/astral-sh/uv-pre-commit
-  rev: 0.11.23
+  rev: 0.11.25
   hooks:
     - id: uv-lock
 

cpp/CMakeLists.txt

@@ -14,14 +14,71 @@ target_include_directories(coconext PUBLIC
 target_compile_features(coconext PUBLIC cxx_std_20)
 set_target_properties(coconext PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
 
-# On macOS the install name is @rpath-relative so a preloaded image
-# satisfies the dependency by install-name match rather than by search path.
-# Looks like RPATH, is actually not.
+# Needed for MacOS.
 set_target_properties(coconext PROPERTIES
     MACOSX_RPATH TRUE
     INSTALL_NAME_DIR "@rpath")
 
-install(TARGETS coconext
+# -- libgpi --------------------------------------------------------------------
+#
+# This is some CMake to pull in libgpi since cocotb doesn't provide a CMake
+# package yet.
+
+# Use cocotb_tools.config to get libgpi binary dir and include dir
+execute_process(
+    COMMAND ${Python_EXECUTABLE} -c
+        "from cocotb_tools.config import libs_dir, share_dir; print(libs_dir); print(share_dir / 'include')"
+    OUTPUT_VARIABLE _coconext_cocotb_paths
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    COMMAND_ERROR_IS_FATAL ANY)
+string(REPLACE "\n" ";" _coconext_cocotb_paths "${_coconext_cocotb_paths}")
+list(GET _coconext_cocotb_paths 0 COCOTB_LIBS_DIR)
+list(GET _coconext_cocotb_paths 1 COCOTB_INCLUDE_DIR)
+
+# Create a CMake target for libgpi. cocotb installs libgpi as .so on every platform except Windows (including MacOS).
+if(WIN32)
+    set(_coconext_libgpi_suffix ".dll")
+else()
+    set(_coconext_libgpi_suffix ".so")
+endif()
+add_library(cocotb_gpi SHARED IMPORTED)
+set_target_properties(cocotb_gpi PROPERTIES
+    IMPORTED_LOCATION "${COCOTB_LIBS_DIR}/libgpi${_coconext_libgpi_suffix}"
+    INTERFACE_INCLUDE_DIRECTORIES "${COCOTB_INCLUDE_DIR}")
+
+# -- libcoconext_gpi -----------------------------------------------------------
+#
+# For parts of the library that have a dependency on libgpi and a running
+# simulation, e.g. handles and GPI triggers.
+
+add_library(coconext_gpi SHARED
+    src/sim_objects.cpp
+)
+set_target_properties(coconext_gpi PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+target_link_libraries(coconext_gpi
+    PRIVATE
+        cocotb_gpi
+    PUBLIC
+        coconext)
+
+# Needed for MacOS.
+set_target_properties(coconext_gpi PROPERTIES
+    MACOSX_RPATH TRUE
+    INSTALL_NAME_DIR "@rpath")
+
+# RPATH to the current dir to pick up libcoconext.
+if(APPLE)
+    set(_coconext_origin "@loader_path")
+else()
+    set(_coconext_origin "$ORIGIN")
+endif()
+set_target_properties(coconext_gpi PROPERTIES
+    INSTALL_RPATH "${_coconext_origin}"
+    BUILD_RPATH "${_coconext_origin}")
+
+# -- install -------------------------------------------------------------------
+
+install(TARGETS coconext coconext_gpi
     EXPORT coconextTargets
     LIBRARY DESTINATION coconext/lib
     RUNTIME DESTINATION coconext/lib

cpp/include/coconext/sim_objects.hpp

@@ -0,0 +1,10 @@
+#ifndef COCONEXT_SIM_OBJECTS_HPP
+#define COCONEXT_SIM_OBJECTS_HPP
+
+namespace coconext::sim_objects {
+
+bool has_registered_impl() noexcept;
+
+}  // namespace coconext::sim_objects
+
+#endif  // COCONEXT_SIM_OBJECTS_HPP

cpp/include/coconext/types.hpp

@@ -10,6 +10,7 @@
 #include "./types/logic_array.hpp"
 #include "./types/range.hpp"
 #include "./types/resize_mode.hpp"
+#include "./types/reverse.hpp"
 #include "./types/signed.hpp"
 #include "./types/unsigned.hpp"
 #include "./types/vector.hpp"

cpp/include/coconext/types/range.hpp

@@ -156,28 +156,17 @@ struct Range {
     }
 
     friend constexpr bool operator==(Range const& lhs, Range const& rhs) noexcept {
-        auto left_len = lhs.length();
-        if (left_len != rhs.length()) {
-            return false;
-        }
-        if (left_len == 0) {
-            // lengths are equal and all zero-length ranges are equal
-            return true;
-        }
-        if (lhs.left != rhs.left) {
-            // lengths are equal and >= 1, so if left endpoints differ the
-            // ranges cannot be equal
-            return false;
-        }
-        // If left endpoints are equal and lengths are equal, then right
-        // endpoint and direction must be the same for length >= 2 cases. If
-        // length is 1, then the direction and right endpoint do not matter,
-        // since the range only contains one value and that's the left endpoint
-        // we already checked.
-        return true;
+        return lhs.left == rhs.left && lhs.right == rhs.right
+            && lhs.direction == rhs.direction;
     }
 };
 
+constexpr Range reverse(Range const& r) noexcept {
+    return Range{
+        r.right, r.direction == Direction::TO ? Direction::DOWNTO : Direction::TO, r.left
+    };
+}
+
 // more optimal implementation of std::ranges::find for Range
 constexpr Range::iterator find(Range const& range, Range::value_type value) {
     if (range.direction == Direction::TO) {
@@ -221,18 +210,9 @@ struct std::formatter<coconext::types::Range> {
 template <>
 struct std::hash<coconext::types::Range> {
     size_t operator()(coconext::types::Range const& range) const noexcept {
-        // if a == a then hash(a) == hash(a), so we have to force all 0 and 1
-        // length ranges to have repeatable hashes.
-        auto const len = range.length();
-        if (len == 0) {
-            return hash<size_t>{}(0);
-        } else if (len == 1) {
-            return hash<coconext::types::Range::value_type>{}(range.left);
-        } else {
-            return coconext::types::detail::hash_combine(
-                range.left, range.right, range.direction
-            );
-        }
+        return coconext::types::detail::hash_combine(
+            range.left, range.right, range.direction
+        );
     }
 };
 

cpp/include/coconext/types/reverse.hpp

@@ -0,0 +1,45 @@
+#ifndef COCONEXT_REVERSE_HPP
+#define COCONEXT_REVERSE_HPP
+
+#include <algorithm>
+#include <coconext/types/array.hpp>
+#include <coconext/types/array_base.hpp>
+#include <coconext/types/range.hpp>
+#include <coconext/types/vector.hpp>
+#include <ranges>
+
+namespace coconext::types {
+
+template <typename T, Range R>
+constexpr detail::Array<T, reverse(R)> reverse(detail::Array<T, R> const& a) {
+    detail::Array<T, reverse(R)> result;
+    std::ranges::reverse_copy(a, result.begin());
+    return result;
+}
+
+template <typename T>
+Vector<T> reverse(Vector<T> const& v) {
+    Vector<T> result(reverse(v.range()));
+    std::ranges::reverse_copy(v, result.begin());
+    return result;
+}
+
+template <typename ArrayT>
+Vector<std::ranges::range_value_t<ArrayT>> reverse(ArraySlice<ArrayT> const& s) {
+    Vector<std::ranges::range_value_t<ArrayT>> result(reverse(s.range()));
+    std::ranges::reverse_copy(s, result.begin());
+    return result;
+}
+
+template <typename ArrayT, Range R>
+constexpr detail::Array<std::ranges::range_value_t<ArrayT>, reverse(R)> reverse(
+    StaticArraySlice<ArrayT, R> const& s
+) {
+    detail::Array<std::ranges::range_value_t<ArrayT>, reverse(R)> result;
+    std::ranges::reverse_copy(s, result.begin());
+    return result;
+}
+
+}  // namespace coconext::types
+
+#endif  // COCONEXT_REVERSE_HPP

cpp/src/sim_objects.cpp

@@ -0,0 +1,8 @@
+#include <coconext/sim_objects.hpp>
+#include <gpi.h>
+
+namespace coconext::sim_objects {
+
+bool has_registered_impl() noexcept { return ::gpi_has_registered_impl(); }
+
+}  // namespace coconext::sim_objects