vere64

.github/workflows/shared.yml

@@ -37,6 +37,8 @@ jobs:
   urbit:
     strategy:
       fail-fast: false
+      matrix:
+        bits: [64, 32]
 
     runs-on: ubuntu-22.04
 
@@ -71,23 +73,37 @@ jobs:
           echo
           swapon --show
           echo
+
+      - name: Set memory overcommit
+        run: |
+          sudo sysctl -w vm.overcommit_memory=1
+          echo "vm.overcommit_memory=1" | sudo tee -a /etc/sysctl.conf
+          sysctl vm.overcommit_memory
 
       - uses: mlugg/setup-zig@v2
         with:
           version: 0.14.1
 
       - name: Build binaries
         run: |
+          # Add -Dvere32 flag for 32-bit builds
+          VERE32_FLAG=""
+          if [[ "${{ matrix.bits }}" == "32" ]]; then
+            VERE32_FLAG="-Dvere32"
+          fi
+
           if [[ "${{ inputs.pace }}" == "live" ]]; then
             zig build                  \
               -Dall                    \
               -Drelease                \
+              $VERE32_FLAG             \
               --summary all
           else
             zig build                  \
               -Dall                    \
               -Doptimize=ReleaseFast   \
               -Dpace=${{inputs.pace}}  \
+              $VERE32_FLAG             \
               --summary all
           fi
       - name: Run unit tests
@@ -100,14 +116,20 @@ jobs:
             pact-test equality-test    \
             boot-test newt-test        \
             vere-noun-test unix-test   \
-            benchmarks                 \
+            palloc-test benchmarks     \
             -Doptimize=ReleaseFast     \
             -Dpace=${{inputs.pace}}    \
             --summary all
 
       - name: Build test binary
         if: ${{ inputs.fake_tests }}
         run: |
+          # Add -Dvere32 flag for 32-bit builds
+          VERE32_FLAG=""
+          if [[ "${{ matrix.bits }}" == "32" ]]; then
+            VERE32_FLAG="-Dvere32"
+          fi
+
           zig build                    \
             -Doptimize=ReleaseFast     \
             -Dpace=${{inputs.pace}}    \
@@ -116,6 +138,7 @@ jobs:
             -Dmem-dbg                  \
             -Dc3dbg                    \
             -Dsnapshot-validation      \
+            $VERE32_FLAG               \
             --summary all
 
       - name: Boot fake ship
@@ -148,21 +171,45 @@ jobs:
         if: ${{ inputs.upload }}
         run: |
           sha_version=$(sed -nr 's/#define URBIT_VERSION "(.*)"/\1/p' zig-out/include/version.h)
-          declare -a targets=(
-            "aarch64-linux-musl linux-aarch64"
-            "aarch64-macos-none macos-aarch64"
-            "x86_64-linux-musl linux-x86_64"
-            "x86_64-macos-none macos-x86_64"
+
+          # Define all targets with bits field
+          declare -a all_targets=(
+            "aarch64-linux-musl linux-aarch64 64"
+            "aarch64-macos-none macos-aarch64 64"
+            "x86_64-linux-musl linux-x86_64 64"
+            "x86_64-macos-none macos-x86_64 64"
+            "aarch64-linux-musl linux-aarch64 32"
+            "aarch64-macos-none macos-aarch64 32"
+            "x86_64-linux-musl linux-x86_64 32"
+            "x86_64-macos-none macos-x86_64 32"
           )
+
+          # Filter targets based on matrix.bits
+          declare -a targets=()
+          for t in "${all_targets[@]}"; do
+            IFS=' ' read zig_target target bits_flag <<< "${t}"
+            if [[ "$bits_flag" == "${{ matrix.bits }}" ]]; then
+              targets+=("$zig_target $target")
+            fi
+          done
+
           for t in "${targets[@]}"
           do
             IFS=' ' read zig_target target <<< "${t}"
             urbit_static=$GITHUB_WORKSPACE/zig-out/${zig_target}/urbit
+
+            # Determine binary prefix (vere32 or vere64)
+            if [[ "${{ matrix.bits }}" == "32" ]]; then
+              binary_prefix="vere32"
+            else
+              binary_prefix="vere64"
+            fi
+
             if ${{ inputs.next != null }}; then
               next=$(echo "${{ inputs.next }}" | sed 's/[^0-9]//g')
-              dest="gs://${UPLOAD_BASE}/next/kelvin/${next}/v${sha_version}/vere-v${sha_version}-${target}"
+              dest="gs://${UPLOAD_BASE}/next/kelvin/${next}/v${sha_version}/${binary_prefix}-v${sha_version}-${target}"
             else
-              dest="gs://${UPLOAD_BASE}/${{ inputs.pace }}/v${sha_version}/vere-v${sha_version}-${target}"
+              dest="gs://${UPLOAD_BASE}/${{ inputs.pace }}/v${sha_version}/${binary_prefix}-v${sha_version}-${target}"
             fi
 
             args=""

build.zig

@@ -36,6 +36,7 @@ const BuildCfg = struct {
     urth_mass: bool = false,
     ubsan: bool = false,
     asan: bool = false,
+    vere32: bool = false,
     tracy_enable: bool = false,
     tracy_callstack: bool = false,
     tracy_no_exit: bool = false,
@@ -121,6 +122,12 @@ pub fn build(b: *std.Build) !void {
     else
         false;
 
+    const vere32 = b.option(
+        bool,
+        "vere32",
+        "Compile in 32-bit mode",
+    ) orelse false;
+
     const tracy_enable = b.option(bool, "tracy", "Enable Tracy profiler") orelse false;
     const tracy_callstack = b.option(bool, "tracy-callstack", "Enable Tracy callstack capture") orelse false;
     const tracy_no_exit = b.option(bool, "tracy-no-exit", "Wait for profiler connection before exiting") orelse false;
@@ -160,6 +167,7 @@ pub fn build(b: *std.Build) !void {
         .urth_mass = urth_mass,
         .asan = asan,
         .ubsan = ubsan,
+        .vere32 = vere32,
         .tracy_enable = tracy_enable,
         .tracy_callstack = tracy_callstack,
         .tracy_no_exit = tracy_no_exit,
@@ -277,6 +285,9 @@ fn buildBinary(
     if (cfg.snapshot_validation)
         try urbit_flags.appendSlice(&.{"-DU3_SNAPSHOT_VALIDATION"});
 
+    if (!cfg.vere32)
+        try urbit_flags.appendSlice(&.{"-DVERE64"});
+
     if (cfg.urth_mass)
         try urbit_flags.appendSlice(&.{"-DU3_URTH_MASS"});
 
@@ -354,18 +365,21 @@ fn buildBinary(
         .copt = copts,
     });
 
-    const pkg_past = b.dependency("pkg_past", .{
-        .target = target,
-        .optimize = optimize,
-        .copt = copts,
-    });
+    // XX re-enable for migration work
+    // const pkg_past = if (cfg.vere32) b.dependency("pkg_past", .{
+    //     .target = target,
+    //     .optimize = optimize,
+    //     .copt = copts,
+    // }) else null;
 
     const pkg_vere = b.dependency("pkg_vere", .{
         .target = target,
         .optimize = optimize,
         .copt = copts,
         .pace = cfg.pace,
         .version = cfg.version,
+        // XX re-enable for migration work
+        // .vere32 = cfg.vere32,
     });
 
     const curl = b.dependency("curl", .{
@@ -485,7 +499,9 @@ fn buildBinary(
 
     urbit.linkLibrary(pkg_vere.artifact("vere"));
     urbit.linkLibrary(pkg_noun.artifact("noun"));
-    urbit.linkLibrary(pkg_past.artifact("past"));
+    // if (cfg.vere32) {
+    //     urbit.linkLibrary(pkg_past.?.artifact("past"));
+    // }
     urbit.linkLibrary(pkg_c3.artifact("c3"));
     urbit.linkLibrary(pkg_ur.artifact("ur"));
 
@@ -720,7 +736,7 @@ fn buildBinary(
             });
             const exe_install = b.addInstallArtifact(test_exe, .{});
             const run_unit_tests = b.addRunArtifact(test_exe);
-            if ( t.os.tag.isDarwin() and (cfg.asan or cfg.ubsan) ) {
+            if (t.os.tag.isDarwin() and (cfg.asan or cfg.ubsan)) {
                 //  disable libmalloc warnings
                 run_unit_tests.setEnvironmentVariable("MallocNanoZone", "0");
             }

pkg/c3/defs.c

@@ -2,18 +2,18 @@
 
 c3_s
 c3_sift_short(c3_y buf_y[2]);
-c3_w
-c3_sift_word(c3_y buf_y[4]);
+c3_h
+c3_sift_half(c3_y buf_y[4]);
 c3_d
 c3_sift_chub(c3_y byt_y[8]);
 
 void
 c3_etch_short(c3_y buf_y[2], c3_s sot_s);
 void
-c3_etch_word(c3_y buf_y[4], c3_w wod_w);
+c3_etch_half(c3_y buf_y[4], c3_h wod_h);
 void
 c3_etch_chub(c3_y byt_y[8], c3_d num_d);
 
-c3_w c3_align_w(c3_w x, c3_w al, align_dir hilo);
+c3_h c3_align_h(c3_h x, c3_h al, align_dir hilo);
 c3_d c3_align_d(c3_d x, c3_d al, align_dir hilo);
 void *c3_align_p(void const * p, size_t al, align_dir hilo);

pkg/c3/defs.h

@@ -48,18 +48,23 @@
 
     /* Size in words.
     */
+// (probably some of that belongs here)
+#ifndef VERE64
 #     define c3_wiseof(x)  (((sizeof (x)) + 3) >> 2)
+#else
+#     define c3_wiseof(x)  (((sizeof (x)) + 7) >> 3)
+#endif
 
     /* Bit counting.
     */
 #if   (32 == (CHAR_BIT * __SIZEOF_INT__))
-#     define c3_lz_w __builtin_clz
-#     define c3_tz_w __builtin_ctz
-#     define c3_pc_w __builtin_popcount
+#     define c3_lz_h __builtin_clz
+#     define c3_tz_h __builtin_ctz
+#     define c3_pc_h __builtin_popcount
 #elif (32 == (CHAR_BIT * __SIZEOF_LONG__))
-#     define c3_lz_w __builtin_clzl
-#     define c3_tz_w __builtin_ctzl
-#     define c3_pc_w __builtin_popcountl
+#     define c3_lz_h __builtin_clzl
+#     define c3_tz_h __builtin_ctzl
+#     define c3_pc_h __builtin_popcountl
 #else
 #     error  "port me"
 #endif
@@ -73,11 +78,23 @@
 #     define c3_tz_d __builtin_ctzll
 #     define c3_pc_d __builtin_popcountll
 #else
-#     error "port me"
+#     error  "port me"
 #endif
 
-#     define c3_bits_word(w) ((w) ? (32 - c3_lz_w(w)) : 0)
-#     define c3_bits_dabl(d) ((d) ? (64 - c3_lz_d(d)) : 0)
+#     define c3_bits_half(h) ((h) ? (32 - c3_lz_h(h)) : 0)
+#     define c3_bits_chub(d) ((d) ? (64 - c3_lz_d(d)) : 0)
+
+#ifndef VERE64
+#     define c3_bits_word(w)  c3_bits_half(w)
+#     define c3_lz_w  c3_lz_h
+#     define c3_tz_w  c3_tz_h
+#     define c3_pc_w  c3_pc_h
+#else
+#     define c3_bits_word(w)  c3_bits_chub(w)
+#     define c3_lz_w  c3_lz_d
+#     define c3_tz_w  c3_tz_d
+#     define c3_pc_w  c3_pc_d
+#endif
 
     /* Min and max.
     */
@@ -101,7 +118,7 @@
     /* Fill 16 words (64 bytes) with high-quality entropy.
     */
       void
-      c3_rand(c3_w* rad_w);
+      c3_rand(c3_h* rad_h);
 
     /* Short integers.
     */
@@ -133,10 +150,10 @@
         return ((c3_s)buf_y[1] << 8 | (c3_s)buf_y[0]);
       }
 
-      inline c3_w
-      c3_sift_word(c3_y buf_y[4])
+      inline c3_h
+      c3_sift_half(c3_y buf_y[4])
       {
-        return ((c3_w)buf_y[3] << 24 | (c3_w)buf_y[2] << 16 | (c3_w)buf_y[1] << 8 | (c3_w)buf_y[0]);
+        return ((c3_h)buf_y[3] << 24 | (c3_h)buf_y[2] << 16 | (c3_h)buf_y[1] << 8 | (c3_h)buf_y[0]);
       }
 
       inline c3_d
@@ -160,12 +177,12 @@
       }
 
       inline void
-      c3_etch_word(c3_y buf_y[4], c3_w wod_w)
+      c3_etch_half(c3_y buf_y[4], c3_h wod_h)
       {
-        buf_y[0] = wod_w         & 0xff;
-        buf_y[1] = (wod_w >>  8) & 0xff;
-        buf_y[2] = (wod_w >> 16) & 0xff;
-        buf_y[3] = (wod_w >> 24) & 0xff;
+        buf_y[0] = wod_h         & 0xff;
+        buf_y[1] = (wod_h >>  8) & 0xff;
+        buf_y[2] = (wod_h >> 16) & 0xff;
+        buf_y[3] = (wod_h >> 24) & 0xff;
       }
 
       inline void
@@ -248,17 +265,17 @@
 
    hi or lo align x to al
 
-   unless effective type of x is c3_w or c3_d, assumes x is a pointer.
+   unless effective type of x is c3_h or c3_d, assumes x is a pointer.
 */
 #define c3_align(x, al, hilo)                   \
   _Generic((x),                                 \
-           c3_w     : c3_align_w,               \
+           c3_h     : c3_align_h,               \
            c3_d     : c3_align_d,               \
            default  : c3_align_p)               \
        (x, al, hilo)
 typedef enum { C3_ALGHI=1, C3_ALGLO=0 } align_dir;
-inline c3_w
-c3_align_w(c3_w x, c3_w al, align_dir hilo) {
+inline c3_h
+c3_align_h(c3_h x, c3_h al, align_dir hilo) {
   c3_dessert(hilo <= C3_ALGHI && hilo >= C3_ALGLO);
   x += hilo * (al - 1);
   x &= ~(al - 1);
@@ -271,6 +288,15 @@ c3_align_d(c3_d x, c3_d al, align_dir hilo) {
   x &= ~(al - 1);
   return x;
 }
+inline c3_w
+c3_align_w(c3_w x, c3_w al, align_dir hilo) {
+#ifndef VERE64
+  return c3_align_h(x, al, hilo);
+#else
+  return c3_align_d(x, al, hilo);
+#endif
+}
+
 inline void*
 c3_align_p(void const * p, size_t al, align_dir hilo) {
   uintptr_t x = (uintptr_t)p;
@@ -280,6 +306,15 @@ c3_align_p(void const * p, size_t al, align_dir hilo) {
   return (void*)x;
 }
 
+#define c3_h_max  0xffffffff
+#define c3_d_max  0xffffffffffffffffULL
+
+#ifndef VERE64
+#define c3_w_max  c3_h_max
+#else
+#define c3_w_max  c3_d_max
+#endif
+
 #define c3_likely(x)    ( __builtin_expect(!!(x), 1) )
 #define c3_unlikely(x)  ( __builtin_expect(!!(x), 0) )