change VCD id generation to be based on hashing the path, making them better for git diff

this makes cpu/crates/cpu/tests/next_pc.rs take 56s instead of 168s

.forgejo/workflows/test.yml

@@ -16,6 +16,7 @@ jobs:
       - uses: https://git.libre-chip.org/mirrors/rust-cache@v2
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
+      - run: rustup override set 1.93.0
       - run: cargo test
       - run: cargo build --tests --features=unstable-doc
       - run: cargo test --doc --features=unstable-doc

Cargo.lock

@@ -319,10 +319,12 @@ dependencies = [
  "jobslot",
  "num-bigint",
  "num-traits",
+ "once_cell",
  "ordered-float",
  "petgraph",
  "serde",
  "serde_json",
+ "sha2",
  "tempfile",
  "trybuild",
  "vec_map",
@@ -521,9 +523,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "ordered-float"

Cargo.toml

@@ -11,7 +11,7 @@ edition = "2024"
 repository = "https://git.libre-chip.org/libre-chip/fayalite"
 keywords = ["hdl", "hardware", "semiconductors", "firrtl", "fpga"]
 categories = ["simulation", "development-tools", "compilers"]
-rust-version = "1.89.0"
+rust-version = "1.93.0"
 
 [workspace.dependencies]
 fayalite-proc-macros = { version = "=0.3.0", path = "crates/fayalite-proc-macros" }
@@ -30,6 +30,7 @@ indexmap = { version = "2.5.0", features = ["serde"] }
 jobslot = "0.2.23"
 num-bigint = "0.4.6"
 num-traits = "0.2.16"
+once_cell = "1.21.3"
 ordered-float = { version = "5.1.0", features = ["serde"] }
 petgraph = "0.8.1"
 prettyplease = "0.2.20"

crates/fayalite-proc-macros-impl/src/hdl_enum.rs

@@ -888,6 +888,7 @@ impl ToTokens for ParsedEnum {
                         #(#sim_value_from_opaque_match_arms)*
                     }
                 }
+                #[allow(irrefutable_let_patterns)]
                 fn sim_value_clone_from_opaque(
                     &self,
                     value: &mut <Self as ::fayalite::ty::Type>::SimValue,

crates/fayalite/Cargo.toml

@@ -26,10 +26,12 @@ hashbrown.workspace = true
 jobslot.workspace = true
 num-bigint.workspace = true
 num-traits.workspace = true
+once_cell.workspace = true
 ordered-float.workspace = true
 petgraph.workspace = true
 serde_json.workspace = true
 serde.workspace = true
+sha2.workspace = true
 tempfile.workspace = true
 vec_map.workspace = true
 which.workspace = true

crates/fayalite/src/array.rs

@@ -109,14 +109,42 @@ impl<T: StaticType, Len: KnownSize> Default for ArrayType<T, Len> {
     }
 }
 
+struct MakeType<T: StaticType>(Interned<T>);
+
+impl<T: StaticType> From<MakeType<T>> for Interned<T> {
+    fn from(value: MakeType<T>) -> Self {
+        value.0
+    }
+}
+
+impl<T: StaticType> Default for MakeType<T> {
+    fn default() -> Self {
+        Self(T::TYPE.intern_sized())
+    }
+}
+
+struct MakeMaskType<T: StaticType>(Interned<T::MaskType>);
+
+impl<T: StaticType> From<MakeMaskType<T>> for Interned<T::MaskType> {
+    fn from(value: MakeMaskType<T>) -> Self {
+        value.0
+    }
+}
+
+impl<T: StaticType> Default for MakeMaskType<T> {
+    fn default() -> Self {
+        Self(T::MASK_TYPE.intern_sized())
+    }
+}
+
 impl<T: StaticType, Len: KnownSize> StaticType for ArrayType<T, Len> {
     const TYPE: Self = Self {
-        element: LazyInterned::new_lazy(&|| T::TYPE.intern_sized()),
+        element: LazyInterned::new_const::<MakeType<T>>(),
         len: Len::SIZE,
         type_properties: Self::TYPE_PROPERTIES,
     };
     const MASK_TYPE: Self::MaskType = ArrayType::<T::MaskType, Len> {
-        element: LazyInterned::new_lazy(&|| T::MASK_TYPE.intern_sized()),
+        element: LazyInterned::new_const::<MakeMaskType<T>>(),
         len: Len::SIZE,
         type_properties: Self::MASK_TYPE_PROPERTIES,
     };

crates/fayalite/src/expr/ops.rs

@@ -579,6 +579,8 @@ macro_rules! make_impls {
     (#[kind(i64)] $($rest:tt)*) => {make_impls! { #[type([][] (i64))] $($rest)* }};
     (#[kind(i128)] $($rest:tt)*) => {make_impls! { #[type([][] (i128))] $($rest)* }};
 }
+
+#[cfg(test)]
 pub(crate) use make_impls;
 
 #[cfg(test)]

crates/fayalite/src/int.rs

@@ -10,7 +10,7 @@ use crate::{
         value_category::ValueCategoryValue,
     },
     hdl,
-    intern::{Intern, Interned, Memoize},
+    intern::{Intern, Interned, Memoize, OnceInterned},
     sim::value::{SimValue, ToSimValueWithType},
     source_location::SourceLocation,
     ty::{
@@ -65,14 +65,21 @@ pub type DynSize = ConstUsize<DYN_SIZE>;
 
 trait KnownSizeBaseSealed {}
 
-impl<const N: usize> KnownSizeBaseSealed for [(); N] {}
+impl<const N: usize> KnownSizeBaseSealed for ConstUsize<N> {}
 
 #[expect(private_bounds)]
-pub trait KnownSizeBase: KnownSizeBaseSealed {}
+pub trait KnownSizeBase: KnownSizeBaseSealed + GetInternedIntCaches {}
 
 macro_rules! impl_known_size_base {
     ($($size:literal),* $(,)?) => {
-        $(impl KnownSizeBase for [(); $size] {})*
+        $(impl KnownSizeBase for ConstUsize<$size> {})*
+        $(impl GetInternedIntCaches for ConstUsize<$size> {
+            #[inline(always)]
+            fn get_interned_int_caches() -> &'static InternedIntCaches<Self> {
+                static CACHES: InternedIntCaches<ConstUsize<$size>> = InternedIntCaches::new();
+                &CACHES
+            }
+        })*
     };
 }
 
@@ -113,12 +120,34 @@ impl_known_size_base! {
     0x200,
 }
 
+trait GetInternedIntCaches {
+    fn get_interned_int_caches() -> &'static InternedIntCaches<Self>
+    where
+        Self: KnownSize;
+}
+
+struct InternedIntCaches<Width: KnownSize> {
+    uint: OnceInterned<UIntType<Width>>,
+    sint: OnceInterned<SIntType<Width>>,
+}
+
+impl<Width: KnownSize> InternedIntCaches<Width> {
+    const fn new() -> Self {
+        Self {
+            uint: OnceInterned::new(),
+            sint: OnceInterned::new(),
+        }
+    }
+}
+
+#[expect(private_bounds)]
 pub trait KnownSize:
     GenericConstUsize
     + sealed::SizeTypeSealed
     + sealed::SizeSealed
     + Default
     + FillInDefaultedGenerics<Type = Self>
+    + GetInternedIntCaches
 {
     const SIZE: Self;
     type ArrayMatch<Element: Type>: AsRef<[Expr<Element>]>
@@ -148,7 +177,7 @@ pub trait KnownSize:
 
 impl<const N: usize> KnownSize for ConstUsize<N>
 where
-    [(); N]: KnownSizeBase,
+    ConstUsize<N>: KnownSizeBase,
 {
     const SIZE: Self = Self;
     type ArrayMatch<Element: Type> = [Expr<Element>; N];
@@ -221,6 +250,10 @@ pub trait Size:
     fn from_usize(v: usize) -> Self::SizeType {
         Self::try_from_usize(v).expect("wrong size")
     }
+    #[doc(hidden)]
+    fn interned_uint(size_type: Self::SizeType) -> Interned<UIntType<Self>>;
+    #[doc(hidden)]
+    fn interned_sint(size_type: Self::SizeType) -> Interned<SIntType<Self>>;
 }
 
 impl sealed::SizeTypeSealed for usize {}
@@ -229,6 +262,8 @@ impl SizeType for usize {
     type Size = DynSize;
 }
 
+const MAX_CACHED_INT_WIDTH: usize = 1 << 10;
+
 impl Size for DynSize {
     type ArrayMatch<Element: Type> = Box<[Expr<Element>]>;
     type ArraySimValue<Element: Type> = Box<[SimValue<Element>]>;
@@ -242,6 +277,36 @@ impl Size for DynSize {
     fn try_from_usize(v: usize) -> Option<Self::SizeType> {
         Some(v)
     }
+
+    #[doc(hidden)]
+    fn interned_uint(size_type: Self::SizeType) -> Interned<UIntType<Self>> {
+        static CACHED: [OnceInterned<UInt>; MAX_CACHED_INT_WIDTH] =
+            [const { OnceInterned::new() }; _];
+        #[cold]
+        fn intern_cold(width: usize) -> Interned<UInt> {
+            Intern::intern_sized(UInt::new(width))
+        }
+        if let Some(cached) = CACHED.get(size_type) {
+            cached.get_or_init(|| intern_cold(size_type))
+        } else {
+            intern_cold(size_type)
+        }
+    }
+
+    #[doc(hidden)]
+    fn interned_sint(size_type: Self::SizeType) -> Interned<SIntType<Self>> {
+        static CACHED: [OnceInterned<SInt>; MAX_CACHED_INT_WIDTH] =
+            [const { OnceInterned::new() }; _];
+        #[cold]
+        fn intern_cold(width: usize) -> Interned<SInt> {
+            Intern::intern_sized(SInt::new(width))
+        }
+        if let Some(cached) = CACHED.get(size_type) {
+            cached.get_or_init(|| intern_cold(size_type))
+        } else {
+            intern_cold(size_type)
+        }
+    }
 }
 
 impl<const VALUE: usize> sealed::SizeSealed for ConstUsize<VALUE> {}
@@ -267,6 +332,20 @@ impl<T: KnownSize> Size for T {
     fn try_from_usize(v: usize) -> Option<Self::SizeType> {
         if v == T::VALUE { Some(T::SIZE) } else { None }
     }
+
+    #[doc(hidden)]
+    fn interned_uint(_size_type: Self::SizeType) -> Interned<UIntType<Self>> {
+        T::get_interned_int_caches()
+            .uint
+            .get_or_init(|| UIntType::new_static().intern_sized())
+    }
+
+    #[doc(hidden)]
+    fn interned_sint(_size_type: Self::SizeType) -> Interned<SIntType<Self>> {
+        T::get_interned_int_caches()
+            .sint
+            .get_or_init(|| SIntType::new_static().intern_sized())
+    }
 }
 
 #[derive(Clone, PartialEq, Eq, Debug)]
@@ -586,7 +665,7 @@ macro_rules! impl_valueless_op_forward {
 }
 
 macro_rules! impl_int {
-    ($pretty_name:ident, $name:ident, $generic_name:ident, $value:ident, $SIGNED:literal) => {
+    ($pretty_name:ident, $name:ident, $generic_name:ident, $value:ident, $SIGNED:literal, $interned_int:ident) => {
         #[derive(Copy, Clone, PartialEq, Eq, Hash)]
         #[repr(transparent)]
         pub struct $name<Width: Size = DynSize> {
@@ -1003,7 +1082,7 @@ macro_rules! impl_int {
             type Output = $name<Width::Size>;
 
             fn index(&self, width: Width) -> &Self::Output {
-                Interned::into_inner(Intern::intern_sized($name::new(width)))
+                Interned::into_inner(Width::Size::$interned_int(width))
             }
         }
 
@@ -1184,8 +1263,22 @@ macro_rules! impl_int {
     };
 }
 
-impl_int!(UInt, UIntType, UIntWithoutGenerics, UIntValue, false);
+impl_int!(
-impl_int!(SInt, SIntType, SIntWithoutGenerics, SIntValue, true);
+    UInt,
+    UIntType,
+    UIntWithoutGenerics,
+    UIntValue,
+    false,
+    interned_uint
+);
+impl_int!(
+    SInt,
+    SIntType,
+    SIntWithoutGenerics,
+    SIntValue,
+    true,
+    interned_sint
+);
 
 impl UInt {
     /// gets the smallest `UInt` that fits `v` losslessly

crates/fayalite/src/intern.rs

@@ -4,68 +4,191 @@
 use crate::{intern::type_map::TypeIdMap, util::DefaultBuildHasher};
 use bitvec::{ptr::BitPtr, slice::BitSlice, vec::BitVec};
 use hashbrown::HashTable;
+use once_cell::race::OnceRef;
 use serde::{Deserialize, Serialize};
 use std::{
     any::{Any, TypeId},
     borrow::{Borrow, Cow},
+    cell::RefCell,
     cmp::Ordering,
     ffi::{OsStr, OsString},
     fmt,
     hash::{BuildHasher, Hash, Hasher},
     iter::FusedIterator,
-    marker::PhantomData,
     ops::Deref,
     path::{Path, PathBuf},
-    sync::{Mutex, RwLock},
+    sync::RwLock,
 };
 
+mod interner;
 mod type_map;
 
-pub trait LazyInternedTrait<T: ?Sized + Send + Sync + 'static>: Send + Sync + Any {
+/// invariant: T must be zero-sized, `type_id` is unique for every possible T value.
-    fn get(&self) -> Interned<T>;
+struct LazyInternedLazyInner<T: ?Sized + 'static> {
+    type_id: TypeId,
+    value: T,
 }
 
-impl<T: ?Sized + Send + Sync + 'static, F: ?Sized + Fn() -> Interned<T> + Send + Sync + Any>
+impl<T: ?Sized + 'static> Hash for LazyInternedLazyInner<T> {
-    LazyInternedTrait<T> for F
+    fn hash<H: Hasher>(&self, state: &mut H) {
-{
+        let Self { type_id, value: _ } = self;
-    fn get(&self) -> Interned<T> {
+        type_id.hash(state);
-        self()
     }
 }
 
-#[repr(transparent)]
+impl<T: ?Sized + 'static> PartialEq for LazyInternedLazyInner<T> {
-pub struct LazyInternedFn<T: ?Sized + Send + Sync + 'static>(pub &'static dyn LazyInternedTrait<T>);
+    fn eq(&self, other: &Self) -> bool {
+        let Self { type_id, value: _ } = self;
+        *type_id == other.type_id
+    }
+}
 
-impl<T: ?Sized + Send + Sync + 'static> Copy for LazyInternedFn<T> {}
+impl<T: ?Sized + 'static> Eq for LazyInternedLazyInner<T> {}
 
-impl<T: ?Sized + Send + Sync + 'static> Clone for LazyInternedFn<T> {
+impl<T: ?Sized + 'static> fmt::Debug for LazyInternedLazyInner<T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("LazyInternedLazyInner")
+            .finish_non_exhaustive()
+    }
+}
+
+impl<T: ?Sized + 'static> LazyInternedLazyInner<T> {
+    const fn new(value: T) -> Self
+    where
+        T: Sized,
+    {
+        const { assert!(size_of::<T>() == 0) };
+        Self {
+            type_id: TypeId::of::<T>(),
+            value,
+        }
+    }
+}
+
+pub struct LazyInternedLazy<T: ?Sized + Send + Sync + 'static>(
+    &'static LazyInternedLazyInner<dyn Fn() -> Interned<T> + Send + Sync>,
+);
+
+impl<T: ?Sized + Send + Sync + 'static> LazyInternedLazy<T> {
+    pub const fn new_const<V: Default + Into<Interned<T>>>() -> Self {
+        Self(&const { LazyInternedLazyInner::new(|| V::default().into()) })
+    }
+    pub const fn new_const_default() -> Self
+    where
+        Interned<T>: Default,
+    {
+        Self::new_const::<Interned<T>>()
+    }
+    pub fn interned(self) -> Interned<T> {
+        struct Map(hashbrown::HashTable<(TypeId, &'static (dyn Any + Send + Sync))>);
+        impl Map {
+            const EMPTY: Self = Self(hashbrown::HashTable::new());
+            fn get<T: ?Sized + Send + Sync + 'static>(
+                &self,
+                lazy_interned_lazy: LazyInternedLazy<T>,
+                hash: u64,
+            ) -> Option<&'static Interned<T>> {
+                let &(_, v) = self.0.find(hash, |v| v.0 == lazy_interned_lazy.0.type_id)?;
+                let Some(retval) = v.downcast_ref::<Interned<T>>() else {
+                    unreachable!();
+                };
+                Some(retval)
+            }
+            fn get_or_insert<T: ?Sized + Send + Sync + 'static>(
+                &mut self,
+                lazy_interned_lazy: LazyInternedLazy<T>,
+                hash: u64,
+                v: &'static Interned<T>,
+            ) -> &'static Interned<T> {
+                let entry = self
+                    .0
+                    .entry(
+                        hash,
+                        |&(k, _)| k == lazy_interned_lazy.0.type_id,
+                        |&(k, _)| type_map::TypeIdBuildHasher.hash_one(k),
+                    )
+                    .or_insert_with(|| (lazy_interned_lazy.0.type_id, v));
+                let &(_, v) = entry.get();
+                let Some(retval) = v.downcast_ref::<Interned<T>>() else {
+                    unreachable!();
+                };
+                retval
+            }
+        }
+        static GLOBAL_CACHE: RwLock<Map> = RwLock::new(Map::EMPTY);
+        #[cold]
+        fn insert_in_thread_local_cache<T: ?Sized + Send + Sync + 'static>(
+            cache: &RefCell<Map>,
+            this: LazyInternedLazy<T>,
+            hash: u64,
+        ) -> Interned<T> {
+            let read_lock = GLOBAL_CACHE.read().unwrap();
+            let v = read_lock.get(this, hash);
+            drop(read_lock);
+            let v = v.unwrap_or_else(|| {
+                let v = Box::leak(Box::new((this.0.value)()));
+                GLOBAL_CACHE.write().unwrap().get_or_insert(this, hash, v)
+            });
+            *cache.borrow_mut().get_or_insert(this, hash, v)
+        }
+        thread_local! {
+            static THREAD_LOCAL_CACHE: RefCell<Map> = const { RefCell::new(Map::EMPTY) };
+        }
+        let hash = type_map::TypeIdBuildHasher.hash_one(self.0.type_id);
+        THREAD_LOCAL_CACHE.with(|cache| {
+            let borrow = cache.borrow();
+            if let Some(v) = borrow.get(self, hash) {
+                *v
+            } else {
+                drop(borrow);
+                insert_in_thread_local_cache(cache, self, hash)
+            }
+        })
+    }
+}
+
+impl<T: ?Sized + Send + Sync + 'static> Copy for LazyInternedLazy<T> {}
+
+impl<T: ?Sized + Send + Sync + 'static> Clone for LazyInternedLazy<T> {
     fn clone(&self) -> Self {
         *self
     }
 }
 
-impl<T: ?Sized + Send + Sync + 'static> Hash for LazyInternedFn<T> {
+impl<T: ?Sized + Send + Sync + 'static> Hash for LazyInternedLazy<T> {
     fn hash<H: Hasher>(&self, state: &mut H) {
-        self.0.get_ptr_eq_with_type_id().hash(state);
+        self.0.hash(state);
     }
 }
 
-impl<T: ?Sized + Send + Sync + 'static> Eq for LazyInternedFn<T> {}
+impl<T: ?Sized + Send + Sync + 'static> Eq for LazyInternedLazy<T> {}
 
-impl<T: ?Sized + Send + Sync + 'static> PartialEq for LazyInternedFn<T> {
+impl<T: ?Sized + Send + Sync + 'static> PartialEq for LazyInternedLazy<T> {
     fn eq(&self, other: &Self) -> bool {
-        self.0.get_ptr_eq_with_type_id() == other.0.get_ptr_eq_with_type_id()
+        self.0 == other.0
     }
 }
 
 pub enum LazyInterned<T: ?Sized + Send + Sync + 'static> {
     Interned(Interned<T>),
-    Lazy(LazyInternedFn<T>),
+    Lazy(LazyInternedLazy<T>),
 }
 
 impl<T: ?Sized + Send + Sync + 'static> LazyInterned<T> {
-    pub const fn new_lazy(v: &'static dyn LazyInternedTrait<T>) -> Self {
+    pub const fn new_const<V: Default + Into<Interned<T>>>() -> Self {
-        Self::Lazy(LazyInternedFn(v))
+        Self::Lazy(LazyInternedLazy::new_const::<V>())
+    }
+    pub const fn new_const_default() -> Self
+    where
+        Interned<T>: Default,
+    {
+        Self::new_const::<Interned<T>>()
+    }
+    pub fn interned(self) -> Interned<T> {
+        match self {
+            Self::Interned(retval) => retval,
+            Self::Lazy(retval) => retval.interned(),
+        }
     }
 }
 
@@ -77,7 +200,7 @@ impl<T: ?Sized + Sync + Send + 'static> Clone for LazyInterned<T> {
 
 impl<T: ?Sized + Sync + Send + 'static> Copy for LazyInterned<T> {}
 
-impl<T: ?Sized + Sync + Send + 'static + Intern> Deref for LazyInterned<T> {
+impl<T: ?Sized + Sync + Send + 'static> Deref for LazyInterned<T> {
     type Target = T;
 
     fn deref(&self) -> &Self::Target {
@@ -85,9 +208,9 @@ impl<T: ?Sized + Sync + Send + 'static + Intern> Deref for LazyInterned<T> {
     }
 }
 
-impl<T: ?Sized + Sync + Send + 'static + Intern> Eq for LazyInterned<T> where Interned<T>: Eq {}
+impl<T: ?Sized + Sync + Send + 'static> Eq for LazyInterned<T> where Interned<T>: Eq {}
 
-impl<T: ?Sized + Sync + Send + 'static + Intern> PartialEq for LazyInterned<T>
+impl<T: ?Sized + Sync + Send + 'static> PartialEq for LazyInterned<T>
 where
     Interned<T>: PartialEq,
 {
@@ -96,7 +219,7 @@ where
     }
 }
 
-impl<T: ?Sized + Sync + Send + 'static + Intern> Ord for LazyInterned<T>
+impl<T: ?Sized + Sync + Send + 'static> Ord for LazyInterned<T>
 where
     Interned<T>: Ord,
 {
@@ -105,7 +228,7 @@ where
     }
 }
 
-impl<T: ?Sized + Sync + Send + 'static + Intern> PartialOrd for LazyInterned<T>
+impl<T: ?Sized + Sync + Send + 'static> PartialOrd for LazyInterned<T>
 where
     Interned<T>: PartialOrd,
 {
@@ -114,7 +237,7 @@ where
     }
 }
 
-impl<T: ?Sized + Sync + Send + 'static + Intern> Hash for LazyInterned<T>
+impl<T: ?Sized + Sync + Send + 'static> Hash for LazyInterned<T>
 where
     Interned<T>: Hash,
 {
@@ -123,77 +246,6 @@ where
     }
 }
 
-impl<T: ?Sized + Sync + Send + 'static> LazyInterned<T> {
-    pub fn interned(self) -> Interned<T>
-    where
-        T: Intern,
-    {
-        struct MemoizeInterned<T: ?Sized + Intern>(PhantomData<T>);
-
-        impl<T: ?Sized + Intern> Hash for MemoizeInterned<T> {
-            fn hash<H: Hasher>(&self, _state: &mut H) {}
-        }
-
-        impl<T: ?Sized + Intern> PartialEq for MemoizeInterned<T> {
-            fn eq(&self, _other: &Self) -> bool {
-                true
-            }
-        }
-
-        impl<T: ?Sized + Intern> Eq for MemoizeInterned<T> {}
-
-        impl<T: ?Sized + Intern> Clone for MemoizeInterned<T> {
-            fn clone(&self) -> Self {
-                *self
-            }
-        }
-
-        impl<T: ?Sized + Intern> Copy for MemoizeInterned<T> {}
-
-        impl<T: ?Sized + Intern> MemoizeGeneric for MemoizeInterned<T> {
-            type InputRef<'a> = LazyInternedFn<T>;
-
-            type InputOwned = LazyInternedFn<T>;
-
-            type InputCow<'a> = LazyInternedFn<T>;
-
-            type Output = Interned<T>;
-
-            fn input_eq(a: Self::InputRef<'_>, b: Self::InputRef<'_>) -> bool {
-                a == b
-            }
-
-            fn input_borrow(input: &Self::InputOwned) -> Self::InputRef<'_> {
-                *input
-            }
-
-            fn input_cow_into_owned(input: Self::InputCow<'_>) -> Self::InputOwned {
-                input
-            }
-
-            fn input_cow_borrow<'a>(input: &'a Self::InputCow<'_>) -> Self::InputRef<'a> {
-                *input
-            }
-
-            fn input_cow_from_owned<'a>(input: Self::InputOwned) -> Self::InputCow<'a> {
-                input
-            }
-
-            fn input_cow_from_ref(input: Self::InputRef<'_>) -> Self::InputCow<'_> {
-                input
-            }
-
-            fn inner(self, input: Self::InputRef<'_>) -> Self::Output {
-                input.0.get()
-            }
-        }
-        match self {
-            Self::Interned(retval) => retval,
-            Self::Lazy(retval) => MemoizeInterned(PhantomData).get(retval),
-        }
-    }
-}
-
 pub trait InternedCompare {
     type InternedCompareKey: Ord + Hash;
     fn interned_compare_key_ref(this: &Self) -> Self::InternedCompareKey;
@@ -593,71 +645,6 @@ impl<T: ?Sized + 'static + Send + Sync + ToOwned> From<Interned<T>> for Cow<'_,
     }
 }
 
-struct InternerState<T: ?Sized + 'static + Send + Sync> {
-    table: HashTable<&'static T>,
-    hasher: DefaultBuildHasher,
-}
-
-pub struct Interner<T: ?Sized + 'static + Send + Sync> {
-    state: Mutex<InternerState<T>>,
-}
-
-impl<T: ?Sized + 'static + Send + Sync> Interner<T> {
-    fn get() -> &'static Interner<T> {
-        static TYPE_ID_MAP: TypeIdMap = TypeIdMap::new();
-        TYPE_ID_MAP.get_or_insert_default()
-    }
-}
-
-impl<T: ?Sized + 'static + Send + Sync> Default for Interner<T> {
-    fn default() -> Self {
-        Self {
-            state: Mutex::new(InternerState {
-                table: HashTable::new(),
-                hasher: Default::default(),
-            }),
-        }
-    }
-}
-
-impl<T: ?Sized + 'static + Send + Sync + Hash + Eq + ToOwned> Interner<T> {
-    fn intern<F: FnOnce(Cow<'_, T>) -> &'static T>(
-        &self,
-        alloc: F,
-        value: Cow<'_, T>,
-    ) -> Interned<T> {
-        let mut state = self.state.lock().unwrap();
-        let InternerState { table, hasher } = &mut *state;
-        let inner = *table
-            .entry(
-                hasher.hash_one(&*value),
-                |k| **k == *value,
-                |k| hasher.hash_one(&**k),
-            )
-            .or_insert_with(|| alloc(value))
-            .get();
-        Interned { inner }
-    }
-}
-
-impl<T: Clone + 'static + Send + Sync + Hash + Eq> Interner<T> {
-    fn intern_sized(&self, value: Cow<'_, T>) -> Interned<T> {
-        self.intern(|value| Box::leak(Box::new(value.into_owned())), value)
-    }
-}
-
-impl<T: Clone + 'static + Send + Sync + Hash + Eq> Interner<[T]> {
-    fn intern_slice(&self, value: Cow<'_, [T]>) -> Interned<[T]> {
-        self.intern(|value| value.into_owned().leak(), value)
-    }
-}
-
-impl Interner<BitSlice> {
-    fn intern_bit_slice(&self, value: Cow<'_, BitSlice>) -> Interned<BitSlice> {
-        self.intern(|value| value.into_owned().leak(), value)
-    }
-}
-
 pub struct Interned<T: ?Sized + 'static + Send + Sync> {
     inner: &'static T,
 }
@@ -977,7 +964,7 @@ impl<T: Clone + Send + Sync + 'static + Hash + Eq> Intern for T {
     where
         Self: ToOwned,
     {
-        Interner::get().intern_sized(this)
+        interner::Interner::get().intern_sized(this)
     }
 }
 
@@ -997,7 +984,7 @@ impl<T: Clone + Send + Sync + 'static + Hash + Eq> Intern for [T] {
     where
         Self: ToOwned,
     {
-        Interner::get().intern_slice(this)
+        interner::Interner::get().intern_slice(this)
     }
 }
 
@@ -1017,7 +1004,7 @@ impl Intern for BitSlice {
     where
         Self: ToOwned,
     {
-        Interner::get().intern_bit_slice(this)
+        interner::Interner::get().intern_bit_slice(this)
     }
 }
 
@@ -1035,10 +1022,17 @@ pub trait MemoizeGeneric: 'static + Send + Sync + Hash + Eq + Copy {
     fn inner(self, input: Self::InputRef<'_>) -> Self::Output;
     fn get_cow(self, input: Self::InputCow<'_>) -> Self::Output {
         static TYPE_ID_MAP: TypeIdMap = TypeIdMap::new();
+        thread_local! {
+            static TYPE_ID_MAP_CACHE: TypeIdMap = const { TypeIdMap::new() };
+        }
         let map: &RwLock<(
             DefaultBuildHasher,
             HashTable<(Self, Self::InputOwned, Self::Output)>,
-        )> = TYPE_ID_MAP.get_or_insert_default();
+        )> = TYPE_ID_MAP_CACHE.with(|cache| {
+            cache.get_or_insert_with(|| {
+                TYPE_ID_MAP.get_or_insert_with(|| Box::leak(Default::default()))
+            })
+        });
         fn hash_eq_key<'a, 'b, T: MemoizeGeneric>(
             this: &'a T,
             input: T::InputRef<'b>,
@@ -1140,3 +1134,35 @@ pub trait Memoize: 'static + Send + Sync + Hash + Eq + Copy {
         self.get_cow(Cow::Borrowed(input))
     }
 }
+
+/// like `once_cell::race::OnceBox` but for `Interned<T>` instead of `Box<T>`
+pub struct OnceInterned<T: 'static + Send + Sync>(OnceRef<'static, T>);
+
+impl<T: 'static + Send + Sync + fmt::Debug> fmt::Debug for OnceInterned<T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_tuple("OnceInterned").field(&self.get()).finish()
+    }
+}
+
+impl<T: 'static + Send + Sync> Default for OnceInterned<T> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<T: 'static + Send + Sync> OnceInterned<T> {
+    pub const fn new() -> Self {
+        Self(OnceRef::new())
+    }
+    pub fn set(&self, v: Interned<T>) -> Result<(), ()> {
+        self.0.set(v.inner)
+    }
+    pub fn get(&self) -> Option<Interned<T>> {
+        self.0.get().map(|inner| Interned { inner })
+    }
+    pub fn get_or_init<F: FnOnce() -> Interned<T>>(&self, f: F) -> Interned<T> {
+        Interned {
+            inner: self.0.get_or_init(|| f().inner),
+        }
+    }
+}

crates/fayalite/src/intern/interner.rs

@@ -0,0 +1,117 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// See Notices.txt for copyright information
+
+use crate::{
+    intern::{Interned, type_map::TypeIdMap},
+    util::DefaultBuildHasher,
+};
+use bitvec::slice::BitSlice;
+use hashbrown::HashTable;
+use std::{
+    borrow::Cow,
+    hash::{BuildHasher, Hash},
+    sync::RwLock,
+};
+
+struct InternerShard<T: ?Sized + 'static + Send + Sync> {
+    table: HashTable<&'static T>,
+}
+
+const LOG2_SHARD_COUNT: u32 = 6;
+
+fn shard_index_from_hash(hash: u64) -> usize {
+    // number of bits used for hashbrown's Tag
+    const HASH_BROWN_TAG_BITS: u32 = 7;
+    // try to extract bits of the hash that hashbrown isn't using,
+    // while accounting for some hash functions only returning `usize` bits.
+    const SHARD_INDEX_START: u32 = usize::BITS
+        .saturating_sub(HASH_BROWN_TAG_BITS)
+        .saturating_sub(LOG2_SHARD_COUNT);
+    let mut shard_index = hash >> SHARD_INDEX_START;
+    shard_index %= 1 << LOG2_SHARD_COUNT;
+    shard_index as usize
+}
+
+pub(crate) struct Interner<T: ?Sized + 'static + Send + Sync> {
+    shards: [RwLock<InternerShard<T>>; 1 << LOG2_SHARD_COUNT],
+    hasher: DefaultBuildHasher,
+}
+
+impl<T: ?Sized + 'static + Send + Sync> Interner<T> {
+    pub(crate) fn get() -> &'static Interner<T> {
+        static TYPE_ID_MAP: TypeIdMap = TypeIdMap::new();
+        thread_local! {
+            static TYPE_ID_MAP_CACHE: TypeIdMap = const { TypeIdMap::new() };
+        }
+        TYPE_ID_MAP_CACHE.with(|cache| {
+            cache.get_or_insert_with(|| {
+                TYPE_ID_MAP.get_or_insert_with(|| Box::leak(Default::default()))
+            })
+        })
+    }
+}
+
+impl<T: ?Sized + 'static + Send + Sync> Default for Interner<T> {
+    fn default() -> Self {
+        Self {
+            shards: [const {
+                RwLock::new(InternerShard {
+                    table: HashTable::new(),
+                })
+            }; _],
+            hasher: Default::default(),
+        }
+    }
+}
+
+impl<T: ?Sized + 'static + Send + Sync + Hash + Eq + ToOwned> Interner<T> {
+    fn intern<F: FnOnce(Cow<'_, T>) -> &'static T>(
+        &self,
+        alloc: F,
+        value: Cow<'_, T>,
+    ) -> Interned<T> {
+        let hash = self.hasher.hash_one(&*value);
+        let shard_index = shard_index_from_hash(hash);
+        let shard = &self.shards[shard_index];
+        let shard_read = shard.read().unwrap();
+        let Some(&inner) = shard_read.table.find(hash, |k| **k == *value) else {
+            drop(shard_read);
+            return self.intern_cold(alloc, value, hash, shard);
+        };
+        Interned { inner }
+    }
+    #[cold]
+    fn intern_cold<F: FnOnce(Cow<'_, T>) -> &'static T>(
+        &self,
+        alloc: F,
+        value: Cow<'_, T>,
+        hash: u64,
+        shard: &RwLock<InternerShard<T>>,
+    ) -> Interned<T> {
+        let mut shard = shard.write().unwrap();
+        let inner = *shard
+            .table
+            .entry(hash, |k| **k == *value, |k| self.hasher.hash_one(&**k))
+            .or_insert_with(|| alloc(value))
+            .get();
+        Interned { inner }
+    }
+}
+
+impl<T: Clone + 'static + Send + Sync + Hash + Eq> Interner<T> {
+    pub(crate) fn intern_sized(&self, value: Cow<'_, T>) -> Interned<T> {
+        self.intern(|value| Box::leak(Box::new(value.into_owned())), value)
+    }
+}
+
+impl<T: Clone + 'static + Send + Sync + Hash + Eq> Interner<[T]> {
+    pub(crate) fn intern_slice(&self, value: Cow<'_, [T]>) -> Interned<[T]> {
+        self.intern(|value| value.into_owned().leak(), value)
+    }
+}
+
+impl Interner<BitSlice> {
+    pub(crate) fn intern_bit_slice(&self, value: Cow<'_, BitSlice>) -> Interned<BitSlice> {
+        self.intern(|value| value.into_owned().leak(), value)
+    }
+}

crates/fayalite/src/intern/type_map.rs

@@ -6,7 +6,7 @@ use std::{
     sync::RwLock,
 };
 
-struct TypeIdHasher(u64);
+pub(crate) struct TypeIdHasher(u64);
 
 // assumes TypeId has at least 64 bits that is a good hash
 impl Hasher for TypeIdHasher {
@@ -63,7 +63,7 @@ impl Hasher for TypeIdHasher {
     }
 }
 
-struct TypeIdBuildHasher;
+pub(crate) struct TypeIdBuildHasher;
 
 impl BuildHasher for TypeIdBuildHasher {
     type Hasher = TypeIdHasher;
@@ -87,20 +87,23 @@ impl TypeIdMap {
     fn insert_slow(
         &self,
         type_id: TypeId,
-        make: fn() -> Box<dyn Any + Sync + Send>,
+        make: impl FnOnce() -> &'static (dyn Any + Sync + Send),
     ) -> &'static (dyn Any + Sync + Send) {
-        let value = Box::leak(make());
+        let value = make();
         let mut write_guard = self.0.write().unwrap();
         *write_guard.entry(type_id).or_insert(value)
     }
-    pub(crate) fn get_or_insert_default<T: Sized + Any + Send + Sync + Default>(&self) -> &T {
+    pub(crate) fn get_or_insert_with<T: Sized + Any + Send + Sync>(
+        &self,
+        make: impl FnOnce() -> &'static T,
+    ) -> &'static T {
         let type_id = TypeId::of::<T>();
         let read_guard = self.0.read().unwrap();
         let retval = read_guard.get(&type_id).map(|v| *v);
         drop(read_guard);
         let retval = match retval {
             Some(retval) => retval,
-            None => self.insert_slow(type_id, move || Box::new(T::default())),
+            None => self.insert_slow(type_id, move || make()),
         };
         retval.downcast_ref().expect("known to have correct TypeId")
     }

crates/fayalite/src/phantom_const.rs

@@ -4,7 +4,7 @@
 use crate::{
     expr::{Expr, HdlPartialEqImpl, HdlPartialOrdImpl, ToExpr, ValueType},
     int::Bool,
-    intern::{Intern, Interned, InternedCompare, LazyInterned, LazyInternedTrait, Memoize},
+    intern::{Intern, Interned, InternedCompare, LazyInterned, Memoize},
     sim::value::{SimValue, ToSimValue, ToSimValueWithType},
     source_location::SourceLocation,
     ty::{
@@ -240,11 +240,17 @@ impl<T: ?Sized + PhantomConstValue> PhantomConst<T> {
     {
         Self::new_interned(value.intern_deref())
     }
-    pub const fn new_lazy(v: &'static dyn LazyInternedTrait<T>) -> Self {
+    pub const fn new_const<V: Default + Into<Interned<T>>>() -> Self {
         Self {
-            value: LazyInterned::new_lazy(v),
+            value: LazyInterned::new_const::<V>(),
         }
     }
+    pub const fn new_const_default() -> Self
+    where
+        Interned<T>: Default,
+    {
+        Self::new_const::<Interned<T>>()
+    }
     pub fn get(self) -> Interned<T> {
         self.value.interned()
     }
@@ -334,9 +340,7 @@ impl<T: ?Sized + PhantomConstValue> StaticType for PhantomConst<T>
 where
     Interned<T>: Default,
 {
-    const TYPE: Self = PhantomConst {
+    const TYPE: Self = Self::new_const_default();
-        value: LazyInterned::new_lazy(&Interned::<T>::default),
-    };
     const MASK_TYPE: Self::MaskType = ();
     const TYPE_PROPERTIES: TypeProperties = <()>::TYPE_PROPERTIES;
     const MASK_TYPE_PROPERTIES: TypeProperties = <()>::TYPE_PROPERTIES;

crates/fayalite/src/sim.rs

@@ -40,7 +40,7 @@ use crate::{
         OpaqueSimValue, OpaqueSimValueSize, OpaqueSimValueSizeRange, OpaqueSimValueSlice,
         OpaqueSimValueWriter,
     },
-    util::{BitSliceWriteWithBase, DebugAsDisplay, HashMap, HashSet},
+    util::{BitSliceWriteWithBase, DebugAsDisplay, HashMap, HashSet, copy_le_bytes_to_bitslice},
 };
 use bitvec::{bits, order::Lsb0, slice::BitSlice, vec::BitVec, view::BitView};
 use num_bigint::BigInt;
@@ -2198,14 +2198,11 @@ impl SimulationImpl {
                 SimTraceKind::BigUInt { index, ty: _ } | SimTraceKind::BigSInt { index, ty: _ } => {
                     let state = state.unwrap_bits_mut();
                     let bigint = &self.state.big_slots[index];
-                    let mut bytes = bigint.to_signed_bytes_le();
+                    copy_le_bytes_to_bitslice(
-                    bytes.resize(
+                        state,
-                        state.len().div_ceil(8),
+                        &bigint.to_signed_bytes_le(),
-                        if bigint.is_negative() { 0xFF } else { 0 },
+                        bigint.is_negative(),
                     );
-                    let bitslice = BitSlice::<u8, Lsb0>::from_slice(&bytes);
-                    let bitslice = &bitslice[..state.len()];
-                    state.clone_from_bitslice(bitslice);
                 }
                 SimTraceKind::BigBool { index }
                 | SimTraceKind::BigAsyncReset { index }

crates/fayalite/src/sim/vcd.rs

@@ -21,14 +21,30 @@ use crate::{
 };
 use bitvec::{order::Lsb0, slice::BitSlice};
 use hashbrown::hash_map::Entry;
+use sha2::{Digest, Sha256};
 use std::{
+    collections::BTreeMap,
     fmt::{self, Write as _},
     io, mem,
 };
 
-#[derive(Default)]
+#[derive(Default, Clone)]
+struct PathHash(Sha256);
+
+impl PathHash {
+    fn joined(mut self, segment: impl AsRef<[u8]>) -> Self {
+        let segment = segment.as_ref();
+        self.0.update(u32::to_le_bytes(
+            segment.len().try_into().expect("path segment is too big"),
+        ));
+        self.0.update(segment);
+        self
+    }
+}
+
 struct Scope {
     last_inserted: HashMap<Interned<str>, usize>,
+    path_hash: PathHash,
 }
 
 #[derive(Copy, Clone)]
@@ -61,6 +77,13 @@ impl fmt::Display for VerilogIdentifier {
 }
 
 impl Scope {
+    fn new(path_hash: PathHash) -> Self {
+        Self {
+            last_inserted: Default::default(),
+            path_hash,
+        }
+    }
+
     fn new_identifier(&mut self, unescaped_name: Interned<str>) -> VerilogIdentifier {
         let next_disambiguator = match self.last_inserted.entry(unescaped_name) {
             Entry::Vacant(entry) => {
@@ -171,12 +194,10 @@ fn write_vcd_scope<W: io::Write, R>(
     scope: &mut Scope,
     f: impl FnOnce(&mut W, &mut Scope) -> io::Result<R>,
 ) -> io::Result<R> {
-    writeln!(
+    let path_hash = scope.path_hash.clone().joined(scope_name);
-        writer,
+    let scope_name = scope.new_identifier(scope_name);
-        "$scope {scope_type} {} $end",
+    writeln!(writer, "$scope {scope_type} {scope_name} $end")?;
-        scope.new_identifier(scope_name),
+    let retval = f(writer, &mut Scope::new(path_hash))?;
-    )?;
-    let retval = f(writer, &mut Scope::default())?;
     writeln!(writer, "$upscope $end")?;
     Ok(retval)
 }
@@ -291,19 +312,75 @@ impl WriteTrace for TraceScalar {
     }
 }
 
-fn write_vcd_id<W: io::Write>(writer: &mut W, mut id: usize) -> io::Result<()> {
+#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
-    let min_char = b'!';
+#[repr(transparent)]
-    let max_char = b'~';
+struct VcdId(u64);
-    let base = (max_char - min_char + 1) as usize;
+
+impl VcdId {
+    const CHAR_RANGE: std::ops::RangeInclusive<u8> = b'!'..=b'~';
+    const BASE: u8 = *Self::CHAR_RANGE.end() - *Self::CHAR_RANGE.start() + 1;
+    const LOW_HALF_CHARS: u32 = 5;
+    const LOW_HALF_MODULUS: u64 = (Self::BASE as u64).pow(Self::LOW_HALF_CHARS);
+
+    const fn from_str(s: &str) -> Option<Self> {
+        if s.is_empty() {
+            return None;
+        }
+        let mut retval = 0u64;
+        let mut bytes = s.as_bytes();
+        while let [ref rest @ .., digit] = *bytes {
+            bytes = rest;
+            let Some(digit) = digit.checked_sub(*Self::CHAR_RANGE.start()) else {
+                return None;
+            };
+            if digit >= Self::BASE {
+                return None;
+            }
+            let Some(v) = retval.checked_mul(Self::BASE as _) else {
+                return None;
+            };
+            let Some(v) = v.checked_add(digit as _) else {
+                return None;
+            };
+            retval = v;
+        }
+        Some(Self(retval))
+    }
+    #[must_use]
+    const fn write(self, out: &mut [u8]) -> usize {
+        let mut id = self.0;
+        let mut len = 0;
         loop {
-        let digit = (id % base) as u8 + min_char;
+            let digit = (id % Self::BASE as u64) as u8 + *Self::CHAR_RANGE.start();
-        id /= base;
+            id /= Self::BASE as u64;
-        writer.write_all(&[digit])?;
+            if len < out.len() {
+                out[len] = digit;
+            }
+            len += 1;
             if id == 0 {
                 break;
             }
         }
-    Ok(())
+        len
+    }
+    const MAX_ID_LEN: usize = Self(u64::MAX).write(&mut []);
+}
+
+/// check that VcdId properly round-trips
+const _: () = {
+    let s = "RoundTrip";
+    let Some(id) = VcdId::from_str(s) else {
+        unreachable!();
+    };
+    let mut buf = [0u8; VcdId::MAX_ID_LEN];
+    let len = id.write(&mut buf);
+    assert!(crate::util::const_bytes_cmp(buf.split_at(len).0, s.as_bytes()).is_eq());
+};
+
+fn write_vcd_id<W: io::Write>(writer: &mut W, id: VcdId) -> io::Result<()> {
+    let mut buf = [0u8; VcdId::MAX_ID_LEN];
+    let len = id.write(&mut buf);
+    writer.write_all(&buf[..len])
 }
 
 struct Escaped<T: fmt::Display>(T);
@@ -346,13 +423,16 @@ impl<T: fmt::Display> fmt::Display for Escaped<T> {
 
 fn write_vcd_var<W: io::Write>(
     properties: &mut VcdWriterProperties,
+    scope: &mut Scope,
     memory_element_part_body: MemoryElementPartBody,
     writer: &mut W,
     var_type: &str,
     size: usize,
     location: TraceLocation,
-    name: VerilogIdentifier,
+    name: Interned<str>,
 ) -> io::Result<()> {
+    let path_hash = scope.path_hash.clone().joined(name);
+    let name = scope.new_identifier(name);
     let id = match location {
         TraceLocation::Scalar(id) => id.as_usize(),
         TraceLocation::Memory(TraceMemoryLocation {
@@ -384,6 +464,9 @@ fn write_vcd_var<W: io::Write>(
             first_id + *element_index
         }
     };
+    let id = properties
+        .scalar_id_to_vcd_id_map
+        .builder_get_or_insert(id, &path_hash);
     write!(writer, "$var {var_type} {size} ")?;
     write_vcd_id(writer, id)?;
     writeln!(writer, " {name} $end")
@@ -414,12 +497,13 @@ impl WriteTrace for TraceUInt {
         }
         write_vcd_var(
             properties,
+            scope,
             MemoryElementPartBody::Scalar,
             writer,
             var_type,
             ty.width(),
             location,
-            scope.new_identifier(name),
+            name,
         )
     }
 }
@@ -494,12 +578,13 @@ impl WriteTrace for TraceEnumDiscriminant {
         } = self;
         write_vcd_var(
             properties,
+            scope,
             MemoryElementPartBody::EnumDiscriminant { ty },
             writer,
             "string",
             1,
             location,
-            scope.new_identifier(name),
+            name,
         )
     }
 }
@@ -569,12 +654,13 @@ impl WriteTrace for TracePhantomConst {
         } = self;
         write_vcd_var(
             properties,
+            scope,
             MemoryElementPartBody::Scalar,
             writer,
             "string",
             1,
             location,
-            scope.new_identifier(name),
+            name,
         )
     }
 }
@@ -596,12 +682,13 @@ impl WriteTrace for TraceSimOnly {
         } = self;
         write_vcd_var(
             properties,
+            scope,
             MemoryElementPartBody::Scalar,
             writer,
             "string",
             1,
             location,
-            scope.new_identifier(name),
+            name,
         )
     }
 }
@@ -923,6 +1010,9 @@ impl<W: io::Write> TraceWriterDecls for VcdWriterDecls<W> {
         writeln!(writer, "$timescale {} $end", vcd_timescale(timescale))?;
         let mut properties = VcdWriterProperties {
             next_scalar_id: trace_scalar_id_count,
+            scalar_id_to_vcd_id_map: ScalarIdToVcdIdMapOrBuilder::Builder(
+                ScalarIdToVcdIdMapBuilder::default(),
+            ),
             memory_properties: (0..trace_memory_id_count)
                 .map(|_| MemoryProperties {
                     element_parts: Vec::with_capacity(8),
@@ -935,9 +1025,16 @@ impl<W: io::Write> TraceWriterDecls for VcdWriterDecls<W> {
             &mut writer,
             ArgModule {
                 properties: &mut properties,
-                scope: &mut Scope::default(),
+                scope: &mut Scope::new(PathHash::default()),
             },
         )?;
+        let ScalarIdToVcdIdMapOrBuilder::Builder(scalar_id_to_vcd_id_map_builder) =
+            properties.scalar_id_to_vcd_id_map
+        else {
+            unreachable!();
+        };
+        properties.scalar_id_to_vcd_id_map =
+            ScalarIdToVcdIdMapOrBuilder::Built(scalar_id_to_vcd_id_map_builder.build());
         writeln!(writer, "$enddefinitions $end")?;
         writeln!(writer, "$dumpvars")?;
         Ok(VcdWriter {
@@ -967,8 +1064,88 @@ struct MemoryProperties {
     element_index: usize,
 }
 
+struct ScalarIdToVcdIdMap {
+    scalar_id_to_vcd_id_map: Box<[VcdId]>,
+}
+
+#[derive(Default)]
+struct ScalarIdToVcdIdMapBuilder {
+    scalar_id_to_vcd_id_map: BTreeMap<usize, VcdId>,
+    lower_half_to_next_upper_half_map: HashMap<u64, u64>,
+}
+
+impl ScalarIdToVcdIdMapBuilder {
+    /// `VcdId`s are based off of `path_hash` (and not `scalar_id`) since the hash doesn't change
+    /// when unrelated variables are added/removed, making the generated VCD more friendly for git diff.
+    fn get_or_insert(&mut self, scalar_id: usize, path_hash: &PathHash) -> VcdId {
+        *self
+            .scalar_id_to_vcd_id_map
+            .entry(scalar_id)
+            .or_insert_with(|| {
+                let hash = u128::from_le_bytes(
+                    *path_hash
+                        .0
+                        .clone()
+                        .finalize()
+                        .first_chunk()
+                        .expect("known to be bigger than u128"),
+                );
+                let lower_half = (hash % VcdId::LOW_HALF_MODULUS as u128) as u64;
+                let next_upper_half = self
+                    .lower_half_to_next_upper_half_map
+                    .entry(lower_half)
+                    .or_insert(0);
+                let upper_half = *next_upper_half;
+                *next_upper_half += 1;
+                let Some(id) = upper_half
+                    .checked_mul(VcdId::LOW_HALF_MODULUS)
+                    .and_then(|v| v.checked_add(lower_half))
+                else {
+                    panic!("too many VcdIds");
+                };
+                VcdId(id)
+            })
+    }
+    fn build(self) -> ScalarIdToVcdIdMap {
+        ScalarIdToVcdIdMap {
+            scalar_id_to_vcd_id_map: self
+                .scalar_id_to_vcd_id_map
+                .into_iter()
+                .enumerate()
+                .map(|(index, (scalar_id, vcd_id))| {
+                    if index != scalar_id {
+                        panic!("missing scalar id {index}");
+                    }
+                    vcd_id
+                })
+                .collect(),
+        }
+    }
+}
+
+enum ScalarIdToVcdIdMapOrBuilder {
+    Builder(ScalarIdToVcdIdMapBuilder),
+    Built(ScalarIdToVcdIdMap),
+}
+
+impl ScalarIdToVcdIdMapOrBuilder {
+    fn built_scalar_id_to_vcd_id(&self, scalar_id: usize) -> VcdId {
+        let Self::Built(v) = self else {
+            panic!("ScalarIdToVcdIdMap isn't built yet");
+        };
+        v.scalar_id_to_vcd_id_map[scalar_id]
+    }
+    fn builder_get_or_insert(&mut self, scalar_id: usize, path_hash: &PathHash) -> VcdId {
+        let Self::Builder(v) = self else {
+            panic!("ScalarIdToVcdIdMap is already built");
+        };
+        v.get_or_insert(scalar_id, path_hash)
+    }
+}
+
 struct VcdWriterProperties {
     next_scalar_id: usize,
+    scalar_id_to_vcd_id_map: ScalarIdToVcdIdMapOrBuilder,
     memory_properties: Box<[MemoryProperties]>,
 }
 
@@ -988,7 +1165,7 @@ impl<W: io::Write + 'static> VcdWriter<W> {
 fn write_string_value_change(
     writer: &mut impl io::Write,
     value: impl fmt::Display,
-    id: usize,
+    id: VcdId,
 ) -> io::Result<()> {
     write!(writer, "s{} ", Escaped(value))?;
     write_vcd_id(writer, id)?;
@@ -998,7 +1175,7 @@ fn write_string_value_change(
 fn write_bits_value_change(
     writer: &mut impl io::Write,
     value: &BitSlice,
-    id: usize,
+    id: VcdId,
 ) -> io::Result<()> {
     match value.len() {
         0 => writer.write_all(b"s0 ")?,
@@ -1028,7 +1205,7 @@ fn write_enum_discriminant_value_change(
     writer: &mut impl io::Write,
     variant_index: usize,
     ty: Enum,
-    id: usize,
+    id: VcdId,
 ) -> io::Result<()> {
     write_string_value_change(
         writer,
@@ -1063,7 +1240,9 @@ impl<W: io::Write> TraceWriter for VcdWriter<W> {
                 MemoryElementPartBody::Scalar => write_bits_value_change(
                     &mut self.writer,
                     &element_data[start..start + len],
-                    first_id + element_index,
+                    self.properties
+                        .scalar_id_to_vcd_id_map
+                        .built_scalar_id_to_vcd_id(first_id + element_index),
                 )?,
                 MemoryElementPartBody::EnumDiscriminant { ty } => {
                     let mut variant_index = 0;
@@ -1073,7 +1252,9 @@ impl<W: io::Write> TraceWriter for VcdWriter<W> {
                         &mut self.writer,
                         variant_index,
                         *ty,
-                        first_id + element_index,
+                        self.properties
+                            .scalar_id_to_vcd_id_map
+                            .built_scalar_id_to_vcd_id(first_id + element_index),
                     )?
                 }
             }
@@ -1082,11 +1263,23 @@ impl<W: io::Write> TraceWriter for VcdWriter<W> {
     }
 
     fn set_signal_uint(&mut self, id: TraceScalarId, value: &BitSlice) -> Result<(), Self::Error> {
-        write_bits_value_change(&mut self.writer, value, id.as_usize())
+        write_bits_value_change(
+            &mut self.writer,
+            value,
+            self.properties
+                .scalar_id_to_vcd_id_map
+                .built_scalar_id_to_vcd_id(id.as_usize()),
+        )
     }
 
     fn set_signal_sint(&mut self, id: TraceScalarId, value: &BitSlice) -> Result<(), Self::Error> {
-        write_bits_value_change(&mut self.writer, value, id.as_usize())
+        write_bits_value_change(
+            &mut self.writer,
+            value,
+            self.properties
+                .scalar_id_to_vcd_id_map
+                .built_scalar_id_to_vcd_id(id.as_usize()),
+        )
     }
 
     fn finish_init(&mut self) -> Result<(), Self::Error> {
@@ -1118,7 +1311,14 @@ impl<W: io::Write> TraceWriter for VcdWriter<W> {
         variant_index: usize,
         ty: Enum,
     ) -> Result<(), Self::Error> {
-        write_enum_discriminant_value_change(&mut self.writer, variant_index, ty, id.as_usize())
+        write_enum_discriminant_value_change(
+            &mut self.writer,
+            variant_index,
+            ty,
+            self.properties
+                .scalar_id_to_vcd_id_map
+                .built_scalar_id_to_vcd_id(id.as_usize()),
+        )
     }
 
     fn set_signal_phantom_const(
@@ -1128,7 +1328,13 @@ impl<W: io::Write> TraceWriter for VcdWriter<W> {
     ) -> Result<(), Self::Error> {
         // avoid multi-line strings because GTKWave can't display them properly:
         // https://github.com/gtkwave/gtkwave/issues/460
-        write_string_value_change(&mut self.writer, format_args!("{ty:?}"), id.as_usize())
+        write_string_value_change(
+            &mut self.writer,
+            format_args!("{ty:?}"),
+            self.properties
+                .scalar_id_to_vcd_id_map
+                .built_scalar_id_to_vcd_id(id.as_usize()),
+        )
     }
 
     fn set_signal_sim_only_value(
@@ -1136,7 +1342,13 @@ impl<W: io::Write> TraceWriter for VcdWriter<W> {
         id: TraceScalarId,
         value: &DynSimOnlyValue,
     ) -> Result<(), Self::Error> {
-        write_string_value_change(&mut self.writer, format_args!("{value:?}"), id.as_usize())
+        write_string_value_change(
+            &mut self.writer,
+            format_args!("{value:?}"),
+            self.properties
+                .scalar_id_to_vcd_id_map
+                .built_scalar_id_to_vcd_id(id.as_usize()),
+        )
     }
 }
 
@@ -1161,7 +1373,7 @@ mod tests {
 
     #[test]
     fn test_scope() {
-        let mut scope = Scope::default();
+        let mut scope = Scope::new(PathHash::default());
         assert_eq!(&*scope.new_identifier("foo".intern()).unescaped_name, "foo");
         assert_eq!(
             &*scope.new_identifier("foo_0".intern()).unescaped_name,

crates/fayalite/src/util.rs

@@ -41,7 +41,7 @@ pub use misc::{
     os_str_strip_suffix, serialize_to_json_ascii, serialize_to_json_ascii_pretty,
     serialize_to_json_ascii_pretty_with_indent, slice_range, try_slice_range,
 };
-pub(crate) use misc::{InternedStrCompareAsStr, chain};
+pub(crate) use misc::{InternedStrCompareAsStr, chain, copy_le_bytes_to_bitslice};
 
 pub mod job_server;
 pub mod prefix_sum;

crates/fayalite/src/util/misc.rs

@@ -612,3 +612,43 @@ impl std::borrow::Borrow<str> for InternedStrCompareAsStr {
         &self.0
     }
 }
+
+pub(crate) fn copy_le_bytes_to_bitslice(
+    dest: &mut BitSlice<usize, Lsb0>,
+    bytes: &[u8],
+    msb_fill: bool,
+) {
+    let (chunks, remainder) = bytes.as_chunks();
+    let mut filled_to = 0;
+    for (i, chunk) in chunks.iter().enumerate() {
+        if let Some(start_bit_index) = i.checked_mul(usize::BITS as usize)
+            && start_bit_index < dest.len()
+        {
+            let end_bit_index = start_bit_index
+                .saturating_add(usize::BITS as usize)
+                .min(dest.len());
+            let bit_len = end_bit_index - start_bit_index;
+            let chunk = usize::from_le_bytes(*chunk);
+            dest[start_bit_index..end_bit_index].copy_from_bitslice(&chunk.view_bits()[..bit_len]);
+            filled_to = end_bit_index;
+        } else {
+            break;
+        }
+    }
+    if !remainder.is_empty() {
+        if let Some(start_bit_index) = chunks.len().checked_mul(usize::BITS as usize)
+            && start_bit_index < dest.len()
+        {
+            let end_bit_index = start_bit_index
+                .saturating_add(usize::BITS as usize)
+                .min(dest.len());
+            let bit_len = end_bit_index - start_bit_index;
+            let mut chunk = [if msb_fill { !0 } else { 0 }; _];
+            chunk[..remainder.len()].copy_from_slice(remainder);
+            let chunk = usize::from_le_bytes(chunk);
+            dest[start_bit_index..end_bit_index].copy_from_bitslice(&chunk.view_bits()[..bit_len]);
+            filled_to = end_bit_index;
+        }
+    }
+    dest[filled_to..].fill(msb_fill);
+}

crates/fayalite/tests/hdl_types.rs

@@ -244,3 +244,13 @@ pub struct MyTypeWithPrivateMembersWithArg<T> {
     pub(crate) b: MyPubCrateTypeWithArg<T>,
     pub c: T,
 }
+
+#[hdl(outline_generated)]
+pub enum EnumWithOnlyOneVariant {
+    A,
+}
+
+#[hdl(outline_generated)]
+pub enum EnumWithOnlyOneVariant2<T> {
+    A(T),
+}

crates/fayalite/tests/sim/expected/array_rw.vcd

@@ -1,283 +1,283 @@
 $timescale 1 ps $end
 $scope module array_rw $end
 $scope struct array_in $end
-$var wire 8 ! \[0] $end
+$var wire 8 Yvfu^ \[0] $end
-$var wire 8 " \[1] $end
+$var wire 8 |Cs`W \[1] $end
-$var wire 8 # \[2] $end
+$var wire 8 M!nsb \[2] $end
-$var wire 8 $ \[3] $end
+$var wire 8 59L{w \[3] $end
-$var wire 8 % \[4] $end
+$var wire 8 o2+|F \[4] $end
-$var wire 8 & \[5] $end
+$var wire 8 ikzV5 \[5] $end
-$var wire 8 ' \[6] $end
+$var wire 8 [E$Z* \[6] $end
-$var wire 8 ( \[7] $end
+$var wire 8 ?"~01 \[7] $end
-$var wire 8 ) \[8] $end
+$var wire 8 /kghT \[8] $end
-$var wire 8 * \[9] $end
+$var wire 8 +}(9) \[9] $end
-$var wire 8 + \[10] $end
+$var wire 8 iMP}= \[10] $end
-$var wire 8 , \[11] $end
+$var wire 8 2M0tL \[11] $end
-$var wire 8 - \[12] $end
+$var wire 8 :AjkA \[12] $end
-$var wire 8 . \[13] $end
+$var wire 8 VM_:8 \[13] $end
-$var wire 8 / \[14] $end
+$var wire 8 UveL2 \[14] $end
-$var wire 8 0 \[15] $end
+$var wire 8 A)9Z6 \[15] $end
 $upscope $end
 $scope struct array_out $end
-$var wire 8 1 \[0] $end
+$var wire 8 2zdj1 \[0] $end
-$var wire 8 2 \[1] $end
+$var wire 8 =;m_[ \[1] $end
-$var wire 8 3 \[2] $end
+$var wire 8 @9Hd \[2] $end
-$var wire 8 4 \[3] $end
+$var wire 8 C:="| \[3] $end
-$var wire 8 5 \[4] $end
+$var wire 8 IDk7# \[4] $end
-$var wire 8 6 \[5] $end
+$var wire 8 i]E1i \[5] $end
-$var wire 8 7 \[6] $end
+$var wire 8 tK,M] \[6] $end
-$var wire 8 8 \[7] $end
+$var wire 8 tGp!\ \[7] $end
-$var wire 8 9 \[8] $end
+$var wire 8 ."qjK \[8] $end
-$var wire 8 : \[9] $end
+$var wire 8 AUO:R \[9] $end
-$var wire 8 ; \[10] $end
+$var wire 8 'kx`n \[10] $end
-$var wire 8 < \[11] $end
+$var wire 8 U&(K\ \[11] $end
-$var wire 8 = \[12] $end
+$var wire 8 q<O41 \[12] $end
-$var wire 8 > \[13] $end
+$var wire 8 zvj)] \[13] $end
-$var wire 8 ? \[14] $end
+$var wire 8 >0H<( \[14] $end
-$var wire 8 @ \[15] $end
+$var wire 8 ARhXJ \[15] $end
 $upscope $end
-$var wire 8 A read_index $end
+$var wire 8 -n:7@ read_index $end
-$var wire 8 B read_data $end
+$var wire 8 >h<=Z read_data $end
-$var wire 8 C write_index $end
+$var wire 8 [xld3 write_index $end
-$var wire 8 D write_data $end
+$var wire 8 J+DYh write_data $end
-$var wire 1 E write_en $end
+$var wire 1 z,@WW write_en $end
 $scope struct array_wire $end
-$var wire 8 F \[0] $end
+$var wire 8 B{KJS \[0] $end
-$var wire 8 G \[1] $end
+$var wire 8 V'K*& \[1] $end
-$var wire 8 H \[2] $end
+$var wire 8 4zI$O \[2] $end
-$var wire 8 I \[3] $end
+$var wire 8 %TTk[ \[3] $end
-$var wire 8 J \[4] $end
+$var wire 8 IgSeY \[4] $end
-$var wire 8 K \[5] $end
+$var wire 8 &&1T" \[5] $end
-$var wire 8 L \[6] $end
+$var wire 8 5)-l\ \[6] $end
-$var wire 8 M \[7] $end
+$var wire 8 0RsLb \[7] $end
-$var wire 8 N \[8] $end
+$var wire 8 T>:}D \[8] $end
-$var wire 8 O \[9] $end
+$var wire 8 DPpZ* \[9] $end
-$var wire 8 P \[10] $end
+$var wire 8 %E(nf \[10] $end
-$var wire 8 Q \[11] $end
+$var wire 8 2'pba \[11] $end
-$var wire 8 R \[12] $end
+$var wire 8 e/c1: \[12] $end
-$var wire 8 S \[13] $end
+$var wire 8 ;w.C7 \[13] $end
-$var wire 8 T \[14] $end
+$var wire 8 fwdfu \[14] $end
-$var wire 8 U \[15] $end
+$var wire 8 *R\vx \[15] $end
 $upscope $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-b11111111 !
+b11111111 Yvfu^
-b1111111 "
+b1111111 |Cs`W
-b111111 #
+b111111 M!nsb
-b11111 $
+b11111 59L{w
-b1111 %
+b1111 o2+|F
-b111 &
+b111 ikzV5
-b11 '
+b11 [E$Z*
-b1 (
+b1 ?"~01
-b0 )
+b0 /kghT
-b10000000 *
+b10000000 +}(9)
-b11000000 +
+b11000000 iMP}=
-b11100000 ,
+b11100000 2M0tL
-b11110000 -
+b11110000 :AjkA
-b11111000 .
+b11111000 VM_:8
-b11111100 /
+b11111100 UveL2
-b11111110 0
+b11111110 A)9Z6
-b11111111 1
+b11111111 2zdj1
-b1111111 2
+b1111111 =;m_[
-b111111 3
+b111111 @9Hd
-b11111 4
+b11111 C:="|
-b1111 5
+b1111 IDk7#
-b111 6
+b111 i]E1i
-b11 7
+b11 tK,M]
-b1 8
+b1 tGp!\
-b0 9
+b0 ."qjK
-b10000000 :
+b10000000 AUO:R
-b11000000 ;
+b11000000 'kx`n
-b11100000 <
+b11100000 U&(K\
-b11110000 =
+b11110000 q<O41
-b11111000 >
+b11111000 zvj)]
-b11111100 ?
+b11111100 >0H<(
-b11111110 @
+b11111110 ARhXJ
-b0 A
+b0 -n:7@
-b11111111 B
+b11111111 >h<=Z
-b0 C
+b0 [xld3
-b0 D
+b0 J+DYh
-0E
+0z,@WW
-b11111111 F
+b11111111 B{KJS
-b1111111 G
+b1111111 V'K*&
-b111111 H
+b111111 4zI$O
-b11111 I
+b11111 %TTk[
-b1111 J
+b1111 IgSeY
-b111 K
+b111 &&1T"
-b11 L
+b11 5)-l\
-b1 M
+b1 0RsLb
-b0 N
+b0 T>:}D
-b10000000 O
+b10000000 DPpZ*
-b11000000 P
+b11000000 %E(nf
-b11100000 Q
+b11100000 2'pba
-b11110000 R
+b11110000 e/c1:
-b11111000 S
+b11111000 ;w.C7
-b11111100 T
+b11111100 fwdfu
-b11111110 U
+b11111110 *R\vx
 $end
 #1000000
-b1 A
+b1 -n:7@
-b1111111 B
+b1111111 >h<=Z
 #2000000
-b10 A
+b10 -n:7@
-b111111 B
+b111111 >h<=Z
 #3000000
-b11 A
+b11 -n:7@
-b11111 B
+b11111 >h<=Z
 #4000000
-b100 A
+b100 -n:7@
-b1111 B
+b1111 >h<=Z
 #5000000
-b101 A
+b101 -n:7@
-b111 B
+b111 >h<=Z
 #6000000
-b110 A
+b110 -n:7@
-b11 B
+b11 >h<=Z
 #7000000
-b111 A
+b111 -n:7@
-b1 B
+b1 >h<=Z
 #8000000
-b1000 A
+b1000 -n:7@
-b0 B
+b0 >h<=Z
 #9000000
-b1001 A
+b1001 -n:7@
-b10000000 B
+b10000000 >h<=Z
 #10000000
-b1010 A
+b1010 -n:7@
-b11000000 B
+b11000000 >h<=Z
 #11000000
-b1011 A
+b1011 -n:7@
-b11100000 B
+b11100000 >h<=Z
 #12000000
-b1100 A
+b1100 -n:7@
-b11110000 B
+b11110000 >h<=Z
 #13000000
-b1101 A
+b1101 -n:7@
-b11111000 B
+b11111000 >h<=Z
 #14000000
-b1110 A
+b1110 -n:7@
-b11111100 B
+b11111100 >h<=Z
 #15000000
-b1111 A
+b1111 -n:7@
-b11111110 B
+b11111110 >h<=Z
 #16000000
-b10000 A
+b10000 -n:7@
-b0 B
+b0 >h<=Z
 #17000000
-b0 1
+b0 2zdj1
-b0 A
+b0 -n:7@
-1E
+1z,@WW
-b0 F
+b0 B{KJS
 #18000000
-b11111111 1
+b11111111 2zdj1
-b1 2
+b1 =;m_[
-b11111111 B
+b11111111 >h<=Z
-b1 C
+b1 [xld3
-b1 D
+b1 J+DYh
-b11111111 F
+b11111111 B{KJS
-b1 G
+b1 V'K*&
 #19000000
-b1111111 2
+b1111111 =;m_[
-b100 3
+b100 @9Hd
-b10 C
+b10 [xld3
-b100 D
+b100 J+DYh
-b1111111 G
+b1111111 V'K*&
-b100 H
+b100 4zI$O
 #20000000
-b111111 3
+b111111 @9Hd
-b1001 4
+b1001 C:="|
-b11 C
+b11 [xld3
-b1001 D
+b1001 J+DYh
-b111111 H
+b111111 4zI$O
-b1001 I
+b1001 %TTk[
 #21000000
-b11111 4
+b11111 C:="|
-b10000 5
+b10000 IDk7#
-b100 C
+b100 [xld3
-b10000 D
+b10000 J+DYh
-b11111 I
+b11111 %TTk[
-b10000 J
+b10000 IgSeY
 #22000000
-b1111 5
+b1111 IDk7#
-b11001 6
+b11001 i]E1i
-b101 C
+b101 [xld3
-b11001 D
+b11001 J+DYh
-b1111 J
+b1111 IgSeY
-b11001 K
+b11001 &&1T"
 #23000000
-b111 6
+b111 i]E1i
-b100100 7
+b100100 tK,M]
-b110 C
+b110 [xld3
-b100100 D
+b100100 J+DYh
-b111 K
+b111 &&1T"
-b100100 L
+b100100 5)-l\
 #24000000
-b11 7
+b11 tK,M]
-b110001 8
+b110001 tGp!\
-b111 C
+b111 [xld3
-b110001 D
+b110001 J+DYh
-b11 L
+b11 5)-l\
-b110001 M
+b110001 0RsLb
 #25000000
-b1 8
+b1 tGp!\
-b1000000 9
+b1000000 ."qjK
-b1000 C
+b1000 [xld3
-b1000000 D
+b1000000 J+DYh
-b1 M
+b1 0RsLb
-b1000000 N
+b1000000 T>:}D
 #26000000
-b0 9
+b0 ."qjK
-b1010001 :
+b1010001 AUO:R
-b1001 C
+b1001 [xld3
-b1010001 D
+b1010001 J+DYh
-b0 N
+b0 T>:}D
-b1010001 O
+b1010001 DPpZ*
 #27000000
-b10000000 :
+b10000000 AUO:R
-b1100100 ;
+b1100100 'kx`n
-b1010 C
+b1010 [xld3
-b1100100 D
+b1100100 J+DYh
-b10000000 O
+b10000000 DPpZ*
-b1100100 P
+b1100100 %E(nf
 #28000000
-b11000000 ;
+b11000000 'kx`n
-b1111001 <
+b1111001 U&(K\
-b1011 C
+b1011 [xld3
-b1111001 D
+b1111001 J+DYh
-b11000000 P
+b11000000 %E(nf
-b1111001 Q
+b1111001 2'pba
 #29000000
-b11100000 <
+b11100000 U&(K\
-b10010000 =
+b10010000 q<O41
-b1100 C
+b1100 [xld3
-b10010000 D
+b10010000 J+DYh
-b11100000 Q
+b11100000 2'pba
-b10010000 R
+b10010000 e/c1:
 #30000000
-b11110000 =
+b11110000 q<O41
-b10101001 >
+b10101001 zvj)]
-b1101 C
+b1101 [xld3
-b10101001 D
+b10101001 J+DYh
-b11110000 R
+b11110000 e/c1:
-b10101001 S
+b10101001 ;w.C7
 #31000000
-b11111000 >
+b11111000 zvj)]
-b11000100 ?
+b11000100 >0H<(
-b1110 C
+b1110 [xld3
-b11000100 D
+b11000100 J+DYh
-b11111000 S
+b11111000 ;w.C7
-b11000100 T
+b11000100 fwdfu
 #32000000
-b11111100 ?
+b11111100 >0H<(
-b11100001 @
+b11100001 ARhXJ
-b1111 C
+b1111 [xld3
-b11100001 D
+b11100001 J+DYh
-b11111100 T
+b11111100 fwdfu
-b11100001 U
+b11100001 *R\vx
 #33000000
-b11111110 @
+b11111110 ARhXJ
-b10000 C
+b10000 [xld3
-b0 D
+b0 J+DYh
-b11111110 U
+b11111110 *R\vx
 #34000000

crates/fayalite/tests/sim/expected/conditional_assignment_last.vcd

@@ -1,14 +1,14 @@
 $timescale 1 ps $end
 $scope module conditional_assignment_last $end
-$var wire 1 ! i $end
+$var wire 1 xt~(W i $end
-$var wire 1 " w $end
+$var wire 1 6:7im w $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-0!
+0xt~(W
-1"
+16:7im
 $end
 #1000000
-1!
+1xt~(W
-0"
+06:7im
 #2000000

crates/fayalite/tests/sim/expected/connect_const_reset.vcd

@@ -1,11 +1,11 @@
 $timescale 1 ps $end
 $scope module connect_const_reset $end
-$var wire 1 ! reset_out $end
+$var wire 1 8ke|= reset_out $end
-$var wire 1 " bit_out $end
+$var wire 1 {"c@= bit_out $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-1!
+18ke|=
-1"
+1{"c@=
 $end
 #1000000

crates/fayalite/tests/sim/expected/counter_async.vcd

@@ -1,217 +1,217 @@
 $timescale 1 ps $end
 $scope module counter $end
 $scope struct cd $end
-$var wire 1 ! clk $end
+$var wire 1 `[J;" clk $end
-$var wire 1 " rst $end
+$var wire 1 4pZx7 rst $end
 $upscope $end
-$var wire 4 # count $end
+$var wire 4 rPs;{ count $end
-$var reg 4 $ count_reg $end
+$var reg 4 6_+(g count_reg $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-0!
+0`[J;"
-0"
+04pZx7
-b0 #
+b0 rPs;{
-b0 $
+b0 6_+(g
 $end
 #500000
-1"
+14pZx7
-b11 #
+b11 rPs;{
-b11 $
+b11 6_+(g
 #1000000
-1!
+1`[J;"
 #1500000
-0"
+04pZx7
 #2000000
-0!
+0`[J;"
 #3000000
-1!
+1`[J;"
-b100 #
+b100 rPs;{
-b100 $
+b100 6_+(g
 #4000000
-0!
+0`[J;"
 #5000000
-1!
+1`[J;"
-b101 #
+b101 rPs;{
-b101 $
+b101 6_+(g
 #6000000
-0!
+0`[J;"
 #7000000
-1!
+1`[J;"
-b110 #
+b110 rPs;{
-b110 $
+b110 6_+(g
 #8000000
-0!
+0`[J;"
 #9000000
-1!
+1`[J;"
-b111 #
+b111 rPs;{
-b111 $
+b111 6_+(g
 #10000000
-0!
+0`[J;"
 #11000000
-1!
+1`[J;"
-b1000 #
+b1000 rPs;{
-b1000 $
+b1000 6_+(g
 #12000000
-0!
+0`[J;"
 #13000000
-1!
+1`[J;"
-b1001 #
+b1001 rPs;{
-b1001 $
+b1001 6_+(g
 #14000000
-0!
+0`[J;"
 #15000000
-1!
+1`[J;"
-b1010 #
+b1010 rPs;{
-b1010 $
+b1010 6_+(g
 #16000000
-0!
+0`[J;"
 #17000000
-1!
+1`[J;"
-b1011 #
+b1011 rPs;{
-b1011 $
+b1011 6_+(g
 #18000000
-0!
+0`[J;"
 #19000000
-1!
+1`[J;"
-b1100 #
+b1100 rPs;{
-b1100 $
+b1100 6_+(g
 #20000000
-0!
+0`[J;"
 #21000000
-1!
+1`[J;"
-b1101 #
+b1101 rPs;{
-b1101 $
+b1101 6_+(g
 #22000000
-0!
+0`[J;"
 #23000000
-1!
+1`[J;"
-b1110 #
+b1110 rPs;{
-b1110 $
+b1110 6_+(g
 #24000000
-0!
+0`[J;"
 #25000000
-1!
+1`[J;"
-b1111 #
+b1111 rPs;{
-b1111 $
+b1111 6_+(g
 #26000000
-0!
+0`[J;"
 #27000000
-1!
+1`[J;"
-b0 #
+b0 rPs;{
-b0 $
+b0 6_+(g
 #28000000
-0!
+0`[J;"
 #29000000
-1!
+1`[J;"
-b1 #
+b1 rPs;{
-b1 $
+b1 6_+(g
 #30000000
-0!
+0`[J;"
 #31000000
-1!
+1`[J;"
-b10 #
+b10 rPs;{
-b10 $
+b10 6_+(g
 #32000000
-0!
+0`[J;"
 #33000000
-1!
+1`[J;"
-b11 #
+b11 rPs;{
-b11 $
+b11 6_+(g
 #34000000
-0!
+0`[J;"
 #35000000
-1!
+1`[J;"
-b100 #
+b100 rPs;{
-b100 $
+b100 6_+(g
 #36000000
-0!
+0`[J;"
 #37000000
-1!
+1`[J;"
-b101 #
+b101 rPs;{
-b101 $
+b101 6_+(g
 #38000000
-0!
+0`[J;"
 #39000000
-1!
+1`[J;"
-b110 #
+b110 rPs;{
-b110 $
+b110 6_+(g
 #40000000
-0!
+0`[J;"
 #41000000
-1!
+1`[J;"
-b111 #
+b111 rPs;{
-b111 $
+b111 6_+(g
 #42000000
-0!
+0`[J;"
 #43000000
-1!
+1`[J;"
-b1000 #
+b1000 rPs;{
-b1000 $
+b1000 6_+(g
 #44000000
-0!
+0`[J;"
 #45000000
-1!
+1`[J;"
-b1001 #
+b1001 rPs;{
-b1001 $
+b1001 6_+(g
 #46000000
-0!
+0`[J;"
 #47000000
-1!
+1`[J;"
-b1010 #
+b1010 rPs;{
-b1010 $
+b1010 6_+(g
 #48000000
-0!
+0`[J;"
 #49000000
-1!
+1`[J;"
-b1011 #
+b1011 rPs;{
-b1011 $
+b1011 6_+(g
 #50000000
-0!
+0`[J;"
 #51000000
-1!
+1`[J;"
-b1100 #
+b1100 rPs;{
-b1100 $
+b1100 6_+(g
 #52000000
-0!
+0`[J;"
 #53000000
-1!
+1`[J;"
-b1101 #
+b1101 rPs;{
-b1101 $
+b1101 6_+(g
 #54000000
-0!
+0`[J;"
 #55000000
-1!
+1`[J;"
-b1110 #
+b1110 rPs;{
-b1110 $
+b1110 6_+(g
 #56000000
-0!
+0`[J;"
 #57000000
-1!
+1`[J;"
-b1111 #
+b1111 rPs;{
-b1111 $
+b1111 6_+(g
 #58000000
-0!
+0`[J;"
 #59000000
-1!
+1`[J;"
-b0 #
+b0 rPs;{
-b0 $
+b0 6_+(g
 #60000000
-0!
+0`[J;"
 #61000000
-1!
+1`[J;"
-b1 #
+b1 rPs;{
-b1 $
+b1 6_+(g
 #62000000
-0!
+0`[J;"
 #63000000
-1!
+1`[J;"
-b10 #
+b10 rPs;{
-b10 $
+b10 6_+(g
 #64000000
-0!
+0`[J;"
 #65000000
-1!
+1`[J;"
-b11 #
+b11 rPs;{
-b11 $
+b11 6_+(g
 #66000000

crates/fayalite/tests/sim/expected/counter_sync.vcd

@@ -1,214 +1,214 @@
 $timescale 1 ps $end
 $scope module counter $end
 $scope struct cd $end
-$var wire 1 ! clk $end
+$var wire 1 `[J;" clk $end
-$var wire 1 " rst $end
+$var wire 1 4pZx7 rst $end
 $upscope $end
-$var wire 4 # count $end
+$var wire 4 rPs;{ count $end
-$var reg 4 $ count_reg $end
+$var reg 4 6_+(g count_reg $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-0!
+0`[J;"
-1"
+14pZx7
-b0 #
+b0 rPs;{
-b0 $
+b0 6_+(g
 $end
 #1000000
-1!
+1`[J;"
-b11 #
+b11 rPs;{
-b11 $
+b11 6_+(g
-0"
+04pZx7
 #2000000
-0!
+0`[J;"
 #3000000
-1!
+1`[J;"
-b100 #
+b100 rPs;{
-b100 $
+b100 6_+(g
 #4000000
-0!
+0`[J;"
 #5000000
-1!
+1`[J;"
-b101 #
+b101 rPs;{
-b101 $
+b101 6_+(g
 #6000000
-0!
+0`[J;"
 #7000000
-1!
+1`[J;"
-b110 #
+b110 rPs;{
-b110 $
+b110 6_+(g
 #8000000
-0!
+0`[J;"
 #9000000
-1!
+1`[J;"
-b111 #
+b111 rPs;{
-b111 $
+b111 6_+(g
 #10000000
-0!
+0`[J;"
 #11000000
-1!
+1`[J;"
-b1000 #
+b1000 rPs;{
-b1000 $
+b1000 6_+(g
 #12000000
-0!
+0`[J;"
 #13000000
-1!
+1`[J;"
-b1001 #
+b1001 rPs;{
-b1001 $
+b1001 6_+(g
 #14000000
-0!
+0`[J;"
 #15000000
-1!
+1`[J;"
-b1010 #
+b1010 rPs;{
-b1010 $
+b1010 6_+(g
 #16000000
-0!
+0`[J;"
 #17000000
-1!
+1`[J;"
-b1011 #
+b1011 rPs;{
-b1011 $
+b1011 6_+(g
 #18000000
-0!
+0`[J;"
 #19000000
-1!
+1`[J;"
-b1100 #
+b1100 rPs;{
-b1100 $
+b1100 6_+(g
 #20000000
-0!
+0`[J;"
 #21000000
-1!
+1`[J;"
-b1101 #
+b1101 rPs;{
-b1101 $
+b1101 6_+(g
 #22000000
-0!
+0`[J;"
 #23000000
-1!
+1`[J;"
-b1110 #
+b1110 rPs;{
-b1110 $
+b1110 6_+(g
 #24000000
-0!
+0`[J;"
 #25000000
-1!
+1`[J;"
-b1111 #
+b1111 rPs;{
-b1111 $
+b1111 6_+(g
 #26000000
-0!
+0`[J;"
 #27000000
-1!
+1`[J;"
-b0 #
+b0 rPs;{
-b0 $
+b0 6_+(g
 #28000000
-0!
+0`[J;"
 #29000000
-1!
+1`[J;"
-b1 #
+b1 rPs;{
-b1 $
+b1 6_+(g
 #30000000
-0!
+0`[J;"
 #31000000
-1!
+1`[J;"
-b10 #
+b10 rPs;{
-b10 $
+b10 6_+(g
 #32000000
-0!
+0`[J;"
 #33000000
-1!
+1`[J;"
-b11 #
+b11 rPs;{
-b11 $
+b11 6_+(g
 #34000000
-0!
+0`[J;"
 #35000000
-1!
+1`[J;"
-b100 #
+b100 rPs;{
-b100 $
+b100 6_+(g
 #36000000
-0!
+0`[J;"
 #37000000
-1!
+1`[J;"
-b101 #
+b101 rPs;{
-b101 $
+b101 6_+(g
 #38000000
-0!
+0`[J;"
 #39000000
-1!
+1`[J;"
-b110 #
+b110 rPs;{
-b110 $
+b110 6_+(g
 #40000000
-0!
+0`[J;"
 #41000000
-1!
+1`[J;"
-b111 #
+b111 rPs;{
-b111 $
+b111 6_+(g
 #42000000
-0!
+0`[J;"
 #43000000
-1!
+1`[J;"
-b1000 #
+b1000 rPs;{
-b1000 $
+b1000 6_+(g
 #44000000
-0!
+0`[J;"
 #45000000
-1!
+1`[J;"
-b1001 #
+b1001 rPs;{
-b1001 $
+b1001 6_+(g
 #46000000
-0!
+0`[J;"
 #47000000
-1!
+1`[J;"
-b1010 #
+b1010 rPs;{
-b1010 $
+b1010 6_+(g
 #48000000
-0!
+0`[J;"
 #49000000
-1!
+1`[J;"
-b1011 #
+b1011 rPs;{
-b1011 $
+b1011 6_+(g
 #50000000
-0!
+0`[J;"
 #51000000
-1!
+1`[J;"
-b1100 #
+b1100 rPs;{
-b1100 $
+b1100 6_+(g
 #52000000
-0!
+0`[J;"
 #53000000
-1!
+1`[J;"
-b1101 #
+b1101 rPs;{
-b1101 $
+b1101 6_+(g
 #54000000
-0!
+0`[J;"
 #55000000
-1!
+1`[J;"
-b1110 #
+b1110 rPs;{
-b1110 $
+b1110 6_+(g
 #56000000
-0!
+0`[J;"
 #57000000
-1!
+1`[J;"
-b1111 #
+b1111 rPs;{
-b1111 $
+b1111 6_+(g
 #58000000
-0!
+0`[J;"
 #59000000
-1!
+1`[J;"
-b0 #
+b0 rPs;{
-b0 $
+b0 6_+(g
 #60000000
-0!
+0`[J;"
 #61000000
-1!
+1`[J;"
-b1 #
+b1 rPs;{
-b1 $
+b1 6_+(g
 #62000000
-0!
+0`[J;"
 #63000000
-1!
+1`[J;"
-b10 #
+b10 rPs;{
-b10 $
+b10 6_+(g
 #64000000
-0!
+0`[J;"
 #65000000
-1!
+1`[J;"
-b11 #
+b11 rPs;{
-b11 $
+b11 6_+(g
 #66000000

crates/fayalite/tests/sim/expected/duplicate_names.vcd

@@ -1,11 +1,11 @@
 $timescale 1 ps $end
 $scope module duplicate_names $end
-$var wire 8 ! w $end
+$var wire 8 7[_7. w $end
-$var wire 8 " w_2 $end
+$var wire 8 7[_7." w_2 $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-b101 !
+b101 7[_7.
-b110 "
+b110 7[_7."
 $end
 #1000000

crates/fayalite/tests/sim/expected/enums.vcd

@@ -1,126 +1,126 @@
 $timescale 1 ps $end
 $scope module enums $end
 $scope struct cd $end
-$var wire 1 ! clk $end
+$var wire 1 0n\U< clk $end
-$var wire 1 " rst $end
+$var wire 1 a?A!) rst $end
 $upscope $end
-$var wire 1 # en $end
+$var wire 1 #ZQY# en $end
-$var wire 2 $ which_in $end
+$var wire 2 8?II+ which_in $end
-$var wire 4 % data_in $end
+$var wire 4 OO,N+ data_in $end
-$var wire 2 & which_out $end
+$var wire 2 yr2gr which_out $end
-$var wire 4 ' data_out $end
+$var wire 4 q_O;Y data_out $end
 $scope struct b_out $end
-$var string 1 ( \$tag $end
+$var string 1 7L1gf \$tag $end
 $scope struct HdlSome $end
-$var wire 1 ) \0 $end
+$var wire 1 EO?Ju \0 $end
-$var wire 1 * \1 $end
+$var wire 1 cGtNN \1 $end
 $upscope $end
 $upscope $end
 $scope struct b2_out $end
-$var string 1 + \$tag $end
+$var string 1 dqd@B \$tag $end
 $scope struct HdlSome $end
-$var wire 1 , \0 $end
+$var wire 1 (FG:I \0 $end
-$var wire 1 - \1 $end
+$var wire 1 dzy-= \1 $end
 $upscope $end
 $upscope $end
 $scope struct the_reg $end
-$var string 1 . \$tag $end
+$var string 1 J#9uO \$tag $end
 $scope struct B $end
-$var reg 1 / \0 $end
+$var reg 1 ca2Gh \0 $end
-$var reg 1 0 \1 $end
+$var reg 1 f)r)? \1 $end
 $upscope $end
 $scope struct C $end
 $scope struct a $end
-$var reg 1 1 \[0] $end
+$var reg 1 ;BepJ \[0] $end
-$var reg 1 2 \[1] $end
+$var reg 1 J~2;e \[1] $end
 $upscope $end
-$var reg 2 3 b $end
+$var reg 2 w\b)K b $end
 $upscope $end
 $upscope $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-0!
+00n\U<
-1"
+1a?A!)
-0#
+0#ZQY#
-b0 $
+b0 8?II+
-b0 %
+b0 OO,N+
-b0 &
+b0 yr2gr
-b0 '
+b0 q_O;Y
-sHdlNone\x20(0) (
+sHdlNone\x20(0) 7L1gf
-0)
+0EO?Ju
-0*
+0cGtNN
-sHdlNone\x20(0) +
+sHdlNone\x20(0) dqd@B
-0,
+0(FG:I
-0-
+0dzy-=
-sA\x20(0) .
+sA\x20(0) J#9uO
-0/
+0ca2Gh
-00
+0f)r)?
-01
+0;BepJ
-02
+0J~2;e
-b0 3
+b0 w\b)K
 $end
 #1000000
-1!
+10n\U<
 #1100000
-0"
+0a?A!)
 #2000000
-0!
+00n\U<
 #3000000
-1!
+10n\U<
 #4000000
-1#
+1#ZQY#
-b1 $
+b1 8?II+
-0!
+00n\U<
 #5000000
-1!
+10n\U<
-b1 &
+b1 yr2gr
-sHdlSome\x20(1) (
+sHdlSome\x20(1) 7L1gf
-sHdlSome\x20(1) +
+sHdlSome\x20(1) dqd@B
-sB\x20(1) .
+sB\x20(1) J#9uO
 #6000000
-0#
+0#ZQY#
-b0 $
+b0 8?II+
-0!
+00n\U<
 #7000000
-1!
+10n\U<
 #8000000
-1#
+1#ZQY#
-b1 $
+b1 8?II+
-b1111 %
+b1111 OO,N+
-0!
+00n\U<
 #9000000
-1!
+10n\U<
-b11 '
+b11 q_O;Y
-1)
+1EO?Ju
-1*
+1cGtNN
-1,
+1(FG:I
-1-
+1dzy-=
-1/
+1ca2Gh
-10
+1f)r)?
-11
+1;BepJ
-12
+1J~2;e
 #10000000
-0!
+00n\U<
 #11000000
-1!
+10n\U<
 #12000000
-b10 $
+b10 8?II+
-0!
+00n\U<
 #13000000
-1!
+10n\U<
-b10 &
+b10 yr2gr
-b1111 '
+b1111 q_O;Y
-sHdlNone\x20(0) (
+sHdlNone\x20(0) 7L1gf
-0)
+0EO?Ju
-0*
+0cGtNN
-sHdlNone\x20(0) +
+sHdlNone\x20(0) dqd@B
-0,
+0(FG:I
-0-
+0dzy-=
-sC\x20(2) .
+sC\x20(2) J#9uO
-b11 3
+b11 w\b)K
 #14000000
-0!
+00n\U<
 #15000000
-1!
+10n\U<
 #16000000

crates/fayalite/tests/sim/expected/extern_module.vcd

@@ -1,52 +1,52 @@
 $timescale 1 ps $end
 $scope module extern_module $end
-$var wire 1 ! i $end
+$var wire 1 `MLd_ i $end
-$var wire 1 " o $end
+$var wire 1 ^;OnJ o $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-0!
+0`MLd_
-0"
+0^;OnJ
 $end
-1"
+1^;OnJ
 #500000
 #1500000
-0"
+0^;OnJ
 #2500000
-1"
+1^;OnJ
 #3500000
-0"
+0^;OnJ
 #4500000
-1"
+1^;OnJ
 #5500000
-0"
+0^;OnJ
 #6500000
-1"
+1^;OnJ
 #7500000
-0"
+0^;OnJ
 #8500000
-1"
+1^;OnJ
 #9500000
-0"
+0^;OnJ
 #10000000
-1!
+1`MLd_
 #10500000
 #11500000
-1"
+1^;OnJ
 #12500000
-0"
+0^;OnJ
 #13500000
-1"
+1^;OnJ
 #14500000
-0"
+0^;OnJ
 #15500000
-1"
+1^;OnJ
 #16500000
-0"
+0^;OnJ
 #17500000
-1"
+1^;OnJ
 #18500000
-0"
+0^;OnJ
 #19500000
-1"
+1^;OnJ
 #20000000

crates/fayalite/tests/sim/expected/extern_module2.vcd

@@ -1,151 +1,151 @@
 $timescale 1 ps $end
 $scope module extern_module2 $end
-$var wire 1 ! en $end
+$var wire 1 oHT(x en $end
-$var wire 1 " clk $end
+$var wire 1 nHT-: clk $end
-$var wire 8 # o $end
+$var wire 8 0:wF& o $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-1!
+1oHT(x
-0"
+0nHT-:
-b0 #
+b0 0:wF&
 $end
-b1001000 #
+b1001000 0:wF&
 #1000000
-1"
+1nHT-:
-b1100101 #
+b1100101 0:wF&
 #2000000
-0"
+0nHT-:
 #3000000
-1"
+1nHT-:
-b1101100 #
+b1101100 0:wF&
 #4000000
-0"
+0nHT-:
 #5000000
-1"
+1nHT-:
 #6000000
-0"
+0nHT-:
 #7000000
-1"
+1nHT-:
-b1101111 #
+b1101111 0:wF&
 #8000000
-0"
+0nHT-:
 #9000000
-1"
+1nHT-:
-b101100 #
+b101100 0:wF&
 #10000000
-0!
+0oHT(x
-0"
+0nHT-:
 #11000000
-1"
+1nHT-:
 #12000000
-0"
+0nHT-:
 #13000000
-1"
+1nHT-:
 #14000000
-0"
+0nHT-:
 #15000000
-1"
+1nHT-:
 #16000000
-0"
+0nHT-:
 #17000000
-1"
+1nHT-:
 #18000000
-0"
+0nHT-:
 #19000000
-1"
+1nHT-:
 #20000000
-1!
+1oHT(x
-0"
+0nHT-:
 #21000000
-1"
+1nHT-:
-b100000 #
+b100000 0:wF&
 #22000000
-0"
+0nHT-:
 #23000000
-1"
+1nHT-:
-b1010111 #
+b1010111 0:wF&
 #24000000
-0"
+0nHT-:
 #25000000
-1"
+1nHT-:
-b1101111 #
+b1101111 0:wF&
 #26000000
-0"
+0nHT-:
 #27000000
-1"
+1nHT-:
-b1110010 #
+b1110010 0:wF&
 #28000000
-0"
+0nHT-:
 #29000000
-1"
+1nHT-:
-b1101100 #
+b1101100 0:wF&
 #30000000
-0!
+0oHT(x
-0"
+0nHT-:
 #31000000
-1"
+1nHT-:
 #32000000
-0"
+0nHT-:
 #33000000
-1"
+1nHT-:
 #34000000
-0"
+0nHT-:
 #35000000
-1"
+1nHT-:
 #36000000
-0"
+0nHT-:
 #37000000
-1"
+1nHT-:
 #38000000
-0"
+0nHT-:
 #39000000
-1"
+1nHT-:
 #40000000
-1!
+1oHT(x
-0"
+0nHT-:
 #41000000
-1"
+1nHT-:
-b1100100 #
+b1100100 0:wF&
 #42000000
-0"
+0nHT-:
 #43000000
-1"
+1nHT-:
-b100001 #
+b100001 0:wF&
 #44000000
-0"
+0nHT-:
 #45000000
-1"
+1nHT-:
-b1010 #
+b1010 0:wF&
 #46000000
-0"
+0nHT-:
 #47000000
-1"
+1nHT-:
-b1001000 #
+b1001000 0:wF&
 #48000000
-0"
+0nHT-:
 #49000000
-1"
+1nHT-:
-b1100101 #
+b1100101 0:wF&
 #50000000
-0!
+0oHT(x
-0"
+0nHT-:
 #51000000
-1"
+1nHT-:
 #52000000
-0"
+0nHT-:
 #53000000
-1"
+1nHT-:
 #54000000
-0"
+0nHT-:
 #55000000
-1"
+1nHT-:
 #56000000
-0"
+0nHT-:
 #57000000
-1"
+1nHT-:
 #58000000
-0"
+0nHT-:
 #59000000
-1"
+1nHT-:
 #60000000

crates/fayalite/tests/sim/expected/memories.vcd

@@ -1,408 +1,408 @@
 $timescale 1 ps $end
 $scope module memories $end
 $scope struct r $end
-$var wire 4 ! addr $end
+$var wire 4 z&0Qk addr $end
-$var wire 1 " en $end
+$var wire 1 o.T)# en $end
-$var wire 1 # clk $end
+$var wire 1 :XNoK clk $end
 $scope struct data $end
-$var wire 8 $ \0 $end
+$var wire 8 Cq]A% \0 $end
-$var wire 8 % \1 $end
+$var wire 8 avKNj \1 $end
 $upscope $end
 $upscope $end
 $scope struct w $end
-$var wire 4 & addr $end
+$var wire 4 p<O.M addr $end
-$var wire 1 ' en $end
+$var wire 1 #9)l8 en $end
-$var wire 1 ( clk $end
+$var wire 1 QX!^| clk $end
 $scope struct data $end
-$var wire 8 ) \0 $end
+$var wire 8 G"IXQ \0 $end
-$var wire 8 * \1 $end
+$var wire 8 h\t:E \1 $end
 $upscope $end
 $scope struct mask $end
-$var wire 1 + \0 $end
+$var wire 1 FCuNz \0 $end
-$var wire 1 , \1 $end
+$var wire 1 /Y7%J \1 $end
 $upscope $end
 $upscope $end
 $scope struct mem $end
 $scope struct contents $end
 $scope struct \[0] $end
 $scope struct mem $end
-$var reg 8 9 \0 $end
+$var reg 8 4d[cL \0 $end
-$var reg 8 I \1 $end
+$var reg 8 {qEUV \1 $end
 $upscope $end
 $upscope $end
 $scope struct \[1] $end
 $scope struct mem $end
-$var reg 8 : \0 $end
+$var reg 8 c`NPR \0 $end
-$var reg 8 J \1 $end
+$var reg 8 vK:33 \1 $end
 $upscope $end
 $upscope $end
 $scope struct \[2] $end
 $scope struct mem $end
-$var reg 8 ; \0 $end
+$var reg 8 ihYp_ \0 $end
-$var reg 8 K \1 $end
+$var reg 8 QZb%P \1 $end
 $upscope $end
 $upscope $end
 $scope struct \[3] $end
 $scope struct mem $end
-$var reg 8 < \0 $end
+$var reg 8 ,O%<$ \0 $end
-$var reg 8 L \1 $end
+$var reg 8 @?uSf \1 $end
 $upscope $end
 $upscope $end
 $scope struct \[4] $end
 $scope struct mem $end
-$var reg 8 = \0 $end
+$var reg 8 N[IF& \0 $end
-$var reg 8 M \1 $end
+$var reg 8 Zf9lw \1 $end
 $upscope $end
 $upscope $end
 $scope struct \[5] $end
 $scope struct mem $end
-$var reg 8 > \0 $end
+$var reg 8 dr6lq \0 $end
-$var reg 8 N \1 $end
+$var reg 8 fc"UR \1 $end
 $upscope $end
 $upscope $end
 $scope struct \[6] $end
 $scope struct mem $end
-$var reg 8 ? \0 $end
+$var reg 8 xpw5\ \0 $end
-$var reg 8 O \1 $end
+$var reg 8 dd$?K \1 $end
 $upscope $end
 $upscope $end
 $scope struct \[7] $end
 $scope struct mem $end
-$var reg 8 @ \0 $end
+$var reg 8 vH;}2 \0 $end
-$var reg 8 P \1 $end
+$var reg 8 ILB?4 \1 $end
 $upscope $end
 $upscope $end
 $scope struct \[8] $end
 $scope struct mem $end
-$var reg 8 A \0 $end
+$var reg 8 /X4v> \0 $end
-$var reg 8 Q \1 $end
+$var reg 8 &V*EE \1 $end
 $upscope $end
 $upscope $end
 $scope struct \[9] $end
 $scope struct mem $end
-$var reg 8 B \0 $end
+$var reg 8 IczZe \0 $end
-$var reg 8 R \1 $end
+$var reg 8 unX>R \1 $end
 $upscope $end
 $upscope $end
 $scope struct \[10] $end
 $scope struct mem $end
-$var reg 8 C \0 $end
+$var reg 8 0hTyY \0 $end
-$var reg 8 S \1 $end
+$var reg 8 9K_w) \1 $end
 $upscope $end
 $upscope $end
 $scope struct \[11] $end
 $scope struct mem $end
-$var reg 8 D \0 $end
+$var reg 8 +C/Sz \0 $end
-$var reg 8 T \1 $end
+$var reg 8 }Y{:o \1 $end
 $upscope $end
 $upscope $end
 $scope struct \[12] $end
 $scope struct mem $end
-$var reg 8 E \0 $end
+$var reg 8 S6-5u \0 $end
-$var reg 8 U \1 $end
+$var reg 8 9q6)w \1 $end
 $upscope $end
 $upscope $end
 $scope struct \[13] $end
 $scope struct mem $end
-$var reg 8 F \0 $end
+$var reg 8 !c<w* \0 $end
-$var reg 8 V \1 $end
+$var reg 8 Ve@)M \1 $end
 $upscope $end
 $upscope $end
 $scope struct \[14] $end
 $scope struct mem $end
-$var reg 8 G \0 $end
+$var reg 8 OiF9* \0 $end
-$var reg 8 W \1 $end
+$var reg 8 Ylyz~ \1 $end
 $upscope $end
 $upscope $end
 $scope struct \[15] $end
 $scope struct mem $end
-$var reg 8 H \0 $end
+$var reg 8 ?+m9D \0 $end
-$var reg 8 X \1 $end
+$var reg 8 A6sb~ \1 $end
 $upscope $end
 $upscope $end
 $upscope $end
 $scope struct r0 $end
-$var wire 4 - addr $end
+$var wire 4 ="2wN addr $end
-$var wire 1 . en $end
+$var wire 1 jy78F en $end
-$var wire 1 / clk $end
+$var wire 1 \o>8T clk $end
 $scope struct data $end
-$var wire 8 0 \0 $end
+$var wire 8 \k#l \0 $end
-$var wire 8 1 \1 $end
+$var wire 8 olx7O \1 $end
 $upscope $end
 $upscope $end
 $scope struct w1 $end
-$var wire 4 2 addr $end
+$var wire 4 H,W!J addr $end
-$var wire 1 3 en $end
+$var wire 1 "7?3I en $end
-$var wire 1 4 clk $end
+$var wire 1 DC/;" clk $end
 $scope struct data $end
-$var wire 8 5 \0 $end
+$var wire 8 0DrV' \0 $end
-$var wire 8 6 \1 $end
+$var wire 8 wa!Cx \1 $end
 $upscope $end
 $scope struct mask $end
-$var wire 1 7 \0 $end
+$var wire 1 u^b&R \0 $end
-$var wire 1 8 \1 $end
+$var wire 1 Ic\|v \1 $end
 $upscope $end
 $upscope $end
 $upscope $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-b1 9
+b1 4d[cL
-b100011 I
+b100011 {qEUV
-b1 :
+b1 c`NPR
-b100011 J
+b100011 vK:33
-b1 ;
+b1 ihYp_
-b100011 K
+b100011 QZb%P
-b1 <
+b1 ,O%<$
-b100011 L
+b100011 @?uSf
-b1 =
+b1 N[IF&
-b100011 M
+b100011 Zf9lw
-b1 >
+b1 dr6lq
-b100011 N
+b100011 fc"UR
-b1 ?
+b1 xpw5\
-b100011 O
+b100011 dd$?K
-b1 @
+b1 vH;}2
-b100011 P
+b100011 ILB?4
-b1 A
+b1 /X4v>
-b100011 Q
+b100011 &V*EE
-b1 B
+b1 IczZe
-b100011 R
+b100011 unX>R
-b1 C
+b1 0hTyY
-b100011 S
+b100011 9K_w)
-b1 D
+b1 +C/Sz
-b100011 T
+b100011 }Y{:o
-b1 E
+b1 S6-5u
-b100011 U
+b100011 9q6)w
-b1 F
+b1 !c<w*
-b100011 V
+b100011 Ve@)M
-b1 G
+b1 OiF9*
-b100011 W
+b100011 Ylyz~
-b1 H
+b1 ?+m9D
-b100011 X
+b100011 A6sb~
-b0 !
+b0 z&0Qk
-0"
+0o.T)#
-0#
+0:XNoK
-b0 $
+b0 Cq]A%
-b0 %
+b0 avKNj
-b0 &
+b0 p<O.M
-0'
+0#9)l8
-0(
+0QX!^|
-b0 )
+b0 G"IXQ
-b0 *
+b0 h\t:E
-0+
+0FCuNz
-0,
+0/Y7%J
-b0 -
+b0 ="2wN
-0.
+0jy78F
-0/
+0\o>8T
-b0 0
+b0 \k#l
-b0 1
+b0 olx7O
-b0 2
+b0 H,W!J
-03
+0"7?3I
-04
+0DC/;"
-b0 5
+b0 0DrV'
-b0 6
+b0 wa!Cx
-07
+0u^b&R
-08
+0Ic\|v
 $end
 #1000000
-1#
+1:XNoK
-1(
+1QX!^|
-1/
+1\o>8T
-14
+1DC/;"
 #2000000
-1"
+1o.T)#
-0#
+0:XNoK
-b1 $
+b1 Cq]A%
-b100011 %
+b100011 avKNj
-1'
+1#9)l8
-0(
+0QX!^|
-b10000 )
+b10000 G"IXQ
-b100000 *
+b100000 h\t:E
-1+
+1FCuNz
-1,
+1/Y7%J
-1.
+1jy78F
-0/
+0\o>8T
-b1 0
+b1 \k#l
-b100011 1
+b100011 olx7O
-13
+1"7?3I
-04
+0DC/;"
-b10000 5
+b10000 0DrV'
-b100000 6
+b100000 wa!Cx
-17
+1u^b&R
-18
+1Ic\|v
 #3000000
-b10000 9
+b10000 4d[cL
-b100000 I
+b100000 {qEUV
-1#
+1:XNoK
-b10000 $
+b10000 Cq]A%
-b100000 %
+b100000 avKNj
-1(
+1QX!^|
-1/
+1\o>8T
-b10000 0
+b10000 \k#l
-b100000 1
+b100000 olx7O
-14
+1DC/;"
 #4000000
-0#
+0:XNoK
-0(
+0QX!^|
-b110000 )
+b110000 G"IXQ
-b1000000 *
+b1000000 h\t:E
-0+
+0FCuNz
-0/
+0\o>8T
-04
+0DC/;"
-b110000 5
+b110000 0DrV'
-b1000000 6
+b1000000 wa!Cx
-07
+0u^b&R
 #5000000
-b10000 9
+b10000 4d[cL
-b1000000 I
+b1000000 {qEUV
-1#
+1:XNoK
-b1000000 %
+b1000000 avKNj
-1(
+1QX!^|
-1/
+1\o>8T
-b1000000 1
+b1000000 olx7O
-14
+1DC/;"
 #6000000
-0#
+0:XNoK
-0(
+0QX!^|
-b1010000 )
+b1010000 G"IXQ
-b1100000 *
+b1100000 h\t:E
-1+
+1FCuNz
-0,
+0/Y7%J
-0/
+0\o>8T
-04
+0DC/;"
-b1010000 5
+b1010000 0DrV'
-b1100000 6
+b1100000 wa!Cx
-17
+1u^b&R
-08
+0Ic\|v
 #7000000
-b1010000 9
+b1010000 4d[cL
-b1000000 I
+b1000000 {qEUV
-1#
+1:XNoK
-b1010000 $
+b1010000 Cq]A%
-1(
+1QX!^|
-1/
+1\o>8T
-b1010000 0
+b1010000 \k#l
-14
+1DC/;"
 #8000000
-0#
+0:XNoK
-0(
+0QX!^|
-b1110000 )
+b1110000 G"IXQ
-b10000000 *
+b10000000 h\t:E
-0+
+0FCuNz
-0/
+0\o>8T
-04
+0DC/;"
-b1110000 5
+b1110000 0DrV'
-b10000000 6
+b10000000 wa!Cx
-07
+0u^b&R
 #9000000
-1#
+1:XNoK
-1(
+1QX!^|
-1/
+1\o>8T
-14
+1DC/;"
 #10000000
-0#
+0:XNoK
-0'
+0#9)l8
-0(
+0QX!^|
-b10010000 )
+b10010000 G"IXQ
-b10100000 *
+b10100000 h\t:E
-0/
+0\o>8T
-03
+0"7?3I
-04
+0DC/;"
-b10010000 5
+b10010000 0DrV'
-b10100000 6
+b10100000 wa!Cx
 #11000000
-1#
+1:XNoK
-1(
+1QX!^|
-1/
+1\o>8T
-14
+1DC/;"
 #12000000
-0#
+0:XNoK
-b1 &
+b1 p<O.M
-1'
+1#9)l8
-0(
+0QX!^|
-1+
+1FCuNz
-1,
+1/Y7%J
-0/
+0\o>8T
-b1 2
+b1 H,W!J
-13
+1"7?3I
-04
+0DC/;"
-17
+1u^b&R
-18
+1Ic\|v
 #13000000
-b10010000 :
+b10010000 c`NPR
-b10100000 J
+b10100000 vK:33
-1#
+1:XNoK
-1(
+1QX!^|
-1/
+1\o>8T
-14
+1DC/;"
 #14000000
-0#
+0:XNoK
-b10 &
+b10 p<O.M
-0(
+0QX!^|
-b10110000 )
+b10110000 G"IXQ
-b11000000 *
+b11000000 h\t:E
-0/
+0\o>8T
-b10 2
+b10 H,W!J
-04
+0DC/;"
-b10110000 5
+b10110000 0DrV'
-b11000000 6
+b11000000 wa!Cx
 #15000000
-b10110000 ;
+b10110000 ihYp_
-b11000000 K
+b11000000 QZb%P
-1#
+1:XNoK
-1(
+1QX!^|
-1/
+1\o>8T
-14
+1DC/;"
 #16000000
-0#
+0:XNoK
-0'
+0#9)l8
-0(
+0QX!^|
-b11010000 )
+b11010000 G"IXQ
-b11100000 *
+b11100000 h\t:E
-0/
+0\o>8T
-03
+0"7?3I
-04
+0DC/;"
-b11010000 5
+b11010000 0DrV'
-b11100000 6
+b11100000 wa!Cx
 #17000000
-1#
+1:XNoK
-1(
+1QX!^|
-1/
+1\o>8T
-14
+1DC/;"
 #18000000
-b1 !
+b1 z&0Qk
-0#
+0:XNoK
-b10010000 $
+b10010000 Cq]A%
-b10100000 %
+b10100000 avKNj
-0(
+0QX!^|
-b1 -
+b1 ="2wN
-0/
+0\o>8T
-b10010000 0
+b10010000 \k#l
-b10100000 1
+b10100000 olx7O
-04
+0DC/;"
 #19000000
-1#
+1:XNoK
-1(
+1QX!^|
-1/
+1\o>8T
-14
+1DC/;"
 #20000000
-b10 !
+b10 z&0Qk
-0#
+0:XNoK
-b10110000 $
+b10110000 Cq]A%
-b11000000 %
+b11000000 avKNj
-0(
+0QX!^|
-b10 -
+b10 ="2wN
-0/
+0\o>8T
-b10110000 0
+b10110000 \k#l
-b11000000 1
+b11000000 olx7O
-04
+0DC/;"
 #21000000
-1#
+1:XNoK
-1(
+1QX!^|
-1/
+1\o>8T
-14
+1DC/;"
 #22000000
-0#
+0:XNoK
-0(
+0QX!^|
-0/
+0\o>8T
-04
+0DC/;"

crates/fayalite/tests/sim/expected/memories2.vcd

@@ -1,363 +1,363 @@
 $timescale 1 ps $end
 $scope module memories2 $end
 $scope struct rw $end
-$var wire 3 ! addr $end
+$var wire 3 xkkG> addr $end
-$var wire 1 " en $end
+$var wire 1 HoA{1 en $end
-$var wire 1 # clk $end
+$var wire 1 C*2BQ clk $end
-$var wire 2 $ rdata $end
+$var wire 2 ueF!x rdata $end
-$var wire 1 % wmode $end
+$var wire 1 m\l/p wmode $end
-$var wire 2 & wdata $end
+$var wire 2 WmjEh wdata $end
-$var wire 1 ' wmask $end
+$var wire 1 +3E@H wmask $end
 $upscope $end
 $scope struct mem $end
 $scope struct contents $end
 $scope struct \[0] $end
 $scope struct mem $end
-$var string 1 1 \$tag $end
+$var string 1 ujd9u \$tag $end
-$var reg 1 6 HdlSome $end
+$var reg 1 *5lV# HdlSome $end
 $upscope $end
 $upscope $end
 $scope struct \[1] $end
 $scope struct mem $end
-$var string 1 2 \$tag $end
+$var string 1 *qL|n \$tag $end
-$var reg 1 7 HdlSome $end
+$var reg 1 ^/FDC HdlSome $end
 $upscope $end
 $upscope $end
 $scope struct \[2] $end
 $scope struct mem $end
-$var string 1 3 \$tag $end
+$var string 1 r*7|@ \$tag $end
-$var reg 1 8 HdlSome $end
+$var reg 1 YMY"3 HdlSome $end
 $upscope $end
 $upscope $end
 $scope struct \[3] $end
 $scope struct mem $end
-$var string 1 4 \$tag $end
+$var string 1 jj/6F \$tag $end
-$var reg 1 9 HdlSome $end
+$var reg 1 S+Uy} HdlSome $end
 $upscope $end
 $upscope $end
 $scope struct \[4] $end
 $scope struct mem $end
-$var string 1 5 \$tag $end
+$var string 1 H72IP \$tag $end
-$var reg 1 : HdlSome $end
+$var reg 1 vH{({ HdlSome $end
 $upscope $end
 $upscope $end
 $upscope $end
 $scope struct rw0 $end
-$var wire 3 ( addr $end
+$var wire 3 uabMI addr $end
-$var wire 1 ) en $end
+$var wire 1 LEn[l en $end
-$var wire 1 * clk $end
+$var wire 1 OpH)U clk $end
 $scope struct rdata $end
-$var string 1 + \$tag $end
+$var string 1 [}rcZ \$tag $end
-$var wire 1 , HdlSome $end
+$var wire 1 5f=Y~ HdlSome $end
 $upscope $end
-$var wire 1 - wmode $end
+$var wire 1 6c_9_ wmode $end
 $scope struct wdata $end
-$var string 1 . \$tag $end
+$var string 1 $hfRN \$tag $end
-$var wire 1 / HdlSome $end
+$var wire 1 rop,b HdlSome $end
 $upscope $end
-$var wire 1 0 wmask $end
+$var wire 1 Ly=US wmask $end
 $upscope $end
 $upscope $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-sHdlSome\x20(1) 1
+sHdlSome\x20(1) ujd9u
-16
+1*5lV#
-sHdlSome\x20(1) 2
+sHdlSome\x20(1) *qL|n
-17
+1^/FDC
-sHdlSome\x20(1) 3
+sHdlSome\x20(1) r*7|@
-18
+1YMY"3
-sHdlSome\x20(1) 4
+sHdlSome\x20(1) jj/6F
-19
+1S+Uy}
-sHdlSome\x20(1) 5
+sHdlSome\x20(1) H72IP
-1:
+1vH{({
-b0 !
+b0 xkkG>
-0"
+0HoA{1
-0#
+0C*2BQ
-b0 $
+b0 ueF!x
-0%
+0m\l/p
-b0 &
+b0 WmjEh
-0'
+0+3E@H
-b0 (
+b0 uabMI
-0)
+0LEn[l
-0*
+0OpH)U
-sHdlNone\x20(0) +
+sHdlNone\x20(0) [}rcZ
-0,
+05f=Y~
-0-
+06c_9_
-sHdlNone\x20(0) .
+sHdlNone\x20(0) $hfRN
-0/
+0rop,b
-00
+0Ly=US
 $end
 #250000
-1#
+1C*2BQ
-1*
+1OpH)U
 #500000
 #750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #1000000
-1"
+1HoA{1
-1)
+1LEn[l
 #1250000
-1#
+1C*2BQ
-b11 $
+b11 ueF!x
-1*
+1OpH)U
-sHdlSome\x20(1) +
+sHdlSome\x20(1) [}rcZ
-1,
+15f=Y~
 #1500000
 #1750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #2000000
-0"
+0HoA{1
-0)
+0LEn[l
 #2250000
-1#
+1C*2BQ
-b0 $
+b0 ueF!x
-1*
+1OpH)U
-sHdlNone\x20(0) +
+sHdlNone\x20(0) [}rcZ
-0,
+05f=Y~
 #2500000
 #2750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #3000000
-1"
+1HoA{1
-1%
+1m\l/p
-1'
+1+3E@H
-1)
+1LEn[l
-1-
+16c_9_
-10
+1Ly=US
 #3250000
-sHdlNone\x20(0) 1
+sHdlNone\x20(0) ujd9u
-06
+0*5lV#
-1#
+1C*2BQ
-1*
+1OpH)U
 #3500000
 #3750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #4000000
-0%
+0m\l/p
-0'
+0+3E@H
-0-
+06c_9_
-00
+0Ly=US
 #4250000
-1#
+1C*2BQ
-1*
+1OpH)U
 #4500000
 #4750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #5000000
-1%
+1m\l/p
-b11 &
+b11 WmjEh
-1-
+16c_9_
-sHdlSome\x20(1) .
+sHdlSome\x20(1) $hfRN
-1/
+1rop,b
 #5250000
-1#
+1C*2BQ
-1*
+1OpH)U
 #5500000
 #5750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #6000000
-b1 !
+b1 xkkG>
-b1 &
+b1 WmjEh
-1'
+1+3E@H
-b1 (
+b1 uabMI
-0/
+0rop,b
-10
+1Ly=US
 #6250000
-sHdlSome\x20(1) 2
+sHdlSome\x20(1) *qL|n
-07
+0^/FDC
-1#
+1C*2BQ
-1*
+1OpH)U
 #6500000
 #6750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #7000000
-b10 !
+b10 xkkG>
-b10 &
+b10 WmjEh
-b10 (
+b10 uabMI
-sHdlNone\x20(0) .
+sHdlNone\x20(0) $hfRN
 #7250000
-sHdlNone\x20(0) 3
+sHdlNone\x20(0) r*7|@
-08
+0YMY"3
-1#
+1C*2BQ
-1*
+1OpH)U
 #7500000
 #7750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #8000000
-b11 !
+b11 xkkG>
-b11 &
+b11 WmjEh
-b11 (
+b11 uabMI
-sHdlSome\x20(1) .
+sHdlSome\x20(1) $hfRN
-1/
+1rop,b
 #8250000
-sHdlSome\x20(1) 4
+sHdlSome\x20(1) jj/6F
-19
+1S+Uy}
-1#
+1C*2BQ
-1*
+1OpH)U
 #8500000
 #8750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #9000000
-b100 !
+b100 xkkG>
-b10 &
+b10 WmjEh
-b100 (
+b100 uabMI
-sHdlNone\x20(0) .
+sHdlNone\x20(0) $hfRN
-0/
+0rop,b
 #9250000
-sHdlNone\x20(0) 5
+sHdlNone\x20(0) H72IP
-0:
+0vH{({
-1#
+1C*2BQ
-1*
+1OpH)U
 #9500000
 #9750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #10000000
-b101 !
+b101 xkkG>
-b1 &
+b1 WmjEh
-b101 (
+b101 uabMI
-sHdlSome\x20(1) .
+sHdlSome\x20(1) $hfRN
 #10250000
-1#
+1C*2BQ
-1*
+1OpH)U
 #10500000
 #10750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #11000000
-b110 !
+b110 xkkG>
-b110 (
+b110 uabMI
 #11250000
-1#
+1C*2BQ
-1*
+1OpH)U
 #11500000
 #11750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #12000000
-b111 !
+b111 xkkG>
-b111 (
+b111 uabMI
 #12250000
-1#
+1C*2BQ
-1*
+1OpH)U
 #12500000
 #12750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #13000000
-0%
+0m\l/p
-b0 &
+b0 WmjEh
-0'
+0+3E@H
-0-
+06c_9_
-sHdlNone\x20(0) .
+sHdlNone\x20(0) $hfRN
-00
+0Ly=US
 #13250000
-1#
+1C*2BQ
-1*
+1OpH)U
 #13500000
 #13750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #14000000
-b110 !
+b110 xkkG>
-b110 (
+b110 uabMI
 #14250000
-1#
+1C*2BQ
-1*
+1OpH)U
 #14500000
 #14750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #15000000
-b101 !
+b101 xkkG>
-b101 (
+b101 uabMI
 #15250000
-1#
+1C*2BQ
-1*
+1OpH)U
 #15500000
 #15750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #16000000
-b100 !
+b100 xkkG>
-b100 (
+b100 uabMI
 #16250000
-1#
+1C*2BQ
-1*
+1OpH)U
 #16500000
 #16750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #17000000
-b11 !
+b11 xkkG>
-b11 (
+b11 uabMI
 #17250000
-1#
+1C*2BQ
-b11 $
+b11 ueF!x
-1*
+1OpH)U
-sHdlSome\x20(1) +
+sHdlSome\x20(1) [}rcZ
-1,
+15f=Y~
 #17500000
 #17750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #18000000
-b10 !
+b10 xkkG>
-b10 (
+b10 uabMI
 #18250000
-1#
+1C*2BQ
-b0 $
+b0 ueF!x
-1*
+1OpH)U
-sHdlNone\x20(0) +
+sHdlNone\x20(0) [}rcZ
-0,
+05f=Y~
 #18500000
 #18750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #19000000
-b0 !
+b0 xkkG>
-b0 (
+b0 uabMI
 #19250000
-1#
+1C*2BQ
-1*
+1OpH)U
 #19500000
 #19750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #20000000
-b1 !
+b1 xkkG>
-b1 (
+b1 uabMI
 #20250000
-1#
+1C*2BQ
-b1 $
+b1 ueF!x
-1*
+1OpH)U
-sHdlSome\x20(1) +
+sHdlSome\x20(1) [}rcZ
 #20500000
 #20750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #21000000
-b0 !
+b0 xkkG>
-0"
+0HoA{1
-b0 (
+b0 uabMI
-0)
+0LEn[l
 #21250000
-1#
+1C*2BQ
-b0 $
+b0 ueF!x
-1*
+1OpH)U
-sHdlNone\x20(0) +
+sHdlNone\x20(0) [}rcZ
 #21500000
 #21750000
-0#
+0C*2BQ
-0*
+0OpH)U
 #22000000

crates/fayalite/tests/sim/expected/mod1.vcd

@@ -1,47 +1,47 @@
 $timescale 1 ps $end
 $scope module mod1 $end
 $scope struct o $end
-$var wire 4 ! i $end
+$var wire 4 avK(^ i $end
-$var wire 2 " o $end
+$var wire 2 Q2~aG o $end
-$var wire 2 # i2 $end
+$var wire 2 DXK'| i2 $end
-$var wire 4 $ o2 $end
+$var wire 4 cPuix o2 $end
 $upscope $end
 $scope struct child $end
-$var wire 4 ) i $end
+$var wire 4 ($5K7 i $end
-$var wire 2 * o $end
+$var wire 2 %6Wv" o $end
-$var wire 2 + i2 $end
+$var wire 2 +|-AU i2 $end
-$var wire 4 , o2 $end
+$var wire 4 Hw?%j o2 $end
 $upscope $end
 $scope module mod1_child $end
-$var wire 4 % i $end
+$var wire 4 4}s%= i $end
-$var wire 2 & o $end
+$var wire 2 }IY?g o $end
-$var wire 2 ' i2 $end
+$var wire 2 of42K i2 $end
-$var wire 4 ( o2 $end
+$var wire 4 D9]&= o2 $end
 $upscope $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-b11 !
+b11 avK(^
-b11 "
+b11 Q2~aG
-b10 #
+b10 DXK'|
-b1110 $
+b1110 cPuix
-b11 %
+b11 4}s%=
-b11 &
+b11 }IY?g
-b10 '
+b10 of42K
-b1110 (
+b1110 D9]&=
-b11 )
+b11 ($5K7
-b11 *
+b11 %6Wv"
-b10 +
+b10 +|-AU
-b1110 ,
+b1110 Hw?%j
 $end
 #1000000
-b1010 !
+b1010 avK(^
-b10 "
+b10 Q2~aG
-b1111 $
+b1111 cPuix
-b1010 %
+b1010 4}s%=
-b10 &
+b10 }IY?g
-b1111 (
+b1111 D9]&=
-b1010 )
+b1010 ($5K7
-b10 *
+b10 %6Wv"
-b1111 ,
+b1111 Hw?%j
 #2000000

crates/fayalite/tests/sim/expected/phantom_const.vcd

@@ -1,31 +1,31 @@
 $timescale 1 ps $end
 $scope module phantom_const $end
 $scope struct out $end
-$var string 1 ! \[0] $end
+$var string 1 Ru)8A \[0] $end
-$var string 1 " \[1] $end
+$var string 1 y&ssi \[1] $end
 $upscope $end
 $scope struct mem $end
 $scope struct contents $end
 $scope struct \[0] $end
-$var string 1 ' mem $end
+$var string 1 =+olp mem $end
 $upscope $end
 $upscope $end
 $scope struct r0 $end
-$var string 0 # addr $end
+$var string 0 U5SS1 addr $end
-$var wire 1 $ en $end
+$var wire 1 rx@_T en $end
-$var wire 1 % clk $end
+$var wire 1 o[(us clk $end
-$var string 1 & data $end
+$var string 1 %Bg(6 data $end
 $upscope $end
 $upscope $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-s0 '
+s0 =+olp
-sPhantomConst([\"a\",\"b\"]) !
+sPhantomConst([\"a\",\"b\"]) Ru)8A
-sPhantomConst([\"a\",\"b\"]) "
+sPhantomConst([\"a\",\"b\"]) y&ssi
-s0 #
+s0 U5SS1
-0$
+0rx@_T
-0%
+0o[(us
-sPhantomConst(\"mem_element\") &
+sPhantomConst(\"mem_element\") %Bg(6
 $end
 #1000000

crates/fayalite/tests/sim/expected/shift_register.vcd

@@ -1,193 +1,193 @@
 $timescale 1 ps $end
 $scope module shift_register $end
 $scope struct cd $end
-$var wire 1 ! clk $end
+$var wire 1 <Ol<I clk $end
-$var wire 1 " rst $end
+$var wire 1 ,E;9k rst $end
 $upscope $end
-$var wire 1 # d $end
+$var wire 1 %2/Zc d $end
-$var wire 1 $ q $end
+$var wire 1 '1p#x q $end
-$var reg 1 % reg0 $end
+$var reg 1 vd~J{ reg0 $end
-$var reg 1 & reg1 $end
+$var reg 1 ~7wBy reg1 $end
-$var reg 1 ' reg2 $end
+$var reg 1 s@[|n reg2 $end
-$var reg 1 ( reg3 $end
+$var reg 1 %.BqD reg3 $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-0!
+0<Ol<I
-1"
+1,E;9k
-0#
+0%2/Zc
-0$
+0'1p#x
-0%
+0vd~J{
-0&
+0~7wBy
-0'
+0s@[|n
-0(
+0%.BqD
 $end
 #1000000
-1!
+1<Ol<I
 #1100000
-0"
+0,E;9k
 #2000000
-0!
+0<Ol<I
 #3000000
-1!
+1<Ol<I
 #4000000
-0!
+0<Ol<I
-1#
+1%2/Zc
 #5000000
-1!
+1<Ol<I
-1%
+1vd~J{
 #6000000
-0!
+0<Ol<I
 #7000000
-1!
+1<Ol<I
-1&
+1~7wBy
 #8000000
-0!
+0<Ol<I
-0#
+0%2/Zc
 #9000000
-1!
+1<Ol<I
-0%
+0vd~J{
-1'
+1s@[|n
 #10000000
-0!
+0<Ol<I
 #11000000
-1!
+1<Ol<I
-1$
+1'1p#x
-0&
+0~7wBy
-1(
+1%.BqD
 #12000000
-0!
+0<Ol<I
-1#
+1%2/Zc
 #13000000
-1!
+1<Ol<I
-1%
+1vd~J{
-0'
+0s@[|n
 #14000000
-0!
+0<Ol<I
-0#
+0%2/Zc
 #15000000
-1!
+1<Ol<I
-0$
+0'1p#x
-0%
+0vd~J{
-1&
+1~7wBy
-0(
+0%.BqD
 #16000000
-0!
+0<Ol<I
-1#
+1%2/Zc
 #17000000
-1!
+1<Ol<I
-1%
+1vd~J{
-0&
+0~7wBy
-1'
+1s@[|n
 #18000000
-0!
+0<Ol<I
 #19000000
-1!
+1<Ol<I
-1$
+1'1p#x
-1&
+1~7wBy
-0'
+0s@[|n
-1(
+1%.BqD
 #20000000
-0!
+0<Ol<I
 #21000000
-1!
+1<Ol<I
-0$
+0'1p#x
-1'
+1s@[|n
-0(
+0%.BqD
 #22000000
-0!
+0<Ol<I
 #23000000
-1!
+1<Ol<I
-1$
+1'1p#x
-1(
+1%.BqD
 #24000000
-0!
+0<Ol<I
-0#
+0%2/Zc
 #25000000
-1!
+1<Ol<I
-0%
+0vd~J{
 #26000000
-0!
+0<Ol<I
 #27000000
-1!
+1<Ol<I
-0&
+0~7wBy
 #28000000
-0!
+0<Ol<I
 #29000000
-1!
+1<Ol<I
-0'
+0s@[|n
 #30000000
-0!
+0<Ol<I
 #31000000
-1!
+1<Ol<I
-0$
+0'1p#x
-0(
+0%.BqD
 #32000000
-0!
+0<Ol<I
 #33000000
-1!
+1<Ol<I
 #34000000
-0!
+0<Ol<I
 #35000000
-1!
+1<Ol<I
 #36000000
-0!
+0<Ol<I
 #37000000
-1!
+1<Ol<I
 #38000000
-0!
+0<Ol<I
 #39000000
-1!
+1<Ol<I
 #40000000
-0!
+0<Ol<I
 #41000000
-1!
+1<Ol<I
 #42000000
-0!
+0<Ol<I
 #43000000
-1!
+1<Ol<I
 #44000000
-0!
+0<Ol<I
 #45000000
-1!
+1<Ol<I
 #46000000
-0!
+0<Ol<I
 #47000000
-1!
+1<Ol<I
 #48000000
-0!
+0<Ol<I
 #49000000
-1!
+1<Ol<I
 #50000000
-0!
+0<Ol<I
 #51000000
-1!
+1<Ol<I
 #52000000
-0!
+0<Ol<I
 #53000000
-1!
+1<Ol<I
 #54000000
-0!
+0<Ol<I
 #55000000
-1!
+1<Ol<I
 #56000000
-0!
+0<Ol<I
 #57000000
-1!
+1<Ol<I
 #58000000
-0!
+0<Ol<I
 #59000000
-1!
+1<Ol<I
 #60000000
-0!
+0<Ol<I
 #61000000
-1!
+1<Ol<I
 #62000000
-0!
+0<Ol<I
 #63000000
-1!
+1<Ol<I
 #64000000
-0!
+0<Ol<I
 #65000000
-1!
+1<Ol<I
 #66000000

crates/fayalite/tests/sim/expected/sim_only_connects.vcd

@@ -1,182 +1,182 @@
 $timescale 1 ps $end
 $scope module sim_only_connects $end
 $scope struct cd $end
-$var wire 1 ! clk $end
+$var wire 1 tq:(w clk $end
-$var wire 1 " rst $end
+$var wire 1 FVlgb rst $end
 $upscope $end
-$var string 1 # inp $end
+$var string 1 g:xf? inp $end
-$var string 1 $ out1 $end
+$var string 1 [OKKg out1 $end
-$var string 1 % out2 $end
+$var string 1 9pB-> out2 $end
-$var string 1 & out3 $end
+$var string 1 8(7-4 out3 $end
 $scope struct helper1 $end
 $scope struct cd $end
-$var wire 1 + clk $end
+$var wire 1 $Kwp\ clk $end
-$var wire 1 , rst $end
+$var wire 1 nmVq' rst $end
 $upscope $end
-$var string 1 - inp $end
+$var string 1 qS)@z inp $end
-$var string 1 . out $end
+$var string 1 ~je// out $end
 $upscope $end
 $scope module sim_only_connects_helper $end
 $scope struct cd $end
-$var wire 1 ' clk $end
+$var wire 1 %uCn6 clk $end
-$var wire 1 ( rst $end
+$var wire 1 Apu`K rst $end
 $upscope $end
-$var string 1 ) inp $end
+$var string 1 $U*lA inp $end
-$var string 1 * out $end
+$var string 1 !prwC out $end
 $upscope $end
-$var string 1 / delay1 $end
+$var string 1 CyjVm delay1 $end
-$var reg 1 0 delay1_empty $end
+$var reg 1 z~g{\ delay1_empty $end
 $scope struct helper2 $end
 $scope struct cd $end
-$var wire 1 5 clk $end
+$var wire 1 Ph.=# clk $end
-$var wire 1 6 rst $end
+$var wire 1 !GXK\ rst $end
 $upscope $end
-$var string 1 7 inp $end
+$var string 1 /YVv: inp $end
-$var string 1 8 out $end
+$var string 1 Kk*{# out $end
 $upscope $end
 $scope module sim_only_connects_helper_2 $end
 $scope struct cd $end
-$var wire 1 1 clk $end
+$var wire 1 %uCn6" clk $end
-$var wire 1 2 rst $end
+$var wire 1 Apu`K" rst $end
 $upscope $end
-$var string 1 3 inp $end
+$var string 1 $U*lA" inp $end
-$var string 1 4 out $end
+$var string 1 !prwC" out $end
 $upscope $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-0!
+0tq:(w
-1"
+1FVlgb
-s{\"extra\":\x20\"value\"} #
+s{\"extra\":\x20\"value\"} g:xf?
-s{} $
+s{} [OKKg
-s{} %
+s{} 9pB->
-s{} &
+s{} 8(7-4
-0'
+0%uCn6
-1(
+1Apu`K
-s{} )
+s{} $U*lA
-s{} *
+s{} !prwC
-0+
+0$Kwp\
-1,
+1nmVq'
-s{} -
+s{} qS)@z
-s{} .
+s{} ~je//
-s{} /
+s{} CyjVm
-00
+0z~g{\
-01
+0%uCn6"
-12
+1Apu`K"
-s{} 3
+s{} $U*lA"
-s{} 4
+s{} !prwC"
-05
+0Ph.=#
-16
+1!GXK\
-s{} 7
+s{} /YVv:
-s{} 8
+s{} Kk*{#
 $end
 #1000000
-1!
+1tq:(w
-s{\"extra\":\x20\"value\"} $
+s{\"extra\":\x20\"value\"} [OKKg
-1'
+1%uCn6
-s{\"extra\":\x20\"value\"} )
+s{\"extra\":\x20\"value\"} $U*lA
-1+
+1$Kwp\
-s{\"extra\":\x20\"value\"} -
+s{\"extra\":\x20\"value\"} qS)@z
-10
+1z~g{\
-11
+1%uCn6"
-15
+1Ph.=#
-s{\"bar\":\x20\"\",\x20\"extra\":\x20\"value\",\x20\"foo\":\x20\"baz\"} %
+s{\"bar\":\x20\"\",\x20\"extra\":\x20\"value\",\x20\"foo\":\x20\"baz\"} 9pB->
-s{\"bar\":\x20\"\",\x20\"extra\":\x20\"value\",\x20\"foo\":\x20\"baz\"} *
+s{\"bar\":\x20\"\",\x20\"extra\":\x20\"value\",\x20\"foo\":\x20\"baz\"} !prwC
-s{\"bar\":\x20\"\",\x20\"extra\":\x20\"value\",\x20\"foo\":\x20\"baz\"} .
+s{\"bar\":\x20\"\",\x20\"extra\":\x20\"value\",\x20\"foo\":\x20\"baz\"} ~je//
-s{\"bar\":\x20\"\",\x20\"extra\":\x20\"value\",\x20\"foo\":\x20\"baz\"} 3
+s{\"bar\":\x20\"\",\x20\"extra\":\x20\"value\",\x20\"foo\":\x20\"baz\"} $U*lA"
-s{\"bar\":\x20\"\",\x20\"extra\":\x20\"value\",\x20\"foo\":\x20\"baz\"} 7
+s{\"bar\":\x20\"\",\x20\"extra\":\x20\"value\",\x20\"foo\":\x20\"baz\"} /YVv:
-s{\"bar\":\x20\"baz\",\x20\"extra\":\x20\"value\",\x20\"foo\":\x20\"baz\"} &
+s{\"bar\":\x20\"baz\",\x20\"extra\":\x20\"value\",\x20\"foo\":\x20\"baz\"} 8(7-4
-s{\"bar\":\x20\"baz\",\x20\"extra\":\x20\"value\",\x20\"foo\":\x20\"baz\"} 4
+s{\"bar\":\x20\"baz\",\x20\"extra\":\x20\"value\",\x20\"foo\":\x20\"baz\"} !prwC"
-s{\"bar\":\x20\"baz\",\x20\"extra\":\x20\"value\",\x20\"foo\":\x20\"baz\"} 8
+s{\"bar\":\x20\"baz\",\x20\"extra\":\x20\"value\",\x20\"foo\":\x20\"baz\"} Kk*{#
 #2000000
-0!
+0tq:(w
-0"
+0FVlgb
-0'
+0%uCn6
-0(
+0Apu`K
-0+
+0$Kwp\
-0,
+0nmVq'
-01
+0%uCn6"
-02
+0Apu`K"
-05
+0Ph.=#
-06
+0!GXK\
 #3000000
-1!
+1tq:(w
-1'
+1%uCn6
-1+
+1$Kwp\
-s{\"extra\":\x20\"value\"} /
+s{\"extra\":\x20\"value\"} CyjVm
-00
+0z~g{\
-11
+1%uCn6"
-15
+1Ph.=#
 #4000000
-0!
+0tq:(w
-0'
+0%uCn6
-0+
+0$Kwp\
-01
+0%uCn6"
-05
+0Ph.=#
 #5000000
-1!
+1tq:(w
-1'
+1%uCn6
-1+
+1$Kwp\
-11
+1%uCn6"
-15
+1Ph.=#
 #6000000
-0!
+0tq:(w
-0'
+0%uCn6
-0+
+0$Kwp\
-01
+0%uCn6"
-05
+0Ph.=#
 #7000000
-1!
+1tq:(w
-1'
+1%uCn6
-1+
+1$Kwp\
-11
+1%uCn6"
-15
+1Ph.=#
 #8000000
-0!
+0tq:(w
-0'
+0%uCn6
-0+
+0$Kwp\
-01
+0%uCn6"
-05
+0Ph.=#
 #9000000
-1!
+1tq:(w
-1'
+1%uCn6
-1+
+1$Kwp\
-11
+1%uCn6"
-15
+1Ph.=#
 #10000000
-0!
+0tq:(w
-0'
+0%uCn6
-0+
+0$Kwp\
-01
+0%uCn6"
-05
+0Ph.=#
 #11000000
-1!
+1tq:(w
-1'
+1%uCn6
-1+
+1$Kwp\
-11
+1%uCn6"
-15
+1Ph.=#
 #12000000
-0!
+0tq:(w
-0'
+0%uCn6
-0+
+0$Kwp\
-01
+0%uCn6"
-05
+0Ph.=#
 #13000000
-1!
+1tq:(w
-1'
+1%uCn6
-1+
+1$Kwp\
-11
+1%uCn6"
-15
+1Ph.=#
 #14000000
-0!
+0tq:(w
-0'
+0%uCn6
-0+
+0$Kwp\
-01
+0%uCn6"
-05
+0Ph.=#
 #15000000
-1!
+1tq:(w
-1'
+1%uCn6
-1+
+1$Kwp\
-11
+1%uCn6"
-15
+1Ph.=#
 #16000000

crates/fayalite/tests/sim/expected/sim_resettable_counter_async.vcd

@@ -1,68 +1,68 @@
 $timescale 1 ps $end
 $scope module sim_resettable_counter $end
 $scope struct cd $end
-$var wire 1 ! clk $end
+$var wire 1 zGup) clk $end
-$var wire 1 " rst $end
+$var wire 1 TfzI\ rst $end
 $upscope $end
-$var wire 8 # out $end
+$var wire 8 #$b%i out $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-0!
+0zGup)
-0"
+0TfzI\
-b0 #
+b0 #$b%i
 $end
 #1000000
-1!
+1zGup)
-b1 #
+b1 #$b%i
 #2000000
-0!
+0zGup)
-1"
+1TfzI\
-b0 #
+b0 #$b%i
 #3000000
-1!
+1zGup)
 #4000000
-0!
+0zGup)
-0"
+0TfzI\
 #5000000
-1!
+1zGup)
-b1 #
+b1 #$b%i
 #6000000
-0!
+0zGup)
 #7000000
-1!
+1zGup)
-b10 #
+b10 #$b%i
 #8000000
-0!
+0zGup)
 #9000000
-1!
+1zGup)
-b11 #
+b11 #$b%i
 #10000000
-0!
+0zGup)
 #11000000
-1!
+1zGup)
-b100 #
+b100 #$b%i
 #12000000
-0!
+0zGup)
-1"
+1TfzI\
-b0 #
+b0 #$b%i
 #13000000
-1!
+1zGup)
 #14000000
-0!
+0zGup)
-0"
+0TfzI\
 #15000000
-1!
+1zGup)
-b1 #
+b1 #$b%i
 #16000000
-0!
+0zGup)
 #17000000
-1!
+1zGup)
-b10 #
+b10 #$b%i
 #18000000
-0!
+0zGup)
 #19000000
-1!
+1zGup)
-b11 #
+b11 #$b%i
 #20000000
-0!
+0zGup)

crates/fayalite/tests/sim/expected/sim_resettable_counter_async_immediate_reset.vcd

@@ -1,65 +1,65 @@
 $timescale 1 ps $end
 $scope module sim_resettable_counter $end
 $scope struct cd $end
-$var wire 1 ! clk $end
+$var wire 1 zGup) clk $end
-$var wire 1 " rst $end
+$var wire 1 TfzI\ rst $end
 $upscope $end
-$var wire 8 # out $end
+$var wire 8 #$b%i out $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-0!
+0zGup)
-1"
+1TfzI\
-b0 #
+b0 #$b%i
 $end
 #1000000
-1!
+1zGup)
 #2000000
-0!
+0zGup)
 #3000000
-1!
+1zGup)
 #4000000
-0!
+0zGup)
-0"
+0TfzI\
 #5000000
-1!
+1zGup)
-b1 #
+b1 #$b%i
 #6000000
-0!
+0zGup)
 #7000000
-1!
+1zGup)
-b10 #
+b10 #$b%i
 #8000000
-0!
+0zGup)
 #9000000
-1!
+1zGup)
-b11 #
+b11 #$b%i
 #10000000
-0!
+0zGup)
 #11000000
-1!
+1zGup)
-b100 #
+b100 #$b%i
 #12000000
-0!
+0zGup)
-1"
+1TfzI\
-b0 #
+b0 #$b%i
 #13000000
-1!
+1zGup)
 #14000000
-0!
+0zGup)
-0"
+0TfzI\
 #15000000
-1!
+1zGup)
-b1 #
+b1 #$b%i
 #16000000
-0!
+0zGup)
 #17000000
-1!
+1zGup)
-b10 #
+b10 #$b%i
 #18000000
-0!
+0zGup)
 #19000000
-1!
+1zGup)
-b11 #
+b11 #$b%i
 #20000000
-0!
+0zGup)

crates/fayalite/tests/sim/expected/sim_resettable_counter_sync.vcd

@@ -1,70 +1,70 @@
 $timescale 1 ps $end
 $scope module sim_resettable_counter $end
 $scope struct cd $end
-$var wire 1 ! clk $end
+$var wire 1 zGup) clk $end
-$var wire 1 " rst $end
+$var wire 1 TfzI\ rst $end
 $upscope $end
-$var wire 8 # out $end
+$var wire 8 #$b%i out $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-0!
+0zGup)
-0"
+0TfzI\
-b0 #
+b0 #$b%i
 $end
 #1000000
-1!
+1zGup)
-b1 #
+b1 #$b%i
 #2000000
-0!
+0zGup)
-1"
+1TfzI\
 #3000000
-1!
+1zGup)
-b10 #
+b10 #$b%i
-b0 #
+b0 #$b%i
 #4000000
-0!
+0zGup)
-0"
+0TfzI\
 #5000000
-1!
+1zGup)
-b1 #
+b1 #$b%i
 #6000000
-0!
+0zGup)
 #7000000
-1!
+1zGup)
-b10 #
+b10 #$b%i
 #8000000
-0!
+0zGup)
 #9000000
-1!
+1zGup)
-b11 #
+b11 #$b%i
 #10000000
-0!
+0zGup)
 #11000000
-1!
+1zGup)
-b100 #
+b100 #$b%i
 #12000000
-0!
+0zGup)
-1"
+1TfzI\
 #13000000
-1!
+1zGup)
-b101 #
+b101 #$b%i
-b0 #
+b0 #$b%i
 #14000000
-0!
+0zGup)
-0"
+0TfzI\
 #15000000
-1!
+1zGup)
-b1 #
+b1 #$b%i
 #16000000
-0!
+0zGup)
 #17000000
-1!
+1zGup)
-b10 #
+b10 #$b%i
 #18000000
-0!
+0zGup)
 #19000000
-1!
+1zGup)
-b11 #
+b11 #$b%i
 #20000000
-0!
+0zGup)

crates/fayalite/tests/sim/expected/sim_resettable_counter_sync_immediate_reset.vcd

@@ -1,70 +1,70 @@
 $timescale 1 ps $end
 $scope module sim_resettable_counter $end
 $scope struct cd $end
-$var wire 1 ! clk $end
+$var wire 1 zGup) clk $end
-$var wire 1 " rst $end
+$var wire 1 TfzI\ rst $end
 $upscope $end
-$var wire 8 # out $end
+$var wire 8 #$b%i out $end
 $upscope $end
 $enddefinitions $end
 $dumpvars
-0!
+0zGup)
-1"
+1TfzI\
-b0 #
+b0 #$b%i
 $end
 #1000000
-1!
+1zGup)
-b1 #
+b1 #$b%i
-b0 #
+b0 #$b%i
 #2000000
-0!
+0zGup)
 #3000000
-1!
+1zGup)
-b1 #
+b1 #$b%i
-b0 #
+b0 #$b%i
 #4000000
-0!
+0zGup)
-0"
+0TfzI\
 #5000000
-1!
+1zGup)
-b1 #
+b1 #$b%i
 #6000000
-0!
+0zGup)
 #7000000
-1!
+1zGup)
-b10 #
+b10 #$b%i
 #8000000
-0!
+0zGup)
 #9000000
-1!
+1zGup)
-b11 #
+b11 #$b%i
 #10000000
-0!
+0zGup)
 #11000000
-1!
+1zGup)
-b100 #
+b100 #$b%i
 #12000000
-0!
+0zGup)
-1"
+1TfzI\
 #13000000
-1!
+1zGup)
-b101 #
+b101 #$b%i
-b0 #
+b0 #$b%i
 #14000000
-0!
+0zGup)
-0"
+0TfzI\
 #15000000
-1!
+1zGup)
-b1 #
+b1 #$b%i
 #16000000
-0!
+0zGup)
 #17000000
-1!
+1zGup)
-b10 #
+b10 #$b%i
 #18000000
-0!
+0zGup)
 #19000000
-1!
+1zGup)
-b11 #
+b11 #$b%i
 #20000000
-0!
+0zGup)

crates/fayalite/tests/ui/simvalue_is_not_internable.stderr

@@ -1,7 +1,7 @@
 error[E0277]: `Cell<util::alternating_cell::State>` cannot be shared between threads safely
  --> tests/ui/simvalue_is_not_internable.rs:11:26
   |
-11 | fn f(v: SimValue<()>) -> Interned<SimValue<()>> {
+ 11 | fn f(v: SimValue<()>) -> Interned<SimValue<()>> {
     |                          ^^^^^^^^^^^^^^^^^^^^^^ `Cell<util::alternating_cell::State>` cannot be shared between threads safely
     |
     = help: within `fayalite::prelude::SimValue<()>`, the trait `Sync` is not implemented for `Cell<util::alternating_cell::State>`
@@ -9,7 +9,7 @@ error[E0277]: `Cell<util::alternating_cell::State>` cannot be shared between thr
 note: required because it appears within the type `util::alternating_cell::AlternatingCell<value::SimValueInner<()>>`
    --> src/util/alternating_cell.rs
     |
-   | pub(crate) struct AlternatingCell<T: ?Sized> {
+ 22 | pub(crate) struct AlternatingCell<T: ?Sized> {
     |                   ^^^^^^^^^^^^^^^
 note: required because it appears within the type `fayalite::prelude::SimValue<()>`
    --> src/sim/value.rs
@@ -25,14 +25,14 @@ note: required by a bound in `fayalite::intern::Interned`
 error[E0277]: `UnsafeCell<value::SimValueInner<()>>` cannot be shared between threads safely
  --> tests/ui/simvalue_is_not_internable.rs:11:26
   |
-11 | fn f(v: SimValue<()>) -> Interned<SimValue<()>> {
+ 11 | fn f(v: SimValue<()>) -> Interned<SimValue<()>> {
     |                          ^^^^^^^^^^^^^^^^^^^^^^ `UnsafeCell<value::SimValueInner<()>>` cannot be shared between threads safely
     |
     = help: within `fayalite::prelude::SimValue<()>`, the trait `Sync` is not implemented for `UnsafeCell<value::SimValueInner<()>>`
 note: required because it appears within the type `util::alternating_cell::AlternatingCell<value::SimValueInner<()>>`
    --> src/util/alternating_cell.rs
     |
-   | pub(crate) struct AlternatingCell<T: ?Sized> {
+ 22 | pub(crate) struct AlternatingCell<T: ?Sized> {
     |                   ^^^^^^^^^^^^^^^
 note: required because it appears within the type `fayalite::prelude::SimValue<()>`
    --> src/sim/value.rs
@@ -48,7 +48,7 @@ note: required by a bound in `fayalite::intern::Interned`
 error[E0277]: `Rc<(dyn value::sim_only_value_unsafe::DynSimOnlyValueTrait + 'static)>` cannot be sent between threads safely
  --> tests/ui/simvalue_is_not_internable.rs:11:26
   |
-11 | fn f(v: SimValue<()>) -> Interned<SimValue<()>> {
+ 11 | fn f(v: SimValue<()>) -> Interned<SimValue<()>> {
     |                          ^^^^^^^^^^^^^^^^^^^^^^ `Rc<(dyn value::sim_only_value_unsafe::DynSimOnlyValueTrait + 'static)>` cannot be sent between threads safely
     |
     = help: within `fayalite::prelude::SimValue<()>`, the trait `Send` is not implemented for `Rc<(dyn value::sim_only_value_unsafe::DynSimOnlyValueTrait + 'static)>`
@@ -59,19 +59,10 @@ note: required because it appears within the type `DynSimOnlyValue`
     |            ^^^^^^^^^^^^^^^
 note: required because it appears within the type `PhantomData<DynSimOnlyValue>`
    --> $RUST/core/src/marker.rs
-   |
-   | pub struct PhantomData<T: PointeeSized>;
-   |            ^^^^^^^^^^^
 note: required because it appears within the type `alloc::raw_vec::RawVec<DynSimOnlyValue>`
    --> $RUST/alloc/src/raw_vec/mod.rs
-   |
-   | pub(crate) struct RawVec<T, A: Allocator = Global> {
-   |                   ^^^^^^
 note: required because it appears within the type `Vec<DynSimOnlyValue>`
    --> $RUST/alloc/src/vec/mod.rs
-   |
-   | pub struct Vec<T, #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global> {
-   |            ^^^
 note: required because it appears within the type `OpaqueSimValue`
    --> src/ty.rs
     |
@@ -80,17 +71,14 @@ note: required because it appears within the type `OpaqueSimValue`
 note: required because it appears within the type `value::SimValueInner<()>`
    --> src/sim/value.rs
     |
-   | struct SimValueInner<T: Type> {
+ 51 | struct SimValueInner<T: Type> {
     |        ^^^^^^^^^^^^^
 note: required because it appears within the type `UnsafeCell<value::SimValueInner<()>>`
    --> $RUST/core/src/cell.rs
-   |
-   | pub struct UnsafeCell<T: ?Sized> {
-   |            ^^^^^^^^^^
 note: required because it appears within the type `util::alternating_cell::AlternatingCell<value::SimValueInner<()>>`
    --> src/util/alternating_cell.rs
     |
-   | pub(crate) struct AlternatingCell<T: ?Sized> {
+ 22 | pub(crate) struct AlternatingCell<T: ?Sized> {
     |                   ^^^^^^^^^^^^^^^
 note: required because it appears within the type `fayalite::prelude::SimValue<()>`
    --> src/sim/value.rs
@@ -120,7 +108,7 @@ help: consider dereferencing here
 error[E0277]: `Cell<util::alternating_cell::State>` cannot be shared between threads safely
  --> tests/ui/simvalue_is_not_internable.rs:12:26
   |
-12 |     Intern::intern_sized(v)
+ 12 |     Intern::intern_sized(v)
     |     -------------------- ^ `Cell<util::alternating_cell::State>` cannot be shared between threads safely
     |     |
     |     required by a bound introduced by this call
@@ -130,7 +118,7 @@ error[E0277]: `Cell<util::alternating_cell::State>` cannot be shared between thr
 note: required because it appears within the type `util::alternating_cell::AlternatingCell<value::SimValueInner<()>>`
    --> src/util/alternating_cell.rs
     |
-   | pub(crate) struct AlternatingCell<T: ?Sized> {
+ 22 | pub(crate) struct AlternatingCell<T: ?Sized> {
     |                   ^^^^^^^^^^^^^^^
 note: required because it appears within the type `fayalite::prelude::SimValue<()>`
    --> src/sim/value.rs
@@ -147,13 +135,13 @@ note: required by a bound in `intern_sized`
     |        ------------ required by a bound in this associated function
 help: consider dereferencing here
     |
-12 |     Intern::intern_sized(*v)
+ 12 |     Intern::intern_sized(*v)
     |                          +
 
 error[E0277]: `UnsafeCell<value::SimValueInner<()>>` cannot be shared between threads safely
  --> tests/ui/simvalue_is_not_internable.rs:12:26
   |
-12 |     Intern::intern_sized(v)
+ 12 |     Intern::intern_sized(v)
     |     -------------------- ^ `UnsafeCell<value::SimValueInner<()>>` cannot be shared between threads safely
     |     |
     |     required by a bound introduced by this call
@@ -162,7 +150,7 @@ error[E0277]: `UnsafeCell<value::SimValueInner<()>>` cannot be shared between th
 note: required because it appears within the type `util::alternating_cell::AlternatingCell<value::SimValueInner<()>>`
    --> src/util/alternating_cell.rs
     |
-   | pub(crate) struct AlternatingCell<T: ?Sized> {
+ 22 | pub(crate) struct AlternatingCell<T: ?Sized> {
     |                   ^^^^^^^^^^^^^^^
 note: required because it appears within the type `fayalite::prelude::SimValue<()>`
    --> src/sim/value.rs
@@ -179,13 +167,13 @@ note: required by a bound in `intern_sized`
     |        ------------ required by a bound in this associated function
 help: consider dereferencing here
     |
-12 |     Intern::intern_sized(*v)
+ 12 |     Intern::intern_sized(*v)
     |                          +
 
 error[E0277]: `Rc<(dyn value::sim_only_value_unsafe::DynSimOnlyValueTrait + 'static)>` cannot be sent between threads safely
  --> tests/ui/simvalue_is_not_internable.rs:12:26
   |
-12 |     Intern::intern_sized(v)
+ 12 |     Intern::intern_sized(v)
     |     -------------------- ^ `Rc<(dyn value::sim_only_value_unsafe::DynSimOnlyValueTrait + 'static)>` cannot be sent between threads safely
     |     |
     |     required by a bound introduced by this call
@@ -198,19 +186,10 @@ note: required because it appears within the type `DynSimOnlyValue`
     |            ^^^^^^^^^^^^^^^
 note: required because it appears within the type `PhantomData<DynSimOnlyValue>`
    --> $RUST/core/src/marker.rs
-   |
-   | pub struct PhantomData<T: PointeeSized>;
-   |            ^^^^^^^^^^^
 note: required because it appears within the type `alloc::raw_vec::RawVec<DynSimOnlyValue>`
    --> $RUST/alloc/src/raw_vec/mod.rs
-   |
-   | pub(crate) struct RawVec<T, A: Allocator = Global> {
-   |                   ^^^^^^
 note: required because it appears within the type `Vec<DynSimOnlyValue>`
    --> $RUST/alloc/src/vec/mod.rs
-   |
-   | pub struct Vec<T, #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global> {
-   |            ^^^
 note: required because it appears within the type `OpaqueSimValue`
    --> src/ty.rs
     |
@@ -219,17 +198,14 @@ note: required because it appears within the type `OpaqueSimValue`
 note: required because it appears within the type `value::SimValueInner<()>`
    --> src/sim/value.rs
     |
-   | struct SimValueInner<T: Type> {
+ 51 | struct SimValueInner<T: Type> {
     |        ^^^^^^^^^^^^^
 note: required because it appears within the type `UnsafeCell<value::SimValueInner<()>>`
    --> $RUST/core/src/cell.rs
-   |
-   | pub struct UnsafeCell<T: ?Sized> {
-   |            ^^^^^^^^^^
 note: required because it appears within the type `util::alternating_cell::AlternatingCell<value::SimValueInner<()>>`
    --> src/util/alternating_cell.rs
     |
-   | pub(crate) struct AlternatingCell<T: ?Sized> {
+ 22 | pub(crate) struct AlternatingCell<T: ?Sized> {
     |                   ^^^^^^^^^^^^^^^
 note: required because it appears within the type `fayalite::prelude::SimValue<()>`
    --> src/sim/value.rs
@@ -246,13 +222,13 @@ note: required by a bound in `intern_sized`
     |        ------------ required by a bound in this associated function
 help: consider dereferencing here
     |
-12 |     Intern::intern_sized(*v)
+ 12 |     Intern::intern_sized(*v)
     |                          +
 
 error[E0277]: `Cell<util::alternating_cell::State>` cannot be shared between threads safely
  --> tests/ui/simvalue_is_not_internable.rs:12:5
   |
-12 |     Intern::intern_sized(v)
+ 12 |     Intern::intern_sized(v)
     |     ^^^^^^^^^^^^^^^^^^^^^^^ `Cell<util::alternating_cell::State>` cannot be shared between threads safely
     |
     = help: within `fayalite::prelude::SimValue<()>`, the trait `Sync` is not implemented for `Cell<util::alternating_cell::State>`
@@ -260,7 +236,7 @@ error[E0277]: `Cell<util::alternating_cell::State>` cannot be shared between thr
 note: required because it appears within the type `util::alternating_cell::AlternatingCell<value::SimValueInner<()>>`
    --> src/util/alternating_cell.rs
     |
-   | pub(crate) struct AlternatingCell<T: ?Sized> {
+ 22 | pub(crate) struct AlternatingCell<T: ?Sized> {
     |                   ^^^^^^^^^^^^^^^
 note: required because it appears within the type `fayalite::prelude::SimValue<()>`
    --> src/sim/value.rs
@@ -276,14 +252,14 @@ note: required by a bound in `fayalite::intern::Interned`
 error[E0277]: `UnsafeCell<value::SimValueInner<()>>` cannot be shared between threads safely
  --> tests/ui/simvalue_is_not_internable.rs:12:5
   |
-12 |     Intern::intern_sized(v)
+ 12 |     Intern::intern_sized(v)
     |     ^^^^^^^^^^^^^^^^^^^^^^^ `UnsafeCell<value::SimValueInner<()>>` cannot be shared between threads safely
     |
     = help: within `fayalite::prelude::SimValue<()>`, the trait `Sync` is not implemented for `UnsafeCell<value::SimValueInner<()>>`
 note: required because it appears within the type `util::alternating_cell::AlternatingCell<value::SimValueInner<()>>`
    --> src/util/alternating_cell.rs
     |
-   | pub(crate) struct AlternatingCell<T: ?Sized> {
+ 22 | pub(crate) struct AlternatingCell<T: ?Sized> {
     |                   ^^^^^^^^^^^^^^^
 note: required because it appears within the type `fayalite::prelude::SimValue<()>`
    --> src/sim/value.rs
@@ -299,7 +275,7 @@ note: required by a bound in `fayalite::intern::Interned`
 error[E0277]: `Rc<(dyn value::sim_only_value_unsafe::DynSimOnlyValueTrait + 'static)>` cannot be sent between threads safely
  --> tests/ui/simvalue_is_not_internable.rs:12:5
   |
-12 |     Intern::intern_sized(v)
+ 12 |     Intern::intern_sized(v)
     |     ^^^^^^^^^^^^^^^^^^^^^^^ `Rc<(dyn value::sim_only_value_unsafe::DynSimOnlyValueTrait + 'static)>` cannot be sent between threads safely
     |
     = help: within `fayalite::prelude::SimValue<()>`, the trait `Send` is not implemented for `Rc<(dyn value::sim_only_value_unsafe::DynSimOnlyValueTrait + 'static)>`
@@ -310,19 +286,10 @@ note: required because it appears within the type `DynSimOnlyValue`
     |            ^^^^^^^^^^^^^^^
 note: required because it appears within the type `PhantomData<DynSimOnlyValue>`
    --> $RUST/core/src/marker.rs
-   |
-   | pub struct PhantomData<T: PointeeSized>;
-   |            ^^^^^^^^^^^
 note: required because it appears within the type `alloc::raw_vec::RawVec<DynSimOnlyValue>`
    --> $RUST/alloc/src/raw_vec/mod.rs
-   |
-   | pub(crate) struct RawVec<T, A: Allocator = Global> {
-   |                   ^^^^^^
 note: required because it appears within the type `Vec<DynSimOnlyValue>`
    --> $RUST/alloc/src/vec/mod.rs
-   |
-   | pub struct Vec<T, #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global> {
-   |            ^^^
 note: required because it appears within the type `OpaqueSimValue`
    --> src/ty.rs
     |
@@ -331,17 +298,14 @@ note: required because it appears within the type `OpaqueSimValue`
 note: required because it appears within the type `value::SimValueInner<()>`
    --> src/sim/value.rs
     |
-   | struct SimValueInner<T: Type> {
+ 51 | struct SimValueInner<T: Type> {
     |        ^^^^^^^^^^^^^
 note: required because it appears within the type `UnsafeCell<value::SimValueInner<()>>`
    --> $RUST/core/src/cell.rs
-   |
-   | pub struct UnsafeCell<T: ?Sized> {
-   |            ^^^^^^^^^^
 note: required because it appears within the type `util::alternating_cell::AlternatingCell<value::SimValueInner<()>>`
    --> src/util/alternating_cell.rs
     |
-   | pub(crate) struct AlternatingCell<T: ?Sized> {
+ 22 | pub(crate) struct AlternatingCell<T: ?Sized> {
     |                   ^^^^^^^^^^^^^^^
 note: required because it appears within the type `fayalite::prelude::SimValue<()>`
    --> src/sim/value.rs