Merge branch 'next/kelvin/410' into mesa-pairs

urbit · Oct 18, 2024 · 4232f8e · 4232f8e
2 parents 7580828 + 24054c9
commit 4232f8e
Show file tree

Hide file tree

Showing 134 changed files with 14,168 additions and 6,321 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -5,13 +5,13 @@ on:
     branches:
       - develop
     paths:
-      - '*.bazel'
-      - '.bazelrc'
-      - '.github/workflows/**.yml'
-      - 'PACE'
-      - 'VERSION'
-      - 'bazel/**'
+      - 'build.zig'
+      - 'build.zig.zon'
+      - 'ext/**'
+      - '!ext/**.md'
       - 'pkg/**'
+      - '.github/workflows/**.yml'
+      - '*.sh'
 
 jobs:
   urbit:

diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml
@@ -3,12 +3,13 @@ name: Feature pull request
 on:
   pull_request:
     paths:
-      - '.bazelrc'
-      - '.github/workflows/*.yml'
-      - 'BUILD.bazel'
-      - 'WORKSPACE.bazel'
-      - 'bazel/**'
+      - 'build.zig'
+      - 'build.zig.zon'
+      - 'ext/**'
+      - '!ext/**.md'
       - 'pkg/**'
+      - '.github/workflows/**.yml'
+      - '*.sh'
 
 jobs:
   urbit:

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -5,14 +5,13 @@ on:
     branches:
       - master
     paths:
-      - '*.bazel'
-      - '.bazelrc'
-      - '.github/workflows/**.yml'
-      - 'PACE'
-      - 'VERSION'
-      - 'bazel/**'
+      - 'build.zig'
+      - 'build.zig.zon'
+      - 'ext/**'
+      - '!ext/**.md'
       - 'pkg/**'
-
+      - '.github/workflows/**.yml'
+      - '*.sh'
 
 jobs:
   urbit:

diff --git a/.github/workflows/next.yml b/.github/workflows/next.yml
@@ -5,13 +5,13 @@ on:
     branches:
       - 'next/kelvin/*'
     paths:
-      - '*.bazel'
-      - '.bazelrc'
-      - '.github/workflows/**.yml'
-      - 'PACE'
-      - 'VERSION'
-      - 'bazel/**'
+      - 'build.zig'
+      - 'build.zig.zon'
+      - 'ext/**'
+      - '!ext/**.md'
       - 'pkg/**'
+      - '.github/workflows/**.yml'
+      - '*.sh'
 
 jobs:
   urbit:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,13 +5,13 @@ on:
     branches:
       - release
     paths:
-      - '*.bazel'
-      - '.bazelrc'
-      - '.github/workflows/**.yml'
-      - 'PACE'
-      - 'VERSION'
-      - 'bazel/**'
+      - 'build.zig'
+      - 'build.zig.zon'
+      - 'ext/**'
+      - '!ext/**.md'
       - 'pkg/**'
+      - '.github/workflows/**.yml'
+      - '*.sh'
 
 jobs:
   urbit:

diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml
@@ -90,7 +90,6 @@ jobs:
               -Dpace=${{inputs.pace}}  \
               --summary all
           fi
-
       - name: Run unit tests
         run: |
           zig build                    \

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -0,0 +1,6 @@
+###############################################################################
+# Bazel now uses Bzlmod by default to manage external dependencies.
+# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
+#
+# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
+###############################################################################
diff --git a/bazel/third_party/softblas/BUILD.bazel b/bazel/third_party/softblas/BUILD.bazel
diff --git a/bazel/third_party/softblas/softblas.BUILD b/bazel/third_party/softblas/softblas.BUILD
@@ -0,0 +1,117 @@
+# FILEPATH: /home/neal/lagoon/vere/bazel/third_party/softblas/softblas.BUILD
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+cc_library(
+    name = "softblas",
+    visibility = ["//visibility:public"],
+    deps = select({
+        "@platforms//cpu:aarch64": [":softblas_aarch64"],
+        "@platforms//cpu:x86_64": [":softblas_x86_64"],
+        "//conditions:default": [],
+    }),
+)
+
+cc_library(
+    name = "softblas_aarch64",
+    visibility = ["//visibility:public"],
+    hdrs = ["include/softblas.h"],
+    includes = ["include"],
+    srcs = [
+        "include/softblas.h",
+        "src/softblas_state.c",
+        "src/blas/level1/sasum.c",
+        "src/blas/level1/dasum.c",
+        "src/blas/level1/hasum.c",
+        "src/blas/level1/qasum.c",
+        "src/blas/level1/saxpy.c",
+        "src/blas/level1/daxpy.c",
+        "src/blas/level1/haxpy.c",
+        "src/blas/level1/qaxpy.c",
+        "src/blas/level1/scopy.c",
+        "src/blas/level1/dcopy.c",
+        "src/blas/level1/hcopy.c",
+        "src/blas/level1/qcopy.c",
+        "src/blas/level1/sdot.c",
+        "src/blas/level1/ddot.c",
+        "src/blas/level1/hdot.c",
+        "src/blas/level1/qdot.c",
+        "src/blas/level1/snrm2.c",
+        "src/blas/level1/dnrm2.c",
+        "src/blas/level1/hnrm2.c",
+        "src/blas/level1/qnrm2.c",
+        "src/blas/level1/sscal.c",
+        "src/blas/level1/dscal.c",
+        "src/blas/level1/hscal.c",
+        "src/blas/level1/qscal.c",
+        "src/blas/level1/sswap.c",
+        "src/blas/level1/dswap.c",
+        "src/blas/level1/hswap.c",
+        "src/blas/level1/qswap.c",
+        "src/blas/level1/isamax.c",
+        "src/blas/level1/idamax.c",
+        "src/blas/level1/ihamax.c",
+        "src/blas/level1/iqamax.c",
+        "src/blas/level2/sgemv.c",
+        "src/blas/level2/dgemv.c",
+        "src/blas/level2/hgemv.c",
+        "src/blas/level2/qgemv.c",
+        "src/blas/level3/sgemm.c",
+        "src/blas/level3/dgemm.c",
+        "src/blas/level3/hgemm.c",
+        "src/blas/level3/qgemm.c"
+    ],
+    deps = ["@softfloat"],
+)
+
+cc_library(
+    name = "softblas_x86_64",
+    visibility = ["//visibility:public"],
+    hdrs = ["include/softblas.h"],
+    includes = ["include"],
+    srcs = [
+        "include/softblas.h",
+        "src/softblas_state.c",
+        "src/blas/level1/sasum.c",
+        "src/blas/level1/dasum.c",
+        "src/blas/level1/hasum.c",
+        "src/blas/level1/qasum.c",
+        "src/blas/level1/saxpy.c",
+        "src/blas/level1/daxpy.c",
+        "src/blas/level1/haxpy.c",
+        "src/blas/level1/qaxpy.c",
+        "src/blas/level1/scopy.c",
+        "src/blas/level1/dcopy.c",
+        "src/blas/level1/hcopy.c",
+        "src/blas/level1/qcopy.c",
+        "src/blas/level1/sdot.c",
+        "src/blas/level1/ddot.c",
+        "src/blas/level1/hdot.c",
+        "src/blas/level1/qdot.c",
+        "src/blas/level1/snrm2.c",
+        "src/blas/level1/dnrm2.c",
+        "src/blas/level1/hnrm2.c",
+        "src/blas/level1/qnrm2.c",
+        "src/blas/level1/sscal.c",
+        "src/blas/level1/dscal.c",
+        "src/blas/level1/hscal.c",
+        "src/blas/level1/qscal.c",
+        "src/blas/level1/sswap.c",
+        "src/blas/level1/dswap.c",
+        "src/blas/level1/hswap.c",
+        "src/blas/level1/qswap.c",
+        "src/blas/level1/isamax.c",
+        "src/blas/level1/idamax.c",
+        "src/blas/level1/ihamax.c",
+        "src/blas/level1/iqamax.c",
+        "src/blas/level2/sgemv.c",
+        "src/blas/level2/dgemv.c",
+        "src/blas/level2/hgemv.c",
+        "src/blas/level2/qgemv.c",
+        "src/blas/level3/sgemm.c",
+        "src/blas/level3/dgemm.c",
+        "src/blas/level3/hgemm.c",
+        "src/blas/level3/qgemm.c"
+    ],
+    deps = ["@softfloat"],
+)
diff --git a/build.zig b/build.zig
@@ -283,6 +283,11 @@ fn build_single(
         .optimize = optimize,
     });
 
+    const softblas = b.dependency("softblas", .{
+        .target = target,
+        .optimize = optimize,
+    });
+
     const softfloat = b.dependency("softfloat", .{
         .target = target,
         .optimize = optimize,
@@ -485,13 +490,12 @@ fn build_single(
     pkg_noun.linkLibrary(pdjson.artifact("pdjson"));
     pkg_noun.linkLibrary(sigsegv.artifact("sigsegv"));
     pkg_noun.linkLibrary(softfloat.artifact("softfloat"));
+    pkg_noun.linkLibrary(softblas.artifact("softblas"));
     if (t.os.tag == .linux)
         pkg_noun.linkLibrary(unwind.artifact("unwind"));
     pkg_noun.linkLibrary(urcrypt.artifact("urcrypt"));
     pkg_noun.linkLibrary(whereami.artifact("whereami"));
-    if (t.os.tag == .linux)
-        pkg_noun.linkLibrary(zlib.artifact("z"));
-
+    pkg_noun.linkLibrary(zlib.artifact("z"));
     pkg_noun.linkLibC();
 
     pkg_noun.addIncludePath(b.path("pkg/noun"));
@@ -689,6 +693,7 @@ fn build_single(
             "jets/f/ut_nest.c",
             "jets/f/ut_rest.c",
             "jets/g/plot.c",
+            "jets/i/lagoon.c",
             "jets/tree.c",
             "log.c",
             "manage.c",

diff --git a/build.zig.zon b/build.zig.zon
@@ -49,6 +49,9 @@
         .softfloat = .{
             .path = "./ext/softfloat",
         },
+        .softblas = .{
+            .path = "./ext/softblas",
+        },
         .unwind = .{
             .path = "./ext/unwind",
         },