Merge branch 'main' into attributes-rework

Author: UnsignedByte

.github/workflows/test.yml

@@ -57,7 +57,7 @@ jobs:
         with:
           context: .
           project: 7grh10615f
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -40,22 +40,13 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v3.28.0-rc3/cmake-3.
     cd cmake-3.28.0-rc3 && ./bootstrap &&\
     make && make install
 
-# Install an older version of ScaLP that still has the `then` keyword
-# This is required by the `flopoco` library
-WORKDIR /home
-RUN git clone https://digidev.digi.e-technik.uni-kassel.de/git/scalp.git &&\
-    cd scalp && git checkout 8f1bdf61ed4d893e7b1370edb62187a19e921960 &&\
-    mkdir build && cd build &&\
-    cmake .. && make &&\
-    cmake --install . --prefix /usr/local
-
 # Install FloPoCo 4.1
 WORKDIR /home
-RUN git clone --branch flopoco-4.1 https://gitlab.com/flopoco/flopoco &&\
-    cd flopoco && git checkout f3d76595c01f84cee57ae67eee1ceb31a6fe93bc &&\
-    mkdir build && cd build &&\
-    cmake -GNinja .. && ninja &&\
-    ln -s /home/flopoco/build/code/FloPoCoBin/flopoco /usr/bin/flopoco
+RUN git clone https://gitlab.com/flopoco/flopoco &&\
+    cd flopoco && git checkout 418ee8b71fe2c4976cbc0a92924683fa73162128 &&\
+    make sysdeps CONFIG=docker &&\
+    make CONFIG=docker &&\
+    make install CONFIG=docker
 
 # Install GHDL 3.0.0
 WORKDIR /home

apps/blas/axpy/harness.fil

@@ -0,0 +1,32 @@
+import "apps/blas/axpy/axpy.fil";
+import "primitives/reshape.fil";
+
+comp Harness[W, N, MultsN, AddsN]<'G:II>(
+  go: interface['G],
+  a: ['G, 'G+1] W,
+  x: ['G, 'G+1] W*N,
+  y: ['G, 'G+1] W*N
+) -> (
+  out: ['G+L, 'G+L+1] W*N
+) with {
+  some L where L > 0;
+  some II where II > 0;
+} where W > 0,
+        N > 0,
+        MultsN > 0,
+        AddsN > 0,
+        N % MultsN == 0,
+        MultsN % AddsN == 0
+{
+  x_vec := new SplitWire[W, N]<'G>(x);
+  y_vec := new SplitWire[W, N]<'G>(y);
+
+  a := new Axpy[W, N, MultsN, AddsN];
+  run_a := a<'G>(a, x_vec.out{0..N}, y_vec.out{0..N});
+
+  out_flat := new ConcatBundle[W, N]<'G+a::L>(run_a.out{0..N});
+  out = out_flat.out;
+
+  II := a::II;
+  L := a::L;
+}

apps/blas/axpy/ports.json

@@ -0,0 +1,21 @@
+{
+    "inputs": {
+        "a": {
+            "type": "scalar"
+        },
+        "x": {
+            "type": "matrix",
+            "dim": [4,1]
+        },
+        "y": {
+            "type": "matrix",
+            "dim": [4,1]
+        }
+    },
+    "outputs": {
+        "out": {
+            "type": "matrix",
+            "dim": [4,1]
+        }
+    }
+}

apps/blas/axpy/test.expect

@@ -1,88 +1,27 @@
-import "apps/blas/axpy/axpy.fil";
+import "apps/blas/axpy/harness.fil";
 
-comp main<'G:II>(
+comp main[W, N, MultsN, AddsN]<'G:II>(
   go: interface['G],
   a:  ['G, 'G+1] W,
-  x_0: ['G, 'G+1] W,
-  x_1: ['G, 'G+1] W,
-  x_2: ['G, 'G+1] W,
-  x_3: ['G, 'G+1] W,
-  x_4: ['G, 'G+1] W,
-  x_5: ['G, 'G+1] W,
-  x_6: ['G, 'G+1] W,
-  x_7: ['G, 'G+1] W,
-  x_8: ['G, 'G+1] W,
-  x_9: ['G, 'G+1] W,
-  x_10: ['G, 'G+1] W,
-  x_11: ['G, 'G+1] W,
-  x_12: ['G, 'G+1] W,
-  x_13: ['G, 'G+1] W,
-  x_14: ['G, 'G+1] W,
-  x_15: ['G, 'G+1] W,
-  y_0: ['G, 'G+1] W,
-  y_1: ['G, 'G+1] W,
-  y_2: ['G, 'G+1] W,
-  y_3: ['G, 'G+1] W,
-  y_4: ['G, 'G+1] W,
-  y_5: ['G, 'G+1] W,
-  y_6: ['G, 'G+1] W,
-  y_7: ['G, 'G+1] W,
-  y_8: ['G, 'G+1] W,
-  y_9: ['G, 'G+1] W,
-  y_10: ['G, 'G+1] W,
-  y_11: ['G, 'G+1] W,
-  y_12: ['G, 'G+1] W,
-  y_13: ['G, 'G+1] W,
-  y_14: ['G, 'G+1] W,
-  y_15: ['G, 'G+1] W,
+  x:  ['G, 'G+1] W*N,
+  y:  ['G, 'G+1] W*N
 ) -> (
-  out_0: ['G+L, 'G+L+1] W,
-  out_1: ['G+L, 'G+L+1] W,
-  out_2: ['G+L, 'G+L+1] W,
-  out_3: ['G+L, 'G+L+1] W,
-  out_4: ['G+L, 'G+L+1] W,
-  out_5: ['G+L, 'G+L+1] W,
-  out_6: ['G+L, 'G+L+1] W,
-  out_7: ['G+L, 'G+L+1] W,
-  out_8: ['G+L, 'G+L+1] W,
-  out_9: ['G+L, 'G+L+1] W,
-  out_10: ['G+L, 'G+L+1] W,
-  out_11: ['G+L, 'G+L+1] W,
-  out_12: ['G+L, 'G+L+1] W,
-  out_13: ['G+L, 'G+L+1] W,
-  out_14: ['G+L, 'G+L+1] W,
-  out_15: ['G+L, 'G+L+1] W,
+  out: ['G+L, 'G+L+1] W*N
 ) with {
-  let M = 8;
-  let N = 16;
-  let W = 32;
-  let A = 8;
   some L where L > 0;
   some II where II > 0;
-} {
-
-  A := new Axpy[W, N, M, A];
-
-  bundle x[N]: ['G, 'G+1] W;
-  bundle y[N]: ['G, 'G+1] W;
-
-  x{0} = x_0; x{1} = x_1; x{2} = x_2; x{3} = x_3; 
-  x{4} = x_4; x{5} = x_5; x{6} = x_6; x{7} = x_7;
-  x{8} = x_8; x{9} = x_9; x{10} = x_10; x{11} = x_11;
-  x{12} = x_12; x{13} = x_13; x{14} = x_14; x{15} = x_15;
-
-  y{0} = y_0; y{1} = y_1; y{2} = y_2; y{3} = y_3; 
-  y{4} = y_4; y{5} = y_5; y{6} = y_6; y{7} = y_7;
-  y{8} = y_8; y{9} = y_9; y{10} = y_10; y{11} = y_11;
-  y{12} = y_12; y{13} = y_13; y{14} = y_14; y{15} = y_15;
-
-  L := A::L;
-  II := A::II;
-
-  a := A<'G>(a, x{0..N}, y{0..N});
-
-  out_0 = a.out{0}; out_1 = a.out{1}; out_2 = a.out{2}; out_3 = a.out{3};
-  out_4 = a.out{4}; out_5 = a.out{5}; out_6 = a.out{6}; out_7 = a.out{7};
-  out_8 = a.out{8}; out_9 = a.out{9}; out_10 = a.out{10}; out_11 = a.out{11};
-  out_12 = a.out{12}; out_13 = a.out{13}; out_14 = a.out{14}; out_15 = a.out{15};
+} where W > 0,
+        N > 0,
+        MultsN > 0,
+        AddsN > 0,
+        N % MultsN == 0,
+        MultsN % AddsN == 0
+{
+
+  har := new Harness[W, N, MultsN, AddsN];
+  h := har<'G>(a, x, y);
+  out = h.out;
+
+  II := har::II;
+  L := har::L;
 }

apps/blas/axpy/test.fil

@@ -0,0 +1 @@
+params.main = [4, 4, 4, 4]

apps/blas/axpy/test.fil.data

@@ -0,0 +1,27 @@
+import "apps/blas/dot/dot.fil";
+import "primitives/reshape.fil";
+
+comp Harness[W, N, MultsN]<'G:II>(
+  go: interface['G],
+  x: ['G, 'G+1] W*N,
+  y: ['G, 'G+1] W*N
+) -> (
+  out: ['G+L, 'G+L+1] W
+) with {
+  some L where L > 0;
+  some II where II > 0;
+} where W > 0,
+        N > 0,
+        MultsN > 0
+{
+  x_vec := new SplitWire[W, N]<'G>(x);
+  y_vec := new SplitWire[W, N]<'G>(y);
+
+  d := new Dot[W, N, MultsN];
+  run_d := d<'G>(x_vec.out{0..N}, y_vec.out{0..N});
+
+  out = run_d.out;
+
+  II := d::II;
+  L := d::L;
+}

apps/blas/axpy/test.toml

@@ -0,0 +1,17 @@
+{
+    "inputs": {
+        "x": {
+            "type": "matrix",
+            "dim": [4,1]
+        },
+        "y": {
+            "type": "matrix",
+            "dim": [4,1]
+        }
+    },
+    "outputs": {
+        "out": {
+            "type": "scalar"
+        }
+    }
+}